diff --git a/pom.xml b/pom.xml
index b03809faf6..9bc6ec172f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
scm-server-api
scm-server-jetty
plugins
- scm-agent
scm-webapp
scm-server
diff --git a/scm-agent/pom.xml b/scm-agent/pom.xml
deleted file mode 100644
index 09ac4f9bf3..0000000000
--- a/scm-agent/pom.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
- 4.0.0
-
-
- scm
- sonia.scm
- 1.0-SNAPSHOT
-
-
- sonia.scm
- scm-agent
- 1.0-SNAPSHOT
- scm-agent
-
-
-
-
- sonia.scm
- scm-core
- 1.0-SNAPSHOT
-
-
-
- com.sun.jersey
- jersey-server
- ${jersey.version}
-
-
-
- com.sun.grizzly
- grizzly-servlet-webserver
- 1.9.18-m
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.3.1
-
-
-
- sonia.scm.agent.Main
-
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- appassembler-maven-plugin
- 1.1
-
-
- package
-
- create-repository
- generate-daemons
-
-
- ${project.build.directory}/appassembler
- ${project.build.directory}/appassembler/jsw/scm-agent
- lib
- flat
- true
-
-
-
- scm-agent
- sonia.scm.agent.Main
-
- jsw
-
-
-
- 256m
- 256m
-
-
-
-
- jsw
-
-
- configuration.directory.in.classpath.first
- conf
-
-
- set.default.REPO_DIR
- lib
-
- wrapper.logfile
- logs/wrapper.log
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 2.2
-
-
- src/main/assembly/scm-agent-jsw.xml
-
-
-
-
- scm-agent-jsw
- package
-
- single
-
-
-
-
-
-
-
-
-
-
-
diff --git a/scm-agent/src/main/assembly/scm-agent-jsw.xml b/scm-agent/src/main/assembly/scm-agent-jsw.xml
deleted file mode 100644
index 95dfe569d9..0000000000
--- a/scm-agent/src/main/assembly/scm-agent-jsw.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
- scm-agent-jsw
-
-
- zip
- tar.gz
- tar.bz2
-
-
- false
-
-
-
- target/appassembler/jsw/scm-agent/bin
- false
- bin
- 0755
-
-
- target/appassembler/jsw/scm-agent/conf
- false
- conf
-
-
- target/appassembler/jsw/scm-agent/lib
- false
- lib
-
-
- target/
- /logs
-
- **/*
-
-
-
-
-
\ No newline at end of file
diff --git a/scm-agent/src/main/java/sonia/scm/agent/Main.java b/scm-agent/src/main/java/sonia/scm/agent/Main.java
deleted file mode 100644
index 7ee9328fa0..0000000000
--- a/scm-agent/src/main/java/sonia/scm/agent/Main.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-package sonia.scm.agent;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.grizzly.http.SelectorThread;
-import com.sun.jersey.api.container.grizzly.GrizzlyWebContainerFactory;
-
-import java.io.IOException;
-
-import java.text.MessageFormat;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class Main
-{
-
- /** Field description */
- private static final int DEFAULT_PORT = 8989;
-
- /** Field description */
- private static final String DEFAULT_URI = "http://localhost:{0}/";
-
- /** Field description */
- private static Logger logger = LoggerFactory.getLogger(Main.class);
-
- //~--- methods --------------------------------------------------------------
-
- /**
- * Method description
- *
- *
- * @param args
- *
- * @throws IOException
- */
- public static void main(String[] args) throws IOException
- {
- SelectorThread threadSelector = startServer();
-
- // TODO replace
- System.in.read();
- System.out.println("Shutting down ...");
- threadSelector.stopEndpoint();
- System.exit(0);
- }
-
- /**
- * Method description
- *
- *
- * @return
- *
- * @throws IOException
- */
- protected static SelectorThread startServer() throws IOException
- {
- final Map initParams = new HashMap();
-
- initParams.put("com.sun.jersey.config.property.packages",
- "sonia.scm.agent.resources");
- System.out.println("Starting grizzly...");
-
- int port = getPort(DEFAULT_PORT);
- String uri = MessageFormat.format(DEFAULT_URI, String.valueOf(port));
-
- return GrizzlyWebContainerFactory.create(uri, initParams);
- }
-
- //~--- get methods ----------------------------------------------------------
-
- /**
- * Method description
- *
- *
- * @param defaultPort
- *
- * @return
- */
- private static int getPort(int defaultPort)
- {
- String port = System.getenv("JERSEY_HTTP_PORT");
-
- if (null != port)
- {
- try
- {
- return Integer.parseInt(port);
- }
- catch (NumberFormatException ex)
- {
- logger.debug(ex.getMessage(), ex);
- }
- }
-
- return defaultPort;
- }
-}
diff --git a/scm-agent/src/main/java/sonia/scm/agent/resources/AgentResource.java b/scm-agent/src/main/java/sonia/scm/agent/resources/AgentResource.java
deleted file mode 100644
index e5111836d8..0000000000
--- a/scm-agent/src/main/java/sonia/scm/agent/resources/AgentResource.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-package sonia.scm.agent.resources;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-@Path("/agent")
-public class AgentResource
-{
-
- /**
- * Method description
- *
- *
- * @return
- */
- @GET
- @Produces("text/plain")
- public String hello()
- {
- return "Hello from Agent";
- }
-}
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 502e56b4ce..55c5857594 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -14,7 +14,7 @@
scm-webapp
war
1.0-SNAPSHOT
- scm-webapp Java EE 6 Webapp
+ scm-webapp