JBossWS SVN: r15491 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: metadata and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-18 06:38:32 -0500 (Wed, 18 Jan 2012)
New Revision: 15491
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
Minor changes to log all DDEndpoint attributes and synch with CXF properties type
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-01-18 10:57:41 UTC (rev 15490)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-01-18 11:38:32 UTC (rev 15491)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -108,7 +108,8 @@
DDBeans metadata = dep.getAttachment(DDBeans.class);
holder = new NonSpringBusHolder(metadata);
}
- Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile());
+ Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
+ new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile());
holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
dep.addAttachment(BusHolder.class, holder);
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2012-01-18 10:57:41 UTC (rev 15490)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2012-01-18 11:38:32 UTC (rev 15491)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -22,8 +22,6 @@
package org.jboss.wsf.stack.cxf.deployment.aspect;
import static org.jboss.wsf.spi.deployment.DeploymentType.JAXRPC;
-import static org.jboss.ws.common.integration.WSHelper.isJaxwsEjbDeployment;
-import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseDeployment;
import static org.jboss.ws.common.integration.WSHelper.isJaxrpcDeployment;
import static org.jboss.ws.common.integration.WSHelper.isJseDeployment;
import static org.jboss.ws.common.integration.WSHelper.isWarArchive;
@@ -50,6 +48,7 @@
* A deployer that locates or generates cxf.xml
*
* @author Thomas.Diesler(a)jboss.org
+ * @author alessio.soldano(a)jboss.com
* @since 10-May-2007
*/
public class DescriptorDeploymentAspect extends AbstractDeploymentAspect
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2012-01-18 10:57:41 UTC (rev 15490)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2012-01-18 11:38:32 UTC (rev 15491)
@@ -21,8 +21,10 @@
*/
package org.jboss.wsf.stack.cxf.metadata;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.ResourceBundle;
import java.util.Stack;
import java.util.StringTokenizer;
@@ -266,7 +268,11 @@
result.setEpClass(seiClass != null ? seiClass : sepClass);
result.setPortName(new QName(serviceNS, portName));
result.setServiceName(new QName(serviceNS, serviceName));
-
+ Map<String, Object> props = new HashMap<String, Object>();
+ for (String k : ep.getProperties()) {
+ props.put(k, ep.getProperty(k));
+ }
+ result.setProperties(props);
return result;
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-01-18 10:57:41 UTC (rev 15490)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-01-18 11:38:32 UTC (rev 15491)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.Writer;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -66,7 +67,7 @@
private List<String> handlers;
- private Map<String, String> properties;
+ private Map<String, Object> properties;
//additional fields
private Class<?> epClass;
@@ -216,12 +217,12 @@
return this.addressingResponses;
}
- public Map<String, String> getProperties()
+ public Map<String, Object> getProperties()
{
return properties;
}
- public void setProperties(Map<String, String> properties)
+ public void setProperties(Map<String, Object> properties)
{
this.properties = properties;
}
@@ -296,7 +297,8 @@
writer.write("<jaxws:properties>");
for (String key : this.properties.keySet())
{
- String value = this.properties.get(key);
+ Object value = this.properties.get(key);
+ //TODO implement proper mapping of mapType (http://www.springframework.org/schema/beans/spring-beans.xsd)
if (value != null)
{
writer.write("<entry key='" + key + "' value='" + value + "'/>");
@@ -326,6 +328,23 @@
str.append("\n portName=" + this.portName);
str.append("\n wsdlLocation=" + this.wsdlLocation);
str.append("\n mtomEnabled=" + this.mtomEnabled);
+ if (this.handlers != null && !this.handlers.isEmpty()) {
+ str.append("\n handlers=[");
+ for (Iterator<String> it = this.handlers.iterator(); it.hasNext();) {
+ str.append(it.next());
+ str.append(it.hasNext() ? "," : "]");
+ }
+ }
+ if (this.properties != null && !this.properties.isEmpty())
+ {
+ str.append("\n properties=[");
+ for (Iterator<String> it = this.properties.keySet().iterator(); it.hasNext();)
+ {
+ final String p = it.next();
+ str.append(p + " -> " + this.properties.get(p));
+ str.append(it.hasNext() ? "," : "]");
+ }
+ }
return str.toString();
}
}
12 years, 11 months
JBossWS SVN: r15490 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-18 05:57:41 -0500 (Wed, 18 Jan 2012)
New Revision: 15490
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/Message.properties
Log:
[JBWS-3414] DeploymentAspectManagerImpl does not properly deal with deployment failures
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java 2012-01-17 13:49:33 UTC (rev 15489)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java 2012-01-18 10:57:41 UTC (rev 15490)
@@ -28,6 +28,7 @@
import java.util.Set;
import org.jboss.logging.Logger;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentState;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -99,9 +100,10 @@
{
// create the deployment
Set<String> providedConditions = new HashSet<String>();
- for (int i = 0; i < getDeploymentAspects().size(); i++)
+ final List<DeploymentAspect> deploymentAspects = getDeploymentAspects();
+ for (int i = 0; i < deploymentAspects.size(); i++)
{
- DeploymentAspect aspect = getDeploymentAspects().get(i);
+ DeploymentAspect aspect = deploymentAspects.get(i);
// Check that all required aspects are met
/*
@@ -118,9 +120,9 @@
}
// start the deployment
- for (int i = 0; i < getDeploymentAspects().size(); i++)
+ for (int i = 0; i < deploymentAspects.size(); i++)
{
- DeploymentAspect aspect = getDeploymentAspects().get(i);
+ DeploymentAspect aspect = deploymentAspects.get(i);
try
{
if (aspect.canHandle(dep)) {
@@ -139,10 +141,19 @@
}
catch (RuntimeException rte)
{
- while (i-- >= 0)
+ while (--i >= 0)
{
// destroy the deployment
- failsafeStop(aspect, dep);
+ try
+ {
+ failsafeStop(deploymentAspects.get(i), dep);
+ }
+ catch (RuntimeException destroyRte)
+ {
+ //log previous exception in the exotic case in which also stopping already started aspects fails
+ log.error(BundleUtils.getMessage(BundleUtils.getBundle(DeploymentAspectManagerImpl.class),"ERROR_DESTROYING_DEPLOYMENT"), rte);
+ throw destroyRte;
+ }
}
throw rte;
}
@@ -153,9 +164,10 @@
public void undeploy(Deployment dep)
{
- for (int i = getDeploymentAspects().size(); 0 < i; i--)
+ final List<DeploymentAspect> deploymentAspects = getDeploymentAspects();
+ for (int i = deploymentAspects.size(); 0 < i; i--)
{
- DeploymentAspect aspect = getDeploymentAspects().get(i - 1);
+ DeploymentAspect aspect = deploymentAspects.get(i - 1);
failsafeStop(aspect, dep);
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Message.properties
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/Message.properties 2012-01-17 13:49:33 UTC (rev 15489)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/Message.properties 2012-01-18 10:57:41 UTC (rev 15490)
@@ -21,3 +21,4 @@
CANNOT_FIND_URL_PATTERN=Cannot find <url-pattern> for servlet-name: {0}
USING_INITAL_CLASS_LAODER_AS_RUNTIME_LAODER=Using inital class laoder as runtime laoder. Hack?
ERROR_CLOSING_JAXB_INTRODUCTIONS=[{0}] Error closing JAXB Introductions Configurations stream
+ERROR_DESTROYING_DEPLOYMENT=Error while destroying deployment due to previous exception
12 years, 11 months
JBossWS SVN: r15489 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-01-17 08:49:33 -0500 (Tue, 17 Jan 2012)
New Revision: 15489
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
sync. ejb client with AS7 trunk
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-17 13:48:49 UTC (rev 15488)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-17 13:49:33 UTC (rev 15489)
@@ -1160,7 +1160,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.0.Beta8</version>
+ <version>1.0.0.Beta12</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
12 years, 11 months
JBossWS SVN: r15488 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-01-17 08:48:49 -0500 (Tue, 17 Jan 2012)
New Revision: 15488
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
sync. ejb client with AS7 trunk
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-01-17 12:37:25 UTC (rev 15487)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-01-17 13:48:49 UTC (rev 15488)
@@ -981,7 +981,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.0.Beta8</version>
+ <version>1.0.0.Beta12</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
12 years, 11 months
JBossWS SVN: r15487 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-01-17 07:37:25 -0500 (Tue, 17 Jan 2012)
New Revision: 15487
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java
Log:
remove unused set/getData() methods
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java 2012-01-13 13:50:40 UTC (rev 15486)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java 2012-01-17 12:37:25 UTC (rev 15487)
@@ -21,13 +21,11 @@
*/
package org.jboss.wsf.spi.metadata.config;
-public class Feature
+public final class Feature
{
private String name;
- private Object data;
-
- public Feature(String name)
+ public Feature(final String name)
{
this.name = name;
}
@@ -36,14 +34,4 @@
{
return name;
}
-
- public Object getData()
- {
- return data;
- }
-
- public void setData(Object data)
- {
- this.data = data;
- }
}
12 years, 11 months
JBossWS SVN: r15486 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-13 08:50:40 -0500 (Fri, 13 Jan 2012)
New Revision: 15486
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsSignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/john.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/john.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/bob2.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/bob2.properties
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java
Log:
[JBWS-3412] Adding testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-01-13 13:33:57 UTC (rev 15485)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-01-13 13:50:40 UTC (rev 15486)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2012, 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.
~
@@ -128,6 +128,27 @@
</manifest>
</war>
+ <!-- jaxws-samples-wsse-policy-sign-encrypt-mc -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-mc.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF">
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF" prefix="WEB-INF/classes">
+ <include name="bob2.jks" />
+ <include name="bob2.properties" />
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ </manifest>
+ </war>
+
<!-- jaxws-samples-wsse-policy-sign-encrypt-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF">
@@ -136,6 +157,16 @@
</metainf>
</jar>
+ <!-- jaxws-samples-wsse-policy-sign-encrypt-mc-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-mc-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ <include name="john.properties" />
+ <include name="john.jks" />
+ </metainf>
+ </jar>
+
<!-- jaxws-samples-wsse-policy-username-unsecure-transport -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-unsecure-transport.war"
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java 2012-01-13 13:33:57 UTC (rev 15485)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java 2012-01-13 13:50:40 UTC (rev 15486)
@@ -39,6 +39,7 @@
{
passwords.put("alice", "password");
passwords.put("bob", "password");
+ passwords.put("john", "password");
}
/**
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java 2012-01-13 13:50:40 UTC (rev 15486)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.policy.basic;
+
+import javax.jws.WebService;
+import javax.servlet.annotation.WebServlet;
+
+import org.apache.cxf.annotations.EndpointProperties;
+import org.apache.cxf.annotations.EndpointProperty;
+
+@WebService
+(
+ portName = "SecurityServicePort",
+ serviceName = "SecurityService",
+ wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.ServiceIface"
+)
+@EndpointProperties(value = {
+ @EndpointProperty(key = "ws-security.signature.properties", value = "bob2.properties"),
+ @EndpointProperty(key = "ws-security.encryption.properties", value = "bob2.properties"),
+ @EndpointProperty(key = "ws-security.signature.username", value = "bob"),
+ @EndpointProperty(key = "ws-security.encryption.username", value = "useReqSigCert"),
+ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback")
+ }
+)
+@WebServlet(name = "TestServlet", urlPatterns = "/*")
+public class MultipleClientsServiceImpl implements ServiceIface
+{
+ public String sayHello()
+ {
+ return "Multiple Clients Secure Hello World!";
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsSignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsSignEncryptTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsSignEncryptTestCase.java 2012-01-13 13:50:40 UTC (rev 15486)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.policy.basic;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import junit.framework.Test;
+
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * WS-Security Policy sign & encrypt test case
+ * (multiple clients)
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 13-Jan-2012
+ */
+public final class MultipleClientsSignEncryptTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-mc";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(MultipleClientsSignEncryptTestCase.class,
+ "jaxws-samples-wsse-policy-sign-encrypt-mc-client.jar jaxws-samples-wsse-policy-sign-encrypt-mc.war");
+ }
+
+ public void testAlice() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "alice");
+ try
+ {
+ assertEquals("Multiple Clients Secure Hello World!", proxy.sayHello());
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
+ }
+
+ public void testJohn() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "john");
+ try
+ {
+ assertEquals("Multiple Clients Secure Hello World!", proxy.sayHello());
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
+ }
+
+ private void setupWsse(ServiceIface proxy, String client)
+ {
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/" + client + ".properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/" + client + ".properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, client);
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/john.jks
===================================================================
(Binary files differ)
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/john.jks
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/john.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/john.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/john.properties 2012-01-13 13:50:40 UTC (rev 15486)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=john
+org.apache.ws.security.crypto.merlin.file=META-INF/john.jks
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/bob2.jks
===================================================================
(Binary files differ)
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/bob2.jks
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/bob2.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/bob2.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/bob2.properties 2012-01-13 13:50:40 UTC (rev 15486)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=bob
+org.apache.ws.security.crypto.merlin.file=bob2.jks
\ No newline at end of file
12 years, 11 months
JBossWS SVN: r15485 - stack/native/trunk/modules/core/src/main/resources/schema.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-01-13 08:33:57 -0500 (Fri, 13 Jan 2012)
New Revision: 15485
Modified:
stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd
Log:
remove WS-RM specific config elements
Modified: stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2012-01-12 15:08:10 UTC (rev 15484)
+++ stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2012-01-13 13:33:57 UTC (rev 15485)
@@ -43,7 +43,6 @@
<xsd:complexType name="commonConfigType">
<xsd:sequence>
<xsd:element name="config-name" type="xsd:string"/>
- <xsd:element name="reliable-messaging" type="tns:rmConfigType" minOccurs="0"/>
<xsd:element name="pre-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/>
<xsd:element name="post-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/>
<xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/>
@@ -58,128 +57,4 @@
</xsd:sequence>
</xsd:complexType>
- <!-- WSRM configuration -->
- <xsd:complexType name="rmConfigType">
- <xsd:sequence>
- <xsd:element name="delivery-assurance" type="tns:deliveryAssuranceType" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Global WS-RM delivery assurance configuration that applies to all WSDL ports.
- If there is the WS-Policy with attached WS-RM assertion in WSDL
- associated with some port or its associated binding it
- will always override this global configuration.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="backports-server" type="tns:backportsServerType" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Backports server configuration to be used for addressable clients.
- If element is not present in client configuration then client is anonymous.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="message-retransmission" type="tns:messageRetransmissionType" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- Message retransmission allow users to configure the QoS of WS-RM.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="port" type="tns:portType" minOccurs="0" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>
- WSDL port specific WS-RM delivery assurance configuration.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="messageRetransmissionType">
- <xsd:attribute name="interval" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Message retransmission interval (in seconds)
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="attempts" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Maximum count of message retransmission attempts.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="timeout" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Maximum count of seconds to wait for response.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="backportsServerType">
- <xsd:attribute name="host" type="xsd:string" use="optional">
- <xsd:annotation>
- <xsd:documentation>
- Host name to be used for backports server. If not specified default one will be detected.
- Make sure you have DNS correctly configured so runtime is able to detect your real hostname.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="port" type="xsd:int" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Port number to be used for backports server.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="deliveryAssuranceType">
- <xsd:attribute name="quality" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Quality of service to be ensured.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="AtLeastOnce"/>
- <xsd:enumeration value="AtMostOnce"/>
- <xsd:enumeration value="ExactlyOnce"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="inOrder" type="xsd:boolean" use="required">
- <xsd:annotation>
- <xsd:documentation>
- In order quality of service to be ensured. Set this attribute to 'true' to ensure in order message delivery.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="portType">
- <xsd:sequence>
- <xsd:element name="delivery-assurance" type="tns:deliveryAssuranceType">
- <xsd:annotation>
- <xsd:documentation>
- This WSDL port specific WS-RM delivery assurance configuration
- applies to all its operations.
- This configuration always overrides the global configuration.
- If there is a WS-Policy with attached WS-RM assertion in WSDL
- associated with this port or its associated binding it
- will be always overriden this port specific configuration.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required">
- <xsd:annotation>
- <xsd:documentation>
- WSDL port name specified in the form {namespace}localPart.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
-
</xsd:schema>
12 years, 11 months
JBossWS SVN: r15484 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-01-12 10:08:10 -0500 (Thu, 12 Jan 2012)
New Revision: 15484
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
Log:
minor refactoring
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-01-10 15:24:08 UTC (rev 15483)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-01-12 15:08:10 UTC (rev 15484)
@@ -49,24 +49,43 @@
* A deployment aspect that creates the CXF Bus early and attaches it to the endpoints (wrapped in a BusHolder)
*
* @author alessio.soldano(a)jboss.com
- * @since 25-Mar-2010
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public class BusDeploymentAspect extends AbstractDeploymentAspect
+public final class BusDeploymentAspect extends AbstractDeploymentAspect
{
+ @Override
+ public void start(final Deployment dep)
+ {
+ if (BusFactory.getDefaultBus(false) == null)
+ {
+ //Make sure the default bus is created and set for client side usage
+ //(i.e. no server side integration contribution in it)
+ JBossWSBusFactory.getDefaultBus(Provider.provider().getClass().getClassLoader());
+ }
+ startDeploymentBus(dep);
+ }
+
+ @Override
+ public void stop(final Deployment dep)
+ {
+ final BusHolder holder = dep.removeAttachment(BusHolder.class);
+ if (holder != null)
+ {
+ holder.close();
+ }
+ }
+
@SuppressWarnings("unchecked")
- protected void startDeploymentBus(Deployment dep)
+ private void startDeploymentBus(final Deployment dep)
{
+ BusFactory.setThreadDefaultBus(null);
ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
try
{
- //start cleaning the BusFactory thread locals
- BusFactory.setThreadDefaultBus(null);
-
- ArchiveDeployment aDep = (ArchiveDeployment) dep;
-
- ResourceResolver deploymentResolver = aDep.getResourceResolver();
- org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
+ final ArchiveDeployment aDep = (ArchiveDeployment) dep;
+ final ResourceResolver deploymentResolver = aDep.getResourceResolver();
+ final org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
Map<String, String> contextParams = (Map<String, String>) dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL);
BusHolder holder = null;
@@ -76,69 +95,40 @@
//parent to make sure user provided libs in the deployment do no mess up the WS endpoint's deploy if they duplicates
//libraries already available on the application server modules.
SecurityActions.setContextClassLoader(new DelegateClassLoader(dep.getRuntimeClassLoader(), origClassLoader));
- if (jbosswsCxfXml != null) // Spring available and jbossws-cxf.xml provided
+ if (jbosswsCxfXml != null)
{
- URL cxfServletURL = null;
- try
- {
- cxfServletURL = deploymentResolver.resolve("WEB-INF/cxf-servlet.xml");
- }
- catch (IOException e)
- {
- } //ignore, cxf-servlet.xml is optional, we might even decide not to support this
-
- try
- {
- holder = new SpringBusHolder(cxfServletURL, deploymentResolver.resolve(jbosswsCxfXml));
- Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
- new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile());
- holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //re-throw, jboss-cxf.xml is required
- }
+ // Spring available and jbossws-cxf.xml provided
+ final URL cxfServletUrl = getResourceUrl(deploymentResolver, "WEB-INF/cxf-servlet.xml", false); // TODO: decide not to support this?
+ final URL jbosswsCxfUrl = getResourceUrl(deploymentResolver, jbosswsCxfXml, true);
+ holder = new SpringBusHolder(cxfServletUrl, jbosswsCxfUrl);
}
else
- //Spring not available or jbossws-cxf.xml not provided
{
+ // Spring not available or jbossws-cxf.xml not provided
DDBeans metadata = dep.getAttachment(DDBeans.class);
holder = new NonSpringBusHolder(metadata);
- Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
- new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile());
- holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
}
+ Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile());
+ holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
dep.addAttachment(BusHolder.class, holder);
}
finally
{
- //clean threadlocals in BusFactory and restore the original classloader
BusFactory.setThreadDefaultBus(null);
SecurityActions.setContextClassLoader(origClassLoader);
}
}
-
-
-
- @Override
- public void start(Deployment dep)
- {
- //Make sure the default bus is created and set for client side usage
- //(i.e. no server side integration contribution in it)
- if (BusFactory.getDefaultBus(false) == null)
- {
- JBossWSBusFactory.getDefaultBus(Provider.provider().getClass().getClassLoader());
- }
- this.startDeploymentBus(dep);
+
+ private static URL getResourceUrl(final ResourceResolver resolver, final String resourcePath, final boolean fail) {
+ try {
+ return resolver.resolve(resourcePath);
+ } catch (final IOException e) {
+ if (fail) {
+ throw new RuntimeException(e);
+ } else {
+ return null;
+ }
+ }
}
- @Override
- public void stop(Deployment dep)
- {
- BusHolder holder = dep.removeAttachment(BusHolder.class);
- if (holder != null)
- {
- holder.close();
- }
- }
}
12 years, 11 months
JBossWS SVN: r15483 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-10 10:24:08 -0500 (Tue, 10 Jan 2012)
New Revision: 15483
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
Log:
[JBWS-3405] Updating Sign-Encrypt sample to use WS-SecurityPolicy 1.2 and to be pretty much equivalent to WS-SecurityPolicy Example 2.2.2 (Mutual Authentication with X.509 Certificats, Sign, Encrypt)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2012-01-10 14:43:43 UTC (rev 15482)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2012-01-10 15:24:08 UTC (rev 15483)
@@ -7,7 +7,7 @@
xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
xmlns:wsaws="http://www.w3.org/2005/08/addressing"
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<types>
<xsd:schema>
<xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" schemaLocation="SecurityService_schema1.xsd"/>
@@ -26,7 +26,7 @@
</operation>
</portType>
<binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <wsp:PolicyReference URI="#SecurityServiceSignThenEncryptPolicy"/>
+ <wsp:PolicyReference URI="#SecurityServiceEncryptThenSignPolicy"/>
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
<operation name="sayHello">
<soap:operation soapAction=""/>
@@ -44,23 +44,23 @@
</port>
</service>
- <wsp:Policy wsu:Id="SecurityServiceSignThenEncryptPolicy" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy wsu:Id="SecurityServiceEncryptThenSignPolicy" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:ExactlyOne>
<wsp:All>
- <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:AsymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:Policy>
<sp:InitiatorToken>
<wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT...">
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
<wsp:Policy>
<sp:WssX509V1Token11/>
</wsp:Policy>
- </sp:X509Token>
+ </sp:X509Token>
</wsp:Policy>
</sp:InitiatorToken>
<sp:RecipientToken>
<wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
<wsp:Policy>
<sp:WssX509V1Token11/>
</wsp:Policy>
@@ -74,13 +74,13 @@
</sp:AlgorithmSuite>
<sp:Layout>
<wsp:Policy>
- <sp:Lax/>
+ <sp:Strict/>
</wsp:Policy>
</sp:Layout>
<sp:IncludeTimestamp/>
- <sp:EncryptSignature/>
+ <sp:ProtectTokens/>
<sp:OnlySignEntireHeadersAndBody/>
- <sp:SignBeforeEncrypting/>
+ <sp:EncryptBeforeSigning/>
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -91,7 +91,6 @@
</sp:EncryptedParts>
<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
<wsp:Policy>
- <!-- sp:MustSupportRefKeyIdentifier/-->
<sp:MustSupportRefIssuerSerial/>
</wsp:Policy>
</sp:Wss10>
12 years, 12 months
JBossWS SVN: r15482 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-10 09:43:43 -0500 (Tue, 10 Jan 2012)
New Revision: 15482
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Sync native-core version
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-10 14:21:47 UTC (rev 15481)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-10 14:43:43 UTC (rev 15482)
@@ -1283,7 +1283,7 @@
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version available on 710 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.CR2.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.GA.jar</additionalClasspathElement>
<!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
<!-- JBossWS Native Core version specified through system property -->
12 years, 12 months