[jbossws-commits] JBossWS SVN: r6264 - in stack/native/branches/hbraun: ant-import and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-04-07 13:20:48 -0400 (Mon, 07 Apr 2008)
New Revision: 6264

Modified:
   stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml
   stack/native/branches/hbraun/ant-import/build-thirdparty.xml
   stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java
   stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java
   stack/native/branches/hbraun/version.properties
Log:
Switching to TJWS for embedded use

Modified: stack/native/branches/hbraun/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/branches/hbraun/ant-import/build-thirdparty.xml	2008-04-07 17:20:16 UTC (rev 6263)
+++ stack/native/branches/hbraun/ant-import/build-thirdparty.xml	2008-04-07 17:20:48 UTC (rev 6264)
@@ -93,10 +93,6 @@
     <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jaxbintros/${jboss-jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/>
-
-    <get src="${jboss.repository}/jetty/${jetty}/lib/jetty.jar" dest="${thirdparty.dir}/jetty.jar" usetimestamp="true" verbose="true"/>
-    <get src="${jboss.repository}/jetty/${jetty}/lib/jetty-util.jar" dest="${thirdparty.dir}/jetty-util.jar" usetimestamp="true" verbose="true"/>
-
     <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-kernel.jar" dest="${thirdparty.dir}/jboss-kernel.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-aop-mc-int.jar" dest="${thirdparty.dir}/jboss-aop-mc-int.jar" usetimestamp="true" verbose="true"/>
@@ -127,6 +123,9 @@
     <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+
+    <get src="${jboss.repository}/tjws/${tjws}/lib/webserver.jar" dest="${thirdparty.dir}/webserver.jar" usetimestamp="true" verbose="true"/>
+
     <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
 

Modified: stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml	2008-04-07 17:20:16 UTC (rev 6263)
+++ stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml	2008-04-07 17:20:48 UTC (rev 6264)
@@ -51,8 +51,7 @@
          <pathelement location="${core.dir}/thirdparty/jboss-mdr.jar"/> 
          <pathelement location="${core.dir}/thirdparty/jboss-common-core.jar"/>
          <pathelement location="${core.dir}/thirdparty/servlet-api.jar"/>
-         <pathelement location="${core.dir}/thirdparty/jetty.jar"/>
-         <pathelement location="${core.dir}/thirdparty/jetty-util.jar"/>
+         <pathelement location="${core.dir}/thirdparty/webserver.jar"/>         
          <!-- / embedded tests -->
 
          <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/>

Modified: stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java
===================================================================
--- stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java	2008-04-07 17:20:16 UTC (rev 6263)
+++ stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java	2008-04-07 17:20:48 UTC (rev 6264)
@@ -40,11 +40,12 @@
    
    protected void setUp() throws Exception
    {
-      ClassLoader cl = EmbeddableWSFRuntime.class.getClassLoader();
+      /*ClassLoader cl = EmbeddableWSFRuntime.class.getClassLoader();
       String config = "org/jboss/wsf/stack/jbws/embedded/standalone-config.xml";
       standaloneConfig = cl.getResource(config);
       if(null==standaloneConfig)
          throw new RuntimeException("Unable to read config: "+config);
+         */
    }
    
    /**
@@ -55,7 +56,7 @@
    {
       EmbeddedBootstrap bootstrap = new EmbeddedBootstrap();     
       bootstrap.run();
-      bootstrap.deploy(standaloneConfig);
+      bootstrap.deploy(EmbeddableWSFRuntime.DEFAULT_CONFIG_URL);
 
       Kernel kernel = bootstrap.getKernel();
       KernelController controller = kernel.getController();

Modified: stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java
===================================================================
--- stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java	2008-04-07 17:20:16 UTC (rev 6263)
+++ stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java	2008-04-07 17:20:48 UTC (rev 6264)
@@ -84,7 +84,7 @@
 
       // Invoke it
       String wsdl = GETRequest("/hello/endpoint?wsdl");
-      assertNotNull("Unable to retrieve WSDL", wsdl);
+      assertNotNull("Unable to retrieve WSDL", wsdl);      
 
       Service service = Service.create(
         new URL("http://localhost:20000/hello/endpoint?wsdl"),
@@ -105,8 +105,9 @@
       {
          //
       }
-      
-      assertNull("Endpoint not removed", wsdl);
+
+      // The root context accepts the request
+      assertEquals("JBossWS HttpDeamon", wsdl);
    }
 
    public static String GETRequest(String context)

Modified: stack/native/branches/hbraun/version.properties
===================================================================
--- stack/native/branches/hbraun/version.properties	2008-04-07 17:20:16 UTC (rev 6263)
+++ stack/native/branches/hbraun/version.properties	2008-04-07 17:20:48 UTC (rev 6264)
@@ -63,7 +63,7 @@
 jboss-security=4.0.5.GA
 jboss-vfs=2.0.0.Beta2
 jbossas-core-libs=4.2.0.GA
-jetty=6.1.8
+tjws=1.33
 junit=3.8.1
 oswego-concurrent=1.3.4
 qdox=1.4