2:05 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-11-30 12:05:54 -0500 (Fri, 30 Nov 2007)
New Revision: 5157
Added:
stack/cxf/trunk/src/main/resources/cxf-incubator.jar/
stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/
stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/
stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension
stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/
stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/
stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/
stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml
Modified:
stack/cxf/trunk/.classpath
stack/cxf/trunk/build.xml
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
Log:
JBWS-1677 - Redirect CXF message logging to jboss log
Modified: stack/cxf/trunk/.classpath
===================================================================
--- stack/cxf/trunk/.classpath 2007-11-30 16:55:20 UTC (rev 5156)
+++ stack/cxf/trunk/.classpath 2007-11-30 17:05:54 UTC (rev 5157)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test-framework/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
@@ -9,10 +11,8 @@
<classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry combineaccessrules="false" kind="src"
path="/spi"/>
<classpathentry combineaccessrules="false" kind="src"
path="/common"/>
- <classpathentry kind="lib"
path="thirdparty/cxf-2.1-incubator-SNAPSHOT.jar"
sourcepath="apache-cxf"/>
<classpathentry kind="lib"
path="thirdparty/geronimo-javamail_1.4_spec-1.0-M1.jar"/>
<classpathentry kind="lib"
path="thirdparty/geronimo-ws-metadata_2.0_spec-1.1.1.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jaxws-api-2.1-1.jar"/>
<classpathentry kind="lib"
path="thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib"
path="thirdparty/jboss-common-core-sources.jar"/>
<classpathentry kind="lib"
path="thirdparty/jboss-javaee.jar"/>
@@ -35,5 +35,7 @@
<classpathentry kind="lib"
path="thirdparty/xbean-2.2.0.jar"/>
<classpathentry kind="lib"
path="thirdparty/xml-resolver-1.2.jar"/>
<classpathentry kind="lib"
path="thirdparty/XmlSchema-1.3.2.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/cxf-2.0.3-incubator.jar"
sourcepath="apache-cxf"/>
+ <classpathentry kind="lib"
path="thirdparty/jaxws-api-2.0.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2007-11-30 16:55:20 UTC (rev 5156)
+++ stack/cxf/trunk/build.xml 2007-11-30 17:05:54 UTC (rev 5157)
@@ -121,6 +121,14 @@
</webinf>
</war>
+ <!-- Update cxf-${cxf.version}.jar -->
+ <copy file="${thirdparty.dir}/cxf-${cxf.version}.jar"
todir="${cxf.output.lib.dir}" overwrite="true"/>
+ <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar"
update="true">
+ <fileset dir="${cxf.resources.dir}/cxf-incubator.jar">
+ <include name="META-INF/cxf/cxf.extension"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws-cxf-src.zip -->
<zip zipfile="${cxf.output.lib.dir}/jbossws-cxf-src.zip" >
<fileset dir="${cxf.java.dir}"/>
@@ -140,15 +148,14 @@
</footer>
</concat>
- <!-- Build jbosswsri.sar -->
+ <!-- Build jbossws-cxf50.sar -->
<jar jarfile="${cxf.output.lib.dir}/jbossws-cxf50.sar"
manifest="${cxf.output.etc.dir}/default.mf">
-
<fileset dir="${cxf.output.lib.dir}">
+ <include name="cxf-${cxf.version}.jar"/>
<include name="jbossws-context.war"/>
+ <include name="jbossws-cxf.jar"/>
</fileset>
-
<fileset dir="${thirdparty.dir}">
- <include name="cxf-${cxf.version}.jar"/>
<include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
<include
name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
<include name="jaxws-api-${cxf.jaxws.api}.jar"/>
@@ -162,19 +169,16 @@
<include name="xbean-${cxf.xbean}.jar"/>
<include name="xml-resolver-${cxf.xml.resolver}.jar"/>
<include name="XmlSchema-${cxf.xmlschema}.jar"/>
-
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="stax-api.jar"/>
<include name="wsdl4j.jar"/>
<include name="wstx.jar"/>
</fileset>
- <fileset dir="${cxf.output.lib.dir}">
- <include name="jbossws-cxf.jar"/>
- </fileset>
<metainf dir="${cxf.output.lib.dir}/jbossws-cxf50">
<include name="jbossws-beans.xml"/>
</metainf>
+ <metainf dir="${cxf.resources.dir}/jbossws-cxf.sar/META-INF"/>
</jar>
</target>
@@ -198,9 +202,8 @@
<!-- Build jbossws-cxf42.sar -->
<jar jarfile="${cxf.output.lib.dir}/jbossws-cxf42.sar"
manifest="${cxf.output.etc.dir}/default.mf">
<fileset dir="${cxf.output.lib.dir}">
+ <include name="cxf-${cxf.version}.jar"/>
<include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${cxf.output.lib.dir}">
<include name="jbossws-cxf.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -218,7 +221,6 @@
<include name="xbean-${cxf.xbean}.jar"/>
<include name="xml-resolver-${cxf.xml.resolver}.jar"/>
<include name="XmlSchema-${cxf.xmlschema}.jar"/>
-
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="stax-api.jar"/>
@@ -231,6 +233,7 @@
<metainf
dir="${cxf.output.dir}/resources/jbossws-jboss42.sar/META-INF">
<include name="jboss-service.xml"/>
</metainf>
+ <metainf dir="${cxf.resources.dir}/jbossws-cxf.sar/META-INF"/>
</jar>
</target>
Added: stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension
===================================================================
--- stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension
(rev 0)
+++
stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension 2007-11-30
17:05:54 UTC (rev 5157)
@@ -0,0 +1,14 @@
+META-INF/cxf/cxf-extension-jaxws.xml
+META-INF/cxf/cxf-extension-rm.xml
+META-INF/cxf/cxf-extension-addr.xml
+META-INF/cxf/cxf-extension-http-jetty.xml
+META-INF/cxf/cxf-extension-object-binding.xml
+META-INF/cxf/cxf-extension-http.xml
+META-INF/cxf/cxf-extension-http-binding.xml
+META-INF/cxf/cxf-extension-xml.xml
+META-INF/cxf/cxf-extension-policy.xml
+META-INF/cxf/cxf-extension-jms.xml
+META-INF/cxf/cxf-extension-local.xml
+META-INF/cxf/cxf-extension-management.xml
+META-INF/cxf/cxf-extension-soap.xml
+META-INF/cxf/cxf-extension-jbossws.xml
\ No newline at end of file
Added:
stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml
===================================================================
---
stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml
(rev 0)
+++
stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml 2007-11-30
17:05:54 UTC (rev 5157)
@@ -0,0 +1,18 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+ <bean id="logInbound"
class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
+ <bean id="logOutbound"
class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
+
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="logInbound"/>
+ </cxf:inInterceptors>
+ <cxf:outInterceptors>
+ <ref bean="logOutbound"/>
+ </cxf:outInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="logOutbound"/>
+ </cxf:inFaultInterceptors>
+ </cxf:bus>
+</beans>
\ No newline at end of file
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-30 16:55:20 UTC
(rev 5156)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-30 17:05:54 UTC
(rev 5157)
@@ -16,43 +16,40 @@
org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
org/jboss/test/ws/jaxws/samples/swaref/**
-# [JBWS-1750] Investigate CXF exception handling
+# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
# [JBWS-1751] Investigate CXF samples handlerchain
-org/jboss/test/ws/jaxws/samples/handlerchain/**
+#org/jboss/test/ws/jaxws/samples/handlerchain/**
# [JBWS-1752] Investigate CXF samples httpbinding
-org/jboss/test/ws/jaxws/samples/httpbinding/**
+#org/jboss/test/ws/jaxws/samples/httpbinding/**
# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
+#org/jboss/test/ws/jaxws/samples/jaxr/**
# [JBWS-1753] Investigate CXF samples logicalhandler
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
+#org/jboss/test/ws/jaxws/samples/logicalhandler/**
-# [JBWS-1754] Investigate CXF samples oneway
-org/jboss/test/ws/jaxws/samples/oneway/**
-
# [JBWS-1755] Investigate CXF samples provider
-org/jboss/test/ws/jaxws/samples/provider/**
+#org/jboss/test/ws/jaxws/samples/provider/**
# [JBWS-1756] Fix @WebServiceRef with CXF
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/serviceref/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
+#org/jboss/test/ws/jaxws/samples/retail/**
+#org/jboss/test/ws/jaxws/samples/serviceref/**
+#org/jboss/test/ws/jaxws/samples/webserviceref/**
# [JBWS-1757] Investigate CXF samples soapbinding
-org/jboss/test/ws/jaxws/samples/soapbinding/**
+#org/jboss/test/ws/jaxws/samples/soapbinding/**
# [JBWS-1758] Investigate CXF samples webmethod
-org/jboss/test/ws/jaxws/samples/webmethod/**
+#org/jboss/test/ws/jaxws/samples/webmethod/**
# [JBWS-1759] Investigate CXF samples webservice
-org/jboss/test/ws/jaxws/samples/webservice/**
+#org/jboss/test/ws/jaxws/samples/webservice/**
# [JBWS-1760] Investigate CXF samples xop
-org/jboss/test/ws/jaxws/samples/xop/**
+#org/jboss/test/ws/jaxws/samples/xop/**
# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and
WSContractConsumer)
org/jboss/test/ws/jaxws/smoke/tools/**