[jbossws-commits] JBossWS SVN: r4954 - in stack/native/branches/jbossws-native-2.0.2: src/test/resources and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-10-31 09:37:22 -0400 (Wed, 31 Oct 2007)
New Revision: 4954

Removed:
   stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml
   stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml
Modified:
   stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml
   stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml
   stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml
   stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Fix context-root

Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml	2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml	2007-10-31 13:37:22 UTC (rev 4954)
@@ -406,13 +406,11 @@
       </fileset>
       <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged">
         <include name="application.xml"/>
-        <include name="jboss-app.xml"/>
       </metainf>
     </jar>
     <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/>
     <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
     <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
-    <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
     <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/>
     <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>
     

Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml	2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml	2007-10-31 13:37:22 UTC (rev 4954)
@@ -12,7 +12,7 @@
    <module>
       <web>
          <web-uri>jaxws-jbws1762-exploded.war</web-uri>
-         <context-root>jaxws-jbws1762-exploded</context-root>
+         <context-root>jaxws-jbws1762</context-root>
       </web>
    </module>
 

Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml	2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml	2007-10-31 13:37:22 UTC (rev 4954)
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-app
-    PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-      
-<jboss-app>
-  <loader-repository>jbossws.jbws1762:domain=jaxws-jbws1762-exploded.ear</loader-repository>
-</jboss-app>
\ No newline at end of file

Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml	2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml	2007-10-31 13:37:22 UTC (rev 4954)
@@ -12,7 +12,7 @@
    <module>
       <web>
          <web-uri>jaxws-jbws1762-packaged.war</web-uri>
-         <context-root>jaxws-jbws1762-packaged</context-root>
+         <context-root>jaxws-jbws1762</context-root>
       </web>
    </module>
 

Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml	2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml	2007-10-31 13:37:22 UTC (rev 4954)
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-app
-    PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-      
-<jboss-app>
-  <loader-repository>jbossws.jbws1762:domain=jaxws-jbws1762-packaged.ear</loader-repository>
-</jboss-app>
\ No newline at end of file

Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt	2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt	2007-10-31 13:37:22 UTC (rev 4954)
@@ -12,6 +12,8 @@
 org/jboss/test/ws/jaxrpc/jbws358/**
 org/jboss/test/ws/jaxrpc/jbws772/**
 org/jboss/test/ws/jaxws/jbws1813/**
+org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/**
+org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/**
 
 # [JBAS-4890] EJBAccessException: Caller unauthorized
 org/jboss/test/ws/jaxws/samples/context/**