[jbossws-commits] JBossWS SVN: r6399 - in stack/cxf/branches/tdiesler/trunk: ant-import and 2 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Sun Apr 13 13:10:19 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-04-13 13:10:18 -0400 (Sun, 13 Apr 2008)
New Revision: 6399

Modified:
   stack/cxf/branches/tdiesler/trunk/.classpath
   stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml
   stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
   stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml
   stack/cxf/branches/tdiesler/trunk/management/pom.xml
   stack/cxf/branches/tdiesler/trunk/pom.xml
Log:
eclipse classpath

Modified: stack/cxf/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.classpath	2008-04-13 16:25:50 UTC (rev 6398)
+++ stack/cxf/branches/tdiesler/trunk/.classpath	2008-04-13 17:10:18 UTC (rev 6399)
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test-framework/java"/>
+	<classpathentry excluding="org/jboss/test/ws/jaxws/complex/|org/jboss/test/ws/jaxws/holder/|org/jboss/test/ws/jaxws/jbws1840/" kind="src" path="src/test-framework/java"/>
+	<classpathentry kind="src" path="runtime/server/src/main/java"/>
+	<classpathentry kind="src" path="runtime/client/src/main/java"/>
 	<classpathentry kind="src" path="src/test/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="/common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
 	<classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.0.5-incubator/cxf-rt-transports-http-2.0.5-incubator.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.0.5-incubator/cxf-rt-frontend-jaxws-2.0.5-incubator.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar"/>
+	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.0.5-incubator/cxf-api-2.0.5-incubator.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.0.5-incubator/cxf-rt-core-2.0.5-incubator.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.8/spring-context-2.0.8.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.8/spring-beans-2.0.8.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.8/spring-core-2.0.8.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-common-utilities/2.0.5-incubator/cxf-common-utilities-2.0.5-incubator.jar"/>
 	<classpathentry kind="output" path="target/eclipse"/>
 </classpath>

Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml	2008-04-13 16:25:50 UTC (rev 6398)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml	2008-04-13 17:10:18 UTC (rev 6399)
@@ -22,6 +22,7 @@
     <delete dir="${deploy.artifacts.dir}"/>
     
     <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+    <copy file="${thirdparty.dir}/wstx-asl.jar" tofile="${thirdparty.dir}/wstx.jar"/>
     <copy todir="${deploy.artifacts.dir}/lib">
       <fileset dir="${thirdparty.dir}">
         <patternset refid="jbossws.client.patternset"/>

Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml	2008-04-13 16:25:50 UTC (rev 6398)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml	2008-04-13 17:10:18 UTC (rev 6399)
@@ -26,9 +26,7 @@
   </patternset>
   
   <patternset id="jbossws.client.patternset">
-    <include name="**/cxf-api.jar"/>
-    <include name="**/cxf-common-utilities.jar"/>
-    <include name="**/cxf-rt-core.jar"/>
+    <include name="**/cxf-*.jar"/>
     <include name="**/geronimo-javamail*.jar"/>
     <include name="**/geronimo-ws-metadata*.jar"/>
     <include name="**/jaxb-api.jar"/>

Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml	2008-04-13 16:25:50 UTC (rev 6398)
+++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml	2008-04-13 17:10:18 UTC (rev 6399)
@@ -24,11 +24,30 @@
   <target name="tests-init" depends="tests-classpath">
     
     <path id="ws.stack.classpath">
-      <fileset dir="${thirdparty.dir}"/>
+      <fileset dir="${thirdparty.dir}">
+        <include name="cxf-*.jar"/>
+      </fileset>
+      <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+      <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+      <pathelement location="${thirdparty.dir}/geronimo-javamail_1.4_spec.jar"/>
+      <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_2.0_spec.jar"/>
+      <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
+      <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+      <pathelement location="${thirdparty.dir}/neethi.jar"/>
+      <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+      <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+      <pathelement location="${thirdparty.dir}/spring-beans.jar"/>
+      <pathelement location="${thirdparty.dir}/spring-context.jar"/>
+      <pathelement location="${thirdparty.dir}/spring-core.jar"/>
+      <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+      <pathelement location="${thirdparty.dir}/wstx.jar"/>
+      <pathelement location="${thirdparty.dir}/xml-resolver.jar"/>
+      <pathelement location="${thirdparty.dir}/XmlSchema.jar"/>
     </path>
     
     <path id="tests.extra.classpath">
-			<pathelement location="${cxf.rt.client.dir}/target/jbossws-cxf-client-${version.id}.jar"/>
+			<pathelement location="${cxf.runtime.client.dir}/target/jbossws-cxf-client-${version.id}.jar"/>
+      <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
     </path>
     
   </target>

Modified: stack/cxf/branches/tdiesler/trunk/management/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/management/pom.xml	2008-04-13 16:25:50 UTC (rev 6398)
+++ stack/cxf/branches/tdiesler/trunk/management/pom.xml	2008-04-13 17:10:18 UTC (rev 6399)
@@ -2,8 +2,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
-  <name>JBoss Web Services - Stack CXF Managment</name>
-  <artifactId>jbossws-cxf-managment</artifactId>
+  <name>JBoss Web Services - Stack CXF Management</name>
+  <artifactId>jbossws-cxf-management</artifactId>
   <packaging>war</packaging>
   
   <parent>

Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml	2008-04-13 16:25:50 UTC (rev 6398)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml	2008-04-13 17:10:18 UTC (rev 6399)
@@ -20,7 +20,7 @@
   </properties>
   
   <modules>
-    <module>managment</module>
+    <module>management</module>
     <module>runtime</module>
   </modules>
   




More information about the jbossws-commits mailing list