Author: veithen
Date: Sun Dec 9 21:38:06 2012
New Revision: 1419168
URL: http://svn.apache.org/viewvc?rev=1419168&view=rev
Log:
Automate the setup of the JWS stuff.
Added:
axis/axis1/java/trunk/axis-rt-jws/src/main/resources/
axis/axis1/java/trunk/axis-rt-jws/src/main/resources/META-INF/
axis/axis1/java/trunk/axis-rt-jws/src/main/resources/META-INF/axis/
axis/axis1/java/trunk/axis-rt-jws/src/main/resources/META-INF/axis/default-server-config.wsdd
- copied unchanged from r1419001,
axis/axis1/java/trunk/axis-standalone-server/src/main/resources/org/apache/axis/server/standalone/jws-handler.wsdd
Removed:
axis/axis1/java/trunk/axis-standalone-server/src/main/resources/org/apache/axis/server/standalone/jws-handler.wsdd
Modified:
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/integration/pom.xml
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
axis/axis1/java/trunk/samples/stock-sample/pom.xml
Modified:
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java?rev=1419168&r1=1419167&r2=1419168&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
(original)
+++
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
Sun Dec 9 21:38:06 2012
@@ -115,7 +115,6 @@ public class StandaloneAxisServer {
for (int i=0; i<jwsDirs.length; i++) {
resources.add(Resource.newResource(jwsDirs[i]));
}
- servlet.enableJWS();
enableJWS = true;
} else {
enableJWS = false;
Modified:
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java?rev=1419168&r1=1419167&r2=1419168&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
(original)
+++
axis/axis1/java/trunk/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
Sun Dec 9 21:38:06 2012
@@ -45,10 +45,6 @@ public class StandaloneAxisServlet exten
wsddUrls.add(StandaloneAxisServlet.class.getResource("quit-handler-deploy.wsdd"));
}
- public void enableJWS() {
-
wsddUrls.add(StandaloneAxisServlet.class.getResource("jws-handler.wsdd"));
- }
-
public void init() throws ServletException {
super.init();
try {
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1419168&r1=1419167&r2=1419168&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Sun Dec 9 21:38:06 2012
@@ -35,11 +35,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-rt-jws</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>axis-codegen</artifactId>
<version>${project.version}</version>
</dependency>
Modified:
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java?rev=1419168&r1=1419167&r2=1419168&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
Sun Dec 9 21:38:06 2012
@@ -119,6 +119,9 @@ public class StartServerMojo extends Abs
// Need to setup additional dependencies before building the default
configuration!
addAxisDependency("axis-standalone-server");
+ if (jwsDirs != null && jwsDirs.length > 0) {
+ addAxisDependency("axis-rt-jws");
+ }
// Determine the port to be used
int actualPort = foreground && foregroundPort != -1 ? foregroundPort :
port;
Modified: axis/axis1/java/trunk/samples/stock-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/stock-sample/pom.xml?rev=1419168&r1=1419167&r2=1419168&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/stock-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/stock-sample/pom.xml Sun Dec 9 21:38:06 2012
@@ -34,11 +34,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis-rt-jws</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
