svn commit: r1420298 - in /axis/axis1/java/trunk: axis-standalone-server/ axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ axis-standalone-server/src/main/java/org/apache/axis/s

2012-12-11 Thread veithen 
Author: veithen
Date: Tue Dec 11 17:26:34 2012
New Revision: 1420298

URL: http://svn.apache.org/viewvc?rev=1420298&view=rev
Log:
* Added a Daemon implementation for the Axis stand-alone server.
* Simplified the maven-axis-server-plugin: now all processes controlled by the 
plug-in are Daemon implementations.

Added:

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java
   (with props)

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Configurator.java
   (with props)

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/ConfiguratorException.java
   (with props)

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Main.java
   (with props)

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/daemon/

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/daemon/AxisServerDaemon.java
   (with props)

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java
  - copied, changed from r1419001, 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractServerMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
  - copied, changed from r1419166, 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
  - copied, changed from r1419001, 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
  - copied, changed from r1419001, 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
  - copied, changed from r1419001, 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java
Removed:

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractServerMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
Modified:
axis/axis1/java/trunk/axis-standalone-server/pom.xml

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitHandler.java

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java

axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
axis/axis1/java/trunk/distribution/pom.xml
axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/reso

svn commit: r1420339 - in /axis/axis1/java/trunk: ./ axis-standalone-server/ jetty-daemon/ jetty-daemon/src/ jetty-daemon/src/main/ jetty-daemon/src/main/java/ jetty-daemon/src/main/java/org/ jetty-da

2012-12-11 Thread veithen 
Author: veithen
Date: Tue Dec 11 19:22:12 2012
New Revision: 1420339

URL: http://svn.apache.org/viewvc?rev=1420339&view=rev
Log:
Added a goal to the maven-axis-server-plugin that allows to run a Jetty 
instance in a separate JVM (and that is more convenient than 
jetty-maven-plugin).

Added:
axis/axis1/java/trunk/jetty-daemon/   (with props)
axis/axis1/java/trunk/jetty-daemon/pom.xml   (with props)
axis/axis1/java/trunk/jetty-daemon/src/
axis/axis1/java/trunk/jetty-daemon/src/main/
axis/axis1/java/trunk/jetty-daemon/src/main/java/
axis/axis1/java/trunk/jetty-daemon/src/main/java/org/
axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/
axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/
axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/

axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/

axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/

axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java
   (with props)

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
   (with props)
Modified:
axis/axis1/java/trunk/axis-standalone-server/pom.xml
axis/axis1/java/trunk/pom.xml
axis/axis1/java/trunk/tests/spring-compat-tests/pom.xml

Modified: axis/axis1/java/trunk/axis-standalone-server/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-standalone-server/pom.xml?rev=1420339&r1=1420338&r2=1420339&view=diff
==
--- axis/axis1/java/trunk/axis-standalone-server/pom.xml (original)
+++ axis/axis1/java/trunk/axis-standalone-server/pom.xml Tue Dec 11 19:22:12 
2012
@@ -46,17 +46,14 @@
 
 commons-cli
 commons-cli
-1.2
 
 
 commons-daemon
 commons-daemon
 
 
-
 org.mortbay.jetty
 jetty
-6.1.26
 
 
 

Propchange: axis/axis1/java/trunk/jetty-daemon/
--
--- svn:ignore (added)
+++ svn:ignore Tue Dec 11 19:22:12 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Added: axis/axis1/java/trunk/jetty-daemon/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/jetty-daemon/pom.xml?rev=1420339&view=auto
==
--- axis/axis1/java/trunk/jetty-daemon/pom.xml (added)
+++ axis/axis1/java/trunk/jetty-daemon/pom.xml Tue Dec 11 19:22:12 2012
@@ -0,0 +1,58 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.axis
+axis-project
+1.4.1-SNAPSHOT
+../pom.xml
+
+jetty-daemon
+Jetty Daemon
+
+Daemon implementation used by maven-axis-server-plugin to launch a 
Jetty server in a separate JVM.
+
+
+
+commons-daemon
+commons-daemon
+
+
+commons-cli
+commons-cli
+
+
+org.mortbay.jetty
+jetty
+
+
+
+
+
+maven-site-plugin
+
+true
+true
+
+
+
+
+

Propchange: axis/axis1/java/trunk/jetty-daemon/pom.xml
--
svn:eol-style = native

Added: 
axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java?rev=1420339&view=auto
==
--- 
axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java
 (added)
+++ 
axis/axis1/java/trunk/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java
 Tue Dec 11 19:22:12 2012
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software dist