diff --git a/.travis.yml b/.travis.yml index 64fdcf2a..8d7f33e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,5 @@ cache: - $HOME/.m2 install: - sudo apt-get -qq update - - sudo apt-get -y install lintian fakeroot rpm python-rpm - - git clone https://github.com/rpm-software-management/rpmlint -o rpmlint-1.9 - - sudo make -C rpmlint install script: - - mvn -Pfull,rpm package install - - mvn -Pfull -pl libresonic-assembly assembly:single + - mvn package install diff --git a/documentation/PROXY.md b/documentation/PROXY.md index b922f6a5..1a9cfe56 100644 --- a/documentation/PROXY.md +++ b/documentation/PROXY.md @@ -20,25 +20,32 @@ free. ## Libresonic configuration -A few settings can be tweaked in Libresonic's startup script or Tomcat -configuration. +A few settings should be tweaked via Spring Boot or Tomcat +configuration: -The reverse proxy will handle HTTPS connections, so there is no need for -Libresonic to handle them, which is why we set `httpsPort` to 0: + - Set the context path to `/libresonic` + - Set the correct address to listen to + - Set the correct port to listen to - libresonic.httpsPort=0 +#### Spring Boot -Furthermore, the internal Libresonic server should only be accessible from the -inside of the reverse proxy : we tell Libresonic to listen on the local IP -only: +Add the following java args: - libresonic.host=127.0.0.1 - libresonic.port=4040 +```java -Dserver.port=4040 -Dserver.address=127.0.0.1 -Dserver.contextPath=/libresonic -jar libresonic.war``` -Finally, if Libresonic should be accessible from a subdirectory, the context -path must be set correctly: +#### Tomcat +Modify your `` with the proper address and port: - libresonic.contextPath=/libresonic +``` + - - 4.0.0 - libresonic-assembly - pom - Libresonic Assembly - - - org.libresonic.player - libresonic - 6.2.beta1.springboot - - - - - org.libresonic.player - libresonic-main - ${project.version} - war - - - - - - libresonic-${project.version} - - - - - maven-assembly-plugin - - - src/main/assembly/war.xml - src/main/assembly/standalone.xml - src/main/assembly/src.xml - - - - - - - maven-antrun-plugin - - - validate - - - - - - - run - - - - - - - - - diff --git a/libresonic-assembly/src/main/assembly/src.xml b/libresonic-assembly/src/main/assembly/src.xml deleted file mode 100644 index 6fe8be51..00000000 --- a/libresonic-assembly/src/main/assembly/src.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - src - - zip - - false - - - - .. - - pom.xml - - - - - - ../repo - repo - - - - ../libresonic-main - - src/** - pom.xml - target/classes/build_number.txt - LICENSE.TXT - README.TXT - Getting Started.html - - libresonic-main - - - - ../libresonic-rest-api - - src/** - pom.xml - - libresonic-rest-api - - - - ../libresonic-sonos-api - - src/** - pom.xml - - libresonic-sonos-api - - - - diff --git a/libresonic-assembly/src/main/assembly/standalone.xml b/libresonic-assembly/src/main/assembly/standalone.xml deleted file mode 100644 index 8e5562cb..00000000 --- a/libresonic-assembly/src/main/assembly/standalone.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - standalone - - tar.gz - - false - - - ../libresonic-main - - - README.TXT - LICENSE.TXT - Getting Started.html - - - - ../libresonic-main/target - - - *.war - - - - ../libresonic-booter/target - - - libresonic-booter-jar-with-dependencies.jar - - - - ../libresonic-booter/src/main/script - - - libresonic.sh - libresonic.bat - - 0777 - - - \ No newline at end of file diff --git a/libresonic-assembly/src/main/assembly/war.xml b/libresonic-assembly/src/main/assembly/war.xml deleted file mode 100644 index 9f0d478c..00000000 --- a/libresonic-assembly/src/main/assembly/war.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - war - - zip - - false - - - ../libresonic-main - - - README.TXT - LICENSE.TXT - Getting Started.html - - - - ../libresonic-main/target - - - *.war - - - - \ No newline at end of file diff --git a/libresonic-booter/pom.xml b/libresonic-booter/pom.xml deleted file mode 100644 index abaf4dc4..00000000 --- a/libresonic-booter/pom.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - 4.0.0 - libresonic-booter - Libresonic Booter - - - org.libresonic.player - libresonic - 6.2.beta1.springboot - - - - - - org.mortbay.jetty - jetty - 6.1.5 - - - - org.mortbay.jetty - jetty-embedded - 6.1.5 - - - javax.servlet.jsp - jsp-api - - - runtime - - - - org.mortbay.jetty - jsp-2.0 - 6.1.5 - pom - runtime - - - - com.jgoodies - looks - 2.1.4 - - - - com.jgoodies - forms - 1.1.0 - - - - org.springframework - spring-context - - - - commons-io - commons-io - 1.3.1 - - - - - - libresonic-booter - - - - maven-assembly-plugin - - - jar-with-dependencies - - - ${basedir}/src/main/resources/META-INF/MANIFEST.MF - - - - - - - make-assembly - package - - attached - - - - - - - - - diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/Main.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/Main.java deleted file mode 100644 index cce64830..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/Main.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.libresonic.player.booter; - -import java.util.Arrays; -import java.util.List; - -import javax.swing.JOptionPane; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import org.libresonic.player.booter.agent.SettingsPanel; -import org.libresonic.player.booter.agent.LibresonicAgent; - -/** - * Application entry point for Libresonic booter. - *

