JBossWS SVN: r12404 - in stack/cxf/trunk: modules/server and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-05-31 07:45:13 -0400 (Mon, 31 May 2010)
New Revision: 12404
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties
Modified:
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/trunk/pom.xml
Log:
JBWS-3028: introducing PicketBox API
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-05-31 11:45:13 UTC (rev 12404)
@@ -208,6 +208,10 @@
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-bare</artifactId>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-05-31 11:45:13 UTC (rev 12404)
@@ -26,6 +26,7 @@
import javax.naming.NamingException;
import org.jboss.security.AuthenticationManager;
+import org.picketbox.factories.SecurityFactory;
/**
* AuthenticationManager loader
@@ -35,7 +36,7 @@
*/
public class AuthenticationManagerLoader
{
- public AuthenticationManager getManager()
+ public AuthenticationManager getManagerWithJndi()
{
try
{
@@ -45,7 +46,24 @@
}
catch (NamingException ne)
{
- throw new SecurityException("Unable to lookup AuthenticationManager");
+ throw new SecurityException("Unable to lookup AuthenticationManager using JNDI");
}
}
+
+ public AuthenticationManager getManager(String securityDomainName)
+ {
+ SecurityFactory.prepare();
+ try
+ {
+ return SecurityFactory.getAuthenticationManager(securityDomainName);
+ }
+ catch (Exception ex) {
+ throw new SecurityException("Unable to get Authentication Manager", ex);
+ }
+ finally
+ {
+ SecurityFactory.release();
+ }
+ }
+
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-05-31 11:45:13 UTC (rev 12404)
@@ -31,10 +31,9 @@
import org.apache.cxf.ws.security.wss4j.AbstractUsernameTokenAuthenticatingInterceptor;
import org.jboss.logging.Logger;
import org.jboss.security.AuthenticationManager;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.invocation.SecurityAdaptor;
-import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.picketbox.config.PicketBoxConfiguration;
+import org.picketbox.exceptions.ConfigurationStreamNullException;
+import org.picketbox.factories.SecurityFactory;
/**
* Interceptor which authenticates a current principal and populates Subject
@@ -45,8 +44,11 @@
public class SubjectCreatingInterceptor extends AbstractUsernameTokenAuthenticatingInterceptor
{
private static final Logger log = Logger.getLogger(SubjectCreatingInterceptor.class);
- private SecurityAdaptorFactory secAdaptorFactory;
-
+ private static final String DEFAULT_SECURITY_DOMAIN_NAME = "JBossWS";
+
+ private AuthenticationManagerLoader aml = null;
+ private String securityDomainName = DEFAULT_SECURITY_DOMAIN_NAME;
+
public SubjectCreatingInterceptor()
{
this(Collections.<String, Object> emptyMap());
@@ -55,17 +57,6 @@
public SubjectCreatingInterceptor(Map<String, Object> properties)
{
super(properties);
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- secAdaptorFactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
- }
-
- @Override
- public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created)
- {
- // Load AuthenticationManager
- // TODO : use PicketBox API
-
- AuthenticationManagerLoader aml = null;
try
{
aml = AuthenticationManagerLoader.class.newInstance();
@@ -76,16 +67,21 @@
log.error(msg);
throw new SecurityException(msg);
}
+ }
- AuthenticationManager am = aml.getManager();
-
- // verify timestamp and nonce if digest
- if (isDigest)
- {
+ @Override
+ public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created)
+ {
+
+ AuthenticationManager am = aml.getManager(securityDomainName);
+
+ // verify timestamp and nonce if digest
+ //if (isDigest)
+ //{
//verifyUsernameToken(nonce, created);
// CallbackHandler cb = new UsernameTokenCallbackHandler(nonce, created);
// CallbackHandlerPolicyContextHandler.setCaallbackHandler(cb);
- }
+ //}
// authenticate and populate Subject
@@ -102,19 +98,56 @@
log.error(msg);
throw new SecurityException(msg);
}
-
- // push subject on the thread local storage
- SecurityAdaptor adaptor = secAdaptorFactory.newSecurityAdapter();
- adaptor.setPrincipal(principal);
- adaptor.setCredential(password);
- adaptor.pushSubjectContext(subject, principal, password);
-
+
if (TRACE)
log.trace("Authenticated, principal=" + name);
return subject;
}
+ /**
+ * Loads a custom configuration file, can be used to add the configuration
+ * for new domains or override the default ones configured by JBoss AS
+ *
+ * Note : loading a custom configuration file may affect other endpoints running
+ * in the same container instance. Example, if some other endpoint depends on
+ * a default JBossWS security domain and this custom config file overrides JBossWS
+ * then the other endpoint may get affected
+ *
+ * @param configFilePath location of the custom configuration file
+ */
+ public void setSecurityConfigFile(String configFilePath)
+ {
+ SecurityFactory.prepare();
+ try
+ {
+ PicketBoxConfiguration idtrustConfig = new PicketBoxConfiguration();
+ idtrustConfig.load(configFilePath);
+ }
+ catch (ConfigurationStreamNullException ex) {
+ throw new SecurityException("Unable to load the configuration file " + configFilePath);
+ }
+ catch (Exception ex) {
+ throw new SecurityException("Unable to read the configuration file " + configFilePath, ex);
+ }
+ finally
+ {
+ SecurityFactory.release();
+ }
+ }
+
+ /**
+ * Sets the security domain name. This property has to be set when loading
+ * a custom configuration file. It also can be used to override the default
+ * security domain name (JBossWS)
+ * @param domainName
+ */
+ public void setSecurityDomainName(String domainName) {
+ securityDomainName = domainName;
+ }
+
+
+
/** TODO: JBWS-3028
private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
private NonceStore nonceStore;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-05-31 11:45:13 UTC (rev 12404)
@@ -191,11 +191,12 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/SubjectCreatingInterceptor.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/AuthenticationManagerLoader.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF">
<include name="jboss-web.xml"/>
+ <include name="login-config.xml"/>
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
<include name="jbossws-cxf.xml"/>
<include name="wsdl/*"/>
</webinf>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2010-05-31 11:45:13 UTC (rev 12404)
@@ -25,7 +25,6 @@
@WebService
(
- portName = "SecurityServicePort",
serviceName = "SecurityService",
wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity",
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-05-31 11:45:13 UTC (rev 12404)
@@ -46,8 +46,12 @@
*/
public final class UsernameAuthorizationTestCase extends JBossWSTest
{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize";
-
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize/default-config";
+ private final String serviceURL2 = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize/custom-config";
+
+ private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort");
+ private final QName servicePort2 = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort2");
+
public static Test suite()
{
return new JBossWSTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war");
@@ -55,14 +59,24 @@
public void testAuthorized() throws Exception
{
+ doTestAuthorized(serviceURL, servicePort, "kermit");
+ }
+
+ public void testAuthorizedCustomConfig() throws Exception
+ {
+ doTestAuthorized(serviceURL2, servicePort2, "theKermit");
+ }
+
+ private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy, "kermit");
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
assertEquals("Secure Hello World!", proxy.sayHello());
}
-
+
public void testUnauthenticated() throws Exception
{
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
@@ -83,11 +97,21 @@
public void testUnauthorized() throws Exception
{
+ doTestUnauthorized(serviceURL, servicePort, "kermit");
+ }
+
+ public void testUnauthorizedCustomConfig() throws Exception
+ {
+ doTestUnauthorized(serviceURL2, servicePort2, "theKermit");
+ }
+
+ private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy, "kermit");
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
try
{
proxy.greetMe();
@@ -98,7 +122,7 @@
assertEquals("Unauthorized", ex.getMessage());
}
}
-
+
private void setupWsse(ServiceIface proxy, String username)
{
Client client = ClientProxy.getClient(proxy);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2010-05-31 11:45:13 UTC (rev 12404)
@@ -35,6 +35,8 @@
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
if ("kermit".equals(pc.getIdentifier()))
pc.setPassword("thefrog");
+ else if ("theKermit".equals(pc.getIdentifier()))
+ pc.setPassword("thefrog2");
else
pc.setPassword("wrong password");
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2010-05-31 11:45:13 UTC (rev 12404)
@@ -32,14 +32,49 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize'
- implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/default-config'
+ implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'
+ endpointName="ns:SecurityServicePort"
+ serviceName="ns:SecurityService"
+ xmlns:ns="http://www.jboss.org/jbossws/ws-extensions/wssecurity">
<jaxws:inInterceptors>
<ref bean="SecurityContextIn"/>
<ref bean="AuthorizeIn"/>
<bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
+
+ <bean id="SecurityContextIn2" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken"/>
+ </map>
+ </constructor-arg>
+ <property name="securityConfigFile" value="login-config.xml"/>
+ <property name="securityDomainName" value="custom"/>
+ </bean>
+
+ <util:map id="methodPermissions2">
+ <entry key="sayHello" value="theFriends"/>
+ <entry key="greetMe" value="theSnoopies"/>
+ </util:map>
+
+ <bean id="AuthorizeIn2" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">
+ <property name="methodRolesMap" ref="methodPermissions2"/>
+ </bean>
-
+ <jaxws:endpoint
+ id='ServiceImpl2'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/custom-config'
+ implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'
+ endpointName="ns:SecurityServicePort2"
+ serviceName="ns:SecurityService"
+ xmlns:ns="http://www.jboss.org/jbossws/ws-extensions/wssecurity">
+ <jaxws:inInterceptors>
+ <ref bean="SecurityContextIn2"/>
+ <ref bean="AuthorizeIn2"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </jaxws:inInterceptors>
+ </jaxws:endpoint>
+
</beans>
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml 2010-05-31 11:45:13 UTC (rev 12404)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<policy xmlns="urn:jboss:security-config:5.0"
+>
+
+ <application-policy name="custom">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ </login-module>
+ </authentication>
+ </application-policy>
+
+
+</policy>
+
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties 2010-05-31 11:45:13 UTC (rev 12404)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+theKermit=theFriends
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties 2010-05-31 11:45:13 UTC (rev 12404)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+theKermit=thefrog2
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2010-05-31 11:45:13 UTC (rev 12404)
@@ -4,12 +4,24 @@
version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
<servlet>
<servlet-name>TestService</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
</servlet>
+
+ <servlet>
+ <servlet-name>TestService2</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>/default-config/*</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TestService2</servlet-name>
+ <url-pattern>/custom-config/*</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2010-05-31 11:45:13 UTC (rev 12404)
@@ -54,7 +54,10 @@
</binding>
<service name="SecurityService">
<port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize"/>
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/default-config"/>
</port>
+ <port name="SecurityServicePort2" binding="tns:SecurityServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/custom-config"/>
+ </port>
</service>
</definitions>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-05-31 08:41:17 UTC (rev 12403)
+++ stack/cxf/trunk/pom.xml 2010-05-31 11:45:13 UTC (rev 12404)
@@ -64,6 +64,7 @@
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jboss.logging.version>2.2.0.CR1</jboss.logging.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
+ <picketbox.version>3.0.0.Beta5</picketbox.version>
<jaxb.api.version>1.0.0.Beta1</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
@@ -82,7 +83,6 @@
<xmlsec.version>1.4.3</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
<spring.version>3.0.1.RELEASE</spring.version>
-
</properties>
@@ -543,6 +543,22 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-bare</artifactId>
+ <version>${picketbox.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
<version>${jboss.security.spi.version}</version>
13 years, 11 months
JBossWS SVN: r12403 - in stack/native: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-31 04:41:17 -0400 (Mon, 31 May 2010)
New Revision: 12403
Added:
stack/native/tags/jbossws-native-3.3.0.GA/
Removed:
stack/native/branches/jbossws-native-3.3.0.GA/
Log:
Tagging jbossws-native-3.3.0.GA
Copied: stack/native/tags/jbossws-native-3.3.0.GA (from rev 12402, stack/native/branches/jbossws-native-3.3.0.GA)
13 years, 11 months
JBossWS SVN: r12402 - in stack/cxf: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-31 04:40:30 -0400 (Mon, 31 May 2010)
New Revision: 12402
Added:
stack/cxf/tags/jbossws-cxf-3.3.0.GA/
Removed:
stack/cxf/branches/jbossws-cxf-3.3.0.GA/
Log:
Tagging jbossws-cxf-3.3.0.GA
Copied: stack/cxf/tags/jbossws-cxf-3.3.0.GA (from rev 12401, stack/cxf/branches/jbossws-cxf-3.3.0.GA)
13 years, 11 months
JBossWS SVN: r12401 - in stack/metro: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-31 04:39:46 -0400 (Mon, 31 May 2010)
New Revision: 12401
Added:
stack/metro/tags/jbossws-metro-3.3.0.GA/
Removed:
stack/metro/branches/jbossws-metro-3.3.0.GA/
Log:
Tagging jbossws-metro-3.3.0.GA
Copied: stack/metro/tags/jbossws-metro-3.3.0.GA (from rev 12400, stack/metro/branches/jbossws-metro-3.3.0.GA)
13 years, 11 months
JBossWS SVN: r12400 - in framework: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-31 03:00:42 -0400 (Mon, 31 May 2010)
New Revision: 12400
Added:
framework/tags/jbossws-framework-3.3.0.GA/
Removed:
framework/branches/jbossws-framework-3.3.0.GA/
Log:
Tagging jbossws-framework-3.3.0.GA
Copied: framework/tags/jbossws-framework-3.3.0.GA (from rev 12399, framework/branches/jbossws-framework-3.3.0.GA)
13 years, 11 months
JBossWS SVN: r12399 - in common: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-31 02:49:30 -0400 (Mon, 31 May 2010)
New Revision: 12399
Added:
common/tags/jbossws-common-1.3.0.GA/
Removed:
common/branches/jbossws-common-1.3.0.GA/
Log:
Tagging jbossws-common-1.3.0.GA
Copied: common/tags/jbossws-common-1.3.0.GA (from rev 12398, common/branches/jbossws-common-1.3.0.GA)
13 years, 11 months
JBossWS SVN: r12398 - in spi: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-31 02:45:51 -0400 (Mon, 31 May 2010)
New Revision: 12398
Added:
spi/tags/jbossws-spi-1.3.0.GA/
Removed:
spi/branches/jbossws-spi-1.3.0.GA/
Log:
Tagging jbossws-spi-1.3.0.GA
Copied: spi/tags/jbossws-spi-1.3.0.GA (from rev 12397, spi/branches/jbossws-spi-1.3.0.GA)
13 years, 11 months
JBossWS SVN: r12397 - stack/metro/branches/jbossws-metro-3.3.0.GA/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-28 13:45:51 -0400 (Fri, 28 May 2010)
New Revision: 12397
Modified:
stack/metro/branches/jbossws-metro-3.3.0.GA/src/main/distro/ReleaseNotes.txt
Log:
Adding release notes
Modified: stack/metro/branches/jbossws-metro-3.3.0.GA/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/metro/branches/jbossws-metro-3.3.0.GA/src/main/distro/ReleaseNotes.txt 2010-05-28 17:42:42 UTC (rev 12396)
+++ stack/metro/branches/jbossws-metro-3.3.0.GA/src/main/distro/ReleaseNotes.txt 2010-05-28 17:45:51 UTC (rev 12397)
@@ -28,19 +28,51 @@
Bug
- TODO: enumerate
+ * [JBWS-2633] - wscompile fails to create valid package name where namespace contains capitalised reserved keyword
+ * [JBWS-3015] - wsdlLocation attribute from @WebServiceClient not considered when building up webservicerefs
+ * [JBWS-3029] - Quote mismatch in JBossWS console index.html
+ * [JBWS-3037] - Fix NPE thrown from logging framework
+ * [JBWS-2970] - InjectionMetaDataDeploymentAspect misuse of EJBContainer.getEnc()
+ * [JBWS-2984] - Benchmark tests are setting incorrect date
+ * [JBWS-2021] - app-client impl assumes client and server share the same filesystem
+ * [JBWS-2917] - We're using buggy xalan version causing namespaces issues
+ * [JBWS-2963] - JavaDoc inconsistency in WSConsume.java
+ * [JBWS-2875] - Remove jbossws-jbossXYZ.jar files from JBOSS_HOME/client directory
+ * [JBWS-2902] - Fix JAX-WS 2.2 webserviceref clarification
+ * [JBWS-2934] - WebServiceContext injection have to be ThreadLocal aware
Feature Request
- TODO: enumerate
+ * [JBWS-2895] - Provide JAX-RPC features on top of stacks not having them
+ * [JBWS-3024] - Implement endorsing support for JBossWS ANT tools
+ * [JBWS-2996] - Provide portcomponentlink servlet
+ * [JBWS-2650] - Provide a Maven plugin for wsconsume/wsprovide
+ * [JBWS-2793] - Support of SOAP header code generation for implicit headers
Task
- TODO: enumerate
+ * [JBWS-3030] - Refactor *-deploy.conf for supporting un-install of CXF stack
+ * [JBWS-2923] - Move out of deployers/jbossws.deployer jars that are not required to be in deployers
+ * [JBWS-2988] - Fix dependency on jboss-logging
+ * [JBWS-3003] - Fix maven [WARNING] Using platform encoding ... build is platform dependent!
+ * [JBWS-3005] - Use new Maven repository at repository.jboss.org/nexus
+ * [JBWS-2948] - Fix regressions due to VFS3 update
+ * [JBWS-2950] - Implement support for JAX-WS 2.2 target in wsconsume tool
+ * [JBWS-2958] - Upgrade to wsdl4j 1.6.2
+ * [JBWS-2959] - Update obsolete jboss dependencies
+ * [JBWS-2968] - Remove compilation warnings where possible
+ * [JBWS-2758] - Remove support for Java 5
+ * [JBWS-2881] - Increase DOMUtils performances optimizing DocumentBuilder creation
+ * [JBWS-2898] - Optimize DocumentBuilderFactory creation using DocumentBuilderFactory.newInstance(String s, ClassLoader c)
+ * [JBWS-2900] - Optimize EntityResolver setup in DOMUtils
+ * [JBWS-2916] - Properly setup deployment classloader
+ * [JBWS-2920] - Review install scripts / container integration to produce jbossws-jaxrpc.deployer
+ * [JBWS-2921] - Isolate factories/services configuration in descriptor only jars
+ * [JBWS-2922] - Add some basic JAX-RPC coverage to jbossws-framework testsuite
Errata
- See: TODO: reference to associated JIRA issue
+ See: https://jira.jboss.org/browse/JBWS-3045
This version of ${project.name} is based on the following Metro components:
* WSIT ${sun.wsit.version}
13 years, 11 months
JBossWS SVN: r12396 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-28 13:42:42 -0400 (Fri, 28 May 2010)
New Revision: 12396
Modified:
stack/native/trunk/pom.xml
Log:
Force java mail 1.4.2
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-05-28 17:41:57 UTC (rev 12395)
+++ stack/native/trunk/pom.xml 2010-05-28 17:42:42 UTC (rev 12396)
@@ -185,7 +185,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
13 years, 11 months
JBossWS SVN: r12395 - stack/native/branches/jbossws-native-3.3.0.GA.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-28 13:41:57 -0400 (Fri, 28 May 2010)
New Revision: 12395
Modified:
stack/native/branches/jbossws-native-3.3.0.GA/pom.xml
Log:
Force java mail 1.4.2
Modified: stack/native/branches/jbossws-native-3.3.0.GA/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.3.0.GA/pom.xml 2010-05-28 17:39:07 UTC (rev 12394)
+++ stack/native/branches/jbossws-native-3.3.0.GA/pom.xml 2010-05-28 17:41:57 UTC (rev 12395)
@@ -185,7 +185,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
13 years, 11 months