Author: thomas.diesler(a)jboss.com Date: 2006-12-22 10:14:31 -0500 (Fri, 22 Dec 2006) New Revision: 1755 Added: branches/tdiesler/trunk/jbossws-docs/ Removed: branches/tdiesler/trunk/docs/ Modified: branches/tdiesler/trunk/integration-jboss42/.classpath branches/tdiesler/trunk/integration-jboss50/.classpath branches/tdiesler/trunk/integration-tomcat/.classpath branches/tdiesler/trunk/jbossws-tests/.classpath branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/tdiesler/trunk/jbossws-tests/build.xml Log: partial commit Modified: branches/tdiesler/trunk/integration-jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration-jboss42/.classpath 2006-12-22 15:00:35 UTC (rev 1754) +++ branches/tdiesler/trunk/integration-jboss42/.classpath 2006-12-22 15:14:31 UTC (rev 1755) @@ -3,7 +3,6 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/> <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/> @@ -36,5 +35,6 @@ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration-jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration-jboss50/.classpath 2006-12-22 15:00:35 UTC (rev 1754) +++ branches/tdiesler/trunk/integration-jboss50/.classpath 2006-12-22 15:14:31 UTC (rev 1755) @@ -3,7 +3,6 @@ <classpathentry excluding="org/jboss/ws/integration/jboss50/ServiceRefHandler.java" kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/> <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/> @@ -36,5 +35,6 @@ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration-tomcat/.classpath =================================================================== --- branches/tdiesler/trunk/integration-tomcat/.classpath 2006-12-22 15:00:35 UTC (rev 1754) +++ branches/tdiesler/trunk/integration-tomcat/.classpath 2006-12-22 15:14:31 UTC (rev 1755) @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/> <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/> @@ -35,5 +34,6 @@ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Copied: branches/tdiesler/trunk/jbossws-docs (from rev 1741, branches/tdiesler/trunk/docs) Modified: branches/tdiesler/trunk/jbossws-tests/.classpath =================================================================== --- branches/tdiesler/trunk/jbossws-tests/.classpath 2006-12-22 15:00:35 UTC (rev 1754) +++ branches/tdiesler/trunk/jbossws-tests/.classpath 2006-12-22 15:14:31 UTC (rev 1755) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="output/tests/wstools/java"/> - <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/test/java"/> + <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/main/java"/> + <classpathentry kind="src" path="output/wstools/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/build"/> @@ -38,5 +37,8 @@ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-tomcat"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2006-12-22 15:00:35 UTC (rev 1754) +++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2006-12-22 15:14:31 UTC (rev 1755) @@ -666,7 +666,7 @@ <!-- jaxrpc-jbws1124one --> <copy todir="${tests.output.dir}/resources" overwrite="true"> - <fileset dir="${test.resources.dir}"> + <fileset dir="${tests.output.dir}/resources"> <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> @@ -690,7 +690,7 @@ </war> <!-- jaxrpc-jbws1124two --> <copy todir="${tests.output.dir}/resources" overwrite="true"> - <fileset dir="${test.resources.dir}"> + <fileset dir="${tests.output.dir}/resources"> <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> Modified: branches/tdiesler/trunk/jbossws-tests/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/build.xml 2006-12-22 15:00:35 UTC (rev 1754) +++ branches/tdiesler/trunk/jbossws-tests/build.xml 2006-12-22 15:14:31 UTC (rev 1755) @@ -18,11 +18,10 @@ <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> - <property name="tests.dir" value="${jbossws.tests.dir}"/> - <property name="tests.etc.dir" value="${tests.dir}/etc"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> - <property name="tests.output.dir" value="${core.dir}/output"/> + <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/> + <property name="tests.java.dir" value="${tests.dir}/src/main/java"/> + <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> <!-- ================================================================== --> <!-- Setup -->