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/libresonic-transcode/README.TXT b/documentation/TRANSCODE.TXT similarity index 100% rename from libresonic-transcode/README.TXT rename to documentation/TRANSCODE.TXT diff --git a/libresonic-assembly/pom.xml b/libresonic-assembly/pom.xml deleted file mode 100644 index e6245cad..00000000 --- a/libresonic-assembly/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 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/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/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-tools/ehcache-monitor/ehcache-monitor-kit-1.0.3-distribution.tar.gz b/libresonic-tools/ehcache-monitor/ehcache-monitor-kit-1.0.3-distribution.tar.gz deleted file mode 100644 index 448b20fb..00000000 Binary files a/libresonic-tools/ehcache-monitor/ehcache-monitor-kit-1.0.3-distribution.tar.gz and /dev/null differ diff --git a/libresonic-tools/exe4j/exe4j_windows_4_5_1.exe b/libresonic-tools/exe4j/exe4j_windows_4_5_1.exe deleted file mode 100644 index 9fcb8a6b..00000000 Binary files a/libresonic-tools/exe4j/exe4j_windows_4_5_1.exe and /dev/null differ diff --git a/libresonic-tools/exe4j/exe4j_windows_4_5_1.zip b/libresonic-tools/exe4j/exe4j_windows_4_5_1.zip deleted file mode 100644 index 874f460d..00000000 Binary files a/libresonic-tools/exe4j/exe4j_windows_4_5_1.zip and /dev/null differ diff --git a/libresonic-tools/nsis/NSIS_Simple_Firewall_Plugin_1.20.zip b/libresonic-tools/nsis/NSIS_Simple_Firewall_Plugin_1.20.zip deleted file mode 100644 index 2fbac079..00000000 Binary files a/libresonic-tools/nsis/NSIS_Simple_Firewall_Plugin_1.20.zip and /dev/null differ diff --git a/libresonic-tools/nsis/Processes.zip b/libresonic-tools/nsis/Processes.zip deleted file mode 100644 index dc81a097..00000000 Binary files a/libresonic-tools/nsis/Processes.zip and /dev/null differ diff --git a/libresonic-tools/nsis/nsis-2.46-setup.exe b/libresonic-tools/nsis/nsis-2.46-setup.exe deleted file mode 100755 index ad6051db..00000000 Binary files a/libresonic-tools/nsis/nsis-2.46-setup.exe and /dev/null differ diff --git a/libresonic-tools/packages/Packages.dmg b/libresonic-tools/packages/Packages.dmg deleted file mode 100644 index 7d0e5788..00000000 Binary files a/libresonic-tools/packages/Packages.dmg and /dev/null differ diff --git a/libresonic-tools/sonos-selftest/smapiConfig.cfg b/libresonic-tools/sonos-selftest/smapiConfig.cfg deleted file mode 100644 index a30ffe80..00000000 --- a/libresonic-tools/sonos-selftest/smapiConfig.cfg +++ /dev/null @@ -1,111 +0,0 @@ -[Service Name] -servicename = Libresonic -serviceid = - -[Endpoints] -insecure = http://localhost:4040/ws/Sonos -secure = http://localhost:4040/ws/Sonos - -[Strings File] -stringslocation = - -[Presentation Map File] -pmaplocation = http://localhost:4040/sonos/presentationMap.xml - -[Authentication Type] -sessionid = True -anonymous = False -stateless = False -oauth = False - -[Device Link] -householdid = -token = -privatekey = -migrationtodevicelink = False - -[Accounts] -supportedaccount = admin -supportedpassword = admin -unsupportedaccount = -unsupportedpassword = -expiredtrialaccount = -expiredtrialpassword = -unsupportedterritoryaccount = -unsupportedterritorypassword = - -[Capabilities] -search = True -favoritestracks = True -favoritesalbums = True -favoritesartists = False -usercontentplaylists = False -playbacklogging = False -extendedmetadata = True -eventanddurationloggingduringplayback = False -accountlogging = False - -[Additional Settings] -hlscontent = False -ephemeraltrackid = False -ephemeralartistid = False -ephemeralalbumid = False -ephemeralstreamid = False -ephemeralprogramid = False - -[Favorite Containers] -faveartists = starred-artists -favealbums = starred-albums -favetracks = starred-songs -faveother = - -[Search Containers] -searchartist = search-artists -searchalbum = search-albums -searchtrack = search-songs -searchstream = -searchprogram = -searchplaylist = -searchother = - -[Test Content] -track = 1186 -track title = Got You by the Balls -album = 1341 -album title = Heart in Motion -artist = 123 -artist name = Chris Rea -stream = -stream title = -program = -program title = -other = -other title = -playlist = 40 -playlist title = Tjobing -playlist folder = -playlist share = - -[Ratings IDs] -positive = -negative = - -[ExtendedMetadata Text] -textartist = -textalbum = -texttrack = -textprogram = -textstream = -textother = - -[ExtendedMetadata Browse] -browseartist = -browsealbum = -browsetrack = -browseprogram = -browsestream = -browseother = - -[Polling Interval] -interval = 60 - diff --git a/libresonic-transcode/linux/ffmpeg b/libresonic-transcode/linux/ffmpeg deleted file mode 100755 index 6142f197..00000000 Binary files a/libresonic-transcode/linux/ffmpeg and /dev/null differ diff --git a/libresonic-transcode/linux/lame b/libresonic-transcode/linux/lame deleted file mode 100755 index c4cb5a35..00000000 Binary files a/libresonic-transcode/linux/lame and /dev/null differ diff --git a/libresonic-transcode/mac/ffmpeg b/libresonic-transcode/mac/ffmpeg deleted file mode 100755 index aef7a0c2..00000000 Binary files a/libresonic-transcode/mac/ffmpeg and /dev/null differ diff --git a/libresonic-transcode/mac/lame b/libresonic-transcode/mac/lame deleted file mode 100755 index 3f9746a0..00000000 Binary files a/libresonic-transcode/mac/lame and /dev/null differ diff --git a/libresonic-transcode/windows/README.TXT b/libresonic-transcode/windows/README.TXT deleted file mode 100644 index a3104ac7..00000000 --- a/libresonic-transcode/windows/README.TXT +++ /dev/null @@ -1,11 +0,0 @@ -========================================================== - LIBRESONIC TRANSCODING PACK -========================================================== - -This is a collection of free audio codecs for Windows. -To be installed in c:\libresonic\transcode - -See http://libresonic.org for details. - -Sindre Mehus, Aug 10 2011 -========================================================== diff --git a/libresonic-transcode/windows/ffmpeg.exe b/libresonic-transcode/windows/ffmpeg.exe deleted file mode 100644 index 8b715d41..00000000 Binary files a/libresonic-transcode/windows/ffmpeg.exe and /dev/null differ diff --git a/libresonic-transcode/windows/ffmpeg_license.txt b/libresonic-transcode/windows/ffmpeg_license.txt deleted file mode 100644 index 94a9ed02..00000000 --- a/libresonic-transcode/windows/ffmpeg_license.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/libresonic-transcode/windows/lame.exe b/libresonic-transcode/windows/lame.exe deleted file mode 100644 index 7e695227..00000000 Binary files a/libresonic-transcode/windows/lame.exe and /dev/null differ diff --git a/libresonic-transcode/windows/lame_license.txt b/libresonic-transcode/windows/lame_license.txt deleted file mode 100644 index bf50f20d..00000000 --- a/libresonic-transcode/windows/lame_license.txt +++ /dev/null @@ -1,482 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307 USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/pom.xml b/pom.xml index 3d179c94..bab47c77 100644 --- a/pom.xml +++ b/pom.xml @@ -76,21 +76,6 @@ libresonic-main - - - full - - libresonic-booter - libresonic-installer-windows - libresonic-installer-mac - libresonic-installer-debian - libresonic-installer-rpm - libresonic-assembly - - - - -