Modified: axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/faults-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -38,11 +38,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axis-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> @@ -91,7 +86,7 @@ <wsdd> <directory>src/main/wsdd</directory> <includes> - <include>**/*.wsdd</include> + <include>deploy.wsdd</include> </includes> </wsdd> </wsdds>
Modified: axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/handler-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -38,11 +38,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axis-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> Modified: axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/jaxrpc-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -40,11 +40,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>axis-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>stock-sample</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -125,13 +120,13 @@ <wsdd> <directory>src/main/wsdd</directory> <includes> - <include>**/*.wsdd</include> + <include>**/deploy.wsdd</include> </includes> </wsdd> <wsdd> <directory>../stock-sample/src/main/wsdd</directory> <includes> - <include>**/*.wsdd</include> + <include>deploy.wsdd</include> </includes> </wsdd> <wsdd> Propchange: axis/axis1/java/branches/AXIS-2882/samples/jms-sample/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 12:01:10 2012 @@ -0,0 +1,4 @@ +.classpath +.project +target +.settings Modified: axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/message-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -38,11 +38,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axis-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> @@ -91,7 +86,7 @@ <wsdd> <directory>src/main/wsdd</directory> <includes> - <include>**/*.wsdd</include> + <include>deploy.wsdd</include> </includes> </wsdd> </wsdds> Modified: axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/misc-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -38,11 +38,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axis-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> @@ -91,7 +86,7 @@ <wsdd> <directory>src/main/wsdd</directory> <includes> - <include>**/*.wsdd</include> + <include>deploy.wsdd</include> </includes> </wsdd> </wsdds> Modified: axis/axis1/java/branches/AXIS-2882/samples/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/pom.xml Mon Dec 10 12:01:10 2012 @@ -42,6 +42,7 @@ <module>integrationguide-sample</module> <module>jaxm-sample</module> <module>jaxrpc-sample</module> + <module>jms-sample</module> <module>message-sample</module> <module>mtomstub-sample</module> <module>misc-sample</module> Modified: axis/axis1/java/branches/AXIS-2882/samples/proxy-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/proxy-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/proxy-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/proxy-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -49,11 +49,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axis-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> Modified: axis/axis1/java/branches/AXIS-2882/samples/stock-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/stock-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/stock-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/stock-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -34,20 +34,10 @@ <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> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axis-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> @@ -104,7 +94,7 @@ <wsdd> <directory>src/main/wsdd</directory> <includes> - <include>**/*.wsdd</include> + <include>deploy.wsdd</include> </includes> </wsdd> </wsdds> Modified: axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml Mon Dec 10 12:01:10 2012 @@ -44,6 +44,11 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-daemon</groupId> + <artifactId>commons-daemon</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -84,10 +89,10 @@ <execution> <id>start-server</id> <goals> - <goal>start-process</goal> + <goal>start-daemon</goal> </goals> <configuration> - <mainClass>samples.transport.tcp.TCPListener</mainClass> + <daemonClass>samples.transport.tcp.TCPListenerDaemon</daemonClass> <args> <arg>-p</arg> <arg>${test.functional.TCPListenerPort}</arg> Modified: axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java?rev=1419363&r1=1419362&r2=1419363&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java (original) +++ axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java Mon Dec 10 12:01:10 2012 @@ -59,7 +59,7 @@ public class TCPListener implements Runn private AxisEngine engine = null ; // becomes true when we want to quit - private boolean done = false; + private volatile boolean done = false; static final String wsdd = "<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\"; " + @@ -115,6 +115,10 @@ public class TCPListener implements Runn } } + public void stop() throws IOException { + done = true; + srvSocket.close(); + } public class SocketHandler implements Runnable { private Socket socket; Propchange: axis/axis1/java/branches/AXIS-2882/test/wsdl/interop/ ------------------------------------------------------------------------------ Merged /axis/axis1/java/trunk/test/wsdl/interop:r1418401-1419360
