[jbossws-commits] JBossWS SVN: r2244 - in branches/jbossws-1.2.0: build/ant-import and 23 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Feb 1 17:03:24 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-01 17:03:24 -0500 (Thu, 01 Feb 2007)
New Revision: 2244
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
Removed:
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml
Modified:
branches/jbossws-1.2.0/build/ant-import/build-setup.xml
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
branches/jbossws-1.2.0/build/version.properties
branches/jbossws-1.2.0/integration-jboss40/.classpath
branches/jbossws-1.2.0/integration-jboss42/.classpath
branches/jbossws-1.2.0/integration-jboss50/.classpath
branches/jbossws-1.2.0/integration-tomcat/.classpath
branches/jbossws-1.2.0/integration-tomcat/build.xml
branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java
branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
branches/jbossws-1.2.0/jbossws-core/.classpath
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
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/version.properties
branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
branches/jbossws-1.2.0/jbossws-tests/.classpath
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Fix tomcat deployment, add target container AS-4.0.5
Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -59,6 +59,7 @@
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
+ <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/>
<property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/>
<available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -40,8 +40,8 @@
<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/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.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"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common-sources.jar" dest="${thirdparty.dir}/jboss-common-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
@@ -87,7 +87,7 @@
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -138,10 +138,12 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>AS-5.0</string>
+ <string>AS-4.2</string>
<string>AS-4.0</string>
<string>AS-4.0-jdk14</string>
- <string>AS-4.2</string>
- <string>AS-5.0</string>
+ <string>AS-4.0.5</string>
+ <string>AS-4.0.5-jdk14</string>
<string>TC-5.5</string>
</jobNames>
<name>Target Container</name>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5 (from rev 2242, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-02-01 16:51:14 UTC (rev 2242)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -6,16 +6,16 @@
#
# Module settings
#
-MODULE=AS-4.0
-SVNBASE=`basename @hudson.jboss40.url@`
+MODULE=AS-4.0.5
+SVNBASE=JBoss_4_0_5_GA
#
# checkout with an explicit version
#
if [ -d "$SVNBASE" ]; then
- svn up -r at hudson.jboss40.rev@ $SVNBASE
+ svn up $SVNBASE
else
- svn co -r at hudson.jboss40.rev@ @hudson.jboss40.url@
+ svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
fi
#
@@ -46,7 +46,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build AS-4.0</description>
+ <description>Build AS-4.0.5</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14 (from rev 2242, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-02-01 16:51:14 UTC (rev 2242)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -6,16 +6,16 @@
#
# Module settings
#
-MODULE=AS-4.0-jdk14
-SVNBASE=`basename @hudson.jboss40.url@`
-
+MODULE=AS-4.0.5-jdk14
+SVNBASE=JBoss_4_0_5_GA
+
#
# checkout with an explicit version
#
if [ -d "$SVNBASE" ]; then
- svn up -r at hudson.jboss40.rev@ $SVNBASE
+ svn up $SVNBASE
else
- svn co -r at hudson.jboss40.rev@ @hudson.jboss40.url@
+ svn co https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
fi
export JAVA_HOME=@hudson.jdk14@
@@ -48,7 +48,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build AS-4.0 with jdk-1.4</description>
+ <description>Build AS-4.0.5-jdk14</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -3,9 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>
- AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, TC-5.5
- </childProjects>
+ <childProjects>AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, AS-4.0.5, AS-4.0.5-jdk14, TC-5.5</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -3,11 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>
- JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5,
- JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14,
- JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5
- </childProjects>
+ <childProjects>JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-01 22:03:24 UTC (rev 2244)
@@ -34,7 +34,7 @@
gnu-getopt=1.0.10
hibernate=3.2.1.GA
jboss-backport-concurrent=2.1.0.GA
-jboss-common-core=2.0.4.Alpha
+jboss-common=1.0.3.GA
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
Modified: branches/jbossws-1.2.0/integration-jboss40/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-jboss40/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -11,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -30,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-jboss42/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-jboss42/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -11,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-jboss50/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -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 combineaccessrules="false" kind="src" path="/jbossws-core"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar" sourcepath="/build/thirdparty/jboss-vfs-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
@@ -12,7 +11,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -31,5 +29,6 @@
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-tomcat/.classpath
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -10,7 +10,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -99,9 +99,6 @@
<include name="META-INF/standard-jaxws-client-config.xml"/>
<include name="META-INF/standard-jaxws-endpoint-config.xml"/>
</fileset>
- <classes dir="${tomcat.resources.dir}/jbossws.war/WEB-INF">
- <include name="log4j.xml"/>
- </classes>
</war>
</target>
@@ -110,9 +107,10 @@
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${tomcat.output.lib.dir}/build"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-impl.jar"/>
- <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-j2ee.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
@@ -122,7 +120,7 @@
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/>
- <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/log4j.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/>
<unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/>
<jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf">
@@ -144,6 +142,11 @@
<include name="xercesImpl.jar"/>
</fileset>
</copy>
+ <copy todir="${tomcat.common.classes}" overwrite="true">
+ <fileset dir="${tomcat.resources.dir}">
+ <include name="log4j.xml"/>
+ </fileset>
+ </copy>
<copy todir="${tomcat.common.lib}" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jbossws-core.jar"/>
Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -40,7 +40,9 @@
{
try
{
- File tmpdir = File.createTempFile("jbossws", null).getParentFile();
+ File tmpFile = File.createTempFile("jbossws", null);
+ File tmpdir = tmpFile.getParentFile();
+ tmpFile.delete();
return tmpdir;
}
catch (IOException e)
@@ -53,7 +55,9 @@
{
try
{
- File tmpdir = File.createTempFile("jbossws", null).getParentFile();
+ File tmpFile = File.createTempFile("jbossws", null);
+ File tmpdir = tmpFile.getParentFile();
+ tmpFile.delete();
return tmpdir;
}
catch (IOException e)
Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -25,7 +25,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.net.URLClassLoader;
import javax.servlet.ServletConfig;
@@ -73,7 +72,7 @@
{
String message = "Failed to initialze service endpoint";
log.error(message, ex);
- throw new WSException(message, ex);
+ WSException.rethrow(message, ex);
}
finally
{
@@ -179,9 +178,17 @@
protected UnifiedVirtualFile getWebservicesFile(URLClassLoader ctxLoader)
{
- URL url = ctxLoader.findResource("WEB-INF/webservices.xml");
- return url != null ? new ResourceLoaderAdapter(ctxLoader) : null;
+ UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(ctxLoader);
+ try
+ {
+ return vfsRoot.findChild("WEB-INF/webservices.xml");
+ }
+ catch (IOException e)
+ {
+ return null;
+ }
}
+
private void undeployServiceEndpoints(ServletContext servletContext)
{
Deleted: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler at jboss.com $ -->
-
-<!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
--->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="../logs/jbossws.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="INFO"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.ws">
- <priority value="DEBUG"/>
- </category>
-
- <category name="org.jboss.remoting">
- <priority value="INFO"/>
- </category>
-
- <category name="jbossws.SOAPMessage">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
-
- <!--
- <category name="org.jboss.xb">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
-<!--
- <appender-ref ref="CONSOLE"/>
--->
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Added: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml (rev 0)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler at jboss.com $ -->
+
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite: http://jakarta.apache.org/log4j
+-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${catalina.home}/logs/jbossws.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="INFO"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Enable SOAP message tracing
+ <category name="jbossws.SOAPMessage">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.2.0/jbossws-core/.classpath
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -9,7 +9,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -31,5 +30,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/getopt.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -86,38 +86,31 @@
// For each service
for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
- File targetFile = getPublishLocation(deploymentName, serviceMetaData);
- targetFile.getParentFile().mkdirs();
+ File wsdlFile = getPublishLocation(deploymentName, serviceMetaData);
+ wsdlFile.getParentFile().mkdirs();
// Get the wsdl definition and write it to the wsdl publish location
try
{
- Writer fWriter = IOUtils.getCharsetFileWriter(targetFile, Constants.DEFAULT_XML_CHARSET);
+ Writer fWriter = IOUtils.getCharsetFileWriter(wsdlFile, Constants.DEFAULT_XML_CHARSET);
WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();
new WSDLWriter(wsdlDefinitions).write(fWriter, Constants.DEFAULT_XML_CHARSET);
- URL wsdlPublishURL = targetFile.toURL();
- serviceMetaData.setWsdlLocation(wsdlPublishURL);
+ URL wsdlPublishURL = wsdlFile.toURL();
log.info("WSDL published to: " + wsdlPublishURL);
- // delete wsdl temp file
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
- if (targetFile.getAbsolutePath().startsWith(config.getServerTempDir().getAbsolutePath()))
- targetFile.delete();
-
// udpate the wsdl file location
- serviceMetaData.setWsdlLocation(wsdlPublishURL);
-
+ serviceMetaData.setWsdlLocation(wsdlFile.toURL());
+
// Process the wsdl imports
Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition();
if (wsdl11Definition != null)
{
- publishWsdlImports(targetFile.toURL(), wsdl11Definition);
+ publishWsdlImports(wsdlFile.toURL(), wsdl11Definition);
// Publish XMLSchema imports
Document document = wsdlDefinitions.getWsdlDocument();
- publishSchemaImports(targetFile.toURL(), document.getDocumentElement());
+ publishSchemaImports(wsdlFile.toURL(), document.getDocumentElement());
}
else
{
@@ -130,7 +123,7 @@
}
catch (Exception e)
{
- throw new WSException("Cannot publish wsdl to: " + targetFile, e);
+ throw new WSException("Cannot publish wsdl to: " + wsdlFile, e);
}
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -24,6 +24,7 @@
import java.io.InputStream;
import java.net.URL;
+import org.jboss.ws.WSException;
import org.jboss.ws.core.UnifiedVirtualFile;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.metadata.webservices.WebservicesFactory;
@@ -66,7 +67,7 @@
}
catch (Exception ex)
{
- throw new RuntimeException(ex);
+ WSException.rethrow(ex);
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -295,19 +295,19 @@
}
}
}
-
+
WSDLDefinitions wsdlDefinitions = null;
if (wsdlURL != null)
{
- wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWSDLDefinition(wsdlURL.toExternalForm());
+ String wsdlKey = wsMetaData.getDeploymentName() + getServiceName();
+ wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlKey);
if (wsdlDefinitions == null)
{
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
wsdlDefinitions = factory.parse(wsdlURL);
- wsMetaData.addWSDLDefinition(wsdlURL.toExternalForm(), wsdlDefinitions);
+ wsMetaData.addWsdlDefinition(wsdlKey, wsdlDefinitions);
}
}
-
return wsdlDefinitions;
}
@@ -431,6 +431,7 @@
buffer.append("\n qname=" + serviceName);
buffer.append("\n refName=" + serviceRefName);
buffer.append("\n wsdName=" + wsdName);
+ buffer.append("\n wsdlFile=" + wsdlFile);
buffer.append("\n wsdlLocation=" + wsdlLocation);
buffer.append("\n jaxrpcMapping=" + mappingLocation);
buffer.append("\n handlerChain=" + handlerChain);
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
@@ -140,12 +140,12 @@
services.add(serviceMetaData);
}
- public void addWSDLDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions)
+ public void addWsdlDefinition(String wsdlFile, WSDLDefinitions wsdlDefinitions)
{
wsdlMap.put(wsdlFile, wsdlDefinitions);
}
- public WSDLDefinitions getWSDLDefinition(String wsdlFile)
+ public WSDLDefinitions getWsdlDefinition(String wsdlFile)
{
return wsdlMap.get(wsdlFile);
}
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 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -30,7 +30,7 @@
<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"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
@@ -60,7 +60,7 @@
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
<pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
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 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 22:03:24 UTC (rev 2244)
@@ -9,7 +9,7 @@
ibm-wsdl4j=@ibm-wsdl4j@
javassist=@javassist@
jbpm-bpel=@jbpm-bpel@
-jboss-common-core=@jboss-common-core@
+jboss-common=@jboss-common@
jboss-common-logging-log4j=@jboss-common-logging-log4j@
jboss-common-logging-spi=@jboss-common-logging-spi@
jboss-ejb3=@jboss-ejb3@
Modified: branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -76,7 +76,7 @@
<jndi-name>ejb/RoleSecuredSLSB</jndi-name>
<port-component>
<port-component-name>RoleSecured</port-component-name>
- <port-component-uri>/ws4ee-samples-ejb/RoleSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-samples-ejb/RoleSecured</port-component-uri>
</port-component>
</session>
<session>
@@ -84,7 +84,7 @@
<jndi-name>ejb/BasicSecuredSLSB</jndi-name>
<port-component>
<port-component-name>BasicSecured</port-component-name>
- <port-component-uri>/ws4ee-samples-ejb/BasicSecured</port-component-uri>
+ <port-component-uri>/jaxrpc-samples-ejb/BasicSecured</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: branches/jbossws-1.2.0/jbossws-tests/.classpath
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-02-01 22:03:24 UTC (rev 2244)
@@ -19,7 +19,6 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -39,5 +38,6 @@
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws424/META-INF/application-client.xml 2007-02-01 22:03:24 UTC (rev 2244)
@@ -15,12 +15,10 @@
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws424.TestSEI</service-endpoint-interface>
</port-component-ref>
- <!-- FIXME: SAAJ view of fault detail is broken in ws4ee
<handler>
<handler-name>TestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.jbws424.TestHandler</handler-class>
</handler>
- -->
</service-ref>
</application-client>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-01 17:57:20 UTC (rev 2243)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-01 22:03:24 UTC (rev 2244)
@@ -15,8 +15,9 @@
# JBoss excludes
org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/**
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
# TODO: Why are these excluded
# [JBWS-1471] - Remove unwanted tomcat excludes
More information about the jbossws-commits
mailing list