Author: veithen
Date: Sat Sep 22 11:59:08 2012
New Revision: 1388780
URL: http://svn.apache.org/viewvc?rev=1388780&view=rev
Log:
Fixed an issue in the migration of the jaxrpc sample: the hello service should
use a static WSDD (with a manually configured JAX-RPC handler) instead of the
generated WSDD.
Added:
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdd/hello/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdd/hello/deploy.wsdd
- copied unchanged from r1388090,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/deploy.wsdd
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdd/hello/undeploy.wsdd
- copied unchanged from r1388090,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/undeploy.wsdd
Removed:
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/deploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/undeploy.wsdd
Modified:
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
Modified: axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml?rev=1388780&r1=1388779&r2=1388780&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Sat Sep 22
11:59:08 2012
@@ -97,6 +97,10 @@
<outputDirectory>samples/jaxrpc</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../samples/jaxrpc-sample/src/main/wsdd</directory>
+ <outputDirectory>samples/jaxrpc</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../samples/message-sample/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
Modified: axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml?rev=1388780&r1=1388779&r2=1388780&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml Sat Sep 22 11:59:08 2012
@@ -87,7 +87,6 @@
<configuration>
<file>src/main/wsdl/hello/HelloWorld.wsdl</file>
<generate>server</generate>
-
<deployWsdd>${project.build.directory}/wsdd/hello.wsdd</deployWsdd>
</configuration>
</execution>
</executions>
@@ -124,6 +123,12 @@
<port>${test.functional.ServicePort}</port>
<wsdds>
<wsdd>
+ <directory>src/main/wsdd</directory>
+ <includes>
+ <include>**/*.wsdd</include>
+ </includes>
+ </wsdd>
+ <wsdd>
<directory>../stock-sample/src/main/wsdd</directory>
<includes>
<include>**/*.wsdd</include>
