Merge branch 'biconou_spring-4-update_PR' into biconou_develop_PR_SpringBoot

master
Rémi Cocula 8 years ago
commit 33b7d81dd9
  1. 41
      libresonic-main/pom.xml
  2. 20
      libresonic-main/src/main/java/org/libresonic/player/TestServer.java

@ -18,34 +18,6 @@
<dependencies> <dependencies>
<!-- Adding Jetty for a simple developement embedded server -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.5</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-embedded</artifactId>
<version>6.1.5</version>
<exclusions>
<exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.0</artifactId>
<version>6.1.5</version>
<type>pom</type>
</dependency>
<!-- END : Adding Jetty for a simple developement embedded server -->
<dependency> <dependency>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic-rest-api</artifactId> <artifactId>libresonic-rest-api</artifactId>
@ -300,33 +272,28 @@
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-core</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId> <artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId> <artifactId>cxf-rt-databinding-jaxb</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${cxf.version}</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

@ -1,20 +0,0 @@
package org.libresonic.player;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.webapp.WebAppContext;
public class TestServer {
public static void main(String[] args) throws Exception {
Server server = new Server(8080);
WebAppContext webapp = new WebAppContext();
webapp.setContextPath("/libresonic");
String baseDir = TestServer.class.getResource("/" + TestServer.class.getName().replaceAll("\\.", "/") + ".class").getFile();
baseDir = baseDir.substring(0,baseDir.indexOf("/target"));
webapp.setWar(baseDir + "/src/main/webapp");
server.setHandler(webapp);
server.setAttribute("reload", "automatic");
server.start();
server.join();
}
}
Loading…
Cancel
Save