- * Use command line argument "-agent" to start the Windows service monitoring agent, - * or "-mac" to start the Mac version of the deployer. - * - * @author Sindre Mehus - */ -public class Main { - - public Main(String contextName, List args) { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext" + contextName + ".xml"); - - if ("-agent".equals(contextName)) { - - LibresonicAgent agent = (LibresonicAgent) context.getBean("agent"); - SettingsPanel settingsPanel = (SettingsPanel) context.getBean("settingsPanel"); - - agent.setElevated(args.contains("-elevated")); - - if (args.contains("-balloon")) { - agent.showTrayIconMessage(); - } - - if (args.contains("-stop")) { - agent.startOrStopService(false); - agent.showStatusPanel(); - } else if (args.contains("-start")) { - agent.startOrStopService(true); - agent.showStatusPanel(); - } - - if (args.contains("-settings")) { - String[] settings = args.get(args.indexOf("-settings") + 1).split(","); - try { - agent.showSettingsPanel(); - settingsPanel.saveSettings(Integer.valueOf(settings[0]), Integer.valueOf(settings[1]), Integer.valueOf(settings[2]), settings[3]); - settingsPanel.readValues(); - } catch (Exception x) { - JOptionPane.showMessageDialog(settingsPanel, x.getMessage(), "Error", JOptionPane.WARNING_MESSAGE); - } - } - } - } - - public static void main(String[] args) { - String context = "-deployer"; - if (args.length > 0) { - context = args[0]; - } - new Main(context, Arrays.asList(args)); - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicAgent.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicAgent.java deleted file mode 100644 index 9fda03b4..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicAgent.java +++ /dev/null @@ -1,201 +0,0 @@ -package org.libresonic.player.booter.agent; - -import java.awt.Desktop; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -import javax.swing.JOptionPane; -import javax.swing.UIManager; - -import org.apache.commons.io.IOUtils; - -import com.jgoodies.looks.plastic.PlasticXPLookAndFeel; - -import org.libresonic.player.booter.deployer.DeploymentStatus; -import org.libresonic.player.booter.deployer.LibresonicDeployerService; - -/** - * Responsible for deploying the Libresonic web app in - * the embedded Jetty container. - * - * @author Sindre Mehus - */ -public class LibresonicAgent { - - private final List listeners = new ArrayList(); - private final TrayController trayController; - private LibresonicFrame frame; - private final LibresonicDeployerService service; - private static final int POLL_INTERVAL_DEPLOYMENT_INFO_SECONDS = 5; - private static final int POLL_INTERVAL_SERVICE_STATUS_SECONDS = 5; - private String url; - private boolean serviceStatusPollingEnabled; - private boolean elevated; - - public LibresonicAgent(LibresonicDeployerService service) { - this.service = service; - setLookAndFeel(); - trayController = new TrayController(this); - startPolling(); - } - - public void setFrame(LibresonicFrame frame) { - this.frame = frame; - } - - private void setLookAndFeel() { - // Set look-and-feel. - try { - UIManager.setLookAndFeel(new PlasticXPLookAndFeel()); - } catch (Throwable x) { - System.err.println("Failed to set look-and-feel.\n" + x); - } - } - - private void startPolling() { - ScheduledExecutorService executor = Executors.newScheduledThreadPool(2); - Runnable runnable = new Runnable() { - public void run() { - try { - notifyDeploymentInfo(service.getDeploymentInfo()); - } catch (Throwable x) { - notifyDeploymentInfo(null); - } - } - }; - executor.scheduleWithFixedDelay(runnable, 0, POLL_INTERVAL_DEPLOYMENT_INFO_SECONDS, TimeUnit.SECONDS); - - runnable = new Runnable() { - public void run() { - if (serviceStatusPollingEnabled) { - try { - notifyServiceStatus(getServiceStatus()); - } catch (Throwable x) { - notifyServiceStatus(null); - } - } - } - }; - executor.scheduleWithFixedDelay(runnable, 0, POLL_INTERVAL_SERVICE_STATUS_SECONDS, TimeUnit.SECONDS); - } - - private String getServiceStatus() throws Exception { - Process process = Runtime.getRuntime().exec("libresonic-service.exe -status"); - return IOUtils.toString(process.getInputStream()); - } - - public void setServiceStatusPollingEnabled(boolean enabled) { - serviceStatusPollingEnabled = enabled; - } - - public void startOrStopService(boolean start) { - try { - String cmd = "libresonic-service.exe " + (start ? "-start" : "-stop"); - System.err.println("Executing: " + cmd); - - Runtime.getRuntime().exec(cmd); - } catch (Exception x) { - x.printStackTrace(); - } - } - - /** - * If necessary, restart agent with elevated rights. - */ - public void checkElevation(String... args) { - - if (isElevationNeeded() && !isElevated()) { - try { - List command = new ArrayList(); - command.add("cmd"); - command.add("/c"); - command.add("libresonic-agent-elevated.exe"); - command.addAll(Arrays.asList(args)); - - ProcessBuilder builder = new ProcessBuilder(); - builder.command(command); - System.err.println("Executing: " + command + " with current dir: " + System.getProperty("user.dir")); - builder.start(); - System.exit(0); - } catch (Exception x) { - JOptionPane.showMessageDialog(frame, "Failed to elevate Libresonic Control Panel. " + x, "Error", JOptionPane.WARNING_MESSAGE); - x.printStackTrace(); - } - } - } - - public void setElevated(boolean elevated) { - this.elevated = elevated; - } - - private boolean isElevated() { - return elevated; - } - - /** - * Returns whether UAC elevation is necessary (to start/stop services etc). - */ - private boolean isElevationNeeded() { - - String osVersion = System.getProperty("os.version"); - try { - int majorVersion = Integer.parseInt(osVersion.substring(0, osVersion.indexOf("."))); - - // Elevation is necessary in Windows Vista (os.version=6.1) and later. - return majorVersion >= 6; - } catch (Exception x) { - System.err.println("Failed to resolve OS version from '" + osVersion + "'\n" + x); - return false; - } - } - - public void addListener(LibresonicListener listener) { - listeners.add(listener); - } - - private void notifyDeploymentInfo(DeploymentStatus status) { - if (status != null) { - url = status.getURL(); - } - - for (LibresonicListener listener : listeners) { - listener.notifyDeploymentStatus(status); - } - } - - private void notifyServiceStatus(String status) { - for (LibresonicListener listener : listeners) { - listener.notifyServiceStatus(status); - } - } - - public void showStatusPanel() { - frame.showStatusPanel(); - } - - public void showSettingsPanel() { - frame.showSettingsPanel(); - } - - public void showTrayIconMessage() { - trayController.showMessage(); - } - - public void exit() { - trayController.uninstallComponents(); - System.exit(0); - } - - public void openBrowser() { - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (Throwable x) { - x.printStackTrace(); - } - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicFrame.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicFrame.java deleted file mode 100644 index b11832d4..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicFrame.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.libresonic.player.booter.agent; - -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.ButtonBarFactory; -import org.libresonic.player.booter.Main; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.lang.reflect.Method; -import java.util.Arrays; - -/** - * Frame that is activated by the tray icon. Contains a tabbed pane - * with status and settings panels. - * - * @author Sindre Mehus - */ -public class LibresonicFrame extends JFrame { - - private final LibresonicAgent libresonicAgent; - - private final StatusPanel statusPanel; - private final SettingsPanel settingsPanel; - private JTabbedPane tabbedPane; - private JButton closeButton; - - public LibresonicFrame(LibresonicAgent libresonicAgent, StatusPanel statusPanel, SettingsPanel settingsPanel) { - super("Libresonic Control Panel"); - this.libresonicAgent = libresonicAgent; - this.statusPanel = statusPanel; - this.settingsPanel = settingsPanel; - createComponents(); - layoutComponents(); - addBehaviour(); - setupIcons(); - - pack(); - centerComponent(); - } - - private void setupIcons() { - Toolkit toolkit = Toolkit.getDefaultToolkit(); - - // Window.setIconImages() was added in Java 1.6. Since Libresonic only requires 1.5, we - // use reflection to invoke it. - try { - Method method = Window.class.getMethod("setIconImages", java.util.List.class); - java.util.List images = Arrays.asList( - toolkit.createImage(Main.class.getResource("/images/libresonic-16.png")), - toolkit.createImage(Main.class.getResource("/images/libresonic-32.png")), - toolkit.createImage(Main.class.getResource("/images/libresonic-512.png"))); - method.invoke(this, images); - } catch (Throwable x) { - // Fallback to old method. - setIconImage(toolkit.createImage(Main.class.getResource("/images/libresonic-32.png"))); - } - } - - public void centerComponent() { - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - setLocation(screenSize.width / 2 - getWidth() / 2, - screenSize.height / 2 - getHeight() / 2); - } - - private void createComponents() { - tabbedPane = new JTabbedPane(); - closeButton = new JButton("Close"); - } - - private void layoutComponents() { - tabbedPane.add("Status", statusPanel); - tabbedPane.add("Settings", settingsPanel); - - JPanel pane = (JPanel) getContentPane(); - pane.setLayout(new BorderLayout(10, 10)); - pane.add(tabbedPane, BorderLayout.CENTER); - pane.add(ButtonBarFactory.buildCloseBar(closeButton), BorderLayout.SOUTH); - - pane.setBorder(Borders.TABBED_DIALOG_BORDER); - } - - private void addBehaviour() { - closeButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - setVisible(false); - } - }); - } - - @Override - public void setVisible(boolean b) { - super.setVisible(b); - libresonicAgent.setServiceStatusPollingEnabled(b); - } - - public void showStatusPanel() { - settingsPanel.readValues(); - tabbedPane.setSelectedComponent(statusPanel); - pack(); - setVisible(true); - toFront(); - } - - public void showSettingsPanel() { - settingsPanel.readValues(); - tabbedPane.setSelectedComponent(settingsPanel); - pack(); - setVisible(true); - toFront(); - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicListener.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicListener.java deleted file mode 100644 index a985a8df..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/LibresonicListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.libresonic.player.booter.agent; - -import org.libresonic.player.booter.deployer.DeploymentStatus; - -/** - * Callback interface implemented by GUI classes that wants to be notified when - * the state of the Libresonic deployment changes. - * - * @author Sindre Mehus - */ -public interface LibresonicListener { - - /** - * Invoked when new information about the Libresonic deployment is available. - * - * @param deploymentStatus The new deployment status, or null if an - * error occurred while retrieving the status. - */ - void notifyDeploymentStatus(DeploymentStatus deploymentStatus); - - /** - * Invoked when new information about the Libresonic Windows service is available. - * - * @param serviceStatus The new service status, or null if an - * error occurred while retrieving the status. - */ - void notifyServiceStatus(String serviceStatus); -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/SettingsPanel.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/SettingsPanel.java deleted file mode 100644 index 6b13aeef..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/SettingsPanel.java +++ /dev/null @@ -1,375 +0,0 @@ -package org.libresonic.player.booter.agent; - -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.ButtonBarFactory; -import com.jgoodies.forms.layout.FormLayout; -import org.libresonic.player.booter.deployer.DeploymentStatus; -import org.libresonic.player.booter.deployer.LibresonicDeployer; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Reader; -import java.io.Writer; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.text.Format; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Panel displaying the settings of the Libresonic service. - * - * @author Sindre Mehus - */ -public class SettingsPanel extends JPanel implements LibresonicListener { - - private static final Format INTEGER_FORMAT = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.UK)); - - private final LibresonicAgent libresonicAgent; - private JFormattedTextField portTextField; - private JCheckBox httpsPortCheckBox; - private JFormattedTextField httpsPortTextField; - private JComboBox contextPathComboBox; - private JFormattedTextField memoryTextField; - private JButton defaultButton; - private JButton saveButton; - public SettingsPanel(LibresonicAgent libresonicAgent) { - this.libresonicAgent = libresonicAgent; - createComponents(); - configureComponents(); - layoutComponents(); - addBehaviour(); - readValues(); - libresonicAgent.addListener(this); - } - - public void readValues() { - portTextField.setValue(getPortFromOptionsFile()); - memoryTextField.setValue(getMemoryLimitFromOptionsFile()); - contextPathComboBox.setSelectedItem(getContextPathFromOptionsFile()); - int httpsPort = getHttpsPortFromOptionsFile(); - boolean httpsEnabled = httpsPort != 0; - httpsPortTextField.setValue(httpsEnabled ? httpsPort : 4443); - httpsPortTextField.setEnabled(httpsEnabled); - httpsPortCheckBox.setSelected(httpsEnabled); - } - - private int getHttpsPortFromOptionsFile() { - try { - String s = grep("-Dlibresonic.httpsPort=(\\d+)"); - return Integer.parseInt(s); - } catch (Exception x) { - x.printStackTrace(); - return LibresonicDeployer.DEFAULT_HTTPS_PORT; - } - } - - private int getPortFromOptionsFile() { - try { - String s = grep("-Dlibresonic.port=(\\d+)"); - return Integer.parseInt(s); - } catch (Exception x) { - x.printStackTrace(); - return LibresonicDeployer.DEFAULT_PORT; - } - } - - private int getMemoryLimitFromOptionsFile() { - try { - String s = grep("-Xmx(\\d+)m"); - return Integer.parseInt(s); - } catch (Exception x) { - x.printStackTrace(); - return LibresonicDeployer.DEFAULT_MEMORY_LIMIT; - } - } - - private String getContextPathFromOptionsFile() { - try { - String s = grep("-Dlibresonic.contextPath=(.*)"); - if (s == null) { - throw new NullPointerException(); - } - return s; - } catch (Exception x) { - x.printStackTrace(); - return LibresonicDeployer.DEFAULT_CONTEXT_PATH; - } - } - - private void createComponents() { - portTextField = new JFormattedTextField(INTEGER_FORMAT); - httpsPortTextField = new JFormattedTextField(INTEGER_FORMAT); - httpsPortCheckBox = new JCheckBox("Enable https on port"); - contextPathComboBox = new JComboBox(); - memoryTextField = new JFormattedTextField(INTEGER_FORMAT); - defaultButton = new JButton("Restore defaults"); - saveButton = new JButton("Save settings"); - } - - private void configureComponents() { - contextPathComboBox.setEditable(true); - contextPathComboBox.addItem("/"); - contextPathComboBox.addItem("/libresonic"); - contextPathComboBox.addItem("/music"); - } - - private void layoutComponents() { - FormLayout layout = new FormLayout("d, 6dlu, max(d;30dlu):grow"); - DefaultFormBuilder builder = new DefaultFormBuilder(layout); - builder.append("Port number", portTextField); - builder.append(httpsPortCheckBox, httpsPortTextField); - builder.append("Memory limit (MB)", memoryTextField); - builder.append("Context path", contextPathComboBox); - - setBorder(Borders.DIALOG_BORDER); - - setLayout(new BorderLayout(12, 12)); - add(builder.getPanel(), BorderLayout.CENTER); - add(ButtonBarFactory.buildCenteredBar(defaultButton, saveButton), BorderLayout.SOUTH); - } - - private void addBehaviour() { - saveButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - libresonicAgent.checkElevation("-settings", getMemoryLimit() + "," + getPort() + "," + getHttpsPort() + "," + getContextPath()); - saveSettings(getMemoryLimit(), getPort(), getHttpsPort(), getContextPath()); - } catch (Exception x) { - JOptionPane.showMessageDialog(SettingsPanel.this, x.getMessage(), "Error", JOptionPane.WARNING_MESSAGE); - } - } - }); - - defaultButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - portTextField.setValue(LibresonicDeployer.DEFAULT_PORT); - httpsPortTextField.setValue(4443); - httpsPortTextField.setEnabled(false); - httpsPortCheckBox.setSelected(false); - memoryTextField.setValue(LibresonicDeployer.DEFAULT_MEMORY_LIMIT); - contextPathComboBox.setSelectedItem(LibresonicDeployer.DEFAULT_CONTEXT_PATH); - } - }); - - httpsPortCheckBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - httpsPortTextField.setEnabled(httpsPortCheckBox.isSelected()); - } - }); - } - - private String getContextPath() throws SettingsException { - String contextPath = (String) contextPathComboBox.getSelectedItem(); - if (contextPath.contains(" ") || !contextPath.startsWith("/")) { - throw new SettingsException("Please specify a valid context path."); - } - return contextPath; - } - - private int getMemoryLimit() throws SettingsException { - int memoryLimit; - try { - memoryLimit = ((Number) memoryTextField.getValue()).intValue(); - if (memoryLimit < 5) { - throw new Exception(); - } - } catch (Exception x) { - throw new SettingsException("Please specify a valid memory limit.", x); - } - return memoryLimit; - } - - private int getPort() throws SettingsException { - int port; - try { - port = ((Number) portTextField.getValue()).intValue(); - if (port < 1 || port > 65535) { - throw new Exception(); - } - } catch (Exception x) { - throw new SettingsException("Please specify a valid port number.", x); - } - return port; - } - - private int getHttpsPort() throws SettingsException { - if (!httpsPortCheckBox.isSelected()) { - return 0; - } - - int port; - try { - port = ((Number) httpsPortTextField.getValue()).intValue(); - if (port < 1 || port > 65535) { - throw new Exception(); - } - } catch (Exception x) { - throw new SettingsException("Please specify a valid https port number.", x); - } - return port; - } - - public void saveSettings(int memoryLimit, int port, int httpsPort, String contextPath) throws SettingsException { - File file = getOptionsFile(); - - java.util.List lines = readLines(file); - java.util.List newLines = new ArrayList(); - - boolean memoryLimitAdded = false; - boolean portAdded = false; - boolean httpsPortAdded = false; - boolean contextPathAdded = false; - - for (String line : lines) { - if (line.startsWith("-Xmx")) { - newLines.add("-Xmx" + memoryLimit + "m"); - memoryLimitAdded = true; - } else if (line.startsWith("-Dlibresonic.port=")) { - newLines.add("-Dlibresonic.port=" + port); - portAdded = true; - } else if (line.startsWith("-Dlibresonic.httpsPort=")) { - newLines.add("-Dlibresonic.httpsPort=" + httpsPort); - httpsPortAdded = true; - } else if (line.startsWith("-Dlibresonic.contextPath=")) { - newLines.add("-Dlibresonic.contextPath=" + contextPath); - contextPathAdded = true; - } else { - newLines.add(line); - } - } - - if (!memoryLimitAdded) { - newLines.add("-Xmx" + memoryLimit + "m"); - } - if (!portAdded) { - newLines.add("-Dlibresonic.port=" + port); - } - if (!httpsPortAdded) { - newLines.add("-Dlibresonic.httpsPort=" + httpsPort); - } - if (!contextPathAdded) { - newLines.add("-Dlibresonic.contextPath=" + contextPath); - } - - writeLines(file, newLines); - - JOptionPane.showMessageDialog(SettingsPanel.this, - "Please restart Libresonic for the new settings to take effect.", - "Settings changed", JOptionPane.INFORMATION_MESSAGE); - - } - - private File getOptionsFile() throws SettingsException { - File file = new File("libresonic-service.exe.vmoptions"); - if (!file.isFile() || !file.exists()) { - throw new SettingsException("File " + file.getAbsolutePath() + " not found."); - } - return file; - } - - private List readLines(File file) throws SettingsException { - List lines = new ArrayList(); - BufferedReader reader = null; - try { - reader = new BufferedReader(new FileReader(file)); - for (String line = reader.readLine(); line != null; line = reader.readLine()) { - lines.add(line); - } - return lines; - } catch (IOException x) { - throw new SettingsException("Failed to read from file " + file.getAbsolutePath(), x); - } finally { - closeQuietly(reader); - } - } - - private void writeLines(File file, List lines) throws SettingsException { - PrintWriter writer = null; - try { - writer = new PrintWriter(new FileWriter(file)); - for (String line : lines) { - writer.println(line); - } - } catch (IOException x) { - throw new SettingsException("Failed to write to file " + file.getAbsolutePath(), x); - } finally { - closeQuietly(writer); - } - } - - private String grep(String regexp) throws SettingsException { - Pattern pattern = Pattern.compile(regexp); - File file = getOptionsFile(); - for (String line : readLines(file)) { - Matcher matcher = pattern.matcher(line); - if (matcher.matches()) { - return matcher.group(1); - } - } - return null; - } - - private void closeQuietly(Reader reader) { - if (reader == null) { - return; - } - - try { - reader.close(); - } catch (IOException x) { - // Intentionally ignored. - } - } - - private void closeQuietly(Writer writer) { - if (writer == null) { - return; - } - - try { - writer.close(); - } catch (IOException x) { - // Intentionally ignored. - } - } - - public void notifyDeploymentStatus(DeploymentStatus deploymentStatus) { - // Nothing here yet. - } - - public void notifyServiceStatus(String serviceStatus) { - // Nothing here yet. - } - - public static class SettingsException extends Exception { - - public SettingsException(String message, Throwable cause) { - super(message, cause); - } - - public SettingsException(String message) { - this(message, null); - } - - @Override - public String getMessage() { - if (getCause() == null || getCause().getMessage() == null) { - return super.getMessage(); - } - return super.getMessage() + " " + getCause().getMessage(); - } - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/StatusPanel.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/StatusPanel.java deleted file mode 100644 index f46769ee..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/StatusPanel.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.libresonic.player.booter.agent; - -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.ButtonBarFactory; -import com.jgoodies.forms.layout.FormLayout; -import org.libresonic.player.booter.deployer.DeploymentStatus; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.text.DateFormat; -import java.util.Locale; - -/** - * Panel displaying the status of the Libresonic service. - * - * @author Sindre Mehus - */ -public class StatusPanel extends JPanel implements LibresonicListener { - - private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.US); - - private final LibresonicAgent libresonicAgent; - - private JTextField statusTextField; - private JTextField startedTextField; - private JTextField memoryTextField; - private JTextArea errorTextField; - private JButton startButton; - private JButton stopButton; - private JButton urlButton; - - public StatusPanel(LibresonicAgent libresonicAgent) { - this.libresonicAgent = libresonicAgent; - createComponents(); - configureComponents(); - layoutComponents(); - addBehaviour(); - libresonicAgent.addListener(this); - } - - private void createComponents() { - statusTextField = new JTextField(); - startedTextField = new JTextField(); - memoryTextField = new JTextField(); - errorTextField = new JTextArea(3, 24); - startButton = new JButton("Start"); - stopButton = new JButton("Stop"); - urlButton = new JButton(); - } - - private void configureComponents() { - statusTextField.setEditable(false); - startedTextField.setEditable(false); - memoryTextField.setEditable(false); - errorTextField.setEditable(false); - - errorTextField.setLineWrap(true); - errorTextField.setBorder(startedTextField.getBorder()); - - urlButton.setBorderPainted(false); - urlButton.setContentAreaFilled(false); - urlButton.setForeground(Color.BLUE.darker()); - urlButton.setHorizontalAlignment(SwingConstants.LEFT); - } - - private void layoutComponents() { - JPanel buttons = ButtonBarFactory.buildRightAlignedBar(startButton, stopButton); - - FormLayout layout = new FormLayout("right:d, 6dlu, max(d;30dlu):grow"); - DefaultFormBuilder builder = new DefaultFormBuilder(layout, this); - builder.append("Service status", statusTextField); - builder.append("", buttons); - builder.appendParagraphGapRow(); - builder.nextRow(); - builder.append("Started on", startedTextField); - builder.append("Memory used", memoryTextField); - builder.append("Error message", errorTextField); - builder.append("Server address", urlButton); - - setBorder(Borders.DIALOG_BORDER); - } - - private void addBehaviour() { - urlButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - libresonicAgent.openBrowser(); - } - }); - startButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - libresonicAgent.checkElevation("-start"); - libresonicAgent.startOrStopService(true); - } - }); - stopButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - libresonicAgent.checkElevation("-stop"); - libresonicAgent.startOrStopService(false); - } - }); - } - - public void notifyDeploymentStatus(DeploymentStatus status) { - startedTextField.setText(status == null ? null : DATE_FORMAT.format(status.getStartTime())); - memoryTextField.setText(status == null ? null : status.getMemoryUsed() + " MB"); - errorTextField.setText(status == null ? null : status.getErrorMessage()); - urlButton.setText(status == null ? null : status.getURL()); - } - - public void notifyServiceStatus(String serviceStatus) { - statusTextField.setText(serviceStatus); - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/TrayController.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/TrayController.java deleted file mode 100644 index 2306f8f4..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/agent/TrayController.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.libresonic.player.booter.agent; - -import java.awt.Image; -import java.awt.MenuItem; -import java.awt.PopupMenu; -import java.awt.SystemTray; -import java.awt.Toolkit; -import java.awt.TrayIcon; -import java.awt.event.ActionEvent; -import java.net.URL; - -import javax.swing.AbstractAction; -import javax.swing.Action; - -import org.libresonic.player.booter.deployer.DeploymentStatus; - -/** - * Controls the Libresonic tray icon. - * - * @author Sindre Mehus - */ -public class TrayController implements LibresonicListener { - - private final LibresonicAgent libresonicAgent; - private TrayIcon trayIcon; - - private Action openAction; - private Action controlPanelAction; - private Action hideAction; - private Image startedImage; - private Image stoppedImage; - - public TrayController(LibresonicAgent libresonicAgent) { - this.libresonicAgent = libresonicAgent; - try { - createActions(); - createComponents(); - addBehaviour(); - installComponents(); - libresonicAgent.addListener(this); - } catch (Throwable x) { - System.err.println("Disabling tray support."); - } - } - - public void showMessage() { - trayIcon.displayMessage("Libresonic", "Libresonic is now running. Click this balloon to get started.", - TrayIcon.MessageType.INFO); - } - - private void createActions() { - openAction = new AbstractAction("Open Libresonic in Browser") { - public void actionPerformed(ActionEvent e) { - libresonicAgent.openBrowser(); - } - }; - - controlPanelAction = new AbstractAction("Libresonic Control Panel") { - public void actionPerformed(ActionEvent e) { - libresonicAgent.showStatusPanel(); - } - }; - - - hideAction = new AbstractAction("Hide Tray Icon") { - public void actionPerformed(ActionEvent e) { - libresonicAgent.exit(); - } - }; - } - - private void createComponents() { - startedImage = createImage("/images/libresonic-started-16.png"); - stoppedImage = createImage("/images/libresonic-stopped-16.png"); - - PopupMenu menu = new PopupMenu(); - menu.add(createMenuItem(openAction)); - menu.add(createMenuItem(controlPanelAction)); - menu.addSeparator(); - menu.add(createMenuItem(hideAction)); - - trayIcon = new TrayIcon(stoppedImage, "Libresonic Music Streamer", menu); - } - - private Image createImage(String resourceName) { - URL url = getClass().getResource(resourceName); - return Toolkit.getDefaultToolkit().createImage(url); - } - - private MenuItem createMenuItem(Action action) { - MenuItem menuItem = new MenuItem((String) action.getValue(Action.NAME)); - menuItem.addActionListener(action); - return menuItem; - } - - private void addBehaviour() { - trayIcon.addActionListener(controlPanelAction); - } - - private void installComponents() throws Throwable { - SystemTray.getSystemTray().add(trayIcon); - } - - public void uninstallComponents() { - try { - SystemTray.getSystemTray().remove(trayIcon); - } catch (Throwable x) { - System.err.println("Disabling tray support."); - } - } - - private void setTrayImage(Image image) { - if (trayIcon.getImage() != image) { - trayIcon.setImage(image); - } - } - - public void notifyDeploymentStatus(DeploymentStatus deploymentStatus) { - setTrayImage(deploymentStatus == null ? stoppedImage : startedImage); - } - - public void notifyServiceStatus(String serviceStatus) { - // Nothing here, but could potentially change tray icon and menu. - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/DeploymentStatus.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/DeploymentStatus.java deleted file mode 100644 index 40bd9fbd..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/DeploymentStatus.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.libresonic.player.booter.deployer; - -import java.util.Date; -import java.io.Serializable; - -/** - * @author Sindre Mehus - */ -public class DeploymentStatus implements Serializable { - - private final Date startTime; - private final String url; - private final String httpsUrl; - private final int memoryUsed; - private final String errorMessage; - - public DeploymentStatus(Date startTime, String url, String httpsUrl, int memoryUsed, String errorMessage) { - this.startTime = startTime; - this.url = url; - this.httpsUrl = httpsUrl; - this.memoryUsed = memoryUsed; - this.errorMessage = errorMessage; - } - - public String getURL() { - return url; - } - - public String getHttpsUrl() { - return httpsUrl; - } - - public Date getStartTime() { - return startTime; - } - - public int getMemoryUsed() { - return memoryUsed; - } - - public String getErrorMessage() { - return errorMessage; - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/LibresonicDeployer.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/LibresonicDeployer.java deleted file mode 100644 index 829116de..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/LibresonicDeployer.java +++ /dev/null @@ -1,338 +0,0 @@ -package org.libresonic.player.booter.deployer; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.Writer; -import java.net.BindException; -import java.util.Date; -import java.util.jar.JarFile; -import java.util.zip.ZipEntry; - -import org.apache.commons.io.IOUtils; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.security.Constraint; -import org.mortbay.jetty.security.ConstraintMapping; -import org.mortbay.jetty.security.SslSocketConnector; -import org.mortbay.jetty.webapp.WebAppContext; - -/** - * Responsible for deploying the Libresonic web app in - * the embedded Jetty container. - *

- * The following system properties may be used to customize the behaviour: - *

- * - * @author Sindre Mehus - */ -public class LibresonicDeployer implements LibresonicDeployerService { - - public static final String DEFAULT_HOST = "0.0.0.0"; - public static final int DEFAULT_PORT = 4040; - public static final int DEFAULT_HTTPS_PORT = 0; - public static final int DEFAULT_MEMORY_LIMIT = 150; - public static final String DEFAULT_CONTEXT_PATH = "/"; - public static final String DEFAULT_WAR = "libresonic.war"; - private static final int MAX_IDLE_TIME_MILLIS = 7 * 24 * 60 * 60 * 1000; // One week. - private static final int HEADER_BUFFER_SIZE = 64 * 1024; - - // Libresonic home directory. - private static final File LIBRESONIC_HOME_WINDOWS = new File("c:/libresonic"); - private static final File LIBRESONIC_HOME_OTHER = new File("/var/libresonic"); - - private Throwable exception; - private File libresonicHome; - private final Date startTime; - - public LibresonicDeployer() { - - // Enable shutdown hook for Ehcache. - System.setProperty("net.sf.ehcache.enableShutdownHook", "true"); - - startTime = new Date(); - createLinkFile(); - deployWebApp(); - } - - private void createLinkFile() { - if ("true".equals(System.getProperty("libresonic.createLinkFile"))) { - Writer writer = null; - try { - writer = new FileWriter("libresonic.url"); - writer.append("[InternetShortcut]"); - writer.append(System.getProperty("line.separator")); - writer.append("URL=").append(getUrl()); - writer.flush(); - } catch (Throwable x) { - System.err.println("Failed to create libresonic.url."); - x.printStackTrace(); - } finally { - if (writer != null) { - try { - writer.close(); - } catch (IOException x) { - // Ignored - } - } - } - } - } - - private void deployWebApp() { - try { - Server server = new Server(); - SelectChannelConnector connector = new SelectChannelConnector(); - connector.setMaxIdleTime(MAX_IDLE_TIME_MILLIS); - connector.setHeaderBufferSize(HEADER_BUFFER_SIZE); - connector.setHost(getHost()); - connector.setPort(getPort()); - if (isHttpsEnabled()) { - connector.setConfidentialPort(getHttpsPort()); - } - server.addConnector(connector); - - if (isHttpsEnabled()) { - SslSocketConnector sslConnector = new SslSocketConnector(); - sslConnector.setMaxIdleTime(MAX_IDLE_TIME_MILLIS); - sslConnector.setHeaderBufferSize(HEADER_BUFFER_SIZE); - sslConnector.setHost(getHost()); - sslConnector.setPort(getHttpsPort()); - sslConnector.setKeystore(System.getProperty("libresonic.ssl.keystore", getClass().getResource("/libresonic.keystore").toExternalForm())); - sslConnector.setPassword(System.getProperty("libresonic.ssl.password", "libresonic")); - server.addConnector(sslConnector); - } - - WebAppContext context = new WebAppContext(); - context.setTempDirectory(getJettyDirectory()); - context.setContextPath(getContextPath()); - context.setWar(getWar()); - context.setOverrideDescriptor("/web-jetty.xml"); - - if (isHttpsEnabled()) { - - // Allow non-https for streaming and cover art (for Chromecast, UPnP, Sonos etc) - context.getSecurityHandler().setConstraintMappings(new ConstraintMapping[]{ - createConstraintMapping("/stream", Constraint.DC_NONE), - createConstraintMapping("/coverArt.view", Constraint.DC_NONE), - createConstraintMapping("/ws/*", Constraint.DC_NONE), - createConstraintMapping("/sonos/*", Constraint.DC_NONE), - createConstraintMapping("/", Constraint.DC_CONFIDENTIAL) - }); - } - - server.addHandler(context); - server.start(); - - System.err.println("Libresonic running on: " + getUrl()); - if (isHttpsEnabled()) { - System.err.println(" and: " + getHttpsUrl()); - } - - } catch (Throwable x) { - x.printStackTrace(); - exception = x; - } - } - - private ConstraintMapping createConstraintMapping(String pathSpec, int dataConstraint) { - ConstraintMapping constraintMapping = new ConstraintMapping(); - Constraint constraint = new Constraint(); - constraint.setDataConstraint(dataConstraint); - constraintMapping.setPathSpec(pathSpec); - constraintMapping.setConstraint(constraint); - return constraintMapping; - } - - private File getJettyDirectory() { - File dir = new File(getLibresonicHome(), "jetty"); - String buildNumber = getLibresonicBuildNumber(); - if (buildNumber != null) { - dir = new File(dir, buildNumber); - } - System.err.println("Extracting webapp to " + dir); - - if (!dir.exists() && !dir.mkdirs()) { - System.err.println("Failed to create directory " + dir); - } - - return dir; - } - - private String getLibresonicBuildNumber() { - File war = new File(getWar()); - InputStream in = null; - try { - if (war.isFile()) { - JarFile jar = new JarFile(war); - ZipEntry entry = jar.getEntry("WEB-INF\\classes\\build_number.txt"); - if (entry == null) { - entry = jar.getEntry("WEB-INF/classes/build_number.txt"); - } - in = jar.getInputStream(entry); - } else { - in = new FileInputStream(war.getPath() + "/WEB-INF/classes/build_number.txt"); - } - return IOUtils.toString(in); - - } catch (Exception x) { - System.err.println("Failed to resolve build number from WAR " + war + ": " + x); - return null; - } finally { - IOUtils.closeQuietly(in); - } - } - - private String getContextPath() { - return System.getProperty("libresonic.contextPath", DEFAULT_CONTEXT_PATH); - } - - - private String getWar() { - String war = System.getProperty("libresonic.war"); - if (war == null) { - war = DEFAULT_WAR; - } - - File file = new File(war); - if (file.exists()) { - System.err.println("Using WAR file: " + file.getAbsolutePath()); - } else { - System.err.println("Error: WAR file not found: " + file.getAbsolutePath()); - } - - return war; - } - - private String getHost() { - return System.getProperty("libresonic.host", DEFAULT_HOST); - } - - private int getPort() { - int port = DEFAULT_PORT; - - String portString = System.getProperty("libresonic.port"); - if (portString != null) { - port = Integer.parseInt(portString); - } - - // Also set it so that the webapp can read it. - System.setProperty("libresonic.port", String.valueOf(port)); - - return port; - } - - private int getHttpsPort() { - int port = DEFAULT_HTTPS_PORT; - - String portString = System.getProperty("libresonic.httpsPort"); - if (portString != null) { - port = Integer.parseInt(portString); - } - - // Also set it so that the webapp can read it. - System.setProperty("libresonic.httpsPort", String.valueOf(port)); - - return port; - } - - private boolean isHttpsEnabled() { - return getHttpsPort() > 0; - } - - public String getErrorMessage() { - if (exception == null) { - return null; - } - if (exception instanceof BindException) { - return "Address already in use. Please change port number."; - } - - return exception.toString(); - } - - public int getMemoryUsed() { - long freeBytes = Runtime.getRuntime().freeMemory(); - long totalBytes = Runtime.getRuntime().totalMemory(); - long usedBytes = totalBytes - freeBytes; - return (int) Math.round(usedBytes / 1024.0 / 1024.0); - } - - private String getUrl() { - String host = DEFAULT_HOST.equals(getHost()) ? "localhost" : getHost(); - StringBuilder url = new StringBuilder("http://").append(host); - if (getPort() != 80) { - url.append(":").append(getPort()); - } - url.append(getContextPath()); - return url.toString(); - } - - private String getHttpsUrl() { - if (!isHttpsEnabled()) { - return null; - } - - String host = DEFAULT_HOST.equals(getHost()) ? "localhost" : getHost(); - StringBuilder url = new StringBuilder("https://").append(host); - if (getHttpsPort() != 443) { - url.append(":").append(getHttpsPort()); - } - url.append(getContextPath()); - return url.toString(); - } - - /** - * Returns the Libresonic home directory. - * - * @return The Libresonic home directory, if it exists. - * @throws RuntimeException If directory doesn't exist. - */ - private File getLibresonicHome() { - - if (libresonicHome != null) { - return libresonicHome; - } - - File home; - - String overrideHome = System.getProperty("libresonic.home"); - if (overrideHome != null) { - home = new File(overrideHome); - } else { - boolean isWindows = System.getProperty("os.name", "Windows").toLowerCase().startsWith("windows"); - home = isWindows ? LIBRESONIC_HOME_WINDOWS : LIBRESONIC_HOME_OTHER; - } - - // Attempt to create home directory if it doesn't exist. - if (!home.exists() || !home.isDirectory()) { - boolean success = home.mkdirs(); - if (success) { - libresonicHome = home; - } else { - String message = "The directory " + home + " does not exist. Please create it and make it writable. " + - "(You can override the directory location by specifying -Dlibresonic.home=... when " + - "starting the servlet container.)"; - System.err.println("ERROR: " + message); - } - } else { - libresonicHome = home; - } - - return home; - } - - public DeploymentStatus getDeploymentInfo() { - return new DeploymentStatus(startTime, getUrl(), getHttpsUrl(), getMemoryUsed(), getErrorMessage()); - } -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/LibresonicDeployerService.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/LibresonicDeployerService.java deleted file mode 100644 index b480e783..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/deployer/LibresonicDeployerService.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.libresonic.player.booter.deployer; - -/** - * RMI interface implemented by the Libresonic deployer and used by the agent. - * - * @author Sindre Mehus - */ -public interface LibresonicDeployerService { - - /** - * Returns information about the Libresonic deployment, such - * as URL, memory consumption, start time etc. - * - * @return Deployment information. - */ - DeploymentStatus getDeploymentInfo(); -} diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/LibresonicController.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/LibresonicController.java deleted file mode 100644 index 0d97bf1d..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/LibresonicController.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.libresonic.player.booter.mac; - -import org.libresonic.player.booter.deployer.LibresonicDeployerService; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.net.URL; -import java.net.URI; - -/** - * Controller for the Mac booter. - * - * @author Sindre Mehus - */ -public class LibresonicController { - - private final LibresonicDeployerService deployer; - private final LibresonicFrame frame; - private Action openAction; - private Action controlPanelAction; - private Action quitAction; - - public LibresonicController(LibresonicDeployerService deployer, LibresonicFrame frame) { - this.deployer = deployer; - this.frame = frame; - createActions(); - createComponents(); - } - - private void createActions() { - openAction = new AbstractAction("Open Libresonic Web Page") { - public void actionPerformed(ActionEvent e) { - openBrowser(); - } - }; - - controlPanelAction = new AbstractAction("Libresonic Control Panel") { - public void actionPerformed(ActionEvent e) { - frame.setActive(false); - frame.setActive(true); - } - }; - - quitAction = new AbstractAction("Quit Libresonic") { - public void actionPerformed(ActionEvent e) { - System.exit(0); - } - }; - } - - private void createComponents() { - PopupMenu menu = new PopupMenu(); - menu.add(createMenuItem(openAction)); - menu.add(createMenuItem(controlPanelAction)); - menu.addSeparator(); - menu.add(createMenuItem(quitAction)); - - URL url = getClass().getResource("/images/libresonic-21.png"); - Image image = Toolkit.getDefaultToolkit().createImage(url); - TrayIcon trayIcon = new TrayIcon(image, "Libresonic Music Streamer", menu); - trayIcon.setImageAutoSize(false); - - try { - SystemTray.getSystemTray().add(trayIcon); - } catch (Throwable x) { - System.err.println("Failed to add tray icon."); - } - } - - private MenuItem createMenuItem(Action action) { - MenuItem menuItem = new MenuItem((String) action.getValue(Action.NAME)); - menuItem.addActionListener(action); - return menuItem; - } - - private void openBrowser() { - String url = deployer.getDeploymentInfo().getURL(); - if (url == null) { - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (Throwable x) { - x.printStackTrace(); - } - } - -} \ No newline at end of file diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/LibresonicFrame.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/LibresonicFrame.java deleted file mode 100644 index e0f34cec..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/LibresonicFrame.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.libresonic.player.booter.mac; - -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.ButtonBarFactory; -import org.libresonic.player.booter.Main; -import org.libresonic.player.booter.deployer.LibresonicDeployerService; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.net.URL; - -/** - * Frame with Libresonic status. Used on Mac installs. - * - * @author Sindre Mehus - */ -public class LibresonicFrame extends JFrame { - - private final LibresonicDeployerService deployer; - private StatusPanel statusPanel; - private JButton hideButton; - private JButton exitButton; - - public LibresonicFrame(LibresonicDeployerService deployer) { - super("Libresonic"); - this.deployer = deployer; - createComponents(); - layoutComponents(); - addBehaviour(); - - URL url = Main.class.getResource("/images/libresonic-512.png"); - setIconImage(Toolkit.getDefaultToolkit().createImage(url)); - } - - public void setActive(boolean active) { - if (active) { - pack(); - centerComponent(); - setVisible(true); - toFront(); - } else { - dispose(); - } - } - - private void centerComponent() { - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - setLocation(screenSize.width / 2 - getWidth() / 2, - screenSize.height / 2 - getHeight() / 2); - } - - private void createComponents() { - statusPanel = new StatusPanel(deployer); - hideButton = new JButton("Hide"); - exitButton = new JButton("Exit"); - } - - private void layoutComponents() { - JPanel pane = (JPanel) getContentPane(); - pane.setLayout(new BorderLayout(10, 10)); - pane.add(statusPanel, BorderLayout.CENTER); - pane.add(ButtonBarFactory.buildRightAlignedBar(hideButton, exitButton), BorderLayout.SOUTH); - - pane.setBorder(Borders.DIALOG_BORDER); - } - - private void addBehaviour() { - hideButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - setActive(false); - } - }); - exitButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - System.exit(0); - } - }); - } - -} \ No newline at end of file diff --git a/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/StatusPanel.java b/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/StatusPanel.java deleted file mode 100644 index d64965bd..00000000 --- a/libresonic-booter/src/main/java/org/libresonic/player/booter/mac/StatusPanel.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.libresonic.player.booter.mac; - -import java.awt.Color; -import java.awt.Desktop; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.net.URI; -import java.text.DateFormat; -import java.util.Locale; - -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.SwingConstants; -import javax.swing.Timer; - -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.FormLayout; - -import org.libresonic.player.booter.deployer.DeploymentStatus; -import org.libresonic.player.booter.deployer.LibresonicDeployerService; - -/** - * Panel displaying the status of the Libresonic service. - * - * @author Sindre Mehus - */ -public class StatusPanel extends JPanel { - - private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.US); - - private final LibresonicDeployerService deployer; - - private JTextField startedTextField; - private JTextField memoryTextField; - private JTextArea errorTextField; - private JButton urlButton; - - public StatusPanel(LibresonicDeployerService deployer) { - this.deployer = deployer; - createComponents(); - configureComponents(); - layoutComponents(); - addBehaviour(); - } - - private void createComponents() { - startedTextField = new JTextField(); - memoryTextField = new JTextField(); - errorTextField = new JTextArea(3, 24); - urlButton = new JButton(); - } - - private void configureComponents() { - startedTextField.setEditable(false); - memoryTextField.setEditable(false); - errorTextField.setEditable(false); - - errorTextField.setLineWrap(true); - errorTextField.setBorder(startedTextField.getBorder()); - - urlButton.setBorderPainted(false); - urlButton.setContentAreaFilled(false); - urlButton.setForeground(Color.BLUE.darker()); - urlButton.setHorizontalAlignment(SwingConstants.LEFT); - } - - private void layoutComponents() { - FormLayout layout = new FormLayout("right:d, 6dlu, max(d;30dlu):grow"); - DefaultFormBuilder builder = new DefaultFormBuilder(layout, this); - builder.append("Started on", startedTextField); - builder.append("Memory used", memoryTextField); - builder.append("Error message", errorTextField); - builder.append("Server address", urlButton); - - setBorder(Borders.DIALOG_BORDER); - } - - private void addBehaviour() { - urlButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - openBrowser(); - } - }); - - Timer timer = new Timer(3000, new ActionListener() { - public void actionPerformed(ActionEvent e) { - updateStatus(deployer.getDeploymentInfo()); - } - }); - updateStatus(deployer.getDeploymentInfo()); - timer.start(); - } - - private void openBrowser() { - String url = urlButton.getText(); - if (url == null) { - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (Throwable x) { - x.printStackTrace(); - } - } - - private void updateStatus(DeploymentStatus status) { - startedTextField.setText(status == null ? null : DATE_FORMAT.format(status.getStartTime())); - memoryTextField.setText(status == null ? null : status.getMemoryUsed() + " MB"); - errorTextField.setText(status == null ? null : status.getErrorMessage()); - urlButton.setText(status == null ? null : status.getURL()); - } -} \ No newline at end of file diff --git a/libresonic-booter/src/main/resources/META-INF/MANIFEST.MF b/libresonic-booter/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 76e121cd..00000000 --- a/libresonic-booter/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: org.libresonic.player.booter.Main diff --git a/libresonic-booter/src/main/resources/applicationContext-agent.xml b/libresonic-booter/src/main/resources/applicationContext-agent.xml deleted file mode 100644 index f4221270..00000000 --- a/libresonic-booter/src/main/resources/applicationContext-agent.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libresonic-booter/src/main/resources/applicationContext-deployer.xml b/libresonic-booter/src/main/resources/applicationContext-deployer.xml deleted file mode 100644 index 86791e3d..00000000 --- a/libresonic-booter/src/main/resources/applicationContext-deployer.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/libresonic-booter/src/main/resources/applicationContext-mac.xml b/libresonic-booter/src/main/resources/applicationContext-mac.xml deleted file mode 100644 index fd908955..00000000 --- a/libresonic-booter/src/main/resources/applicationContext-mac.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libresonic-booter/src/main/resources/images/libresonic-16.png b/libresonic-booter/src/main/resources/images/libresonic-16.png deleted file mode 100644 index eba8bb57..00000000 Binary files a/libresonic-booter/src/main/resources/images/libresonic-16.png and /dev/null differ diff --git a/libresonic-booter/src/main/resources/images/libresonic-21.png b/libresonic-booter/src/main/resources/images/libresonic-21.png deleted file mode 100644 index 6ce85a4f..00000000 Binary files a/libresonic-booter/src/main/resources/images/libresonic-21.png and /dev/null differ diff --git a/libresonic-booter/src/main/resources/images/libresonic-32.png b/libresonic-booter/src/main/resources/images/libresonic-32.png deleted file mode 100644 index b30ed059..00000000 Binary files a/libresonic-booter/src/main/resources/images/libresonic-32.png and /dev/null differ diff --git a/libresonic-booter/src/main/resources/images/libresonic-512.png b/libresonic-booter/src/main/resources/images/libresonic-512.png deleted file mode 100644 index cda726b5..00000000 Binary files a/libresonic-booter/src/main/resources/images/libresonic-512.png and /dev/null differ diff --git a/libresonic-booter/src/main/resources/images/libresonic-started-16.png b/libresonic-booter/src/main/resources/images/libresonic-started-16.png deleted file mode 100644 index 8bfcd647..00000000 Binary files a/libresonic-booter/src/main/resources/images/libresonic-started-16.png and /dev/null differ diff --git a/libresonic-booter/src/main/resources/images/libresonic-stopped-16.png b/libresonic-booter/src/main/resources/images/libresonic-stopped-16.png deleted file mode 100644 index c2d637cc..00000000 Binary files a/libresonic-booter/src/main/resources/images/libresonic-stopped-16.png and /dev/null differ diff --git a/libresonic-booter/src/main/resources/libresonic.keystore b/libresonic-booter/src/main/resources/libresonic.keystore deleted file mode 100644 index 95861d24..00000000 Binary files a/libresonic-booter/src/main/resources/libresonic.keystore and /dev/null differ diff --git a/libresonic-booter/src/main/resources/web-jetty.xml b/libresonic-booter/src/main/resources/web-jetty.xml deleted file mode 100644 index 0ea23153..00000000 --- a/libresonic-booter/src/main/resources/web-jetty.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - GzipFilter - org.mortbay.servlet.GzipFilter - - mimeTypes - text/xml,application/json,text/javascript - - - - GzipFilter - /rest/* - - - \ No newline at end of file diff --git a/libresonic-booter/src/main/script/libresonic.bat b/libresonic-booter/src/main/script/libresonic.bat deleted file mode 100644 index 68a89009..00000000 --- a/libresonic-booter/src/main/script/libresonic.bat +++ /dev/null @@ -1,24 +0,0 @@ -@echo off - -REM The directory where Libresonic will create files. Make sure it is writable. -set LIBRESONIC_HOME=c:\libresonic - -REM The host name or IP address on which to bind Libresonic. Only relevant if you have -REM multiple network interfaces and want to make Libresonic available on only one of them. -REM The default value 0.0.0.0 will bind Libresonic to all available network interfaces. -set LIBRESONIC_HOST=0.0.0.0 - -REM The port on which Libresonic will listen for incoming HTTP traffic. -set LIBRESONIC_PORT=4040 - -REM The port on which Libresonic will listen for incoming HTTPS traffic (0 to disable). -set LIBRESONIC_HTTPS_PORT=0 - -REM The context path (i.e., the last part of the Libresonic URL). Typically "/" or "/libresonic". -set LIBRESONIC_CONTEXT_PATH=/ - -REM The memory limit (max Java heap size) in megabytes. -set MAX_MEMORY=150 - -java -Xmx%MAX_MEMORY%m -Dlibresonic.home=%LIBRESONIC_HOME% -Dlibresonic.host=%LIBRESONIC_HOST% -Dlibresonic.port=%LIBRESONIC_PORT% -Dlibresonic.httpsPort=%LIBRESONIC_HTTPS_PORT% -Dlibresonic.contextPath=%LIBRESONIC_CONTEXT_PATH% -jar libresonic-booter-jar-with-dependencies.jar - diff --git a/libresonic-booter/src/main/script/libresonic.sh b/libresonic-booter/src/main/script/libresonic.sh deleted file mode 100755 index 2d058beb..00000000 --- a/libresonic-booter/src/main/script/libresonic.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -################################################################################### -# Shell script for starting Libresonic. See http://libresonic.org. -# -# Author: Sindre Mehus -################################################################################### - -LIBRESONIC_HOME=/var/libresonic -LIBRESONIC_HOST=0.0.0.0 -LIBRESONIC_PORT=4040 -LIBRESONIC_HTTPS_PORT=0 -LIBRESONIC_CONTEXT_PATH=/ -LIBRESONIC_MAX_MEMORY=150 -LIBRESONIC_PIDFILE= -LIBRESONIC_DEFAULT_MUSIC_FOLDER=/var/music -LIBRESONIC_DEFAULT_PODCAST_FOLDER=/var/music/Podcast -LIBRESONIC_DEFAULT_PLAYLIST_FOLDER=/var/playlists - -quiet=0 - -usage() { - echo "Usage: libresonic.sh [options]" - echo " --help This small usage guide." - echo " --home=DIR The directory where Libresonic will create files." - echo " Make sure it is writable. Default: /var/libresonic" - echo " --host=HOST The host name or IP address on which to bind Libresonic." - echo " Only relevant if you have multiple network interfaces and want" - echo " to make Libresonic available on only one of them. The default value" - echo " will bind Libresonic to all available network interfaces. Default: 0.0.0.0" - echo " --port=PORT The port on which Libresonic will listen for" - echo " incoming HTTP traffic. Default: 4040" - echo " --https-port=PORT The port on which Libresonic will listen for" - echo " incoming HTTPS traffic. Default: 0 (disabled)" - echo " --context-path=PATH The context path, i.e., the last part of the Libresonic" - echo " URL. Typically '/' or '/libresonic'. Default '/'" - echo " --max-memory=MB The memory limit (max Java heap size) in megabytes." - echo " Default: 100" - echo " --pidfile=PIDFILE Write PID to this file. Default not created." - echo " --quiet Don't print anything to standard out. Default false." - echo " --default-music-folder=DIR Configure Libresonic to use this folder for music. This option " - echo " only has effect the first time Libresonic is started. Default '/var/music'" - echo " --default-podcast-folder=DIR Configure Libresonic to use this folder for Podcasts. This option " - echo " only has effect the first time Libresonic is started. Default '/var/music/Podcast'" - echo " --default-playlist-folder=DIR Configure Libresonic to use this folder for playlists. This option " - echo " only has effect the first time Libresonic is started. Default '/var/playlists'" - exit 1 -} - -# Parse arguments. -while [ $# -ge 1 ]; do - case $1 in - --help) - usage - ;; - --home=?*) - LIBRESONIC_HOME=${1#--home=} - ;; - --host=?*) - LIBRESONIC_HOST=${1#--host=} - ;; - --port=?*) - LIBRESONIC_PORT=${1#--port=} - ;; - --https-port=?*) - LIBRESONIC_HTTPS_PORT=${1#--https-port=} - ;; - --context-path=?*) - LIBRESONIC_CONTEXT_PATH=${1#--context-path=} - ;; - --max-memory=?*) - LIBRESONIC_MAX_MEMORY=${1#--max-memory=} - ;; - --pidfile=?*) - LIBRESONIC_PIDFILE=${1#--pidfile=} - ;; - --quiet) - quiet=1 - ;; - --default-music-folder=?*) - LIBRESONIC_DEFAULT_MUSIC_FOLDER=${1#--default-music-folder=} - ;; - --default-podcast-folder=?*) - LIBRESONIC_DEFAULT_PODCAST_FOLDER=${1#--default-podcast-folder=} - ;; - --default-playlist-folder=?*) - LIBRESONIC_DEFAULT_PLAYLIST_FOLDER=${1#--default-playlist-folder=} - ;; - *) - usage - ;; - esac - shift -done - -# Use JAVA_HOME if set, otherwise assume java is in the path. -JAVA=java -if [ -e "${JAVA_HOME}" ] - then - JAVA=${JAVA_HOME}/bin/java -fi - -# Create Libresonic home directory. -mkdir -p ${LIBRESONIC_HOME} -LOG=${LIBRESONIC_HOME}/libresonic_sh.log -rm -f ${LOG} - -cd $(dirname $0) -if [ -L $0 ] && ([ -e /bin/readlink ] || [ -e /usr/bin/readlink ]); then - cd $(dirname $(readlink $0)) -fi - -${JAVA} -Xmx${LIBRESONIC_MAX_MEMORY}m \ - -Dlibresonic.home=${LIBRESONIC_HOME} \ - -Dlibresonic.host=${LIBRESONIC_HOST} \ - -Dlibresonic.port=${LIBRESONIC_PORT} \ - -Dlibresonic.httpsPort=${LIBRESONIC_HTTPS_PORT} \ - -Dlibresonic.contextPath=${LIBRESONIC_CONTEXT_PATH} \ - -Dlibresonic.defaultMusicFolder=${LIBRESONIC_DEFAULT_MUSIC_FOLDER} \ - -Dlibresonic.defaultPodcastFolder=${LIBRESONIC_DEFAULT_PODCAST_FOLDER} \ - -Dlibresonic.defaultPlaylistFolder=${LIBRESONIC_DEFAULT_PLAYLIST_FOLDER} \ - -Djava.awt.headless=true \ - -verbose:gc \ - -jar libresonic-booter-jar-with-dependencies.jar > ${LOG} 2>&1 & - -# Write pid to pidfile if it is defined. -if [ $LIBRESONIC_PIDFILE ]; then - echo $! > ${LIBRESONIC_PIDFILE} -fi - -if [ $quiet = 0 ]; then - echo Started Libresonic [PID $!, ${LOG}] -fi - diff --git a/libresonic-installer-debian/pom.xml b/libresonic-installer-debian/pom.xml deleted file mode 100644 index 0cef0e1c..00000000 --- a/libresonic-installer-debian/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - 4.0.0 - libresonic-installer-debian - pom - Libresonic Installer for Debian - - - org.libresonic.player - libresonic - 6.2.beta1.springboot - - - - - - linux - - - linux - - - - - - - maven-antrun-plugin - - - dpkg - compile - - - Creating Debian package... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - - - - - - - diff --git a/libresonic-installer-debian/src/DEBIAN/conffiles b/libresonic-installer-debian/src/DEBIAN/conffiles deleted file mode 100644 index 01b33bee..00000000 --- a/libresonic-installer-debian/src/DEBIAN/conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/default/libresonic diff --git a/libresonic-installer-debian/src/DEBIAN/control b/libresonic-installer-debian/src/DEBIAN/control deleted file mode 100644 index 08e6f05d..00000000 --- a/libresonic-installer-debian/src/DEBIAN/control +++ /dev/null @@ -1,18 +0,0 @@ -Package: libresonic -Version: @VERSION@ -Section: Multimedia -Priority: optional -Recommends: ffmpeg -Architecture: all -Maintainer: Eugene E. Kashpureff Jr -Description: A web-based music streamer, jukebox and Podcast receiver - Libresonic is a web-based music streamer, jukebox and Podcast receiver, - providing access to your music collection wherever you are. Use it - to share your music with friends, or to listen to your music while away - from home. - . - Apps for Android, iPhone and Windows Phone are also available. - . - Java 1.6 or higher is required to run Libresonic. - . - Libresonic can be found at http://libresonic.org diff --git a/libresonic-installer-debian/src/DEBIAN/postinst b/libresonic-installer-debian/src/DEBIAN/postinst deleted file mode 100644 index 30abebda..00000000 --- a/libresonic-installer-debian/src/DEBIAN/postinst +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -set -e - -ln -sf /usr/share/libresonic/libresonic.sh /usr/bin/libresonic - -chmod 750 /var/libresonic - -# Clear jetty cache. -rm -rf /var/libresonic/jetty - -# Configure Libresonic service. -update-rc.d libresonic defaults 99 - -# Start Libresonic service. -invoke-rc.d libresonic start diff --git a/libresonic-installer-debian/src/DEBIAN/postrm b/libresonic-installer-debian/src/DEBIAN/postrm deleted file mode 100644 index 2bfccda9..00000000 --- a/libresonic-installer-debian/src/DEBIAN/postrm +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -set -e - -# Remove symlink. -rm -f /usr/bin/libresonic - -# Remove startup scripts. -update-rc.d -f libresonic remove diff --git a/libresonic-installer-debian/src/DEBIAN/preinst b/libresonic-installer-debian/src/DEBIAN/preinst deleted file mode 100644 index 1b32b446..00000000 --- a/libresonic-installer-debian/src/DEBIAN/preinst +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh - -set -e - -# Stop Libresonic service. -if [ -e /etc/init.d/libresonic ]; then - invoke-rc.d libresonic stop -fi - -# Backup database. -if [ -e /var/libresonic/db ]; then - rm -rf /var/libresonic/db.backup - cp -R /var/libresonic/db /var/libresonic/db.backup -fi - diff --git a/libresonic-installer-debian/src/DEBIAN/prerm b/libresonic-installer-debian/src/DEBIAN/prerm deleted file mode 100644 index 786b645e..00000000 --- a/libresonic-installer-debian/src/DEBIAN/prerm +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -set -e - -# Stop Libresonic service. -if [ -e /etc/init.d/libresonic ]; then - invoke-rc.d libresonic stop -fi diff --git a/libresonic-installer-debian/src/etc/default/libresonic b/libresonic-installer-debian/src/etc/default/libresonic deleted file mode 100644 index df01c916..00000000 --- a/libresonic-installer-debian/src/etc/default/libresonic +++ /dev/null @@ -1,25 +0,0 @@ -# -# This is the configuration file for the Libresonic service -# (/etc/init.d/libresonic) -# -# To change the startup parameters of Libresonic, modify -# the LIBRESONIC_ARGS variable below. -# -# Type "/usr/share/libresonic/libresonic.sh --help" on the command line to read an -# explanation of the different options. -# -# For example, to specify that Libresonic should use port 80 (for http) -# and 443 (for https), and use a Java memory heap size of 200 MB, use -# the following: -# -# LIBRESONIC_ARGS="--port=80 --https-port=443 --max-memory=200" - -LIBRESONIC_ARGS="--max-memory=150" - - -# The user which should run the Libresonic process. Default "root". -# Note that non-root users are by default not allowed to use ports -# below 1024. Also make sure to grant the user write permissions in -# the music directories, otherwise changing album art and tags will fail. - -LIBRESONIC_USER=root \ No newline at end of file diff --git a/libresonic-installer-debian/src/etc/init.d/libresonic b/libresonic-installer-debian/src/etc/init.d/libresonic deleted file mode 100644 index bcb1c4d9..00000000 --- a/libresonic-installer-debian/src/etc/init.d/libresonic +++ /dev/null @@ -1,138 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: libresonic -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Libresonic daemon -# Description: Starts the Libresonic daemon. Libresonic is a web-based -# music streamer, jukebox and Podcast receiver. -# See http://libresonic.org for more details. -### END INIT INFO - -# Author: Sindre Mehus - -# To change the startup parameters of Libresonic, modify the service -# configuration file /etc/default/libresonic rather than this file. -[ -r /etc/default/libresonic ] && . /etc/default/libresonic - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Libresonic Daemon" -NAME=libresonic -PIDFILE=/var/run/$NAME.pid -DAEMON=/usr/bin/$NAME -DAEMON_ARGS="--pidfile=$PIDFILE $LIBRESONIC_ARGS" -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Run as root if LIBRESONIC_USER is not set. -[ "$LIBRESONIC_USER" = "" ] && LIBRESONIC_USER=root - -# Make sure Libresonic is started with system locale -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG -fi - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - - if [ -e $PIDFILE ] - then - ps -p $(cat $PIDFILE) > /dev/null - [ "$?" = 0 ] && return 1 - fi - - touch $PIDFILE - chown $LIBRESONIC_USER $PIDFILE - [ -e /var/libresonic ] && chown -R $LIBRESONIC_USER /var/libresonic - [ -e /tmp/libresonic ] && chown -R $LIBRESONIC_USER /tmp/libresonic - - start-stop-daemon --start -c $LIBRESONIC_USER --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/libresonic-installer-mac/pom.xml b/libresonic-installer-mac/pom.xml deleted file mode 100644 index da9f1c39..00000000 --- a/libresonic-installer-mac/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - 4.0.0 - libresonic-installer-mac - pom - Libresonic Installer for Mac - - - org.libresonic.player - libresonic - 6.2.beta1.springboot - - - - - - org.libresonic.player - libresonic-main - ${project.version} - war - - - - org.libresonic.player - libresonic-booter - ${project.version} - - - - - - - mac - - - mac - - - - - - - maven-antrun-plugin - - - compile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - com.oracle - appbundler - 1.0 - - - - - - - - - - diff --git a/libresonic-installer-mac/src/libresonic.icns b/libresonic-installer-mac/src/libresonic.icns deleted file mode 100644 index 804ce79d..00000000 Binary files a/libresonic-installer-mac/src/libresonic.icns and /dev/null differ diff --git a/libresonic-installer-mac/src/libresonic.pkgproj b/libresonic-installer-mac/src/libresonic.pkgproj deleted file mode 100755 index c2c75fe2..00000000 --- a/libresonic-installer-mac/src/libresonic.pkgproj +++ /dev/null @@ -1,883 +0,0 @@ - - - - - PACKAGES - - - PACKAGE_FILES - - DEFAULT_INSTALL_LOCATION - / - HIERARCHY - - CHILDREN - - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - ../target/Libresonic.app - PATH_TYPE - 1 - PERMISSIONS - 493 - TYPE - 3 - UID - 0 - - - CHILDREN - - GID - 80 - PATH - Utilities - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - GID - 80 - PATH - Applications - PATH_TYPE - 0 - PERMISSIONS - 509 - TYPE - 1 - UID - 0 - - - CHILDREN - - - CHILDREN - - - CHILDREN - - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - ../../libresonic-transcode/mac/ffmpeg - PATH_TYPE - 1 - PERMISSIONS - 493 - TYPE - 3 - UID - 0 - - - GID - 80 - PATH - transcode - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 2 - UID - 0 - - - GID - 80 - PATH - Libresonic - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 2 - UID - 0 - - - GID - 80 - PATH - Application Support - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Documentation - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Filesystems - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Frameworks - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Input Methods - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Internet Plug-Ins - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - LaunchAgents - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - LaunchDaemons - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - PreferencePanes - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Preferences - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 80 - PATH - Printers - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - PrivilegedHelperTools - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - QuickLook - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - QuickTime - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Screen Savers - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Scripts - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Services - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - GID - 0 - PATH - Widgets - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - GID - 0 - PATH - Library - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - - CHILDREN - - - CHILDREN - - GID - 0 - PATH - Extensions - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - GID - 0 - PATH - Library - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - GID - 0 - PATH - System - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - CHILDREN - - - CHILDREN - - GID - 0 - PATH - Shared - PATH_TYPE - 0 - PERMISSIONS - 1023 - TYPE - 1 - UID - 0 - - - GID - 80 - PATH - Users - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - - GID - 0 - PATH - / - PATH_TYPE - 0 - PERMISSIONS - 493 - TYPE - 1 - UID - 0 - - PAYLOAD_TYPE - 0 - VERSION - 2 - - PACKAGE_SCRIPTS - - POSTINSTALL_PATH - - PATH - postinstall.sh - PATH_TYPE - 1 - - PREINSTALL_PATH - - PATH - preinstall.sh - PATH_TYPE - 1 - - RESOURCES - - - PACKAGE_SETTINGS - - AUTHENTICATION - 1 - CONCLUSION_ACTION - 0 - IDENTIFIER - org.libresonic.player - NAME - libresonic - OVERWRITE_PERMISSIONS - - VERSION - 1.0 - - UUID - 1804C6F2-A8D3-496B-B75B-8945F1A8CFEE - - - PROJECT - - PROJECT_COMMENTS - - NOTES - - PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M - IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv - c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l - cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7 - IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250 - ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp - dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u - dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD - b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjEyNjUuMTkiPgo8c3R5bGUg - dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5 - Pgo8L2JvZHk+CjwvaHRtbD4K - - - PROJECT_PRESENTATION - - BACKGROUND - - ALIGNMENT - 6 - BACKGROUND_PATH - - PATH - libresonic.png - PATH_TYPE - 1 - - CUSTOM - 1 - SCALING - 2 - - INSTALLATION_STEPS - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewIntroductionController - INSTALLER_PLUGIN - Introduction - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewReadMeController - INSTALLER_PLUGIN - ReadMe - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewLicenseController - INSTALLER_PLUGIN - License - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewDestinationSelectController - INSTALLER_PLUGIN - TargetSelect - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewInstallationTypeController - INSTALLER_PLUGIN - PackageSelection - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewInstallationController - INSTALLER_PLUGIN - Install - LIST_TITLE_KEY - InstallerSectionTitle - - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewSummaryController - INSTALLER_PLUGIN - Summary - LIST_TITLE_KEY - InstallerSectionTitle - - - INTRODUCTION - - LOCALIZATIONS - - - SUMMARY - - LOCALIZATIONS - - - TITLE - - LOCALIZATIONS - - - LANGUAGE - English - VALUE - Libresonic - - - - - PROJECT_REQUIREMENTS - - LIST - - POSTINSTALL_PATH - - PREINSTALL_PATH - - RESOURCES - - ROOT_VOLUME_ONLY - - - PROJECT_SETTINGS - - ADVANCED_OPTIONS - - BUILD_FORMAT - 0 - BUILD_PATH - - PATH - ../target - PATH_TYPE - 1 - - EXCLUDED_FILES - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - .DS_Store - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Remove .DS_Store files - PROXY_TOOLTIP - Remove ".DS_Store" files created by the Finder. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - .pbdevelopment - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Remove .pbdevelopment files - PROXY_TOOLTIP - Remove ".pbdevelopment" files created by ProjectBuilder or Xcode. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - CVS - TYPE - 1 - - - REGULAR_EXPRESSION - - STRING - .cvsignore - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - .cvspass - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - .svn - TYPE - 1 - - - REGULAR_EXPRESSION - - STRING - .git - TYPE - 1 - - - REGULAR_EXPRESSION - - STRING - .gitignore - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Remove SCM metadata - PROXY_TOOLTIP - Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - classes.nib - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - designable.db - TYPE - 0 - - - REGULAR_EXPRESSION - - STRING - info.nib - TYPE - 0 - - - PROTECTED - - PROXY_NAME - Optimize nib files - PROXY_TOOLTIP - Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles. - STATE - - - - PATTERNS_ARRAY - - - REGULAR_EXPRESSION - - STRING - Resources Disabled - TYPE - 1 - - - PROTECTED - - PROXY_NAME - Remove Resources Disabled folders - PROXY_TOOLTIP - Remove "Resources Disabled" folders. - STATE - - - - SEPARATOR - - - - NAME - libresonic - - - TYPE - 0 - VERSION - 2 - - diff --git a/libresonic-installer-mac/src/libresonic.png b/libresonic-installer-mac/src/libresonic.png deleted file mode 100644 index 1ed82fb0..00000000 Binary files a/libresonic-installer-mac/src/libresonic.png and /dev/null differ diff --git a/libresonic-installer-mac/src/postinstall.sh b/libresonic-installer-mac/src/postinstall.sh deleted file mode 100644 index a01c068b..00000000 --- a/libresonic-installer-mac/src/postinstall.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -LIBRESONIC_HOME="/Library/Application Support/Libresonic" - -chmod oug+rwx "$LIBRESONIC_HOME" -chown root:admin "$LIBRESONIC_HOME" - -chmod oug+rx "$LIBRESONIC_HOME/transcode" -chown root:admin "$LIBRESONIC_HOME/transcode" - -rm -rf "$LIBRESONIC_HOME/jetty" - -echo Libresonic installation done diff --git a/libresonic-installer-mac/src/preinstall.sh b/libresonic-installer-mac/src/preinstall.sh deleted file mode 100755 index 3846ca0a..00000000 --- a/libresonic-installer-mac/src/preinstall.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -LIBRESONIC_HOME="/Library/Application Support/Libresonic" - -# Backup database. - -if [ -e "$LIBRESONIC_HOME/db" ]; then - rm -rf "$LIBRESONIC_HOME/db.backup" - cp -R "$LIBRESONIC_HOME/db" "$LIBRESONIC_HOME/db.backup" -fi - diff --git a/libresonic-installer-rpm/pom.xml b/libresonic-installer-rpm/pom.xml deleted file mode 100644 index a9c5b6ed..00000000 --- a/libresonic-installer-rpm/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 4.0.0 - libresonic-installer-rpm - pom - Libresonic Installer for RPM - - - org.libresonic.player - libresonic - 6.2.beta1.springboot - - - - - - rpm - - - rpm - - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - - - validate - - create - - - - - false - false - - - - - maven-antrun-plugin - - - rpm - compile - - - Creating RPM package... - - - - - - - - - - - .beta1 - .beta2 - .beta3 - .beta4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - - - - - - diff --git a/libresonic-installer-rpm/src/etc/init.d/libresonic b/libresonic-installer-rpm/src/etc/init.d/libresonic deleted file mode 100644 index d58df0a4..00000000 --- a/libresonic-installer-rpm/src/etc/init.d/libresonic +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -# -# libresonic This shell script takes care of starting and stopping Libresonic -# -# chkconfig: - 80 20 -# -### BEGIN INIT INFO -# Provides: libresonic -# Required-Start: $network $syslog -# Required-Stop: $network $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Libresonic daemon -# Description: Starts the Libresonic daemon. Libresonic is a web-based -# music streamer, jukebox and Podcast receiver. -# See http://libresonic.org for more details. -### END INIT INFO - -# Author: Sindre Mehus - -# To change the startup parameters of Libresonic, modify the service -# configuration file /etc/sysconfig/libresonic rather than this file. -[ -r /etc/sysconfig/libresonic ] && . /etc/sysconfig/libresonic - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Libresonic Daemon" -NAME=libresonic -PIDFILE=/var/run/$NAME.pid -LOCKFILE=/var/lock/subsys/$NAME -DAEMON=/usr/bin/$NAME -DAEMON_ARGS="--pidfile=$PIDFILE $LIBRESONIC_ARGS" -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed. -[ -x "$DAEMON" ] || exit 0 - -# Run as root if LIBRESONIC_USER is not set. -[ "$LIBRESONIC_USER" = "" ] && LIBRESONIC_USER=root - -# Source function library. -. /etc/init.d/functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Check if daemon is already running. - if [ -e $PIDFILE ] - then - ps -p $(cat $PIDFILE) > /dev/null - [ "$?" = 0 ] && return 1 - fi - - touch $PIDFILE - chown $LIBRESONIC_USER $PIDFILE - [ -e /var/libresonic ] && chown -R $LIBRESONIC_USER /var/libresonic - [ -e /tmp/libresonic ] && chown -R $LIBRESONIC_USER /tmp/libresonic - - echo $"Starting $NAME ..." - su -c "$DAEMON $DAEMON_ARGS" $LIBRESONIC_USER - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $LOCKFILE - return $RETVAL -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Check if pidfile exists - [ ! -e $PIDFILE ] && return 1 - - echo -n $"Stopping $NAME ..." - killproc -p $PIDFILE $DAEMON - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $LOCKFILE - return $RETVAL -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - status) - status -p $PIDFILE "$NAME" - ;; - restart|force-reload) - do_stop - do_start - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/libresonic-installer-rpm/src/etc/sysconfig/libresonic b/libresonic-installer-rpm/src/etc/sysconfig/libresonic deleted file mode 100644 index 919b31d1..00000000 --- a/libresonic-installer-rpm/src/etc/sysconfig/libresonic +++ /dev/null @@ -1,25 +0,0 @@ -# -# This is the configuration file for the Libresonic service -# (/etc/init.d/libresonic) -# -# To change the startup parameters of Libresonic, modify -# the LIBRESONIC_ARGS variable below. -# -# Type "/usr/share/libresonic/libresonic.sh --help" on the command line to read an -# explanation of the different options. -# -# For example, to specify that Libresonic should use port 80 (for http) -# and 443 (for https), and use a Java memory heap size of 200 MB, use -# the following: -# -# LIBRESONIC_ARGS="--port=80 --https-port=443 --max-memory=200" - -LIBRESONIC_ARGS="--max-memory=150" - - -# The user which should run the Libresonic process. Default "root". -# Note that non-root users are by default not allowed to use ports -# below 1024. Also make sure to grant the user write permissions in -# the music directories, otherwise changing album art and tags will fail. - -LIBRESONIC_USER=root diff --git a/libresonic-installer-rpm/src/libresonic.spec b/libresonic-installer-rpm/src/libresonic.spec deleted file mode 100644 index 2818f059..00000000 --- a/libresonic-installer-rpm/src/libresonic.spec +++ /dev/null @@ -1,78 +0,0 @@ -Name: libresonic -Version: @VERSION@ -Release: @BUILD_NUMBER@ -Summary: A web-based music streamer, jukebox and Podcast receiver - -Group: Applications/Multimedia -License: GPLv3 -URL: http://libresonic.org - -%description -Libresonic is a web-based music streamer, jukebox and Podcast receiver, -providing access to your music collection wherever you are. Use it -to share your music with friends, or to listen to your music while away -from home. - -Apps for Android, iPhone and Windows Phone are also available. - -Java 1.6 or higher is required to run Libresonic. - -Libresonic can be found at http://libresonic.org - -%files -%defattr(644,root,root,755) -/usr/share/libresonic/libresonic-booter-jar-with-dependencies.jar -/usr/share/libresonic/libresonic.war -%attr(755,root,root) /usr/share/libresonic/libresonic.sh -%attr(755,root,root) /etc/init.d/libresonic -%attr(755,root,root) /var/libresonic/transcode/ffmpeg -%attr(755,root,root) /var/libresonic/transcode/lame -%config(noreplace) /etc/sysconfig/libresonic - -%pre -# Stop Libresonic service. -if [ -e /etc/init.d/libresonic ]; then - service libresonic stop -fi - -# Backup database. -if [ -e /var/libresonic/db ]; then - rm -rf /var/libresonic/db.backup - cp -R /var/libresonic/db /var/libresonic/db.backup -fi - -exit 0 - -%post -ln -sf /usr/share/libresonic/libresonic.sh /usr/bin/libresonic -chmod 750 /var/libresonic - -# Clear jetty cache. -rm -rf /var/libresonic/jetty - -# For SELinux: Set security context -chcon -t java_exec_t /etc/init.d/libresonic 2>/dev/null - -# Configure and start Libresonic service. -chkconfig --add libresonic -service libresonic start - -exit 0 - -%preun -# Only do it if uninstalling, not upgrading. -if [ $1 = 0 ] ; then - - # Stop the service. - [ -e /etc/init.d/libresonic ] && service libresonic stop - - # Remove symlink. - rm -f /usr/bin/libresonic - - # Remove startup scripts. - chkconfig --del libresonic - -fi - -exit 0 - diff --git a/libresonic-installer-windows/pom.xml b/libresonic-installer-windows/pom.xml deleted file mode 100644 index 727a7768..00000000 --- a/libresonic-installer-windows/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - libresonic-installer-windows - pom - Libresonic Installer for Windows - - - org.libresonic.player - libresonic - 6.2.beta1.springboot - - - - c:/Program Files/exe4j - c:/Program Files (x86)/NSIS - - - - - - org.libresonic.player - libresonic-main - ${project.version} - war - - - - org.libresonic.player - libresonic-booter - ${project.version} - - - - - - - - windows - - - windows - - - - - - - maven-antrun-plugin - - - exe4j - compile - - - Compiling exe4j... - - - - - - - - - - - - - - - - - - run - - - - - nsis - compile - - - Compiling NSIS script... - - - - - - - - - run - - - - - - - - - - - diff --git a/libresonic-installer-windows/src/main/exe4j/libresonic-16.ico b/libresonic-installer-windows/src/main/exe4j/libresonic-16.ico deleted file mode 100644 index d2c13383..00000000 Binary files a/libresonic-installer-windows/src/main/exe4j/libresonic-16.ico and /dev/null differ diff --git a/libresonic-installer-windows/src/main/exe4j/libresonic-agent-elevated.exe.vmoptions b/libresonic-installer-windows/src/main/exe4j/libresonic-agent-elevated.exe.vmoptions deleted file mode 100644 index 291ff123..00000000 --- a/libresonic-installer-windows/src/main/exe4j/libresonic-agent-elevated.exe.vmoptions +++ /dev/null @@ -1 +0,0 @@ --Xmx16m diff --git a/libresonic-installer-windows/src/main/exe4j/libresonic-agent-elevated.exe4j b/libresonic-installer-windows/src/main/exe4j/libresonic-agent-elevated.exe4j deleted file mode 100644 index 7b213300..00000000 --- a/libresonic-installer-windows/src/main/exe4j/libresonic-agent-elevated.exe4j +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libresonic-installer-windows/src/main/exe4j/libresonic-agent.exe.vmoptions b/libresonic-installer-windows/src/main/exe4j/libresonic-agent.exe.vmoptions deleted file mode 100644 index 291ff123..00000000 --- a/libresonic-installer-windows/src/main/exe4j/libresonic-agent.exe.vmoptions +++ /dev/null @@ -1 +0,0 @@ --Xmx16m diff --git a/libresonic-installer-windows/src/main/exe4j/libresonic-agent.exe4j b/libresonic-installer-windows/src/main/exe4j/libresonic-agent.exe4j deleted file mode 100644 index da39f532..00000000 --- a/libresonic-installer-windows/src/main/exe4j/libresonic-agent.exe4j +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libresonic-installer-windows/src/main/exe4j/libresonic-service.exe.vmoptions b/libresonic-installer-windows/src/main/exe4j/libresonic-service.exe.vmoptions deleted file mode 100644 index 7196e9ae..00000000 --- a/libresonic-installer-windows/src/main/exe4j/libresonic-service.exe.vmoptions +++ /dev/null @@ -1,6 +0,0 @@ --Xmx150m --verbose:gc --Dlibresonic.host=0.0.0.0 --Dlibresonic.port=4040 --Dlibresonic.httpsPort=0 --Dlibresonic.contextPath=/ diff --git a/libresonic-installer-windows/src/main/exe4j/libresonic-service.exe4j b/libresonic-installer-windows/src/main/exe4j/libresonic-service.exe4j deleted file mode 100644 index 6bfb2327..00000000 --- a/libresonic-installer-windows/src/main/exe4j/libresonic-service.exe4j +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libresonic-installer-windows/src/main/nsis/jre-8u31-windows-i586-iftw.exe b/libresonic-installer-windows/src/main/nsis/jre-8u31-windows-i586-iftw.exe deleted file mode 100644 index a122cd5e..00000000 Binary files a/libresonic-installer-windows/src/main/nsis/jre-8u31-windows-i586-iftw.exe and /dev/null differ diff --git a/libresonic-installer-windows/src/main/nsis/libresonic.nsi b/libresonic-installer-windows/src/main/nsis/libresonic.nsi deleted file mode 100644 index b7ef37fe..00000000 --- a/libresonic-installer-windows/src/main/nsis/libresonic.nsi +++ /dev/null @@ -1,213 +0,0 @@ -# libresonic.nsi - -!include "WordFunc.nsh" -!include "MUI.nsh" - -!insertmacro VersionCompare - -# The name of the installer -Name "Libresonic" - -# The default installation directory -InstallDir $PROGRAMFILES\Libresonic - -# Registry key to check for directory (so if you install again, it will -# overwrite the old one automatically) -InstallDirRegKey HKLM "Software\Libresonic" "Install_Dir" - -#-------------------------------- -#Interface Configuration - -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange.bmp" -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\Getting Started.html" -!define MUI_FINISHPAGE_SHOWREADME_TEXT "View Getting Started document" - -#-------------------------------- -# Pages - -# This page checks for JRE -Page custom CheckInstalledJRE - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -# Languages -!insertmacro MUI_LANGUAGE "English" - -Section "Libresonic" - - SectionIn RO - - # Install for all users - SetShellVarContext "all" - - # Take backup of existing libresonic-service.exe.vmoptions - CopyFiles /SILENT $INSTDIR\libresonic-service.exe.vmoptions $TEMP\libresonic-service.exe.vmoptions - - # Silently uninstall existing version. - ExecWait '"$INSTDIR\uninstall.exe" /S _?=$INSTDIR' - - # Remove previous Jetty temp directory. - RMDir /r "c:\libresonic\jetty" - - # Backup database. - RMDir /r "c:\libresonic\db.backup" - CreateDirectory "c:\libresonic\db.backup" - CopyFiles /SILENT "c:\libresonic\db\*" "c:\libresonic\db.backup" - - # Set output path to the installation directory. - SetOutPath $INSTDIR - - # Write files. - File ..\..\..\target\libresonic-agent.exe - File ..\..\..\target\libresonic-agent.exe.vmoptions - File ..\..\..\target\libresonic-agent-elevated.exe - File ..\..\..\target\libresonic-agent-elevated.exe.vmoptions - File ..\..\..\target\libresonic-service.exe - File ..\..\..\target\libresonic-service.exe.vmoptions - File ..\..\..\..\libresonic-booter\target\libresonic-booter-jar-with-dependencies.jar - File ..\..\..\..\libresonic-main\README.TXT - File ..\..\..\..\libresonic-main\LICENSE.TXT - File "..\..\..\..\libresonic-main\Getting Started.html" - File ..\..\..\..\libresonic-main\target\libresonic.war - File ..\..\..\..\libresonic-main\target\classes\version.txt - File ..\..\..\..\libresonic-main\target\classes\build_number.txt - - # Write the installation path into the registry - WriteRegStr HKLM SOFTWARE\Libresonic "Install_Dir" "$INSTDIR" - - # Write the uninstall keys for Windows - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Libresonic" "DisplayName" "Libresonic" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Libresonic" "UninstallString" '"$INSTDIR\uninstall.exe"' - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Libresonic" "NoModify" 1 - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Libresonic" "NoRepair" 1 - WriteUninstaller "uninstall.exe" - - # Restore libresonic-service.exe.vmoptions - CopyFiles /SILENT $TEMP\libresonic-service.exe.vmoptions $INSTDIR\libresonic-service.exe.vmoptions - Delete $TEMP\libresonic-service.exe.vmoptions - - # Write transcoding pack files. - SetOutPath "c:\libresonic\transcode" - File ..\..\..\..\libresonic-transcode\windows\*.* - - # Add Windows Firewall exception. - # (Requires NSIS plugin found on http://nsis.sourceforge.net/NSIS_Simple_Firewall_Plugin to be installed - # as NSIS_HOME/Plugins/SimpleFC.dll) - - SimpleFC::AdvAddRule "Libresonic Service (TCP)" "" "6" "1" "1" "7" "1" "$INSTDIR\libresonic-service.exe" "" "" "Libresonic" "" "" "" "" - SimpleFC::AdvAddRule "Libresonic Service (UDP)" "" "17" "1" "1" "7" "1" "$INSTDIR\libresonic-service.exe" "" "" "Libresonic" "" "" "" "" - SimpleFC::AdvAddRule "Libresonic Agent (TCP)" "" "6" "1" "1" "7" "1" "$INSTDIR\libresonic-agent.exe" "" "" "Libresonic" "" "" "" "" - SimpleFC::AdvAddRule "Libresonic Agent (UDP)" "" "17" "1" "1" "7" "1" "$INSTDIR\libresonic-agent.exe" "" "" "Libresonic" "" "" "" "" - SimpleFC::AdvAddRule "Libresonic Agent Elevated (TCP)" "" "6" "1" "1" "7" "1" "$INSTDIR\libresonic-agent-elevated.exe" "" "" "Libresonic" "" "" "" "" - SimpleFC::AdvAddRule "Libresonic Agent Elevated (UDP)" "" "17" "1" "1" "7" "1" "$INSTDIR\libresonic-agent-elevated.exe" "" "" "Libresonic" "" "" "" "" - - # Install and start service. - ExecWait '"$INSTDIR\libresonic-service.exe" -install' - ExecWait '"$INSTDIR\libresonic-service.exe" -start' - - # Start agent. - Exec '"$INSTDIR\libresonic-agent-elevated.exe" -balloon' - -SectionEnd - - -Section "Start Menu Shortcuts" - - CreateDirectory "$SMPROGRAMS\Libresonic" - CreateShortCut "$SMPROGRAMS\Libresonic\Open Libresonic.lnk" "$INSTDIR\libresonic.url" "" "$INSTDIR\libresonic-agent.exe" 0 - CreateShortCut "$SMPROGRAMS\Libresonic\Libresonic Tray Icon.lnk" "$INSTDIR\libresonic-agent.exe" "-balloon" "$INSTDIR\libresonic-agent.exe" 0 - CreateShortCut "$SMPROGRAMS\Libresonic\Start Libresonic Service.lnk" "$INSTDIR\libresonic-service.exe" "-start" "$INSTDIR\libresonic-service.exe" 0 - CreateShortCut "$SMPROGRAMS\Libresonic\Stop Libresonic Service.lnk" "$INSTDIR\libresonic-service.exe" "-stop" "$INSTDIR\libresonic-service.exe" 0 - CreateShortCut "$SMPROGRAMS\Libresonic\Uninstall Libresonic.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\Libresonic\Getting Started.lnk" "$INSTDIR\Getting Started.html" "" "$INSTDIR\Getting Started.html" 0 - - CreateShortCut "$SMSTARTUP\Libresonic.lnk" "$INSTDIR\libresonic-agent.exe" "" "$INSTDIR\libresonic-agent.exe" 0 - -SectionEnd - - -# Uninstaller - -Section "Uninstall" - - # Uninstall for all users - SetShellVarContext "all" - - # Stop and uninstall service if present. - ExecWait '"$INSTDIR\libresonic-service.exe" -stop' - ExecWait '"$INSTDIR\libresonic-service.exe" -uninstall' - - # Stop agent by killing it. - # (Requires NSIS plugin found on http://nsis.sourceforge.net/Processes_plug-in to be installed - # as NSIS_HOME/Plugins/Processes.dll) - Processes::KillProcess "libresonic-agent" - Processes::KillProcess "libresonic-agent-elevated" - Processes::KillProcess "ffmpeg" - - # Remove registry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Libresonic" - DeleteRegKey HKLM SOFTWARE\Libresonic - - # Remove files. - Delete "$SMSTARTUP\Libresonic.lnk" - RMDir /r "$SMPROGRAMS\Libresonic" - Delete "$INSTDIR\build_number.txt" - Delete "$INSTDIR\elevate.exe" - Delete "$INSTDIR\Getting Started.html" - Delete "$INSTDIR\LICENSE.TXT" - Delete "$INSTDIR\README.TXT" - Delete "$INSTDIR\libresonic.url" - Delete "$INSTDIR\libresonic.war" - Delete "$INSTDIR\libresonic-agent.exe" - Delete "$INSTDIR\libresonic-agent.exe.vmoptions" - Delete "$INSTDIR\libresonic-agent-elevated.exe" - Delete "$INSTDIR\libresonic-agent-elevated.exe.vmoptions" - Delete "$INSTDIR\libresonic-booter-jar-with-dependencies.jar" - Delete "$INSTDIR\libresonic-service.exe" - Delete "$INSTDIR\libresonic-service.exe.vmoptions" - Delete "$INSTDIR\uninstall.exe" - Delete "$INSTDIR\version.txt" - RMDir /r "$INSTDIR\log" - RMDir "$INSTDIR" - - # Remove Windows Firewall exception. - # (Requires NSIS plugin found on http://nsis.sourceforge.net/NSIS_Simple_Firewall_Plugin to be installed - # as NSIS_HOME/Plugins/SimpleFC.dll) - SimpleFC::AdvRemoveRule "Libresonic Service (TCP)" - SimpleFC::AdvRemoveRule "Libresonic Service (UDP)" - SimpleFC::AdvRemoveRule "Libresonic Agent (TCP)" - SimpleFC::AdvRemoveRule "Libresonic Agent (UDP)" - SimpleFC::AdvRemoveRule "Libresonic Agent Elevated (TCP)" - SimpleFC::AdvRemoveRule "Libresonic Agent Elevated (UDP)" - -SectionEnd - - -Function CheckInstalledJRE - # Read the value from the registry into the $0 register - ReadRegStr $0 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" CurrentVersion - - # Check JRE version. At least 1.6 is required. - # $1=0 Versions are equal - # $1=1 Installed version is newer - # $1=2 Installed version is older (or non-existent) - ${VersionCompare} $0 "1.6" $1 - IntCmp $1 2 InstallJRE 0 0 - Return - - InstallJRE: - # Launch Java web installer. - MessageBox MB_OK "Java was not found and will now be installed." - File /oname=$TEMP\jre-setup.exe jre-8u31-windows-i586-iftw.exe - ExecWait '"$TEMP\jre-setup.exe"' $0 - Delete "$TEMP\jre-setup.exe" - -FunctionEnd diff --git a/libresonic-main/pom.xml b/libresonic-main/pom.xml index 04646d11..9139561e 100644 --- a/libresonic-main/pom.xml +++ b/libresonic-main/pom.xml @@ -68,6 +68,11 @@ org.springframework.security spring-security-ldap + + org.springframework.ldap + spring-ldap-core + 2.0.2.RELEASE + org.springframework.security spring-security-taglibs diff --git a/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java b/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java index 7e35eeb5..25d35e7b 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java +++ b/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java @@ -1,6 +1,9 @@ package org.libresonic.player.boot; import net.sf.ehcache.constructs.web.ShutdownListener; +import org.apache.catalina.Container; +import org.apache.catalina.Wrapper; +import org.apache.catalina.webresources.StandardRoot; import org.directwebremoting.servlet.DwrServlet; import org.libresonic.player.filter.*; import org.libresonic.player.spring.LibresonicPropertySourceConfigurer; @@ -11,6 +14,10 @@ import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration; import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer; +import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.boot.context.embedded.tomcat.TomcatContextCustomizer; +import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.boot.web.support.SpringBootServletInitializer; @@ -32,7 +39,7 @@ import javax.servlet.ServletContextListener; "classpath:/applicationContext-cache.xml", "classpath:/applicationContext-sonos.xml", "classpath:/libresonic-servlet.xml"}) -public class Application extends SpringBootServletInitializer { +public class Application extends SpringBootServletInitializer implements EmbeddedServletContainerCustomizer { /** * Registers the DWR servlet. @@ -177,9 +184,36 @@ public class Application extends SpringBootServletInitializer { return doConfigure(application); } + @Override + public void customize(ConfigurableEmbeddedServletContainer container) { + if (container instanceof TomcatEmbeddedServletContainerFactory) { + TomcatEmbeddedServletContainerFactory tomcatFactory = (TomcatEmbeddedServletContainerFactory) container; + tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> { + + // Increase the size and time before eviction of the Tomcat + // cache so that resources aren't uncompressed too often. + // See https://github.com/jhipster/generator-jhipster/issues/3995 + StandardRoot resources = new StandardRoot(); + resources.setCacheMaxSize(100000); + resources.setCacheObjectMaxSize(4000); + resources.setCacheTtl(24 * 3600 * 1000); // 1 day, in milliseconds + context.setResources(resources); + + // Put Jasper in production mode so that JSP aren't recompiled + // on each request. + // See http://stackoverflow.com/questions/29653326/spring-boot-application-slow-because-of-jsp-compilation + Container jsp = context.findChild("jsp"); + if (jsp instanceof Wrapper) { + ((Wrapper)jsp).addInitParameter("development", "false"); + } + }); + } + + } + public static void main(String[] args) { SpringApplicationBuilder builder = new SpringApplicationBuilder(); doConfigure(builder).run(args); } -} \ No newline at end of file +} diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java index 774e7632..3f9845ee 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java @@ -98,6 +98,8 @@ public class AdvancedSettingsController { settingsService.setSmtpPassword(command.getSmtpPassword()); } + settingsService.save(); + return "redirect:advancedSettings.view"; } diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ControllerUtils.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ControllerUtils.java index 7f08f919..7177a09e 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/ControllerUtils.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ControllerUtils.java @@ -1,35 +1,9 @@ package org.libresonic.player.controller; -import org.apache.commons.lang.ObjectUtils; -import org.libresonic.player.service.SettingsService; - -import javax.servlet.http.HttpServletRequest; - /** * This class has been created to refactor code previously present * in the MultiController. */ public class ControllerUtils { - public static void updatePortAndContextPath(HttpServletRequest request, SettingsService settingsService) { - - int port = Integer.parseInt(System.getProperty("libresonic.port", String.valueOf(request.getLocalPort()))); - int httpsPort = Integer.parseInt(System.getProperty("libresonic.httpsPort", "0")); - - String contextPath = request.getContextPath().replace("/", ""); - - if (settingsService.getPort() != port) { - settingsService.setPort(port); - settingsService.save(); - } - if (settingsService.getHttpsPort() != httpsPort) { - settingsService.setHttpsPort(httpsPort); - settingsService.save(); - } - if (!ObjectUtils.equals(settingsService.getUrlRedirectContextPath(), contextPath)) { - settingsService.setUrlRedirectContextPath(contextPath); - settingsService.save(); - } - } - } diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java index 1094a7f0..b60a7f38 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java @@ -48,7 +48,7 @@ public class DBController { @Autowired private DaoHelper daoHelper; - @RequestMapping(method = RequestMethod.GET) + @RequestMapping(method = { RequestMethod.GET, RequestMethod.POST }) protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { Map map = new HashMap(); diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java index 4b4809f9..aab9d27a 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java @@ -41,7 +41,6 @@ public class GettingStartedController { @RequestMapping(method = RequestMethod.GET) public ModelAndView gettingStarted(HttpServletRequest request) { - ControllerUtils.updatePortAndContextPath(request,settingsService); if (request.getParameter("hide") != null) { settingsService.setGettingStartedEnabled(false); diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java index fec8ca4a..04b734ad 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java @@ -29,7 +29,6 @@ public class IndexController { @RequestMapping(method = { RequestMethod.GET}) public ModelAndView index(HttpServletRequest request) { - ControllerUtils.updatePortAndContextPath(request,settingsService); UserSettings userSettings = settingsService.getUserSettings(securityService.getCurrentUsername(request)); Map map = new HashMap(); diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java index de3a8002..0f6827fb 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java @@ -80,7 +80,7 @@ public class StatusController { } - private static class TransferStatusHolder { + public static class TransferStatusHolder { private TransferStatus transferStatus; private boolean isStream; private boolean isDownload; diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java index cb08ff5d..36309a7e 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java +++ b/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java @@ -69,11 +69,23 @@ public class UserDao extends AbstractDao { * Returns the user with the given username. * * @param username The username used when logging in. + * @param caseSensitive * @return The user, or null if not found. */ - public User getUserByName(String username) { - String sql = "select " + USER_COLUMNS + " from " + getUserTable() + " where username=?"; - User user = queryOne(sql, userRowMapper, username); + public User getUserByName(String username, boolean caseSensitive) { + String sql; + if(caseSensitive) { + sql = "select " + USER_COLUMNS + " from " + getUserTable() + " where username=?"; + } else { + sql = "select " + USER_COLUMNS + " from " + getUserTable() + " where UPPER(username)=UPPER(?)"; + } + List users = query(sql, userRowMapper, username); + User user = null; + if(users.size() == 1) { + user = users.iterator().next(); + } else if (users.size() > 1) { + throw new RuntimeException("Too many matching users"); + } if(user != null) { readRoles(user); } diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/LibresonicUserDetailsContextMapper.java b/libresonic-main/src/main/java/org/libresonic/player/security/LibresonicUserDetailsContextMapper.java new file mode 100644 index 00000000..09d3d344 --- /dev/null +++ b/libresonic-main/src/main/java/org/libresonic/player/security/LibresonicUserDetailsContextMapper.java @@ -0,0 +1,133 @@ +/* + * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.libresonic.player.security; + +import org.libresonic.player.Logger; +import org.libresonic.player.domain.User; +import org.libresonic.player.service.SecurityService; +import org.libresonic.player.service.SettingsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ldap.core.DirContextAdapter; +import org.springframework.ldap.core.DirContextOperations; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.ldap.ppolicy.PasswordPolicyControl; +import org.springframework.security.ldap.ppolicy.PasswordPolicyResponseControl; +import org.springframework.security.ldap.userdetails.LdapUserDetailsImpl; +import org.springframework.security.ldap.userdetails.UserDetailsContextMapper; +import org.springframework.stereotype.Component; + +import java.util.Collection; + +@Component +public class LibresonicUserDetailsContextMapper implements UserDetailsContextMapper { + // ~ Instance fields + // ================================================================================================ + + private final Logger logger = Logger.getLogger(LibresonicUserDetailsContextMapper.class); + private String passwordAttributeName = "userPassword"; + + @Autowired + SecurityService securityService; + + @Autowired + SettingsService settingsService; + + // ~ Methods + // ======================================================================================================== + + public UserDetails mapUserFromContext(DirContextOperations ctx, String username, + Collection authorities) { + String dn = ctx.getNameInNamespace(); + + logger.debug("Mapping user details from context with DN: " + dn); + + // User must be defined in Libresonic, unless auto-shadowing is enabled. + User user = securityService.getUserByName(username, false); + if (user == null && !settingsService.isLdapAutoShadowing()) { + throw new BadCredentialsException("User does not exist."); + } + + if (user == null) { + User newUser = new User(username, "", null, true, 0L, 0L, 0L); + newUser.setStreamRole(true); + newUser.setSettingsRole(true); + securityService.createUser(newUser); + logger.info("Created local user '" + username + "' for DN " + dn); + user = securityService.getUserByName(username, false); + } + + // LDAP authentication must be enabled for the given user. + if (!user.isLdapAuthenticated()) { + throw new BadCredentialsException("LDAP authentication disabled for user."); + } + + LdapUserDetailsImpl.Essence essence = new LdapUserDetailsImpl.Essence(); + essence.setDn(dn); + + Object passwordValue = ctx.getObjectAttribute(passwordAttributeName); + + if (passwordValue != null) { + essence.setPassword(mapPassword(passwordValue)); + } + + essence.setUsername(user.getUsername()); + + // Add the supplied authorities + for (GrantedAuthority authority : securityService.getGrantedAuthorities(user.getUsername())) { + essence.addAuthority(authority); + } + + // Check for PPolicy data + + PasswordPolicyResponseControl ppolicy = (PasswordPolicyResponseControl) ctx + .getObjectAttribute(PasswordPolicyControl.OID); + + if (ppolicy != null) { + essence.setTimeBeforeExpiration(ppolicy.getTimeBeforeExpiration()); + essence.setGraceLoginsRemaining(ppolicy.getGraceLoginsRemaining()); + } + + return essence.createUserDetails(); + + } + + public void mapUserToContext(UserDetails user, DirContextAdapter ctx) { + throw new UnsupportedOperationException( + "LdapUserDetailsMapper only supports reading from a context. Please" + + "use a subclass if mapUserToContext() is required."); + } + + /** + * Extension point to allow customized creation of the user's password from the + * attribute stored in the directory. + * + * @param passwordValue the value of the password attribute + * @return a String representation of the password. + */ + protected String mapPassword(Object passwordValue) { + + if (!(passwordValue instanceof String)) { + // Assume it's binary + passwordValue = new String((byte[]) passwordValue); + } + + return (String) passwordValue; + + } +} diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/WebSecurityConfig.java b/libresonic-main/src/main/java/org/libresonic/player/security/WebSecurityConfig.java index 8b101a97..99440c0e 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/security/WebSecurityConfig.java +++ b/libresonic-main/src/main/java/org/libresonic/player/security/WebSecurityConfig.java @@ -1,6 +1,7 @@ package org.libresonic.player.security; import org.libresonic.player.service.SecurityService; +import org.libresonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,20 +19,37 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired private SecurityService securityService; + @Autowired private CsrfSecurityRequestMatcher csrfSecurityRequestMatcher; + @Autowired LoginFailureLogger loginFailureLogger; + @Autowired + SettingsService settingsService; + + @Autowired + LibresonicUserDetailsContextMapper libresonicUserDetailsContextMapper; + @Override @Bean(name = "authenticationManager") public AuthenticationManager authenticationManagerBean() throws Exception { return super.authenticationManagerBean(); } - @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + if (settingsService.isLdapEnabled()) { + auth.ldapAuthentication() + .contextSource() + .managerDn(settingsService.getLdapManagerDn()) + .managerPassword(settingsService.getLdapManagerPassword()) + .url(settingsService.getLdapUrl()) + .and() + .userSearchFilter(settingsService.getLdapSearchFilter()) + .userDetailsContextMapper(libresonicUserDetailsContextMapper); + } auth.userDetailsService(securityService); } @@ -89,7 +107,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .passwordParameter("j_password") // see http://docs.spring.io/spring-security/site/docs/3.2.4.RELEASE/reference/htmlsingle/#csrf-logout .and().logout().logoutRequestMatcher(new AntPathRequestMatcher("/logout", "GET")).logoutSuccessUrl("/login?logout") - .and().rememberMe().userDetailsService(securityService).key("libresonic"); - + .and().rememberMe().key("libresonic"); } } \ No newline at end of file diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java b/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java index c3878bcc..176a43a9 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java +++ b/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java @@ -461,8 +461,7 @@ public class PlaylistService { for (Object obj : tracks) { Element track = (Element) obj; String location = track.getChildText("location", ns); - if (location != null && location.startsWith("file://")) { - location = location.replaceFirst("file://", ""); + if (location != null) { MediaFile file = getMediaFile(location); if (file != null) { ok.add(file); diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java b/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java index d4b07cc5..86dda168 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java +++ b/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java @@ -62,11 +62,22 @@ public class SecurityService implements UserDetailsService { * @throws DataAccessException If user could not be found for a repository-specific reason. */ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException { - User user = getUserByName(username); + return loadUserByUsername(username, true); + } + + public UserDetails loadUserByUsername(String username, boolean caseSensitive) + throws UsernameNotFoundException, DataAccessException { + User user = getUserByName(username, caseSensitive); if (user == null) { throw new UsernameNotFoundException("User \"" + username + "\" was not found."); } + List authorities = getGrantedAuthorities(username); + + return new org.springframework.security.core.userdetails.User(username, user.getPassword(), authorities); + } + + public List getGrantedAuthorities(String username) { String[] roles = userDao.getRolesForUser(username); List authorities = new ArrayList<>(); authorities.add(new SimpleGrantedAuthority("IS_AUTHENTICATED_ANONYMOUSLY")); @@ -74,8 +85,7 @@ public class SecurityService implements UserDetailsService { for (int i = 0; i < roles.length; i++) { authorities.add(new SimpleGrantedAuthority("ROLE_" + roles[i].toUpperCase())); } - - return new org.springframework.security.core.userdetails.User(username, user.getPassword(), authorities); + return authorities; } /** @@ -86,7 +96,7 @@ public class SecurityService implements UserDetailsService { */ public User getCurrentUser(HttpServletRequest request) { String username = getCurrentUsername(request); - return username == null ? null : userDao.getUserByName(username); + return username == null ? null : getUserByName(username); } /** @@ -106,7 +116,17 @@ public class SecurityService implements UserDetailsService { * @return The user, or null if not found. */ public User getUserByName(String username) { - return userDao.getUserByName(username); + return getUserByName(username, true); + } + + /** + * Returns the user with the given username + * @param username + * @param caseSensitive If false, will do a case insensitive search + * @return + */ + public User getUserByName(String username, boolean caseSensitive) { + return userDao.getUserByName(username, caseSensitive); } /** diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties index 512346ff..b90fdc02 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties @@ -371,6 +371,7 @@ advancedsettings.ldapsearchfilter = LDAP search filter advancedsettings.ldapmanagerdn = LDAP manager DN
(Optional)
advancedsettings.ldapmanagerpassword = Password advancedsettings.ldapautoshadowing = Automatically create users in {0} +advancedsettings.ldapRequiresRestart = LDAP settings require a restart to take effect advancedsettings.smtpPort = SMTP port advancedsettings.smtpServer = SMTP server advancedsettings.smtpEncryption = SMTP encryption diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp index 500124c4..ac66edfb 100644 --- a/libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp +++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp @@ -138,6 +138,8 @@ +

+ " style="margin-right:0.3em"> " onclick="location.href='nowPlaying.view'"> diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp index a11290b3..27c8193e 100644 --- a/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp +++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp @@ -278,6 +278,7 @@