JBossWS SVN: r13626 - in stack/cxf/branches/JBPAPP-5764: modules/server and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 14:39:50 -0500 (Thu, 27 Jan 2011)
New Revision: 13626
Added:
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMe.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMeResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd
Removed:
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd
Modified:
stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/branches/JBPAPP-5764/pom.xml
Log:
Porting initial patch for JBWS-2210 (JBWS-CXF Username Token JAAS integration), commit rev. 12227, 12228, 12237, 12238
Modified: stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -160,6 +160,10 @@
<groupId>sun-fi</groupId>
<artifactId>FastInfoset</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security (from rev 12228, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security)
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication (from rev 12228, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication)
Deleted: stack/cxf/branches/JBPAPP-5764/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-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.security.authentication;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.security.AuthenticationManager;
-
-/**
- * AuthenticationManager loader
- *
- * @author Sergey Beryozkin
- *
- */
-public class AuthenticationManagerLoader
-{
- public AuthenticationManager getManager()
- {
- try
- {
- Context ctx = new InitialContext();
- Object obj = ctx.lookup("java:/comp/env/security/securityMgr");
- return (AuthenticationManager)obj;
- }
- catch (NamingException ne)
- {
- throw new SecurityException("Unable to lookup AuthenticationManager");
- }
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java (from rev 12228, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.security.authentication;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.security.AuthenticationManager;
+
+/**
+ * AuthenticationManager loader
+ *
+ * @author Sergey Beryozkin
+ *
+ */
+public class AuthenticationManagerLoader
+{
+ public AuthenticationManager getManager()
+ {
+ try
+ {
+ Context ctx = new InitialContext();
+ Object obj = ctx.lookup("java:/comp/env/security/securityMgr");
+ return (AuthenticationManager)obj;
+ }
+ catch (NamingException ne)
+ {
+ throw new SecurityException("Unable to lookup AuthenticationManager");
+ }
+ }
+}
Deleted: stack/cxf/branches/JBPAPP-5764/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-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,144 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.security.authentication;
-
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Map;
-
-import java.security.Principal;
-import java.security.acl.Group;
-import javax.security.auth.Subject;
-
-import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.common.security.SimplePrincipal;
-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;
-
-/**
- * Interceptor which authenticates a current principal and populates Subject
- *
- * @author Sergey Beryozkin
- *
- */
-public class SubjectCreatingInterceptor extends AbstractUsernameTokenAuthenticatingInterceptor
-{
- private static final Logger log = Logger.getLogger(SubjectCreatingInterceptor.class);
- private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
-
- // private NonceStore nonceStore;
- private SecurityAdaptorFactory secAdaptorFactory;
-
- public SubjectCreatingInterceptor()
- {
- this(Collections.<String, Object> emptyMap());
- }
-
- 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();
- }
- catch (Exception ex)
- {
- String msg = "AuthenticationManager can not be loaded";
- log.error(msg);
- throw new SecurityException(msg);
- }
-
- AuthenticationManager am = aml.getManager();
-
- // verify timestamp and nonce if digest
- if (isDigest)
- {
- verifyUsernameToken(nonce, created);
- // CallbackHandler cb = new UsernameTokenCallbackHandler(nonce, created);
- // CallbackHandlerPolicyContextHandler.setCaallbackHandler(cb);
- }
-
- // authenticate and populate Subject
-
- Principal principal = new SimplePrincipal(name);
- Subject subject = new Subject();
-
- boolean TRACE = log.isTraceEnabled();
- if (TRACE)
- log.trace("About to authenticate, using security domain '" + am.getSecurityDomain() + "'");
-
- if (am.isValid(principal, password, subject) == false)
- {
- String msg = "Authentication failed, principal=" + principal.getName();
- 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;
- }
-
- private void verifyUsernameToken(String nonce, String created)
- {
-// if (created != null)
-// {
-// Calendar cal = SimpleTypeBindings.unmarshalDateTime(created);
-// Calendar ref = Calendar.getInstance();
-// ref.add(Calendar.SECOND, -TIMESTAMP_FRESHNESS_THRESHOLD);
-// if (ref.after(cal))
-// throw new SecurityException("Request rejected since a stale timestamp has been provided: " + created);
-// }
-//
-// if (nonce != null)
-// {
-// if (nonceStore.hasNonce(nonce))
-// throw new SecurityException("Request rejected since a message with the same nonce has been recently received; nonce = " + nonce);
-// }
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java (from rev 12228, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,140 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.security.authentication;
+
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+
+import org.apache.cxf.common.security.SimplePrincipal;
+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;
+
+/**
+ * Interceptor which authenticates a current principal and populates Subject
+ *
+ * @author Sergey Beryozkin
+ *
+ */
+public class SubjectCreatingInterceptor extends AbstractUsernameTokenAuthenticatingInterceptor
+{
+ private static final Logger log = Logger.getLogger(SubjectCreatingInterceptor.class);
+ private SecurityAdaptorFactory secAdaptorFactory;
+
+ public SubjectCreatingInterceptor()
+ {
+ this(Collections.<String, Object> emptyMap());
+ }
+
+ 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();
+ }
+ catch (Exception ex)
+ {
+ String msg = "AuthenticationManager can not be loaded";
+ log.error(msg);
+ throw new SecurityException(msg);
+ }
+
+ AuthenticationManager am = aml.getManager();
+
+ // verify timestamp and nonce if digest
+ if (isDigest)
+ {
+ //verifyUsernameToken(nonce, created);
+ // CallbackHandler cb = new UsernameTokenCallbackHandler(nonce, created);
+ // CallbackHandlerPolicyContextHandler.setCaallbackHandler(cb);
+ }
+
+ // authenticate and populate Subject
+
+ Principal principal = new SimplePrincipal(name);
+ Subject subject = new Subject();
+
+ boolean TRACE = log.isTraceEnabled();
+ if (TRACE)
+ log.trace("About to authenticate, using security domain '" + am.getSecurityDomain() + "'");
+
+ if (am.isValid(principal, password, subject) == false)
+ {
+ String msg = "Authentication failed, principal=" + principal.getName();
+ 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;
+ }
+
+ /** TODO: JBWS-3028
+ private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
+ private NonceStore nonceStore;
+
+ private void verifyUsernameToken(String nonce, String created)
+ {
+ if (created != null)
+ {
+ Calendar cal = SimpleTypeBindings.unmarshalDateTime(created);
+ Calendar ref = Calendar.getInstance();
+ ref.add(Calendar.SECOND, -TIMESTAMP_FRESHNESS_THRESHOLD);
+ if (ref.after(cal))
+ throw new SecurityException("Request rejected since a stale timestamp has been provided: " + created);
+ }
+
+ if (nonce != null)
+ {
+ if (nonceStore.hasNonce(nonce))
+ throw new SecurityException("Request rejected since a message with the same nonce has been recently received; nonce = " + nonce);
+ }
+ }
+ */
+}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -128,6 +128,23 @@
</webinf>
</war>
+ <!-- jaxws-samples-wsse-username-authorize -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml">
+ <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="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
<!-- jaxws-samples-wssePolicy-sign -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign.war"
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -33,7 +33,7 @@
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if (!("kermit".equals(pc.getIdentifer()) && "thefrog".equals(pc.getPassword())))
- throw new SecurityException("User '" + pc.getIdentifer() + "' with password '" + pc.getPassword() + "' not allowed.");
+ if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword())))
+ throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed.");
}
}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -32,4 +32,7 @@
{
@WebMethod
String sayHello();
+
+ @WebMethod
+ String greetMe();
}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -37,4 +37,8 @@
{
return "Secure Hello World!";
}
+ public String greetMe()
+ {
+ return "Greetings!";
+ }
}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * WS-Security username authorization test case
+ *
+ * @author Sergey Beryozkin
+ *
+ */
+public final class UsernameAuthorizationTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war");
+ }
+
+ public void testAuthorized() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "kermit");
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ public void testUnauthenticated() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "foo");
+ try
+ {
+ proxy.sayHello();
+ fail("User foo should not be authenticated.");
+ }
+ catch (Exception ex)
+ {
+ //expected
+ }
+ }
+
+ public void testUnauthorized() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "kermit");
+ try
+ {
+ proxy.greetMe();
+ fail("User kermit should not be authorized to invoke greetMe.");
+ }
+ catch (Exception ex)
+ {
+ assertEquals("Unauthorized", ex.getMessage());
+ }
+ }
+
+ private void setupWsse(ServiceIface proxy, String username)
+ {
+ Client client = ClientProxy.getClient(proxy);
+ Endpoint cxfEndpoint = client.getEndpoint();
+
+ Map<String, Object> outProps = new HashMap<String, Object>();
+ outProps.put("action", "UsernameToken");
+ outProps.put("user", username);
+ outProps.put("passwordType", "PasswordText");
+ outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.UsernamePasswordCallback");
+ WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
+ cxfEndpoint.getOutInterceptors().add(wssOut);
+ cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
+ }
+}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -33,7 +33,7 @@
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if ("kermit".equals(pc.getIdentifer()))
+ if ("kermit".equals(pc.getIdentifier()))
pc.setPassword("thefrog");
else
pc.setPassword("wrong password");
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMe.java (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMe.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMe.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMe.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "greetMe", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "greetMe", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class GreetMe {}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMeResponse.java (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMeResponse.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMeResponse.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/GreetMeResponse.java 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "greetMeResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "greetMeResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class GreetMeResponse
+{
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ public String getReturn()
+ {
+ return this._return;
+ }
+
+ public void setReturn(String _return)
+ {
+ this._return = _return;
+ }
+
+}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize)
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml 2010-05-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
- <security-domain>java:/jaas/JBossWS</security-domain>
-</jboss-web>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jboss-web.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <security-domain>java:/jaas/JBossWS</security-domain>
+</jboss-web>
Deleted: stack/cxf/branches/JBPAPP-5764/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-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,45 +0,0 @@
-<beans
- xmlns='http://www.springframework.org/schema/beans'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xmlns:beans='http://www.springframework.org/schema/beans'
- xmlns:jaxws='http://cxf.apache.org/jaxws'
- xmlns:util='http://www.springframework.org/schema/util'
- xsi:schemaLocation='http://cxf.apache.org/core
- http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/jaxws
- http://cxf.apache.org/schemas/jaxws.xsd'>
-
- <bean id="SecurityContextIn" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor">
- <constructor-arg>
- <map>
- <entry key="action" value="UsernameToken"/>
- </map>
- </constructor-arg>
- </bean>
-
- <util:map id="methodPermissions">
- <entry key="sayHello" value="friend"/>
- <entry key="greetMe" value="snoopies"/>
- </util:map>
-
- <bean id="AuthorizeIn" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">
- <property name="methodRolesMap" ref="methodPermissions"/>
- </bean>
-
- <jaxws:endpoint
- id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize'
- implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
- <jaxws:inInterceptors>
- <ref bean="SecurityContextIn"/>
- <ref bean="AuthorizeIn"/>
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
- </jaxws:inInterceptors>
- </jaxws:endpoint>
-
-
-</beans>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,45 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:util='http://www.springframework.org/schema/util'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <bean id="SecurityContextIn" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <util:map id="methodPermissions">
+ <entry key="sayHello" value="friend"/>
+ <entry key="greetMe" value="snoopies"/>
+ </util:map>
+
+ <bean id="AuthorizeIn" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">
+ <property name="methodRolesMap" ref="methodPermissions"/>
+ </bean>
+
+ <jaxws:endpoint
+ id='ServiceImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize'
+ implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
+ <jaxws:inInterceptors>
+ <ref bean="SecurityContextIn"/>
+ <ref bean="AuthorizeIn"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </jaxws:inInterceptors>
+ </jaxws:endpoint>
+
+
+</beans>
Deleted: stack/cxf/branches/JBPAPP-5764/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-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- 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-mapping>
- <servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ 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-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl)
Deleted: stack/cxf/branches/JBPAPP-5764/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-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="sayHello">
- <part name="parameters" element="tns:sayHello"/>
- </message>
- <message name="sayHelloResponse">
- <part name="parameters" element="tns:sayHelloResponse"/>
- </message>
- <message name="greetMe">
- <part name="parameters" element="tns:greetMe"/>
- </message>
- <message name="greetMeResponse">
- <part name="parameters" element="tns:greetMeResponse"/>
- </message>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- <operation name="greetMe">
- <input message="tns:greetMe"/>
- <output message="tns:greetMeResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="greetMe">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize"/>
- </port>
- </service>
-</definitions>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <message name="greetMe">
+ <part name="parameters" element="tns:greetMe"/>
+ </message>
+ <message name="greetMeResponse">
+ <part name="parameters" element="tns:greetMeResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ <operation name="greetMe">
+ <input message="tns:greetMe"/>
+ <output message="tns:greetMeResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMe">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize"/>
+ </port>
+ </service>
+</definitions>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd 2010-05-13 15:38:57 UTC (rev 12228)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-01-27 19:39:50 UTC (rev 13626)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="sayHello" type="tns:sayHello"/>
-
- <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
-
- <xs:complexType name="sayHello">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="sayHelloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="greetMe" type="tns:greetMe"/>
-
- <xs:element name="greetMeResponse" type="tns:greetMeResponse"/>
-
- <xs:complexType name="greetMe">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="greetMeResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd (from rev 12228, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-01-27 19:39:50 UTC (rev 13626)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="greetMe" type="tns:greetMe"/>
+
+ <xs:element name="greetMeResponse" type="tns:greetMeResponse"/>
+
+ <xs:complexType name="greetMe">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="greetMeResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt 2011-01-27 19:39:50 UTC (rev 13626)
@@ -41,3 +41,5 @@
# [JBWS-3020] Investigate why HandlerScopeTestCase fails
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
+org/jboss/**/*wstrust*/**
Modified: stack/cxf/branches/JBPAPP-5764/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/pom.xml 2011-01-27 19:07:54 UTC (rev 13625)
+++ stack/cxf/branches/JBPAPP-5764/pom.xml 2011-01-27 19:39:50 UTC (rev 13626)
@@ -58,6 +58,7 @@
<cxf.asm.version>3.1</cxf.asm.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
+ <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
@@ -469,6 +470,12 @@
<version>${jboss.common.core.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <version>${jboss.security.spi.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
13 years, 10 months
- 1
- 0
JBossWS SVN: r13625 - in stack/cxf/branches/JBPAPP-5764: modules/client/src/main/resources/META-INF and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 14:07:54 -0500 (Thu, 27 Jan 2011)
New Revision: 13625
Modified:
stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/extensions.xml
stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/tools.service.validator.xml
stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/pom.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/branches/JBPAPP-5764/pom.xml
Log:
Upgrade to Apache CXF 2.2.8
Modified: stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/extensions.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/extensions.xml 2011-01-27 16:28:49 UTC (rev 13624)
+++ stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/extensions.xml 2011-01-27 19:07:54 UTC (rev 13625)
@@ -19,7 +19,7 @@
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties version="1.0">
+<properties>
<entry key="org.apache.cxf.binding.corba-1">javax.wsdl.Binding=org.apache.cxf.binding.corba.wsdl.BindingType</entry>
<entry key="org.apache.cxf.binding.corba-2">javax.wsdl.BindingOperation=org.apache.cxf.binding.corba.wsdl.OperationType</entry>
<entry key="org.apache.cxf.binding.corba-3">javax.wsdl.Definition=org.apache.cxf.binding.corba.wsdl.TypeMappingType</entry>
Modified: stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/tools.service.validator.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2011-01-27 16:28:49 UTC (rev 13624)
+++ stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2011-01-27 19:07:54 UTC (rev 13625)
@@ -19,7 +19,7 @@
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties version="1.0">
+<properties>
<entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry>
<entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry>
<entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry>
Modified: stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2011-01-27 16:28:49 UTC (rev 13624)
+++ stack/cxf/branches/JBPAPP-5764/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2011-01-27 19:07:54 UTC (rev 13625)
@@ -19,7 +19,7 @@
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties version="1.0">
+<properties>
<entry key="soap-javax.wsdl.Port">org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin</entry>
<entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry>
<entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry>
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/pom.xml 2011-01-27 16:28:49 UTC (rev 13624)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/pom.xml 2011-01-27 19:07:54 UTC (rev 13625)
@@ -17,7 +17,7 @@
<!-- Properties -->
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
- <surefire.memory.args>-Xmx512m -XX:MaxPermSize=256m</surefire.memory.args>
+ <surefire.memory.args>-Xmx768m -XX:MaxPermSize=450m</surefire.memory.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt 2011-01-27 16:28:49 UTC (rev 13624)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/test-excludes-jboss510.txt 2011-01-27 19:07:54 UTC (rev 13625)
@@ -8,9 +8,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-# [CXF-1516] Type inheritance with document/literal/bare
-org/jboss/test/ws/jaxws/jbws1702/**
-
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/branches/JBPAPP-5764/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/pom.xml 2011-01-27 16:28:49 UTC (rev 13624)
+++ stack/cxf/branches/JBPAPP-5764/pom.xml 2011-01-27 19:07:54 UTC (rev 13625)
@@ -52,7 +52,7 @@
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
-->
<!-- END -->
- <cxf.version>2.2.6-patch-01</cxf.version>
+ <cxf.version>2.2.8</cxf.version>
<cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>3.1</cxf.asm.version>
13 years, 10 months
- 1
- 0
JBossWS SVN: r13624 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 11:28:49 -0500 (Thu, 27 Jan 2011)
New Revision: 13624
Added:
framework/branches/JBPAPP-5764/
Log:
Branching for trying porting fixes for JBPAPP-5764
Copied: framework/branches/JBPAPP-5764 (from rev 13623, framework/branches/jbossws-framework-3.1.2)
13 years, 10 months
- 1
- 0
JBossWS SVN: r13623 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 11:08:57 -0500 (Thu, 27 Jan 2011)
New Revision: 13623
Added:
stack/cxf/branches/JBPAPP-5764/
Log:
Branching for trying porting fixes for JBPAPP-5764
Copied: stack/cxf/branches/JBPAPP-5764 (from rev 13622, stack/cxf/branches/jbossws-cxf-3.1.2)
13 years, 10 months
- 1
- 0
JBossWS SVN: r13622 - in stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist: src/main/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-27 06:01:24 -0500 (Thu, 27 Jan 2011)
New Revision: 13622
Added:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
Log:
Add xsl file to generate exclude test file list, binaray distribution needs that to run ant tests
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml 2011-01-27 10:36:59 UTC (rev 13621)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml 2011-01-27 11:01:24 UTC (rev 13622)
@@ -151,6 +151,39 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>generate-exclude-file</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${basedir}/target/exclude-file" />
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss600.txt">
+ <param name="targetName" expression="jboss600" />
+ </xslt>
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss601.txt">
+ <param name="targetName" expression="jboss601" />
+ </xslt>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-27 10:36:59 UTC (rev 13621)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-27 11:01:24 UTC (rev 13622)
@@ -74,7 +74,7 @@
</fileSet>
<!-- test excludes -->
<fileSet>
- <directory>../modules/testsuite</directory>
+ <directory>target/exclude-file</directory>
<outputDirectory>jbossws-cxf-bin-dist/tests/resources</outputDirectory>
<includes>
<include>test-excludes-*.txt</include>
Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl 2011-01-27 11:01:24 UTC (rev 13622)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0">
+<xsl:param name="targetName"/>
+<xsl:output method="text"/>
+<xsl:template match="/">
+<xsl:for-each select="//m:profile[m:id='$targetName']/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
+<xsl:value-of select="."/><xsl:text> </xsl:text>
+</xsl:for-each>
+</xsl:template>
+</xsl:stylesheet>
13 years, 10 months
- 1
- 0
JBossWS SVN: r13621 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 05:36:59 -0500 (Thu, 27 Jan 2011)
New Revision: 13621
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
Log:
[JBPAPP-4525] Created element within UsernameToken uses wsse namespace instead of wsu namespace
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2011-01-27 10:23:33 UTC (rev 13620)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2011-01-27 10:36:59 UTC (rev 13621)
@@ -96,7 +96,7 @@
this.nonce = XMLUtils.getFullTextChildrenFromElement(elem);
}
- Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSSE_NS, "Created"));
+ Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSU_NS, "Created"));
if (itCreated != null && itCreated.hasNext())
{
this.created = XMLUtils.getFullTextChildrenFromElement(itCreated.next());
@@ -163,7 +163,7 @@
}
if (created != null)
{
- child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX + ":" + "Created");
+ child = doc.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX + ":" + "Created");
child.appendChild(doc.createTextNode(created));
element.appendChild(child);
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2011-01-27 10:23:33 UTC (rev 13620)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2011-01-27 10:36:59 UTC (rev 13621)
@@ -112,7 +112,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...'>IEeuDaP/NTozwiyJHzTgBoCCDjg=</wsse:Password>" +
"<wsse:Nonce EncodingType='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-secu...'>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" +
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -148,7 +148,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...'>IEeuDaP/NTozwiyJHzTgBoCCDjg=</wsse:Password>" +
"<wsse:Nonce>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" +
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -196,7 +196,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"), Constants.WSS_SOAP_NS+"#Base64Binary");
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}
@@ -218,7 +218,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"), Constants.WSS_SOAP_NS+"#Base64Binary");
- assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).hasNext());
+ assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).hasNext());
}
public void testEncodeMessageWithCreated() throws Exception
@@ -235,7 +235,7 @@
Element usernameTokenEl = (Element)DOMUtils.getChildElements(securityEl, new QName(Constants.WSSE_NS, "UsernameToken")).next();
assertPassword(usernameTokenEl);
assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Nonce")).hasNext());
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}
13 years, 10 months
- 1
- 0
JBossWS SVN: r13620 - stack/native/branches/jbossws-native-3.1.2/modules/client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 05:23:33 -0500 (Thu, 27 Jan 2011)
New Revision: 13620
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
Log:
Adding jboss-remoting.jar to MANIFEST.MF, solves JBWS1666TestCase failure
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2011-01-27 10:11:08 UTC (rev 13619)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2011-01-27 10:23:33 UTC (rev 13620)
@@ -37,7 +37,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-factories.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+ <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-factories.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-remoting.jar jboss-xml-binding.jar jbossxb.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
13 years, 10 months
- 1
- 0
JBossWS SVN: r13619 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules: management and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 05:11:08 -0500 (Thu, 27 Jan 2011)
New Revision: 13619
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/management/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/framework-tests/
Log:
Fixing svn:ignore props
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/management
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
13 years, 10 months
- 1
- 0
JBossWS SVN: r13618 - in stack/native/branches/jbossws-native-3.1.2/modules: core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 05:07:16 -0500 (Thu, 27 Jan 2011)
New Revision: 13618
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/
stack/native/branches/jbossws-native-3.1.2/modules/core/
stack/native/branches/jbossws-native-3.1.2/modules/endorsed/
stack/native/branches/jbossws-native-3.1.2/modules/management/
stack/native/branches/jbossws-native-3.1.2/modules/resources/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/
Log:
Fixing svn:ignore props
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/client
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/endorsed
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/management
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/resources
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.classpath
.settings
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite
___________________________________________________________________
Name: svn:ignore
+ .project
.classpath
.settings
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
- target
wsprovide
work
wsconsume
+ target
wsprovide
work
wsconsume
.project
.classpath
.settings
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests
___________________________________________________________________
Name: svn:ignore
- target
tools
wstools
+ target
tools
wstools
.project
.classpath
.settings
13 years, 10 months
- 1
- 0
JBossWS SVN: r13617 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-27 03:25:40 -0500 (Thu, 27 Jan 2011)
New Revision: 13617
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBPAPP-5748] configuring remoting to reuse SSL sessions
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-26 16:14:18 UTC (rev 13616)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-27 08:25:40 UTC (rev 13617)
@@ -73,6 +73,8 @@
{
// provide logging
private static Logger log = Logger.getLogger(HTTPRemotingConnection.class);
+ private static final String REMOTING_DESTRUCTION_DELAY =
+ System.getProperty("org.jboss.ws.client.remoting.destruction.delay", "5000");
private Map<String, Object> clientConfig = new HashMap<String, Object>();
@@ -200,6 +202,7 @@
}
locator = new InvokerLocator(targetAddress);
+ locator.getParameters().put(Client.INVOKER_DESTRUCTION_DELAY, REMOTING_DESTRUCTION_DELAY);
}
catch (MalformedURLException e)
{
13 years, 10 months
- 1
- 0