Author: thomas.diesler(a)jboss.com
Date: 2007-02-01 11:51:14 -0500 (Thu, 01 Feb 2007)
New Revision: 2242
Removed:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/etc/
Modified:
branches/jbossws-1.2.0/build/ant-import/build-samples.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
Log:
Fix samples build
Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 16:22:09 UTC (rev
2241)
+++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 16:51:14 UTC (rev
2242)
@@ -24,8 +24,6 @@
<copy todir="${build.src.samples.dir}">
<fileset dir="${core.samples.dir}">
<include name="ant-import/build-thirdparty.xml"/>
- <include name="etc/jndi.properties"/>
- <include name="etc/log4j.xml"/>
<include name="ant.properties.example"/>
<include name="build.xml"/>
</fileset>
@@ -43,12 +41,14 @@
<copy todir="${build.src.samples.dir}">
<fileset dir="${tests.dir}">
- <include name="ant-imports/build-samples-jaxrpc.xml"/>
- <include name="ant-imports/build-samples-jaxws.xml"/>
+ <include name="ant-import/build-samples-jaxrpc.xml"/>
+ <include name="ant-import/build-samples-jaxws.xml"/>
+ <include name="src/main/etc/*"/>
<include
name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/>
<include
name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/>
<include name="src/main/java/org/jboss/test/ws/*"/>
<include name="src/main/resources/jaxrpc/samples/**"/>
+ <include name="src/main/resources/jaxrpc/samples-override/**"/>
<include name="src/main/resources/jaxws/samples/**"/>
<include name="src/main/resources/*excludes.txt"/>
</fileset>
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01
16:22:09 UTC (rev 2241)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01
16:51:14 UTC (rev 2242)
@@ -24,8 +24,10 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
+ <get
src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar"
dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar"
dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar"
dest="${thirdparty.dir}/log4j.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar"
dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar"
dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar"
dest="${thirdparty.dir}/javassist.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar"
dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true"
verbose="true"/>
@@ -37,11 +39,15 @@
<get
src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar"
dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar"
dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true"
verbose="true" />
<get
src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar"
dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar"
dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar"
dest="${thirdparty.dir}/activation.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar"
dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar"
dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar"
dest="${thirdparty.dir}/mail.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"/>
+
+ <mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
+ <unzip dest="${thirdparty.dir}/jbpm-bpel"
src="${thirdparty.dir}/jbpm-bpel.sar"/>
<unzip dest="${thirdparty.dir}"
src="${thirdparty.dir}/ejb3.deployer.zip"/>
</target>
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01
16:22:09 UTC (rev 2241)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01
16:51:14 UTC (rev 2242)
@@ -7,7 +7,7 @@
jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss42
+jbossws.integration.target=jboss50
# The JBoss server instance
jboss.server.instance=default
@@ -17,9 +17,15 @@
tomcat.manager.username=manager
tomcat.manager.password=manager
+# JBoss Repository
+jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
+#jboss.repository=http://repository.jboss.com
+
# Force thirdparty HTTP get
#force.thirdparty.get=true
-# JBoss Repository
-jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
-#jboss.repository=http://repository.jboss.com
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=yes
+javac.fail.onerror=yes
+javac.verbose=no
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01
16:22:09 UTC (rev 2241)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01
16:51:14 UTC (rev 2242)
@@ -320,9 +320,7 @@
<!-- generate mapping artifacts -->
<taskdef name="wstools"
classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="core.classpath"/>
- <classpath location="${jbossws.client.jar}"/>
- <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
- <classpath
location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
+ <classpath location="${tests.lib.dir}/jbossws-client.jar"/>
<classpath location="${thirdparty.dir}/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath location="${tests.output.dir}"/>
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01
16:22:09 UTC (rev 2241)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01
16:51:14 UTC (rev 2242)
@@ -2,8 +2,10 @@
# $Id: version.properties 1420 2006-11-14 12:44:10Z thomas.diesler(a)jboss.com $
# thirdparty library versions
+apache-collections=@apache-collections@
apache-log4j=@apache-log4j@
apache-logging=@apache-logging@
+dom4j=@dom4j@
ibm-wsdl4j=@ibm-wsdl4j@
javassist=@javassist@
jbpm-bpel=@jbpm-bpel@
@@ -15,6 +17,7 @@
jboss-security=@jboss-security@
jbossas-core-libs=@jbossas-core-libs@
oswego-concurrent=@oswego-concurrent@
+stax-api=@stax-api@
sun-jaf=@sun-jaf@
sun-jaxb=@sun-jaxb@
sun-javamail=@sun-javamail@
Show replies by date