JBossWS SVN: r18033 - projects/wsi-bp-test/trunk.
by jbossws-commits@lists.jboss.org
Author: rsvoboda(a)redhat.com
Date: 2013-10-22 07:07:49 -0400 (Tue, 22 Oct 2013)
New Revision: 18033
Modified:
projects/wsi-bp-test/trunk/pom.xml
Log:
WSI: removing eap610 jboss713 jboss712 profiles
Modified: projects/wsi-bp-test/trunk/pom.xml
===================================================================
--- projects/wsi-bp-test/trunk/pom.xml 2013-10-22 08:14:11 UTC (rev 18032)
+++ projects/wsi-bp-test/trunk/pom.xml 2013-10-22 11:07:49 UTC (rev 18033)
@@ -478,106 +478,6 @@
</profile>
<!--
- Name: jboss712
- Descr: JBoss-7.1.2 specific options
- -->
- <profile>
- <id>jboss712</id>
- <properties>
- <jboss.version>${jboss712.version}</jboss.version>
- <jbossws.integration.target>jboss712</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss712-tests-integration</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
- <excludes>
- <!--https://tools.oasis-open.org/issues/browse/WSBRSP-3(BSP3070)-->
- <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude>
-
- <!--https://tools.oasis-open.org/issues/browse/WSBRSP-4(BSP3032)-->
- <!--After WSBRSP-4 is resolved we can port KerberosTestCase(with spring installed)-->
- <!--this broke the WSI-Analyzer-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude>
- <!--this broke the alogrithm conformance in wsi-bsp-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase*</exclude>
-
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss713
- Descr: JBoss-7.1.3 specific options
- -->
- <profile>
- <id>jboss713</id>
- <properties>
- <jboss.version>${jboss713.version}</jboss.version>
- <jbossws.integration.target>jboss713</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss713-tests-integration</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
- <excludes>
- <!--https://tools.oasis-open.org/issues/browse/WSBRSP-3(BSP3070)-->
- <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude>
-
- <!--https://tools.oasis-open.org/issues/browse/WSBRSP-4(BSP3032)-->
- <!--After WSBRSP-4 is resolved we can port KerberosTestCase(with spring installed)-->
- <!--this broke the WSI-Analyzer-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude>
- <!--this broke the alogrithm conformance in wsi-bsp-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase*</exclude>
-
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss720
Descr: JBoss-7.2.0 specific options
-->
@@ -668,66 +568,7 @@
</build>
</profile>
-
<!--
- Name: EAP 6.1.0.GA
- -->
- <profile>
- <id>eap610</id>
- <properties>
- <jbossws.cxf.version>4.1.3.Final-redhat-1</jbossws.cxf.version>
- <jbossws.shared.testsuite.version>4.0.7.GA-redhat-1</jbossws.shared.testsuite.version>
- <gnu.getopt.version>1.0.13-redhat-2</gnu.getopt.version>
- <log4j.version>1.2.16-redhat-2</log4j.version>
- <jboss720.version>7.2.0.Final</jboss720.version>
- <ejb.api.version>1.0.1.Final</ejb.api.version>
- <jaxb.api.version>1.0.3.Final</jaxb.api.version>
- <jaxws.api.version>2.0.0.Final</jaxws.api.version>
- <jsr181.api.version>1.0-MR1</jsr181.api.version>
- <spring.version>3.0.7.RELEASE</spring.version>
- <picketlink.version>2.1.6.Final-redhat-1</picketlink.version>
- <org.slf4j.version>1.7.2-redhat-1</org.slf4j.version>
- <jboss.version>${jboss720.version}</jboss.version>
- <jbossws.integration.target>jboss720</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
- <excludes>
- <!--https://tools.oasis-open.org/issues/browse/WSBRSP-3(BSP3070)-->
- <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude>
-
- <!--https://tools.oasis-open.org/issues/browse/WSBRSP-4(BSP3032)-->
- <!--After WSBRSP-4 is resolved we can port KerberosTestCase(with spring installed)-->
- <!--this broke the WSI-Analyzer-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude>
- <!--this broke the alogrithm conformance in wsi-bsp-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase*</exclude>
-
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
-
-
-
- <!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
11 years, 2 months
JBossWS SVN: r18032 - in projects/jaspic-soap/trunk: src/main/java/org/jboss/ws/jaspic/container/config and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2013-10-22 04:14:11 -0400 (Tue, 22 Oct 2013)
New Revision: 18032
Added:
projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthConfig.java
projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthContext.java
projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/module/SOAPClientAuthModule.java
projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/wss/interceptor/
projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/wss/interceptor/WSS4JOutInterceptor.java
projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/JASPISoapClientTest.java
projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/UsernamePasswordCallbackHandler.java
projects/jaspic-soap/trunk/src/test/resources/jaspi-config-client.xml
projects/jaspic-soap/trunk/src/test/resources/plain-soapmessage.xml
Modified:
projects/jaspic-soap/trunk/pom.xml
projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSAuthConfigProvider.java
Log:
Add client api implementation and test
Modified: projects/jaspic-soap/trunk/pom.xml
===================================================================
--- projects/jaspic-soap/trunk/pom.xml 2013-10-22 06:37:29 UTC (rev 18031)
+++ projects/jaspic-soap/trunk/pom.xml 2013-10-22 08:14:11 UTC (rev 18032)
@@ -29,7 +29,7 @@
<log4j.version>1.2.16</log4j.version>
<opensaml.version>2.5.3</opensaml.version>
<saaj.api.version>1.0.1.Final</saaj.api.version>
- <wss4j.version>1.6.12</wss4j.version>
+ <wss4j.version>2.0-SNAPSHOT</wss4j.version>
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
</properties>
@@ -55,24 +55,43 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-dom</artifactId>
+ <version>${wss4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-policy</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-common</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-stax</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-policy-stax</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.picketbox</groupId>
<artifactId>jbosssx-bare</artifactId>
Modified: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSAuthConfigProvider.java
===================================================================
--- projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSAuthConfigProvider.java 2013-10-22 06:37:29 UTC (rev 18031)
+++ projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSAuthConfigProvider.java 2013-10-22 08:14:11 UTC (rev 18032)
@@ -45,9 +45,9 @@
}
@Override
- public ClientAuthConfig getClientAuthConfig(String layer,String appContext, CallbackHandler handler) throws AuthException, SecurityException {
- //TODO:implement it
- return null;
+ public ClientAuthConfig getClientAuthConfig(String layer,
+ String appContext, CallbackHandler handler) throws AuthException, SecurityException {
+ return new JBossWSClientAuthConfig(layer, appContext, handler, contextProperties);
}
@Override
Added: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthConfig.java
===================================================================
--- projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthConfig.java (rev 0)
+++ projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthConfig.java 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.ws.jaspic.container.config;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.message.AuthException;
+import javax.security.auth.message.config.ClientAuthContext;
+import javax.security.auth.message.module.ClientAuthModule;
+
+import org.jboss.security.PicketBoxMessages;
+import org.jboss.security.SecurityConstants;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.auth.container.config.AuthModuleEntry;
+import org.jboss.security.auth.login.AuthenticationInfo;
+import org.jboss.security.auth.login.BaseAuthenticationInfo;
+import org.jboss.security.auth.login.JASPIAuthenticationInfo;
+import org.jboss.security.auth.message.config.JBossClientAuthConfig;
+import org.jboss.security.config.ApplicationPolicy;
+import org.jboss.security.config.ControlFlag;
+import org.jboss.security.config.SecurityConfiguration;
+import org.jboss.security.plugins.ClassLoaderLocator;
+import org.jboss.security.plugins.ClassLoaderLocatorFactory;
+
+/**
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JBossWSClientAuthConfig extends JBossClientAuthConfig {
+
+ @SuppressWarnings("rawtypes")
+ private List modules = new ArrayList();
+ private CallbackHandler callbackHandler;
+
+ @SuppressWarnings("rawtypes")
+ public JBossWSClientAuthConfig(String layer, String appContext,
+ CallbackHandler handler, Map properties) {
+ super(layer, appContext, handler, properties);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public ClientAuthContext getAuthContext(String authContextID,
+ Subject clientSubject, Map properties) throws AuthException {
+ List<ControlFlag> controlFlags = new ArrayList<ControlFlag>();
+
+ Map<String, Map> mapOptionsByName = new HashMap<String, Map>();
+ SecurityContext securityContext = SecurityActions.getSecurityContext();
+ String secDomain = null;
+ if (securityContext != null) {
+ secDomain = securityContext.getSecurityDomain();
+ } else {
+ secDomain = (String) properties.get("security-domain");
+ if (secDomain == null)
+ throw PicketBoxMessages.MESSAGES
+ .failedToObtainSecDomainFromContextOrConfig();
+ }
+
+ String defaultAppDomain = SecurityConstants.DEFAULT_APPLICATION_POLICY;
+ // Get the modules from the SecurityConfiguration
+ ApplicationPolicy ap = SecurityConfiguration
+ .getApplicationPolicy(secDomain);
+ if (ap == null) {
+ ap = SecurityConfiguration.getApplicationPolicy(defaultAppDomain);
+ }
+ if (ap == null)
+ throw PicketBoxMessages.MESSAGES
+ .failedToObtainApplicationPolicy(secDomain);
+ BaseAuthenticationInfo bai = ap.getAuthenticationInfo();
+ if (bai == null)
+ throw PicketBoxMessages.MESSAGES
+ .failedToObtainAuthenticationInfo(secDomain);
+
+ if (bai instanceof AuthenticationInfo) {
+ throw new AuthException("Unexpected authentication configuration");
+
+ } else {
+ JASPIAuthenticationInfo jai = (JASPIAuthenticationInfo) bai;
+ AuthModuleEntry[] amearr = jai.getAuthModuleEntry();
+
+ ClassLoader moduleCL = null;
+ String jbossModule = jai.getJBossModuleName();
+ if (jbossModule != null && !jbossModule.isEmpty()) {
+ ClassLoaderLocator locator = ClassLoaderLocatorFactory.get();
+ if (locator != null)
+ moduleCL = locator.get(jbossModule);
+ }
+
+ for (AuthModuleEntry ame : amearr) {
+
+ try {
+ mapOptionsByName.put(ame.getAuthModuleName(),
+ ame.getOptions());
+ controlFlags.add(ame.getControlFlag());
+ ClientAuthModule sam = this.createCAM(moduleCL,
+ ame.getAuthModuleName());
+
+ Map options = new HashMap();
+ sam.initialize(null, null, callbackHandler, options);
+ modules.add(sam);
+ } catch (Exception e) {
+ throw new AuthException(e.getLocalizedMessage());
+ }
+ }
+
+ }
+ return new JBossWSClientAuthContext(this);
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ private ClientAuthModule createCAM(ClassLoader moduleCL, String name)
+ throws Exception {
+ Class clazz = SecurityActions.loadClass(moduleCL, name);
+ Constructor ctr = clazz.getConstructor(new Class[0]);
+ return (ClientAuthModule) ctr.newInstance(new Object[0]);
+ }
+
+ @SuppressWarnings({ "rawtypes" })
+ public List getClientAuthModules() {
+ return modules;
+ }
+
+}
\ No newline at end of file
Property changes on: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthConfig.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthContext.java
===================================================================
--- projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthContext.java (rev 0)
+++ projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthContext.java 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.ws.jaspic.container.config;
+
+import org.jboss.security.auth.message.config.JBossClientAuthContext;
+
+/**
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+// TODO:refactor JBossClientAuthContex
+public class JBossWSClientAuthContext extends JBossClientAuthContext {
+
+
+ public JBossWSClientAuthContext(JBossWSClientAuthConfig config) {
+ super(config);
+ }
+}
\ No newline at end of file
Property changes on: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/config/JBossWSClientAuthContext.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/module/SOAPClientAuthModule.java
===================================================================
--- projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/module/SOAPClientAuthModule.java (rev 0)
+++ projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/module/SOAPClientAuthModule.java 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.ws.jaspic.container.module;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.message.AuthException;
+import javax.security.auth.message.AuthStatus;
+import javax.security.auth.message.MessageInfo;
+import javax.security.auth.message.MessagePolicy;
+import javax.security.auth.message.module.ClientAuthModule;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.binding.soap.SoapVersionFactory;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.ws.security.WSSConfig;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.ws.jaspic.wss.interceptor.WSS4JOutInterceptor;
+/**
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class SOAPClientAuthModule implements ClientAuthModule {
+
+ @SuppressWarnings("rawtypes")
+ private List<Class> supportedTypes = new ArrayList<Class>();
+ private SimplePrincipal principal = null;
+ private Object credential = null;
+
+ @SuppressWarnings("unused")
+ private MessagePolicy requestPolicy = null;
+ @SuppressWarnings("unused")
+ private MessagePolicy responsePolicy = null;
+ @SuppressWarnings("unused")
+ private CallbackHandler handler = null;
+ @SuppressWarnings({ "unused", "rawtypes" })
+ private Map options = null;
+
+ public SOAPClientAuthModule() {
+ this.supportedTypes.add(Object.class);
+ this.supportedTypes.add(SOAPMessage.class);
+ }
+
+ @SuppressWarnings("rawtypes")
+ public SOAPClientAuthModule(List<Class> supportedTypes) {
+ this.supportedTypes = supportedTypes;
+ }
+
+ @SuppressWarnings("rawtypes")
+ public void initialize(MessagePolicy requestPolicy,
+ MessagePolicy responsePolicy, CallbackHandler handler, Map options)
+ throws AuthException {
+ this.requestPolicy = requestPolicy;
+ this.responsePolicy = responsePolicy;
+ this.handler = handler;
+ this.options = options;
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public AuthStatus secureRequest(MessageInfo messageInfo, Subject source)
+ throws AuthException {
+
+ SOAPMessage soapMessage = (SOAPMessage) messageInfo.getRequestMessage();
+ SoapVersion soapVersion = null;
+ try {
+ String ns = soapMessage.getSOAPBody().getNamespaceURI();
+ soapVersion = SoapVersionFactory.getInstance().getSoapVersion(ns);
+ } catch (SOAPException e) {
+ throw new AuthException(e.getMessage());
+ }
+ if (soapVersion == null) {
+ throw new AuthException("Invalid soap message");
+ }
+
+ Exchange exchange = new ExchangeImpl();
+ MessageImpl messageImpl = new MessageImpl();
+ messageImpl.setExchange(exchange);
+ SoapMessage cxfSoapMessage = new SoapMessage(messageImpl);
+ cxfSoapMessage.setVersion(soapVersion);
+ cxfSoapMessage.setContent(SOAPMessage.class, soapMessage);
+
+ WSSConfig wssConfig = WSSConfig.getNewInstance();
+ cxfSoapMessage.put(WSSConfig.class.getName(), wssConfig);
+
+ Map map = messageInfo.getMap();
+ WSS4JOutInterceptor wss4jOutInterceptor = new WSS4JOutInterceptor(map);
+ wss4jOutInterceptor.createEndingInterceptor().handleMessage(cxfSoapMessage);
+ return AuthStatus.SUCCESS;
+ }
+
+ public AuthStatus validateResponse(MessageInfo messageInfo, Subject source,
+ Subject recipient) throws AuthException {
+ // TODO:to implement
+ return AuthStatus.SUCCESS;
+ }
+
+ @SuppressWarnings("rawtypes")
+ public Class[] getSupportedMessageTypes() {
+ Class[] clsarr = new Class[this.supportedTypes.size()];
+ supportedTypes.toArray(clsarr);
+ return clsarr;
+ }
+
+ public void cleanSubject(MessageInfo messageInfo, Subject subject)
+ throws AuthException {
+ subject.getPrincipals().remove(principal);
+ subject.getPublicCredentials().remove(credential);
+ }
+
+}
Property changes on: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/container/module/SOAPClientAuthModule.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/wss/interceptor/WSS4JOutInterceptor.java
===================================================================
--- projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/wss/interceptor/WSS4JOutInterceptor.java (rev 0)
+++ projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/wss/interceptor/WSS4JOutInterceptor.java 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,360 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.ws.jaspic.wss.interceptor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.soap.SOAPMessage;
+
+import org.apache.cxf.binding.soap.SoapFault;
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.phase.PhaseInterceptor;
+import org.apache.cxf.ws.security.wss4j.AbstractWSS4JInterceptor;
+
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSConfig;
+import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.action.Action;
+import org.apache.ws.security.handler.RequestData;
+import org.apache.ws.security.handler.WSHandlerConstants;
+import org.apache.ws.security.util.WSSecurityUtil;
+import org.w3c.dom.Document;
+/**
+ * This is a copy of WSS4JOutInterceptor and public WSS4JOutInterceptorInternal
+ * We need to refactor the WSS4JOutInterceptor and directly use it
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ *
+ */
+public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
+
+ /**
+ * Property name for a map of action IDs ({@link Integer}) to action
+ * class names. Values can be either {@link Class}) or Objects
+- * implementing {@link Action}.
+ */
+ public static final String WSS4J_ACTION_MAP = "wss4j.action.map";
+
+ private static final Logger LOG = LogUtils
+ .getL7dLogger(WSS4JOutInterceptor.class);
+
+ private static final Logger TIME_LOG = LogUtils
+ .getL7dLogger(WSS4JOutInterceptor.class,
+ null,
+ WSS4JOutInterceptor.class.getName() + "-Time");
+
+ private WSS4JOutInterceptorInternal ending;
+ private SAAJOutInterceptor saajOut = new SAAJOutInterceptor();
+ private boolean mtomEnabled;
+
+
+
+ public WSS4JOutInterceptor() {
+ super();
+ setPhase(Phase.PRE_PROTOCOL);
+ getAfter().add(SAAJOutInterceptor.class.getName());
+
+ ending = createEndingInterceptor();
+ }
+
+ public WSS4JOutInterceptor(Map<String, Object> props) {
+ this();
+ setProperties(props);
+ }
+
+ public boolean isAllowMTOM() {
+ return mtomEnabled;
+ }
+ /**
+ * Enable or disable mtom with WS-Security. By default MTOM is disabled as
+ * attachments would not get encrypted or be part of the signature.
+ * @param mtomEnabled
+ */
+ public void setAllowMTOM(boolean allowMTOM) {
+ this.mtomEnabled = allowMTOM;
+ }
+
+
+ @Override
+ public Object getProperty(Object msgContext, String key) {
+ // use the superclass first
+ Object result = super.getProperty(msgContext, key);
+
+ // handle the special case of the RECV_RESULTS
+ if (result == null
+ && WSHandlerConstants.RECV_RESULTS.equals(key)
+ && !this.isRequestor((SoapMessage)msgContext)) {
+ result = ((SoapMessage)msgContext).getExchange().getInMessage().get(key);
+ }
+ return result;
+ }
+
+ public void handleMessage(SoapMessage mc) throws Fault {
+ //must turn off mtom when using WS-Sec so binary is inlined so it can
+ //be properly signed/encrypted/etc...
+ if (!mtomEnabled) {
+ mc.put(org.apache.cxf.message.Message.MTOM_ENABLED, false);
+ }
+
+ if (mc.getContent(SOAPMessage.class) == null) {
+ saajOut.handleMessage(mc);
+ }
+
+ mc.getInterceptorChain().add(ending);
+ }
+ public void handleFault(SoapMessage message) {
+ saajOut.handleFault(message);
+ }
+
+ public final WSS4JOutInterceptorInternal createEndingInterceptor() {
+ return new WSS4JOutInterceptorInternal();
+ }
+
+ public class WSS4JOutInterceptorInternal
+ implements PhaseInterceptor<SoapMessage> {
+ public WSS4JOutInterceptorInternal() {
+ super();
+ }
+
+ public void handleMessage(SoapMessage mc) throws Fault {
+
+ boolean doDebug = LOG.isLoggable(Level.FINE);
+ boolean doTimeDebug = TIME_LOG.isLoggable(Level.FINE);
+
+ long t0 = 0;
+ long t1 = 0;
+ long t2 = 0;
+
+ if (doTimeDebug) {
+ t0 = System.currentTimeMillis();
+ }
+
+ if (doDebug) {
+ LOG.fine("WSS4JOutInterceptor: enter handleMessage()");
+ }
+ /**
+ * There is nothing to send...Usually happens when the provider
+ * needs to send a HTTP 202 message (with no content)
+ */
+ if (mc == null) {
+ return;
+ }
+ SoapVersion version = mc.getVersion();
+ RequestData reqData = new RequestData();
+ translateProperties(mc);
+
+ reqData.setMsgContext(mc);
+
+ /*
+ * The overall try, just to have a finally at the end to perform some
+ * housekeeping.
+ */
+ try {
+ WSSConfig config = WSSConfig.getNewInstance();
+ reqData.setWssConfig(config);
+
+ /*
+ * Setup any custom actions first by processing the input properties
+ * and reconfiguring the WSSConfig with the user defined properties.
+ */
+ this.configureActions(mc, doDebug, version, config);
+
+ /*
+ * Get the action first.
+ */
+ List<Integer> actions = new ArrayList<Integer>();
+ String action = getString(WSHandlerConstants.ACTION, mc);
+ if (action == null) {
+ throw new SoapFault(new Message("NO_ACTION", LOG), version
+ .getReceiver());
+ }
+
+ int doAction = WSSecurityUtil.decodeAction(action, actions, config);
+ if (doAction == WSConstants.NO_SECURITY && actions.isEmpty()) {
+ return;
+ }
+
+ /*
+ * For every action we need a username, so get this now. The
+ * username defined in the deployment descriptor takes precedence.
+ */
+ reqData.setUsername((String) getOption(WSHandlerConstants.USER));
+ if (reqData.getUsername() == null
+ || reqData.getUsername().equals("")) {
+ String username = (String) getProperty(reqData.getMsgContext(),
+ WSHandlerConstants.USER);
+ if (username != null) {
+ reqData.setUsername(username);
+ }
+ }
+
+ /*
+ * Now we perform some set-up for UsernameToken and Signature
+ * functions. No need to do it for encryption only. Check if
+ * username is available and then get a passowrd.
+ */
+ if ((doAction & (WSConstants.SIGN | WSConstants.UT | WSConstants.UT_SIGN)) != 0
+ && (reqData.getUsername() == null
+ || reqData.getUsername().equals(""))) {
+ /*
+ * We need a username - if none throw an SoapFault. For
+ * encryption there is a specific parameter to get a username.
+ */
+ throw new SoapFault(new Message("NO_USERNAME", LOG), version
+ .getReceiver());
+ }
+ if (doDebug) {
+ LOG.fine("Action: " + doAction);
+ LOG.fine("Actor: " + reqData.getActor());
+ }
+ /*
+ * Now get the SOAP part from the request message and convert it
+ * into a Document. This forces CXF to serialize the SOAP request
+ * into FORM_STRING. This string is converted into a document.
+ * During the FORM_STRING serialization CXF performs multi-ref of
+ * complex data types (if requested), generates and inserts
+ * references for attachements and so on. The resulting Document
+ * MUST be the complete and final SOAP request as CXF would send it
+ * over the wire. Therefore this must shall be the last (or only)
+ * handler in a chain. Now we can perform our security operations on
+ * this request.
+ */
+
+ SOAPMessage saaj = mc.getContent(SOAPMessage.class);
+
+ if (saaj == null) {
+ LOG.warning("SAAJOutHandler must be enabled for WS-Security!");
+ throw new SoapFault(new Message("NO_SAAJ_DOC", LOG), version
+ .getReceiver());
+ }
+
+ Document doc = saaj.getSOAPPart();
+
+ if (doTimeDebug) {
+ t1 = System.currentTimeMillis();
+ }
+
+ doSenderAction(doAction, doc, reqData, actions, Boolean.TRUE
+ .equals(getProperty(mc, org.apache.cxf.message.Message.REQUESTOR_ROLE)));
+
+ if (doTimeDebug) {
+ t2 = System.currentTimeMillis();
+ TIME_LOG.fine("Send request: total= " + (t2 - t0)
+ + " request preparation= " + (t1 - t0)
+ + " request processing= " + (t2 - t1)
+ + "\n");
+ }
+
+ if (doDebug) {
+ LOG.fine("WSS4JOutInterceptor: exit handleMessage()");
+ }
+ } catch (WSSecurityException e) {
+ throw new SoapFault(new Message("SECURITY_FAILED", LOG), e, version
+ .getSender());
+ } finally {
+ reqData.clear();
+ reqData = null;
+ }
+ }
+
+ public Set<String> getAfter() {
+ return Collections.emptySet();
+ }
+
+ public Set<String> getBefore() {
+ return Collections.emptySet();
+ }
+
+ public String getId() {
+ return WSS4JOutInterceptorInternal.class.getName();
+ }
+
+ public String getPhase() {
+ return Phase.POST_PROTOCOL;
+ }
+
+ public void handleFault(SoapMessage message) {
+ //nothing
+ }
+
+ private void configureActions(SoapMessage mc, boolean doDebug,
+ SoapVersion version, WSSConfig config) {
+
+ final Map<Integer, Object> actionMap = CastUtils.cast(
+ (Map<?, ?>)getProperty(mc, WSS4J_ACTION_MAP));
+ if (actionMap != null) {
+ for (Map.Entry<Integer, Object> entry : actionMap.entrySet()) {
+ Class<?> removedAction = null;
+
+ // Be defensive here since the cast above is slightly risky
+ // with the handler config options not being strongly typed.
+ try {
+ if (entry.getValue() instanceof Class<?>) {
+ removedAction = config.setAction(
+ entry.getKey().intValue(),
+ (Class<?>)entry.getValue());
+ } else if (entry.getValue() instanceof Action) {
+ removedAction = config.setAction(
+ entry.getKey().intValue(),
+ (Action)entry.getValue());
+ } else {
+ throw new SoapFault(new Message("BAD_ACTION", LOG), version
+ .getReceiver());
+ }
+ } catch (ClassCastException e) {
+ throw new SoapFault(new Message("BAD_ACTION", LOG), version
+ .getReceiver());
+ }
+
+ if (doDebug) {
+ if (removedAction != null) {
+ LOG.fine("Replaced Action: " + removedAction.getName()
+ + " with Action: " + entry.getValue()
+ + " for ID: " + entry.getKey());
+ } else {
+ LOG.fine("Added Action: " + entry.getValue()
+ + " with ID: " + entry.getKey());
+ }
+ }
+ }
+ }
+ }
+
+ public Collection<PhaseInterceptor<? extends org.apache.cxf.message.Message>>
+ getAdditionalInterceptors() {
+ return null;
+ }
+ }
+}
Property changes on: projects/jaspic-soap/trunk/src/main/java/org/jboss/ws/jaspic/wss/interceptor/WSS4JOutInterceptor.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/JASPISoapClientTest.java
===================================================================
--- projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/JASPISoapClientTest.java (rev 0)
+++ projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/JASPISoapClientTest.java 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,121 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.ws.jaspic.container.config;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Properties;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.message.AuthStatus;
+import javax.security.auth.message.MessageInfo;
+import javax.security.auth.message.config.AuthConfigFactory;
+import javax.security.auth.message.config.AuthConfigProvider;
+import javax.security.auth.message.config.ClientAuthConfig;
+import javax.security.auth.message.config.ClientAuthContext;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.TestCase;
+
+import org.jboss.security.auth.callback.JBossCallbackHandler;
+import org.jboss.security.auth.login.XMLLoginConfigImpl;
+import org.jboss.security.auth.message.GenericMessageInfo;
+import org.junit.BeforeClass;
+import org.junit.Test;
+/**
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JASPISoapClientTest extends TestCase {
+
+ @BeforeClass
+ protected void setUp() throws Exception {
+ XMLLoginConfigImpl xli = XMLLoginConfigImpl.getInstance();
+
+ setJAASConfiguration(xli);
+
+ URL configURL = Thread.currentThread().getContextClassLoader()
+ .getResource("jaspi-config-client.xml");
+ assertNotNull("Config URL", configURL);
+
+ xli.setConfigURL(configURL);
+ xli.loadConfig();
+ }
+
+ @Test
+ @SuppressWarnings({ "unchecked"})
+ public void testValidateUTPlainPassword() throws Exception {
+ AuthConfigFactory factory = AuthConfigFactory.getFactory();
+ Properties properties = new Properties();
+ String appId = "localhost /jbossws-spi/endpointB";
+ String layer = "SOAP";
+ AuthConfigProvider provider = new JBossWSAuthConfigProvider(properties, factory);
+ provider = factory.getConfigProvider(layer, appId, null);
+
+ JBossCallbackHandler callbackHandler = new JBossCallbackHandler();
+ ClientAuthConfig clientConfig = provider.getClientAuthConfig(layer,
+ appId, callbackHandler);
+
+ Properties serverContextProperties = new Properties();
+ serverContextProperties.setProperty("security-domain", "client-jaspi");
+ ClientAuthContext sctx = clientConfig.getAuthContext("helloWorld", new Subject(), serverContextProperties);
+
+ MessageInfo messageInfo = new GenericMessageInfo();
+
+ messageInfo.setRequestMessage(prepareSOAPMessage("plain-soapmessage.xml"));
+ Subject clientSubject = new Subject();
+ messageInfo.getMap().put("action", "UsernameToken");
+ messageInfo.getMap().put("passwordCallbackClass", "org.jboss.ws.jaspic.container.config.UsernamePasswordCallbackHandler");
+ messageInfo.getMap().put("user", "Alice");
+ AuthStatus authStatus = sctx.secureRequest(messageInfo, clientSubject);
+ assertTrue(authStatus.equals(AuthStatus.SUCCESS));
+ SOAPMessage soapmessage = (SOAPMessage)messageInfo.getRequestMessage();
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ soapmessage.writeTo(bout);
+ String out = new String(bout.toByteArray());
+ assertTrue(out.indexOf("wsse:UsernameToken") > -1);
+ assertTrue(out.indexOf("<wsse:Username>Alice</wsse:Username><wsse:Password") > -1);
+
+ }
+
+ private static void setJAASConfiguration(final Configuration configuration) {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ Configuration.setConfiguration(configuration);
+ return null;
+ }
+ });
+ }
+
+ private SOAPMessage prepareSOAPMessage(String messageFile) throws Exception {
+ MessageFactory factory = MessageFactory.newInstance();
+ URL fileURl = Thread.currentThread().getContextClassLoader()
+ .getResource(messageFile);
+ FileInputStream fins = new FileInputStream(fileURl.getFile());
+ return factory.createMessage(null, fins);
+ }
+}
+
Property changes on: projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/JASPISoapClientTest.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/UsernamePasswordCallbackHandler.java
===================================================================
--- projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/UsernamePasswordCallbackHandler.java (rev 0)
+++ projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/UsernamePasswordCallbackHandler.java 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.ws.jaspic.container.config;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import org.apache.ws.security.WSPasswordCallback;
+public class UsernamePasswordCallbackHandler implements CallbackHandler {
+
+ private Map<String, String> users = new HashMap<String, String>();
+
+ public UsernamePasswordCallbackHandler() {
+ users.put("wernerd", "verySecret");
+ users.put("bob", "security");
+ users.put("Alice", "securityPassword");
+ }
+
+ public void handle(Callback[] callbacks) throws IOException,
+ UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ if (callbacks[i] instanceof WSPasswordCallback) {
+ WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
+ pc.setPassword(users.get(pc.getIdentifier()));
+ } else {
+ throw new UnsupportedCallbackException(callbacks[i],
+ "Unrecognized Callback");
+ }
+ }
+ }
+}
Property changes on: projects/jaspic-soap/trunk/src/test/java/org/jboss/ws/jaspic/container/config/UsernamePasswordCallbackHandler.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/jaspic-soap/trunk/src/test/resources/jaspi-config-client.xml
===================================================================
--- projects/jaspic-soap/trunk/src/test/resources/jaspi-config-client.xml (rev 0)
+++ projects/jaspic-soap/trunk/src/test/resources/jaspi-config-client.xml 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+
+<policy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:security-config:5.0"
+ xmlns="urn:jboss:security-config:5.0">
+ <application-policy name="client-jaspi">
+ <authentication-jaspi>
+ <auth-module code="org.jboss.ws.jaspic.container.module.SOAPClientAuthModule"/>
+ </authentication-jaspi>
+ </application-policy>
+</policy>
\ No newline at end of file
Property changes on: projects/jaspic-soap/trunk/src/test/resources/jaspi-config-client.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/jaspic-soap/trunk/src/test/resources/plain-soapmessage.xml
===================================================================
--- projects/jaspic-soap/trunk/src/test/resources/plain-soapmessage.xml (rev 0)
+++ projects/jaspic-soap/trunk/src/test/resources/plain-soapmessage.xml 2013-10-22 08:14:11 UTC (rev 18032)
@@ -0,0 +1,9 @@
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+ <SOAP-ENV:Header xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+ </SOAP-ENV:Header>
+ <soap:Body>
+ <ns2:DoubleIt xmlns:ns2="http://www.example.org/schema/DoubleIt">
+ <numberToDouble>25</numberToDouble>
+ </ns2:DoubleIt>
+ </soap:Body>
+</soap:Envelope>
\ No newline at end of file
Property changes on: projects/jaspic-soap/trunk/src/test/resources/plain-soapmessage.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
11 years, 2 months
JBossWS SVN: r18031 - projects/wsi-bp-test/trunk.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2013-10-22 02:37:29 -0400 (Tue, 22 Oct 2013)
New Revision: 18031
Modified:
projects/wsi-bp-test/trunk/pom.xml
Log:
Update to the latest jbossws cxf version;Copy the jbossws-cxf-factries to the endorsed dir
Modified: projects/wsi-bp-test/trunk/pom.xml
===================================================================
--- projects/wsi-bp-test/trunk/pom.xml 2013-10-21 14:08:18 UTC (rev 18030)
+++ projects/wsi-bp-test/trunk/pom.xml 2013-10-22 06:37:29 UTC (rev 18031)
@@ -26,7 +26,7 @@
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
- <jbossws.cxf.version>4.2.0-SNAPSHOT</jbossws.cxf.version>
+ <jbossws.cxf.version>4.2.2-SNAPSHOT</jbossws.cxf.version>
<jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version>
<gnu.getopt.version>1.0.13</gnu.getopt.version>
@@ -69,6 +69,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${jbossws.cxf.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>gnu-getopt</groupId>
<artifactId>getopt</artifactId>
<version>${gnu.getopt.version}</version>
@@ -214,6 +220,12 @@
<type>jar</type>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
11 years, 2 months
JBossWS SVN: r18030 - stack/cxf/branches.
by jbossws-commits@lists.jboss.org
Author: nwallace
Date: 2013-10-21 10:08:18 -0400 (Mon, 21 Oct 2013)
New Revision: 18030
Added:
stack/cxf/branches/jbossws-cxf-3.1.2.SP14-BZ-985988/
Log:
new branch to pickup patch on Apache cxf
11 years, 2 months
JBossWS SVN: r18029 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2013-10-21 09:21:23 -0400 (Mon, 21 Oct 2013)
New Revision: 18029
Modified:
stack/cxf/trunk/pom.xml
Log:
Using latest released components
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-10-21 12:17:46 UTC (rev 18028)
+++ stack/cxf/trunk/pom.xml 2013-10-21 13:21:23 UTC (rev 18029)
@@ -61,12 +61,12 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
<jbossws.spi.version>2.2.2.Final</jbossws.spi.version>
- <jbossws.common.version>2.2.3-SNAPSHOT</jbossws.common.version>
+ <jbossws.common.version>2.2.3.Final</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
<jbossws.jboss712.version>4.2.1.Final</jbossws.jboss712.version>
<jbossws.jboss713.version>4.2.1.Final</jbossws.jboss713.version>
- <jbossws.jboss720.version>4.2.2-SNAPSHOT</jbossws.jboss720.version>
- <jbossws.native.version>4.1.2-SNAPSHOT</jbossws.native.version>
+ <jbossws.jboss720.version>4.2.2.Final</jbossws.jboss720.version>
+ <jbossws.native.version>4.1.2.Final</jbossws.native.version>
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Final</jboss720.version>
11 years, 2 months
JBossWS SVN: r18028 - stack/cxf/trunk/modules/dist/src/main/doc.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2013-10-21 08:17:46 -0400 (Mon, 21 Oct 2013)
New Revision: 18028
Modified:
stack/cxf/trunk/modules/dist/src/main/doc/Revision_History.xml
stack/cxf/trunk/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml
Log:
Updating documentation
Modified: stack/cxf/trunk/modules/dist/src/main/doc/Revision_History.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/doc/Revision_History.xml 2013-10-21 12:16:07 UTC (rev 18027)
+++ stack/cxf/trunk/modules/dist/src/main/doc/Revision_History.xml 2013-10-21 12:17:46 UTC (rev 18028)
@@ -88,6 +88,20 @@
</simplelist>
</revdescription>
</revision>
+ <revision>
+ <revnumber>4.2.2</revnumber>
+ <date>Mon Oct 21 2013</date>
+ <author>
+ <firstname>Alessio</firstname>
+ <surname>Soldano</surname>
+ <email>alessio.soldano(a)jboss.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>JBossWS-CXF 4.2.2 documentation</member>
+ </simplelist>
+ </revdescription>
+ </revision>
</revhistory>
</simpara>
</appendix>
Modified: stack/cxf/trunk/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml 2013-10-21 12:16:07 UTC (rev 18027)
+++ stack/cxf/trunk/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml 2013-10-21 12:17:46 UTC (rev 18028)
@@ -438,15 +438,56 @@
<section id="sid-41713670_Predefinedclientandendpointconfigurations-Clientconfigurationassignment">
<title>Client configuration assignment</title>
- <para>JBossWS API comes with facility classes for assigning configurations when building up a client; JAXWS handlers can be read from client configurations as follows:</para>
- <informalexample>
- <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
+ <section id="sid-41713670_Predefinedclientandendpointconfigurations-JAXWSFeature">
+
+ <title>JAXWS Feature</title>
+ <para>
+ The most practical way of setting a configuration is using
+ <code>org.jboss.ws.api.configuration.ClientConfigFeature</code>
+ , a JAXWS
+ <code>Feature</code>
+ extension provided by JBossWS:
+ </para>
+ <informalexample>
+ <programlisting>
+import org.jboss.ws.api.configuration.ClientConfigFeature;
+
+...
+
+Service service = Service.create(wsdlURL, serviceName);
+Endpoint port = service.getPort(Endpoint.class, new ClientConfigFeature("META-INF/jaxws-client-config.xml", "Custom Client Config"));
+port.echo("Kermit");
+
+... or ....
+
+port = service.getPort(Endpoint.class, new ClientConfigFeature("META-INF/jaxws-client-config.xml", "Custom Client Config"), true); //setup properties too from the configuration
+port.echo("Kermit");
+... or ...
+
+port = service.getPort(Endpoint.class, new ClientConfigFeature(null, testConfigName)); //reads from current container configurations if available
+port.echo("Kermit");
+</programlisting>
+ </informalexample>
+ <para>
+ JBossWS internally parses the specified configuration file, if any, after having resolved it as a resources using the current thread context classloader. The
+ <ulink url="http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.1.0.Beta1/s...">jbossws-jaxws-config schema</ulink>
+ defines the descriptor contents and is included in the
+ <emphasis role="italics">jbossws-spi</emphasis>
+ artifact.
+ </para>
+ </section>
+ <section id="sid-41713670_Predefinedclientandendpointconfigurations-Explicitsetup">
+
+ <title>Explicit setup</title>
+ <para>Alternatively, JBossWS API facility classes can be used for assigning configurations when building up a client; JAXWS handlers can be read from client configurations as follows:</para>
+ <informalexample>
+ <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
...
Service service = Service.create(wsdlURL, serviceName);
-Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+Endpoint port = service.getPort(Endpoint.class);
BindingProvider bp = (BindingProvider)port;
ClientConfigUtil.setConfigHandlers(bp, "META-INF/jaxws-client-config.xml", "Custom Client Config 1");
port.echo("Kermit");
@@ -465,19 +506,19 @@
...
-configurer.setConfigHandlers(bp, null, "Container Custom Client Config"); //reads from container configurations
+configurer.setConfigHandlers(bp, null, "Container Custom Client Config"); //reads from current container configurations if available
port.echo("Kermit");
</programlisting>
- </informalexample>
- <para>... similarly, properties are read from client configurations as follows:</para>
- <informalexample>
- <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
+ </informalexample>
+ <para>... similarly, properties are read from client configurations as follows:</para>
+ <informalexample>
+ <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
...
Service service = Service.create(wsdlURL, serviceName);
-Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+Endpoint port = service.getPort(Endpoint.class);
ClientConfigUtil.setConfigProperties(port, "META-INF/jaxws-client-config.xml", "Custom Client Config 1");
port.echo("Kermit");
@@ -496,19 +537,20 @@
...
-configurer.setConfigProperties(port, null, "Container Custom Client Config"); //reads from container configurations
+configurer.setConfigProperties(port, null, "Container Custom Client Config"); //reads from current container configurations if available
port.echo("Kermit");
</programlisting>
- </informalexample>
- <para>
- The default
- <code>ClientConfigurer</code>
- implementation parses the specified configuration file, if any, after having resolved it as a resources using the current thread context classloader. The
- <ulink url="http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.1.0.Beta1/s...">jbossws-jaxws-config schema</ulink>
- defines the descriptor contents and is included in the
- <emphasis role="italics">jbossws-spi</emphasis>
- artifact.
- </para>
+ </informalexample>
+ <para>
+ The default
+ <code>ClientConfigurer</code>
+ implementation parses the specified configuration file, if any, after having resolved it as a resources using the current thread context classloader. The
+ <ulink url="http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.1.0.Beta1/s...">jbossws-jaxws-config schema</ulink>
+ defines the descriptor contents and is included in the
+ <emphasis role="italics">jbossws-spi</emphasis>
+ artifact.
+ </para>
+ </section>
</section>
</section>
<section id="sid-41713670_Predefinedclientandendpointconfigurations-Applicationserverconfigurations">
11 years, 2 months
JBossWS SVN: r18027 - stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2013-10-21 08:16:07 -0400 (Mon, 21 Oct 2013)
New Revision: 18027
Modified:
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/Revision_History.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml
Log:
Updating documentation
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/Revision_History.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/Revision_History.xml 2013-10-21 11:56:08 UTC (rev 18026)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/Revision_History.xml 2013-10-21 12:16:07 UTC (rev 18027)
@@ -88,6 +88,20 @@
</simplelist>
</revdescription>
</revision>
+ <revision>
+ <revnumber>4.2.2</revnumber>
+ <date>Mon Oct 21 2013</date>
+ <author>
+ <firstname>Alessio</firstname>
+ <surname>Soldano</surname>
+ <email>alessio.soldano(a)jboss.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>JBossWS-CXF 4.2.2 documentation</member>
+ </simplelist>
+ </revdescription>
+ </revision>
</revhistory>
</simpara>
</appendix>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml 2013-10-21 11:56:08 UTC (rev 18026)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/doc/chapter-5-Advanced_User_Guide.xml 2013-10-21 12:16:07 UTC (rev 18027)
@@ -438,15 +438,56 @@
<section id="sid-41713670_Predefinedclientandendpointconfigurations-Clientconfigurationassignment">
<title>Client configuration assignment</title>
- <para>JBossWS API comes with facility classes for assigning configurations when building up a client; JAXWS handlers can be read from client configurations as follows:</para>
- <informalexample>
- <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
+ <section id="sid-41713670_Predefinedclientandendpointconfigurations-JAXWSFeature">
+
+ <title>JAXWS Feature</title>
+ <para>
+ The most practical way of setting a configuration is using
+ <code>org.jboss.ws.api.configuration.ClientConfigFeature</code>
+ , a JAXWS
+ <code>Feature</code>
+ extension provided by JBossWS:
+ </para>
+ <informalexample>
+ <programlisting>
+import org.jboss.ws.api.configuration.ClientConfigFeature;
+
+...
+
+Service service = Service.create(wsdlURL, serviceName);
+Endpoint port = service.getPort(Endpoint.class, new ClientConfigFeature("META-INF/jaxws-client-config.xml", "Custom Client Config"));
+port.echo("Kermit");
+
+... or ....
+
+port = service.getPort(Endpoint.class, new ClientConfigFeature("META-INF/jaxws-client-config.xml", "Custom Client Config"), true); //setup properties too from the configuration
+port.echo("Kermit");
+... or ...
+
+port = service.getPort(Endpoint.class, new ClientConfigFeature(null, testConfigName)); //reads from current container configurations if available
+port.echo("Kermit");
+</programlisting>
+ </informalexample>
+ <para>
+ JBossWS internally parses the specified configuration file, if any, after having resolved it as a resources using the current thread context classloader. The
+ <ulink url="http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.1.0.Beta1/s...">jbossws-jaxws-config schema</ulink>
+ defines the descriptor contents and is included in the
+ <emphasis role="italics">jbossws-spi</emphasis>
+ artifact.
+ </para>
+ </section>
+ <section id="sid-41713670_Predefinedclientandendpointconfigurations-Explicitsetup">
+
+ <title>Explicit setup</title>
+ <para>Alternatively, JBossWS API facility classes can be used for assigning configurations when building up a client; JAXWS handlers can be read from client configurations as follows:</para>
+ <informalexample>
+ <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
...
Service service = Service.create(wsdlURL, serviceName);
-Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+Endpoint port = service.getPort(Endpoint.class);
BindingProvider bp = (BindingProvider)port;
ClientConfigUtil.setConfigHandlers(bp, "META-INF/jaxws-client-config.xml", "Custom Client Config 1");
port.echo("Kermit");
@@ -465,19 +506,19 @@
...
-configurer.setConfigHandlers(bp, null, "Container Custom Client Config"); //reads from container configurations
+configurer.setConfigHandlers(bp, null, "Container Custom Client Config"); //reads from current container configurations if available
port.echo("Kermit");
</programlisting>
- </informalexample>
- <para>... similarly, properties are read from client configurations as follows:</para>
- <informalexample>
- <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
+ </informalexample>
+ <para>... similarly, properties are read from client configurations as follows:</para>
+ <informalexample>
+ <programlisting>import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
...
Service service = Service.create(wsdlURL, serviceName);
-Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+Endpoint port = service.getPort(Endpoint.class);
ClientConfigUtil.setConfigProperties(port, "META-INF/jaxws-client-config.xml", "Custom Client Config 1");
port.echo("Kermit");
@@ -496,19 +537,20 @@
...
-configurer.setConfigProperties(port, null, "Container Custom Client Config"); //reads from container configurations
+configurer.setConfigProperties(port, null, "Container Custom Client Config"); //reads from current container configurations if available
port.echo("Kermit");
</programlisting>
- </informalexample>
- <para>
- The default
- <code>ClientConfigurer</code>
- implementation parses the specified configuration file, if any, after having resolved it as a resources using the current thread context classloader. The
- <ulink url="http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.1.0.Beta1/s...">jbossws-jaxws-config schema</ulink>
- defines the descriptor contents and is included in the
- <emphasis role="italics">jbossws-spi</emphasis>
- artifact.
- </para>
+ </informalexample>
+ <para>
+ The default
+ <code>ClientConfigurer</code>
+ implementation parses the specified configuration file, if any, after having resolved it as a resources using the current thread context classloader. The
+ <ulink url="http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.1.0.Beta1/s...">jbossws-jaxws-config schema</ulink>
+ defines the descriptor contents and is included in the
+ <emphasis role="italics">jbossws-spi</emphasis>
+ artifact.
+ </para>
+ </section>
</section>
</section>
<section id="sid-41713670_Predefinedclientandendpointconfigurations-Applicationserverconfigurations">
11 years, 2 months
JBossWS SVN: r18026 - stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2013-10-21 07:56:08 -0400 (Mon, 21 Oct 2013)
New Revision: 18026
Modified:
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/distro/ReleaseNotes.txt
Log:
Setting release notes
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/distro/ReleaseNotes.txt 2013-10-21 11:55:23 UTC (rev 18025)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/src/main/distro/ReleaseNotes.txt 2013-10-21 11:56:08 UTC (rev 18026)
@@ -28,27 +28,35 @@
Bug
- [JBWS-???] - ...
+ * [JBWS-3680] - SOAP 1.2 fault reason xml:lang attribute not properly parsed on client side
+ * [JBWS-3690] - XMLJavaTypeAdapter not working in Exception Classes
+ * [JBWS-3710] - appclient test failures against WFLY master
+ * [JBWS-3712] - Wrong processing of compressed zero (::) format IPv6 addresses
+ * [JBWS-3715] - Custom SOAPConnectionFactory not used in-container
+ * [JBWS-3717] - EndpointResolver implementations do not verify endpoint state before using endpoint
+ * [JBWS-3719] - ServiceContainerEndpointRegistry#getRegisteredEndpoints() returns set containing null
+ * [JBWS-3720] - Missing SOAPHandler compatible extension of ConfigDelegateHandler
Enhancement
- [JBWS-???] - ...
+ * [JBWS-3667] - Support to create deployment archives directly in testcase using shrinkwrap
Feature Request
- [JBWS-???] - ...
+ * [JBWS-3713] - Allow better control over Apache CXF bus creation for JAXWS clients
Task
- [JBWS-???] - ...
+ * [JBWS-3378] - JSR 109 - explicit JAXWS handler authorization for EJB3 endpoints
+ * [JBWS-3625] - Fix the WS-I BSP test failures
+ * [JBWS-3688] - Upgrade to Apache CXF 2.7.7
+ * [JBWS-3714] - Fix test support classes for use with non compressed-zero format IPv6 addresses
+ * [JBWS-3716] - Reveal hidden exception when running EJB3ClientBusTestCase with IPv6
+ * [JBWS-3718] - Upgrade to JBossWS Native 4.1.2.Final
-Sub-task
-
- [JBWS-???] - ...
-
Errata
- See: https://issues.jboss.org/browse/JBWS-???
+ See: https://issues.jboss.org/browse/JBWS-3706
This version of "${project.name}" is based on Apache CXF ${cxf.version}
11 years, 2 months
JBossWS SVN: r18025 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2013-10-21 07:55:23 -0400 (Mon, 21 Oct 2013)
New Revision: 18025
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt
Log:
Updating release notes
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt 2013-10-21 10:46:38 UTC (rev 18024)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt 2013-10-21 11:55:23 UTC (rev 18025)
@@ -58,6 +58,45 @@
Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-----------------------
+jbossws-cxf-4.2.2.Final
+-----------------------
+
+Bug
+
+ * [JBWS-3680] - SOAP 1.2 fault reason xml:lang attribute not properly parsed on client side
+ * [JBWS-3690] - XMLJavaTypeAdapter not working in Exception Classes
+ * [JBWS-3710] - appclient test failures against WFLY master
+ * [JBWS-3712] - Wrong processing of compressed zero (::) format IPv6 addresses
+ * [JBWS-3715] - Custom SOAPConnectionFactory not used in-container
+ * [JBWS-3717] - EndpointResolver implementations do not verify endpoint state before using endpoint
+ * [JBWS-3719] - ServiceContainerEndpointRegistry#getRegisteredEndpoints() returns set containing null
+ * [JBWS-3720] - Missing SOAPHandler compatible extension of ConfigDelegateHandler
+
+Enhancement
+
+ * [JBWS-3667] - Support to create deployment archives directly in testcase using shrinkwrap
+
+Feature Request
+
+ * [JBWS-3713] - Allow better control over Apache CXF bus creation for JAXWS clients
+
+Task
+
+ * [JBWS-3378] - JSR 109 - explicit JAXWS handler authorization for EJB3 endpoints
+ * [JBWS-3625] - Fix the WS-I BSP test failures
+ * [JBWS-3688] - Upgrade to Apache CXF 2.7.7
+ * [JBWS-3714] - Fix test support classes for use with non compressed-zero format IPv6 addresses
+ * [JBWS-3716] - Reveal hidden exception when running EJB3ClientBusTestCase with IPv6
+ * [JBWS-3718] - Upgrade to JBossWS Native 4.1.2.Final
+
+Errata
+
+ See: https://issues.jboss.org/browse/JBWS-3706
+
+This version of "JBoss Web Services - Stack CXF Distribution" is based on Apache CXF 2.7.7
+
+
+-----------------------
jbossws-cxf-4.2.1.Final
-----------------------
11 years, 2 months
JBossWS SVN: r18024 - in stack/cxf/tags/jbossws-cxf-4.2.2.Final: modules/addons and 12 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2013-10-21 06:46:38 -0400 (Mon, 21 Oct 2013)
New Revision: 18024
Modified:
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/udp/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/endorsed/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/shared-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/test-utils/pom.xml
stack/cxf/tags/jbossws-cxf-4.2.2.Final/pom.xml
Log:
Fixing poms
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/http/httpserver/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/http/httpserver/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/udp/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/addons/transports/udp/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/client/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/client/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/dist/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/endorsed/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/endorsed/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/resources/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/resources/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/server/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/server/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-spring-tests/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-spring-tests/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-tests/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/cxf-tests/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/shared-tests/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/shared-tests/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/test-utils/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/test-utils/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/modules/testsuite/test-utils/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.2.2.Final/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.2.2.Final/pom.xml 2013-10-21 09:58:14 UTC (rev 18023)
+++ stack/cxf/tags/jbossws-cxf-4.2.2.Final/pom.xml 2013-10-21 10:46:38 UTC (rev 18024)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.2.Final</version>
<!-- Parent -->
<parent>
@@ -43,9 +43,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.2.2...</url>
</scm>
<!-- Modules -->
@@ -61,12 +61,12 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
<jbossws.spi.version>2.2.2.Final</jbossws.spi.version>
- <jbossws.common.version>2.2.3-SNAPSHOT</jbossws.common.version>
+ <jbossws.common.version>2.2.3.Final</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
<jbossws.jboss712.version>4.2.1.Final</jbossws.jboss712.version>
<jbossws.jboss713.version>4.2.1.Final</jbossws.jboss713.version>
- <jbossws.jboss720.version>4.2.2-SNAPSHOT</jbossws.jboss720.version>
- <jbossws.native.version>4.1.2-SNAPSHOT</jbossws.native.version>
+ <jbossws.jboss720.version>4.2.2.Final</jbossws.jboss720.version>
+ <jbossws.native.version>4.1.2.Final</jbossws.native.version>
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Final</jboss720.version>
11 years, 2 months