JBossWS SVN: r13395 - in stack/cxf/branches/jbossws-cxf-3.4.0/modules: testsuite/cxf-spring-tests/scripts and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-12-03 05:21:30 -0500 (Fri, 03 Dec 2010)
New Revision: 13395
Removed:
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
Log:
Reverted the commit for [JBWS-3174]
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 09:08:42 UTC (rev 13394)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 10:21:30 UTC (rev 13395)
@@ -66,13 +66,16 @@
{
if (SpringUtils.isSpringAvailable())
{
- URL cxfURL = getCXFConfigFromDeployment(dep);
+ URL cxfURL = getCXFConfigFromClassLoader(dep);
if (cxfURL == null)
{
- cxfURL = generateCXFConfigFromDeployment(dep);
+ cxfURL = getCXFConfigFromDeployment(dep);
+ if (cxfURL == null)
+ {
+ cxfURL = generateCXFConfigFromDeployment(dep);
+ }
+ putCXFConfigToDeployment(dep, cxfURL);
}
- putCXFConfigToDeployment(dep, cxfURL);
-
}
else
{
@@ -90,8 +93,24 @@
dd.destroyFileURL();
}
}
-
+
/**
+ * Looks for <b>cxf.xml</b> in classloader
+ * @param dep deployment which initial classloader will be used
+ * @return <b>cxf.xml URL</b> or <b>null</b> if not found
+ */
+ private URL getCXFConfigFromClassLoader(Deployment dep)
+ {
+ ClassLoader initCL = dep.getInitialClassLoader();
+ URL cxfURL = initCL.getResource("cxf.xml");
+ if (cxfURL != null)
+ {
+ log.info("CXF configuration found: " + cxfURL);
+ }
+ return cxfURL;
+ }
+
+ /**
* Looks for <b>jbossws-cxf.xml</b> in:
* <ul>
* <li><b>META-INF</b> resource directory for EJB3 deployment</li>
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 09:08:42 UTC (rev 13394)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 10:21:30 UTC (rev 13395)
@@ -64,11 +64,7 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.class"/>
</classes>
- <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/">
- <include name="cxf.xml"/>
- </classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF">
<include name="jbossws-cxf.xml"/>
</webinf>
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 09:08:42 UTC (rev 13394)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 10:21:30 UTC (rev 13395)
@@ -29,5 +29,4 @@
public interface DescriptorEndpoint
{
String echo(String input);
- String getInBoundLog();
}
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 09:08:42 UTC (rev 13394)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 10:21:30 UTC (rev 13395)
@@ -46,10 +46,4 @@
return input;
}
-
- @WebMethod
- public String getInBoundLog()
- {
- return new String(TestLoggingInInterceptor.stringWriter.getBuffer());
- }
}
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 09:08:42 UTC (rev 13394)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 10:21:30 UTC (rev 13395)
@@ -57,9 +57,5 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
-
- //JBWS-3174: test the cxf.xml is loaded
- String serverInBoundLog = port.getInBoundLog();
- assertTrue(serverInBoundLog.length() > 0);
}
}
Deleted: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java 2010-12-03 09:08:42 UTC (rev 13394)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java 2010-12-03 10:21:30 UTC (rev 13395)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.descriptor;
-
-import java.io.PrintWriter;
-
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-
-public class TestLoggingInInterceptor extends LoggingInInterceptor {
-
- public static java.io.StringWriter stringWriter = new java.io.StringWriter();
-
- public TestLoggingInInterceptor() {
- super();
- this.setPrintWriter(new PrintWriter(stringWriter));
- }
-
-}
Deleted: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml 2010-12-03 09:08:42 UTC (rev 13394)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml 2010-12-03 10:21:30 UTC (rev 13395)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
- <bean id="logInbound"
- class="org.jboss.test.ws.jaxws.cxf.descriptor.TestLoggingInInterceptor" />
- <cxf:bus>
- <cxf:inInterceptors>
- <ref bean="logInbound" />
- </cxf:inInterceptors>
- </cxf:bus>
-</beans>
13 years, 5 months
JBossWS SVN: r13394 - in stack/cxf/branches/jbossws-cxf-3.4.1/modules: testsuite/cxf-spring-tests/scripts and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-12-03 04:08:42 -0500 (Fri, 03 Dec 2010)
New Revision: 13394
Added:
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
Log:
[JBWS-3174]:Fixed the issue that CXF stack doesn't pick up cxf.xml in the classpath to create spring bus
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 09:04:06 UTC (rev 13393)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 09:08:42 UTC (rev 13394)
@@ -66,16 +66,13 @@
{
if (SpringUtils.isSpringAvailable())
{
- URL cxfURL = getCXFConfigFromClassLoader(dep);
+ URL cxfURL = getCXFConfigFromDeployment(dep);
if (cxfURL == null)
{
- cxfURL = getCXFConfigFromDeployment(dep);
- if (cxfURL == null)
- {
- cxfURL = generateCXFConfigFromDeployment(dep);
- }
- putCXFConfigToDeployment(dep, cxfURL);
+ cxfURL = generateCXFConfigFromDeployment(dep);
}
+ putCXFConfigToDeployment(dep, cxfURL);
+
}
else
{
@@ -93,24 +90,8 @@
dd.destroyFileURL();
}
}
-
+
/**
- * Looks for <b>cxf.xml</b> in classloader
- * @param dep deployment which initial classloader will be used
- * @return <b>cxf.xml URL</b> or <b>null</b> if not found
- */
- private URL getCXFConfigFromClassLoader(Deployment dep)
- {
- ClassLoader initCL = dep.getInitialClassLoader();
- URL cxfURL = initCL.getResource("cxf.xml");
- if (cxfURL != null)
- {
- log.info("CXF configuration found: " + cxfURL);
- }
- return cxfURL;
- }
-
- /**
* Looks for <b>jbossws-cxf.xml</b> in:
* <ul>
* <li><b>META-INF</b> resource directory for EJB3 deployment</li>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 09:04:06 UTC (rev 13393)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 09:08:42 UTC (rev 13394)
@@ -64,7 +64,11 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.class"/>
</classes>
+ <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/">
+ <include name="cxf.xml"/>
+ </classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF">
<include name="jbossws-cxf.xml"/>
</webinf>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 09:04:06 UTC (rev 13393)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 09:08:42 UTC (rev 13394)
@@ -29,4 +29,5 @@
public interface DescriptorEndpoint
{
String echo(String input);
+ String getInBoundLog();
}
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 09:04:06 UTC (rev 13393)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 09:08:42 UTC (rev 13394)
@@ -46,4 +46,10 @@
return input;
}
+
+ @WebMethod
+ public String getInBoundLog()
+ {
+ return new String(TestLoggingInInterceptor.stringWriter.getBuffer());
+ }
}
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 09:04:06 UTC (rev 13393)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 09:08:42 UTC (rev 13394)
@@ -57,5 +57,9 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+
+ //JBWS-3174: test the cxf.xml is loaded
+ String serverInBoundLog = port.getInBoundLog();
+ assertTrue(serverInBoundLog.length() > 0);
}
}
Copied: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java (from rev 13389, stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java 2010-12-03 09:08:42 UTC (rev 13394)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.descriptor;
+
+import java.io.PrintWriter;
+
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+
+public class TestLoggingInInterceptor extends LoggingInInterceptor {
+
+ public static java.io.StringWriter stringWriter = new java.io.StringWriter();
+
+ public TestLoggingInInterceptor() {
+ super();
+ this.setPrintWriter(new PrintWriter(stringWriter));
+ }
+
+}
Copied: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml (from rev 13389, stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml 2010-12-03 09:08:42 UTC (rev 13394)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+ <bean id="logInbound"
+ class="org.jboss.test.ws.jaxws.cxf.descriptor.TestLoggingInInterceptor" />
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="logInbound" />
+ </cxf:inInterceptors>
+ </cxf:bus>
+</beans>
13 years, 5 months
JBossWS SVN: r13393 - in stack/cxf/branches/jbossws-cxf-3.4.0/modules: testsuite/cxf-spring-tests/scripts and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-12-03 04:04:06 -0500 (Fri, 03 Dec 2010)
New Revision: 13393
Added:
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
Log:
[JBWS-3174]:Fixed the issue that CXF stack doesn't pick up cxf.xml in the classpath to create spring bus
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 06:10:41 UTC (rev 13392)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 09:04:06 UTC (rev 13393)
@@ -66,16 +66,13 @@
{
if (SpringUtils.isSpringAvailable())
{
- URL cxfURL = getCXFConfigFromClassLoader(dep);
+ URL cxfURL = getCXFConfigFromDeployment(dep);
if (cxfURL == null)
{
- cxfURL = getCXFConfigFromDeployment(dep);
- if (cxfURL == null)
- {
- cxfURL = generateCXFConfigFromDeployment(dep);
- }
- putCXFConfigToDeployment(dep, cxfURL);
+ cxfURL = generateCXFConfigFromDeployment(dep);
}
+ putCXFConfigToDeployment(dep, cxfURL);
+
}
else
{
@@ -93,24 +90,8 @@
dd.destroyFileURL();
}
}
-
+
/**
- * Looks for <b>cxf.xml</b> in classloader
- * @param dep deployment which initial classloader will be used
- * @return <b>cxf.xml URL</b> or <b>null</b> if not found
- */
- private URL getCXFConfigFromClassLoader(Deployment dep)
- {
- ClassLoader initCL = dep.getInitialClassLoader();
- URL cxfURL = initCL.getResource("cxf.xml");
- if (cxfURL != null)
- {
- log.info("CXF configuration found: " + cxfURL);
- }
- return cxfURL;
- }
-
- /**
* Looks for <b>jbossws-cxf.xml</b> in:
* <ul>
* <li><b>META-INF</b> resource directory for EJB3 deployment</li>
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 06:10:41 UTC (rev 13392)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 09:04:06 UTC (rev 13393)
@@ -64,7 +64,11 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.class"/>
</classes>
+ <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/">
+ <include name="cxf.xml"/>
+ </classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF">
<include name="jbossws-cxf.xml"/>
</webinf>
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 06:10:41 UTC (rev 13392)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 09:04:06 UTC (rev 13393)
@@ -29,4 +29,5 @@
public interface DescriptorEndpoint
{
String echo(String input);
+ String getInBoundLog();
}
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 06:10:41 UTC (rev 13392)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 09:04:06 UTC (rev 13393)
@@ -46,4 +46,10 @@
return input;
}
+
+ @WebMethod
+ public String getInBoundLog()
+ {
+ return new String(TestLoggingInInterceptor.stringWriter.getBuffer());
+ }
}
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 06:10:41 UTC (rev 13392)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 09:04:06 UTC (rev 13393)
@@ -57,5 +57,9 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+
+ //JBWS-3174: test the cxf.xml is loaded
+ String serverInBoundLog = port.getInBoundLog();
+ assertTrue(serverInBoundLog.length() > 0);
}
}
Copied: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java (from rev 13389, stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java 2010-12-03 09:04:06 UTC (rev 13393)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.descriptor;
+
+import java.io.PrintWriter;
+
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+
+public class TestLoggingInInterceptor extends LoggingInInterceptor {
+
+ public static java.io.StringWriter stringWriter = new java.io.StringWriter();
+
+ public TestLoggingInInterceptor() {
+ super();
+ this.setPrintWriter(new PrintWriter(stringWriter));
+ }
+
+}
Copied: stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml (from rev 13389, stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml 2010-12-03 09:04:06 UTC (rev 13393)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+ <bean id="logInbound"
+ class="org.jboss.test.ws.jaxws.cxf.descriptor.TestLoggingInInterceptor" />
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="logInbound" />
+ </cxf:inInterceptors>
+ </cxf:bus>
+</beans>
13 years, 5 months
JBossWS SVN: r13392 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-03 01:10:41 -0500 (Fri, 03 Dec 2010)
New Revision: 13392
Modified:
stack/native/trunk/pom.xml
Log:
upgrade JAXR to 2.0.2
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-12-03 06:10:03 UTC (rev 13391)
+++ stack/native/trunk/pom.xml 2010-12-03 06:10:41 UTC (rev 13392)
@@ -68,7 +68,7 @@
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jboss.logging.version>2.2.0.CR1</jboss.logging.version>
- <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <jboss.jaxr.version>2.0.2</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
<netty.version>3.2.3.Final</netty.version>
13 years, 5 months
JBossWS SVN: r13391 - stack/native/branches/jbossws-native-3.4.1.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-03 01:10:03 -0500 (Fri, 03 Dec 2010)
New Revision: 13391
Modified:
stack/native/branches/jbossws-native-3.4.1/pom.xml
Log:
upgrade JAXR to 2.0.2
Modified: stack/native/branches/jbossws-native-3.4.1/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/pom.xml 2010-12-03 06:09:14 UTC (rev 13390)
+++ stack/native/branches/jbossws-native-3.4.1/pom.xml 2010-12-03 06:10:03 UTC (rev 13391)
@@ -68,7 +68,7 @@
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jboss.logging.version>2.2.0.CR1</jboss.logging.version>
- <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <jboss.jaxr.version>2.0.2</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
<netty.version>3.2.3.Final</netty.version>
13 years, 5 months
JBossWS SVN: r13390 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-03 01:09:14 -0500 (Fri, 03 Dec 2010)
New Revision: 13390
Modified:
stack/cxf/trunk/pom.xml
Log:
upgrade JAXR to 2.0.2
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-12-03 06:08:16 UTC (rev 13389)
+++ stack/cxf/trunk/pom.xml 2010-12-03 06:09:14 UTC (rev 13390)
@@ -74,7 +74,7 @@
<jaxb.impl.version>2.2</jaxb.impl.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<jaxws.api.version>1.0.0.Final</jaxws.api.version>
- <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <jboss.jaxr.version>2.0.2</jboss.jaxr.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
13 years, 5 months
JBossWS SVN: r13389 - in stack/cxf/trunk/modules: testsuite/cxf-spring-tests/scripts and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-12-03 01:08:16 -0500 (Fri, 03 Dec 2010)
New Revision: 13389
Added:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
Log:
[JBWS-3174]:Fixed CXF stack doesn't pick up cxf.xml in the classpath to create spring bus
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 06:08:14 UTC (rev 13388)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-12-03 06:08:16 UTC (rev 13389)
@@ -66,16 +66,13 @@
{
if (SpringUtils.isSpringAvailable())
{
- URL cxfURL = getCXFConfigFromClassLoader(dep);
+ URL cxfURL = getCXFConfigFromDeployment(dep);
if (cxfURL == null)
{
- cxfURL = getCXFConfigFromDeployment(dep);
- if (cxfURL == null)
- {
- cxfURL = generateCXFConfigFromDeployment(dep);
- }
- putCXFConfigToDeployment(dep, cxfURL);
+ cxfURL = generateCXFConfigFromDeployment(dep);
}
+ putCXFConfigToDeployment(dep, cxfURL);
+
}
else
{
@@ -93,24 +90,8 @@
dd.destroyFileURL();
}
}
-
+
/**
- * Looks for <b>cxf.xml</b> in classloader
- * @param dep deployment which initial classloader will be used
- * @return <b>cxf.xml URL</b> or <b>null</b> if not found
- */
- private URL getCXFConfigFromClassLoader(Deployment dep)
- {
- ClassLoader initCL = dep.getInitialClassLoader();
- URL cxfURL = initCL.getResource("cxf.xml");
- if (cxfURL != null)
- {
- log.info("CXF configuration found: " + cxfURL);
- }
- return cxfURL;
- }
-
- /**
* Looks for <b>jbossws-cxf.xml</b> in:
* <ul>
* <li><b>META-INF</b> resource directory for EJB3 deployment</li>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 06:08:14 UTC (rev 13388)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 06:08:16 UTC (rev 13389)
@@ -64,7 +64,11 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.class"/>
</classes>
+ <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/">
+ <include name="cxf.xml"/>
+ </classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF">
<include name="jbossws-cxf.xml"/>
</webinf>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 06:08:14 UTC (rev 13388)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 06:08:16 UTC (rev 13389)
@@ -29,4 +29,5 @@
public interface DescriptorEndpoint
{
String echo(String input);
+ String getInBoundLog();
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 06:08:14 UTC (rev 13388)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 06:08:16 UTC (rev 13389)
@@ -46,4 +46,10 @@
return input;
}
+
+ @WebMethod
+ public String getInBoundLog()
+ {
+ return new String(TestLoggingInInterceptor.stringWriter.getBuffer());
+ }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 06:08:14 UTC (rev 13388)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 06:08:16 UTC (rev 13389)
@@ -57,5 +57,9 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+
+ //JBWS-3174: test the cxf.xml is loaded
+ String serverInBoundLog = port.getInBoundLog();
+ assertTrue(serverInBoundLog.length() > 0);
}
}
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java 2010-12-03 06:08:16 UTC (rev 13389)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.descriptor;
+
+import java.io.PrintWriter;
+
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+
+public class TestLoggingInInterceptor extends LoggingInInterceptor {
+
+ public static java.io.StringWriter stringWriter = new java.io.StringWriter();
+
+ public TestLoggingInInterceptor() {
+ super();
+ this.setPrintWriter(new PrintWriter(stringWriter));
+ }
+
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml 2010-12-03 06:08:16 UTC (rev 13389)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+ <bean id="logInbound"
+ class="org.jboss.test.ws.jaxws.cxf.descriptor.TestLoggingInInterceptor" />
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="logInbound" />
+ </cxf:inInterceptors>
+ </cxf:bus>
+</beans>
13 years, 5 months
JBossWS SVN: r13388 - stack/cxf/branches/jbossws-cxf-3.4.1.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-03 01:08:14 -0500 (Fri, 03 Dec 2010)
New Revision: 13388
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
Log:
upgrade JAXR to 2.0.2
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-03 06:03:35 UTC (rev 13387)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-03 06:08:14 UTC (rev 13388)
@@ -74,7 +74,7 @@
<jaxb.impl.version>2.2</jaxb.impl.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<jaxws.api.version>1.0.0.Final</jaxws.api.version>
- <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <jboss.jaxr.version>2.0.2</jboss.jaxr.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
13 years, 5 months
JBossWS SVN: r13387 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test: resources/jaxws/cxf/descriptor and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-12-03 01:03:35 -0500 (Fri, 03 Dec 2010)
New Revision: 13387
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
Log:
[JBPAPP-5494]:The missing files in the previous commit
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.java 2010-12-03 06:03:35 UTC (rev 13387)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.descriptor;
+
+import java.io.PrintWriter;
+
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+
+public class TestLoggingInInterceptor extends LoggingInInterceptor {
+
+ public static java.io.StringWriter stringWriter = new java.io.StringWriter();
+
+ public TestLoggingInInterceptor() {
+ super();
+ this.setPrintWriter(new PrintWriter(stringWriter));
+ }
+
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/cxf.xml 2010-12-03 06:03:35 UTC (rev 13387)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+ <bean id="logInbound"
+ class="org.jboss.test.ws.jaxws.cxf.descriptor.TestLoggingInInterceptor" />
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="logInbound" />
+ </cxf:inInterceptors>
+ </cxf:bus>
+</beans>
13 years, 5 months
JBossWS SVN: r13386 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-12-03 00:43:31 -0500 (Fri, 03 Dec 2010)
New Revision: 13386
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
Log:
[JBPAPP-5494]:Added cast case
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-12-02 18:46:58 UTC (rev 13385)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 05:43:31 UTC (rev 13386)
@@ -26,7 +26,11 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.class"/>
</classes>
+ <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/">
+ <include name="cxf.xml"/>
+ </classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF">
<include name="jbossws-cxf.xml"/>
</webinf>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-02 18:46:58 UTC (rev 13385)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 05:43:31 UTC (rev 13386)
@@ -29,4 +29,5 @@
public interface DescriptorEndpoint
{
String echo(String input);
+ String getInBoundLog();
}
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-02 18:46:58 UTC (rev 13385)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 05:43:31 UTC (rev 13386)
@@ -46,4 +46,10 @@
return input;
}
+
+ @WebMethod
+ public String getInBoundLog()
+ {
+ return new String(TestLoggingInInterceptor.stringWriter.getBuffer());
+ }
}
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-02 18:46:58 UTC (rev 13385)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 05:43:31 UTC (rev 13386)
@@ -57,5 +57,9 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+
+ //JBPAPP-5494/JBWS-3174: test the cxf.xml is loaded
+ String serverInBoundLog = port.getInBoundLog();
+ assertTrue(serverInBoundLog.length() > 0);
}
}
13 years, 5 months