[jbossws-commits] JBossWS SVN: r13900 - in stack/cxf/branches/spring-as7/modules: resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main and 3 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Mar 14 12:18:03 EDT 2011
Author: alessio.soldano at jboss.com
Date: 2011-03-14 12:18:02 -0400 (Mon, 14 Mar 2011)
New Revision: 13900
Modified:
stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/branches/spring-as7/modules/testsuite/pom.xml
Log:
Dealt with most of the ws-security related failures, excluded some tests due to isolated problems
Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -42,6 +42,8 @@
<module name="org.apache.neethi" />
<module name="org.apache.ws.commons.xmlschema" />
<module name="wsdl4j.wsdl4j" />
+ <module name="org.apache.ws.security" />
+ <module name="org.apache.santuario.xmlsec" />
<module name="org.springframework.spring" optional="true"/>
</dependencies>
</module>
Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -68,6 +68,15 @@
<module name="org.jboss.as.webservices" services="export" export="true"/>
<module name="com.sun.xml.messaging.saaj" services="export" export="true"/>
<module name="wsdl4j.wsdl4j" export="true"/>
- <module name="org.springframework.spring" optional="true" export="true"/>
+ <module name="org.apache.ws.security" export="true"/>
+ <module name="org.apache.santuario.xmlsec" export="true"/>
+ <module name="org.springframework.spring" optional="true" export="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF"/>
+ </exports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -55,6 +55,7 @@
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="wsdl4j.wsdl4j" />
+ <module name="org.apache.ws.security" />
<module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
Modified: stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-14 16:18:02 UTC (rev 13900)
@@ -34,6 +34,7 @@
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
+import org.apache.ws.security.WSSConfig;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -133,6 +134,20 @@
}
}
}
+ //try early configuration of xmlsec engine through WSS4J to avoid doing this
+ //later when the TCCL won't have visibility over the xmlsec internals
+ try
+ {
+ WSSConfig.getNewInstance();
+ }
+ catch (Exception e)
+ {
+ log.warn("Could not early initialize security engine!");
+ if (log.isTraceEnabled())
+ {
+ log.trace("Error while getting default WSSConfig: ", e);
+ }
+ }
configured = true;
}
Modified: stack/cxf/branches/spring-as7/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -980,6 +980,7 @@
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
<exclude>org/jboss/test/ws/projectGenerator/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
<!-- # [JBWS-3219] unexpected element 'security-domain' encountered -->
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
@@ -1002,6 +1003,7 @@
<!-- # [JBWS-3226] jboss-service.xml not matching AS7 format -->
<exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase*</exclude>
<!-- # [JBWS-3227] handles config file not found on classpath -->
<exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
@@ -1018,9 +1020,18 @@
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
+
+ <!-- # [JBWS-3248] Unable to lookup AuthenticationManager using JNDI -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase*</exclude>
+
+ <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- @WebServiceRef not implemented yet on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
<!-- JAXRPC deployments -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
More information about the jbossws-commits
mailing list