February 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15752 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-27 05:48:47 -0500 (Mon, 27 Feb 2012) New Revision: 15752 Added: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd Removed: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml Log: Merged revisions 15748,15751 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15748 | alessio.soldano(a)jboss.com | 2012-02-27 09:32:19 +0100 (Mon, 27 Feb 2012) | 2 lines Minor optimization ....... r15751 | alessio.soldano(a)jboss.com | 2012-02-27 11:23:46 +0100 (Mon, 27 Feb 2012) | 2 lines [JBWS-3439] Adding GCM tests to verify WSS4J 1.6.5 / Santuario 1.5 upgrade ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15751 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-02-27 10:48:47 UTC (rev 15752) @@ -28,7 +28,9 @@ import org.apache.cxf.bus.CXFBusFactory; import org.apache.cxf.bus.extension.ExtensionManagerBus; import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; import org.jboss.wsf.stack.cxf.client.ProviderImpl; +import org.jboss.wsf.stack.cxf.extensions.security.DefaultAlgorithmSuiteLoader; /** * @@ -49,6 +51,9 @@ { extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new BeanCustomizer())); } + if (!extensions.containsKey(AlgorithmSuiteLoader.class)) { + extensions.put(AlgorithmSuiteLoader.class, new DefaultAlgorithmSuiteLoader()); + } //Explicitly ask for the ProviderImpl.class.getClassLoader() to be used for getting //cxf bus extensions (as that classloader is the jaxws-client module one which 'sees' all Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-02-27 10:48:47 UTC (rev 15752) @@ -32,6 +32,8 @@ import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; +import org.jboss.wsf.stack.cxf.extensions.security.DefaultAlgorithmSuiteLoader; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; @@ -109,6 +111,10 @@ bus.setExtension(bac, BusApplicationContext.class); setConfigurer(bus); + + if (bus.getExtension(AlgorithmSuiteLoader.class) == null) { + bus.setExtension(new DefaultAlgorithmSuiteLoader(), AlgorithmSuiteLoader.class); + } possiblySetDefaultBus(bus); Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java 2012-02-27 10:48:47 UTC (rev 15752) @@ -1,75 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * 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.wsf.stack.cxf.extensions.security; - -import org.w3c.dom.Element; - -import org.apache.cxf.helpers.DOMUtils; -import org.apache.cxf.ws.security.policy.SPConstants; -import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; -import org.apache.cxf.ws.security.policy.model.AlgorithmSuite; - -/** - * This class retrieves the default AlgorithmSuites. - */ -public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader { - - private static final String CXF_CUSTOM_POLICY_NS = - "http://cxf.apache.org/custom/security-policy"; - - public AlgorithmSuite getAlgorithmSuite(Element policyElement, SPConstants consts) { - if (policyElement != null) { - Element algorithm = DOMUtils.getFirstElement(policyElement); - if (algorithm != null) { - AlgorithmSuite algorithmSuite = null; - if (CXF_CUSTOM_POLICY_NS.equals(algorithm.getNamespaceURI())) { - algorithmSuite = new GCMAlgorithmSuite(consts); - } else { - algorithmSuite = new AlgorithmSuite(consts); - } - algorithmSuite.setAlgorithmSuite(algorithm.getLocalName()); - return algorithmSuite; - } - } - return null; - } - -} Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java (from rev 15751, stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java 2012-02-27 10:48:47 UTC (rev 15752) @@ -0,0 +1,75 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * 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.wsf.stack.cxf.extensions.security; + +import org.w3c.dom.Element; + +import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.ws.security.policy.SPConstants; +import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; +import org.apache.cxf.ws.security.policy.model.AlgorithmSuite; + +/** + * This class retrieves the default AlgorithmSuites. + */ +public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader { + + private static final String CXF_CUSTOM_POLICY_NS = + "http://cxf.apache.org/custom/security-policy"; + + public AlgorithmSuite getAlgorithmSuite(Element policyElement, SPConstants consts) { + if (policyElement != null) { + Element algorithm = DOMUtils.getFirstElement(policyElement); + if (algorithm != null) { + AlgorithmSuite algorithmSuite = null; + if (CXF_CUSTOM_POLICY_NS.equals(algorithm.getNamespaceURI())) { + algorithmSuite = new GCMAlgorithmSuite(consts); + } else { + algorithmSuite = new AlgorithmSuite(consts); + } + algorithmSuite.setAlgorithmSuite(algorithm.getLocalName()); + return algorithmSuite; + } + } + return null; + } + +} Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java 2012-02-27 10:48:47 UTC (rev 15752) @@ -1,103 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * 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.wsf.stack.cxf.extensions.security; - -import org.apache.cxf.ws.security.policy.SP12Constants; -import org.apache.cxf.ws.security.policy.SPConstants; -import org.apache.cxf.ws.security.policy.WSSPolicyException; -import org.apache.cxf.ws.security.policy.model.AlgorithmSuite; - -/** - * This AlgorithmSuite supports GCM security policies. - */ -public class GCMAlgorithmSuite extends AlgorithmSuite { - - public GCMAlgorithmSuite(SPConstants version) { - super(version); - } - - public GCMAlgorithmSuite() { - super(SP12Constants.INSTANCE); - } - - /** - * Set the algorithm suite - * - * @param algoSuite - * @throws WSSPolicyException - */ - @Override - public void setAlgorithmSuite(String algoSuite) throws WSSPolicyException { - this.algoSuiteString = algoSuite; - - if ("Basic128GCM".equals(algoSuite)) { - this.digest = SPConstants.SHA1; - this.encryption = "http://www.w3.org/2009/xmlenc11#aes128-gcm"; - this.symmetricKeyWrap = SPConstants.KW_AES128; - this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; - this.encryptionKeyDerivation = SPConstants.P_SHA1_L128; - this.signatureKeyDerivation = SPConstants.P_SHA1_L128; - this.encryptionDerivedKeyLength = 128; - this.signatureDerivedKeyLength = 128; - this.minimumSymmetricKeyLength = 128; - } else if ("Basic192GCM".equals(algoSuite)) { - this.digest = SPConstants.SHA1; - this.encryption = "http://www.w3.org/2009/xmlenc11#aes192-gcm"; - this.symmetricKeyWrap = SPConstants.KW_AES192; - this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; - this.encryptionKeyDerivation = SPConstants.P_SHA1_L192; - this.signatureKeyDerivation = SPConstants.P_SHA1_L192; - this.encryptionDerivedKeyLength = 192; - this.signatureDerivedKeyLength = 192; - this.minimumSymmetricKeyLength = 192; - } else if ("Basic256GCM".equals(algoSuite)) { - this.digest = SPConstants.SHA1; - this.encryption = "http://www.w3.org/2009/xmlenc11#aes256-gcm"; - this.symmetricKeyWrap = SPConstants.KW_AES256; - this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; - this.encryptionKeyDerivation = SPConstants.P_SHA1_L256; - this.signatureKeyDerivation = SPConstants.P_SHA1_L192; - this.encryptionDerivedKeyLength = 256; - this.signatureDerivedKeyLength = 192; - this.minimumSymmetricKeyLength = 256; - this.encryptionDerivedKeyLength = 256; - } - } -} Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java (from rev 15751, stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java 2012-02-27 10:48:47 UTC (rev 15752) @@ -0,0 +1,103 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/* + * 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.wsf.stack.cxf.extensions.security; + +import org.apache.cxf.ws.security.policy.SP12Constants; +import org.apache.cxf.ws.security.policy.SPConstants; +import org.apache.cxf.ws.security.policy.WSSPolicyException; +import org.apache.cxf.ws.security.policy.model.AlgorithmSuite; + +/** + * This AlgorithmSuite supports GCM security policies. + */ +public class GCMAlgorithmSuite extends AlgorithmSuite { + + public GCMAlgorithmSuite(SPConstants version) { + super(version); + } + + public GCMAlgorithmSuite() { + super(SP12Constants.INSTANCE); + } + + /** + * Set the algorithm suite + * + * @param algoSuite + * @throws WSSPolicyException + */ + @Override + public void setAlgorithmSuite(String algoSuite) throws WSSPolicyException { + this.algoSuiteString = algoSuite; + + if ("Basic128GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes128-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES128; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L128; + this.signatureKeyDerivation = SPConstants.P_SHA1_L128; + this.encryptionDerivedKeyLength = 128; + this.signatureDerivedKeyLength = 128; + this.minimumSymmetricKeyLength = 128; + } else if ("Basic192GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes192-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES192; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L192; + this.signatureKeyDerivation = SPConstants.P_SHA1_L192; + this.encryptionDerivedKeyLength = 192; + this.signatureDerivedKeyLength = 192; + this.minimumSymmetricKeyLength = 192; + } else if ("Basic256GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes256-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES256; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L256; + this.signatureKeyDerivation = SPConstants.P_SHA1_L192; + this.encryptionDerivedKeyLength = 256; + this.signatureDerivedKeyLength = 192; + this.minimumSymmetricKeyLength = 256; + this.encryptionDerivedKeyLength = 256; + } + } +} Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-02-27 10:48:47 UTC (rev 15752) @@ -75,9 +75,10 @@ } if (depEndpoints != null) { + final String targetBeanName = factory.getServiceBean().getClass().getName(); for (Endpoint depEndpoint : depEndpoints) { - if (depEndpoint.getTargetBeanClass().getName().equals(factory.getServiceBean().getClass().getName())) + if (depEndpoint.getTargetBeanClass().getName().equals(targetBeanName)) { depEndpoint.addAttachment(ServerFactoryBean.class, factory); } Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-02-27 10:48:47 UTC (rev 15752) @@ -128,6 +128,28 @@ </manifest> </war> +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-gcm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.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/gcm/WEB-INF"> + <include name="jaxws-endpoint-config.xml"/> + <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> + <include name="bob.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security"/> + </manifest> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-mc.war" needxmlfile='false'> Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks =================================================================== (Binary files differ) Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks (from rev 15751, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks) =================================================================== (Binary files differ) Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties 2012-02-27 10:48:47 UTC (rev 15752) @@ -1,5 +0,0 @@ -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=bob.jks \ No newline at end of file Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties (from rev 15751, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties 2012-02-27 10:48:47 UTC (rev 15752) @@ -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=bob.jks \ No newline at end of file Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml 2012-02-27 10:48:47 UTC (rev 15752) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> - - <endpoint-config> - <config-name>Custom WS-Security Endpoint</config-name> - <property> - <property-name>ws-security.signature.properties</property-name> - <property-value>bob.properties</property-value> - </property> - <property> - <property-name>ws-security.encryption.properties</property-name> - <property-value>bob.properties</property-value> - </property> - <property> - <property-name>ws-security.signature.username</property-name> - <property-value>bob</property-value> - </property> - <property> - <property-name>ws-security.encryption.username</property-name> - <property-value>alice</property-value> - </property> - <property> - <property-name>ws-security.callback-handler</property-name> - <property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback</property-value> - </property> - </endpoint-config> - -</jaxws-config> \ No newline at end of file Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml (from rev 15751, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml 2012-02-27 10:48:47 UTC (rev 15752) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Custom WS-Security Endpoint</config-name> + <property> + <property-name>ws-security.signature.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> + <property-name>ws-security.encryption.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> + <property-name>ws-security.signature.username</property-name> + <property-value>bob</property-value> + </property> + <property> + <property-name>ws-security.encryption.username</property-name> + <property-value>alice</property-value> + </property> + <property> + <property-name>ws-security.callback-handler</property-name> + <property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback</property-value> + </property> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml 2012-02-27 10:48:47 UTC (rev 15752) @@ -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.policy.basic.ServiceImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml (from rev 15751, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml 2012-02-27 10:48:47 UTC (rev 15752) @@ -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.policy.basic.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2012-02-27 10:48:47 UTC (rev 15752) @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" name="SecurityService" - xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns="http://schemas.xmlsoap.org/wsdl/" - 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://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"/> - </xsd:schema> - </types> - <message name="sayHello"> - <part name="parameters" element="tns:sayHello"/> - </message> - <message name="sayHelloResponse"> - <part name="parameters" element="tns:sayHelloResponse"/> - </message> - <portType name="ServiceIface"> - <operation name="sayHello"> - <input message="tns:sayHello"/> - <output message="tns:sayHelloResponse"/> - </operation> - </portType> - <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> - <wsp:PolicyReference URI="#SecurityServiceEncryptThenSignPolicy"/> - <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> - </binding> - <service name="SecurityService"> - <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> - </port> - </service> - - <wsp:Policy wsu:Id="SecurityServiceEncryptThenSignPolicy"> - <wsp:ExactlyOne> - <wsp:All> - <sp:AsymmetricBinding> - <wsp:Policy> - <sp:InitiatorToken> - <wsp:Policy> - <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> - <wsp:Policy> - <sp:WssX509V1Token11/> - </wsp:Policy> - </sp:X509Token> - </wsp:Policy> - </sp:InitiatorToken> - <sp:RecipientToken> - <wsp:Policy> - <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> - <wsp:Policy> - <sp:WssX509V1Token11/> - </wsp:Policy> - </sp:X509Token> - </wsp:Policy> - </sp:RecipientToken> - <sp:Layout> - <wsp:Policy> - <sp:Lax/> - </wsp:Policy> - </sp:Layout> - <sp:IncludeTimestamp/> - <sp:OnlySignEntireHeadersAndBody/> - <sp:AlgorithmSuite> - <wsp:Policy> - <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> - </wsp:Policy> - </sp:AlgorithmSuite> - </wsp:Policy> - </sp:AsymmetricBinding> - <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> - <sp:Body/> - </sp:SignedParts> - <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> - <sp:Body/> - </sp:EncryptedParts> - <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> - <wsp:Policy> - <sp:MustSupportRefIssuerSerial/> - </wsp:Policy> - </sp:Wss10> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - -</definitions> Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl (from rev 15751, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2012-02-27 10:48:47 UTC (rev 15752) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + 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://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"/> + </xsd:schema> + </types> + <message name="sayHello"> + <part name="parameters" element="tns:sayHello"/> + </message> + <message name="sayHelloResponse"> + <part name="parameters" element="tns:sayHelloResponse"/> + </message> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityServiceEncryptThenSignPolicy"/> + <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> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> + </port> + </service> + + <wsp:Policy wsu:Id="SecurityServiceEncryptThenSignPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> + <sp:Body/> + </sp:SignedParts> + <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> + <sp:Body/> + </sp:EncryptedParts> + <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> + <wsp:Policy> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + +</definitions> Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd 2012-02-27 10:23:46 UTC (rev 15751) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd 2012-02-27 10:48:47 UTC (rev 15752) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" 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:schema> - Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd (from rev 15751, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd 2012-02-27 10:48:47 UTC (rev 15752) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" 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:schema> +

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15751 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/extensions and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-27 05:23:46 -0500 (Mon, 27 Feb 2012) New Revision: 15751 Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml Log: [JBWS-3439] Adding GCM tests to verify WSS4J 1.6.5 / Santuario 1.5 upgrade Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-02-27 09:37:06 UTC (rev 15750) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-02-27 10:23:46 UTC (rev 15751) @@ -28,7 +28,9 @@ import org.apache.cxf.bus.CXFBusFactory; import org.apache.cxf.bus.extension.ExtensionManagerBus; import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; import org.jboss.wsf.stack.cxf.client.ProviderImpl; +import org.jboss.wsf.stack.cxf.extensions.security.DefaultAlgorithmSuiteLoader; /** * @@ -49,6 +51,9 @@ { extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new BeanCustomizer())); } + if (!extensions.containsKey(AlgorithmSuiteLoader.class)) { + extensions.put(AlgorithmSuiteLoader.class, new DefaultAlgorithmSuiteLoader()); + } //Explicitly ask for the ProviderImpl.class.getClassLoader() to be used for getting //cxf bus extensions (as that classloader is the jaxws-client module one which 'sees' all Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-02-27 09:37:06 UTC (rev 15750) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-02-27 10:23:46 UTC (rev 15751) @@ -32,6 +32,8 @@ import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; +import org.jboss.wsf.stack.cxf.extensions.security.DefaultAlgorithmSuiteLoader; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; @@ -109,6 +111,10 @@ bus.setExtension(bac, BusApplicationContext.class); setConfigurer(bus); + + if (bus.getExtension(AlgorithmSuiteLoader.class) == null) { + bus.setExtension(new DefaultAlgorithmSuiteLoader(), AlgorithmSuiteLoader.class); + } possiblySetDefaultBus(bus); Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java 2012-02-27 10:23:46 UTC (rev 15751) @@ -0,0 +1,75 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * 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.wsf.stack.cxf.extensions.security; + +import org.w3c.dom.Element; + +import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.ws.security.policy.SPConstants; +import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; +import org.apache.cxf.ws.security.policy.model.AlgorithmSuite; + +/** + * This class retrieves the default AlgorithmSuites. + */ +public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader { + + private static final String CXF_CUSTOM_POLICY_NS = + "http://cxf.apache.org/custom/security-policy"; + + public AlgorithmSuite getAlgorithmSuite(Element policyElement, SPConstants consts) { + if (policyElement != null) { + Element algorithm = DOMUtils.getFirstElement(policyElement); + if (algorithm != null) { + AlgorithmSuite algorithmSuite = null; + if (CXF_CUSTOM_POLICY_NS.equals(algorithm.getNamespaceURI())) { + algorithmSuite = new GCMAlgorithmSuite(consts); + } else { + algorithmSuite = new AlgorithmSuite(consts); + } + algorithmSuite.setAlgorithmSuite(algorithm.getLocalName()); + return algorithmSuite; + } + } + return null; + } + +} Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java 2012-02-27 10:23:46 UTC (rev 15751) @@ -0,0 +1,103 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/* + * 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.wsf.stack.cxf.extensions.security; + +import org.apache.cxf.ws.security.policy.SP12Constants; +import org.apache.cxf.ws.security.policy.SPConstants; +import org.apache.cxf.ws.security.policy.WSSPolicyException; +import org.apache.cxf.ws.security.policy.model.AlgorithmSuite; + +/** + * This AlgorithmSuite supports GCM security policies. + */ +public class GCMAlgorithmSuite extends AlgorithmSuite { + + public GCMAlgorithmSuite(SPConstants version) { + super(version); + } + + public GCMAlgorithmSuite() { + super(SP12Constants.INSTANCE); + } + + /** + * Set the algorithm suite + * + * @param algoSuite + * @throws WSSPolicyException + */ + @Override + public void setAlgorithmSuite(String algoSuite) throws WSSPolicyException { + this.algoSuiteString = algoSuite; + + if ("Basic128GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes128-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES128; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L128; + this.signatureKeyDerivation = SPConstants.P_SHA1_L128; + this.encryptionDerivedKeyLength = 128; + this.signatureDerivedKeyLength = 128; + this.minimumSymmetricKeyLength = 128; + } else if ("Basic192GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes192-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES192; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L192; + this.signatureKeyDerivation = SPConstants.P_SHA1_L192; + this.encryptionDerivedKeyLength = 192; + this.signatureDerivedKeyLength = 192; + this.minimumSymmetricKeyLength = 192; + } else if ("Basic256GCM".equals(algoSuite)) { + this.digest = SPConstants.SHA1; + this.encryption = "http://www.w3.org/2009/xmlenc11#aes256-gcm"; + this.symmetricKeyWrap = SPConstants.KW_AES256; + this.asymmetricKeyWrap = SPConstants.KW_RSA_OAEP; + this.encryptionKeyDerivation = SPConstants.P_SHA1_L256; + this.signatureKeyDerivation = SPConstants.P_SHA1_L192; + this.encryptionDerivedKeyLength = 256; + this.signatureDerivedKeyLength = 192; + this.minimumSymmetricKeyLength = 256; + this.encryptionDerivedKeyLength = 256; + } + } +} 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-02-27 09:37:06 UTC (rev 15750) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-02-27 10:23:46 UTC (rev 15751) @@ -128,6 +128,28 @@ </manifest> </war> +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-gcm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.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/gcm/WEB-INF"> + <include name="jaxws-endpoint-config.xml"/> + <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> + <include name="bob.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security"/> + </manifest> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-mc.war" needxmlfile='false'> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties 2012-02-27 10:23:46 UTC (rev 15751) @@ -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=bob.jks \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml 2012-02-27 10:23:46 UTC (rev 15751) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Custom WS-Security Endpoint</config-name> + <property> + <property-name>ws-security.signature.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> + <property-name>ws-security.encryption.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> + <property-name>ws-security.signature.username</property-name> + <property-value>bob</property-value> + </property> + <property> + <property-name>ws-security.encryption.username</property-name> + <property-value>alice</property-value> + </property> + <property> + <property-name>ws-security.callback-handler</property-name> + <property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback</property-value> + </property> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/web.xml 2012-02-27 10:23:46 UTC (rev 15751) @@ -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.policy.basic.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2012-02-27 10:23:46 UTC (rev 15751) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + 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://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"/> + </xsd:schema> + </types> + <message name="sayHello"> + <part name="parameters" element="tns:sayHello"/> + </message> + <message name="sayHelloResponse"> + <part name="parameters" element="tns:sayHelloResponse"/> + </message> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityServiceEncryptThenSignPolicy"/> + <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> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> + </port> + </service> + + <wsp:Policy wsu:Id="SecurityServiceEncryptThenSignPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> + <sp:Body/> + </sp:SignedParts> + <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> + <sp:Body/> + </sp:EncryptedParts> + <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"> + <wsp:Policy> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + +</definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService_schema1.xsd 2012-02-27 10:23:46 UTC (rev 15751) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" 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:schema> +

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15750 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-27 04:37:06 -0500 (Mon, 27 Feb 2012) New Revision: 15750 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: sync. with AS7 upstream Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-27 09:25:03 UTC (rev 15749) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-27 09:37:06 UTC (rev 15750) @@ -1168,7 +1168,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -1254,13 +1254,13 @@ <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.0.Final</version> + <version>1.0.1.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.1.GA</version> + <version>3.2.2.GA</version> <scope>test</scope> </dependency> </dependencies>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15749 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-27 04:25:03 -0500 (Mon, 27 Feb 2012) New Revision: 15749 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: sync. with AS7 upstream Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-27 08:32:19 UTC (rev 15748) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-27 09:25:03 UTC (rev 15749) @@ -1065,7 +1065,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -1110,13 +1110,13 @@ <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.0.Final</version> + <version>1.0.1.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.1.GA</version> + <version>3.2.2.GA</version> <scope>test</scope> </dependency> </dependencies>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15748 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-27 03:32:19 -0500 (Mon, 27 Feb 2012) New Revision: 15748 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java Log: Minor optimization Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-02-27 03:26:43 UTC (rev 15747) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-02-27 08:32:19 UTC (rev 15748) @@ -75,9 +75,10 @@ } if (depEndpoints != null) { + final String targetBeanName = factory.getServiceBean().getClass().getName(); for (Endpoint depEndpoint : depEndpoints) { - if (depEndpoint.getTargetBeanClass().getName().equals(factory.getServiceBean().getClass().getName())) + if (depEndpoint.getTargetBeanClass().getName().equals(targetBeanName)) { depEndpoint.addAttachment(ServerFactoryBean.class, factory); }

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15747 - in thirdparty/cxf/branches/cxf-2.2.12: tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2012-02-26 22:26:43 -0500 (Sun, 26 Feb 2012) New Revision: 15747 Modified: thirdparty/cxf/branches/cxf-2.2.12/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Log: [JBPAPP-8235]:wsconsume chokes on wsdl containing element referring its schema Modified: thirdparty/cxf/branches/cxf-2.2.12/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java 2012-02-26 15:12:25 UTC (rev 15746) +++ thirdparty/cxf/branches/cxf-2.2.12/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java 2012-02-27 03:26:43 UTC (rev 15747) @@ -161,6 +161,7 @@ public static final String NS_JAXB_BINDINGS = "http://java.sun.com/xml/ns/jaxb"; public static final QName JAXWS_BINDINGS = new QName(NS_JAXWS_BINDINGS, "bindings"); public static final QName JAXB_BINDINGS = new QName(NS_JAXB_BINDINGS, "bindings"); + public static final QName SCHEMA = new QName(SCHEMA_URI, "schema"); public static final String JAXWS_BINDINGS_WSDL_LOCATION = "wsdlLocation"; public static final String JAXWS_BINDING_NODE = "node"; public static final String JAXWS_BINDING_VERSION = "version"; Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java 2012-02-26 15:12:25 UTC (rev 15746) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java 2012-02-27 03:26:43 UTC (rev 15747) @@ -578,8 +578,8 @@ } private boolean isValidJaxbBindingFile(XMLStreamReader reader) { - if (ToolConstants.JAXB_BINDINGS.equals(reader.getName())) { - + if (ToolConstants.JAXB_BINDINGS.equals(reader.getName()) + || ToolConstants.SCHEMA.equals(reader.getName())) { return true; } return false; Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java 2012-02-26 15:12:25 UTC (rev 15746) +++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java 2012-02-27 03:26:43 UTC (rev 15747) @@ -1371,5 +1371,17 @@ RequestWrapper reqWrapper = method.getAnnotation(RequestWrapper.class); assertNotNull("@RequestWrapper is expected", reqWrapper); } - + @Test + // CXF-4135 + public void testPassShemaFileAsJAXBBinding() throws Exception { + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl")); + env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/Invoice.xsd")); + processor.setContext(env); + processor.execute(); + File generateFromBindingFile = new File(output, "org/apache/invoice/Invoice.java"); + assertTrue(generateFromBindingFile.exists()); + File seiFile = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/Greeter.java"); + assertTrue(seiFile.exists()); + } + }

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15746 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2012-02-26 10:12:25 -0500 (Sun, 26 Feb 2012) New Revision: 15746 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15743 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15743 | alessio.soldano(a)jboss.com | 2012-02-25 15:02:00 +0100 (Sat, 25 Feb 2012) | 2 lines [JBWS-3444] Excluding org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase* to prevent Hudson from hanging ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-25 14:30:36 UTC (rev 15745) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-26 15:12:25 UTC (rev 15746) @@ -664,10 +664,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> @@ -847,10 +843,6 @@  <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> @@ -1117,10 +1109,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> @@ -1337,13 +1325,12 @@  <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> </excludes>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15745 - stack/cxf/branches/jbossws-cxf-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-25 09:30:36 -0500 (Sat, 25 Feb 2012) New Revision: 15745 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 15674 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15674 | alessio.soldano(a)jboss.com | 2012-02-16 16:24:58 +0100 (Thu, 16 Feb 2012) | 2 lines [JBWS-3439] Moving to santuario 1.5.0 and wss4j 1.6.5-SNAPSHOT ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 14:15:14 UTC (rev 15744) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 14:30:36 UTC (rev 15745) @@ -103,8 +103,8 @@ <jms.api.version>1.0.0.Final</jms.api.version> <velocity.version>1.5</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.4.5</xmlsec.version> - <wss4j.version>1.6.4</wss4j.version> + <xmlsec.version>1.5.0</xmlsec.version> + <wss4j.version>1.6.5-SNAPSHOT</wss4j.version> <wstx.version>3.2.9</wstx.version> <spring.version>3.0.6.RELEASE</spring.version> </properties>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15744 - stack/cxf/branches/jbossws-cxf-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-25 09:15:14 -0500 (Sat, 25 Feb 2012) New Revision: 15744 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ Log: Blocked revisions 15688 via svnmerge ....... r15688 | alessio.soldano(a)jboss.com | 2012-02-17 17:35:03 +0100 (Fri, 17 Feb 2012) | 2 lines [JBWS-3434] Making OpenSAML maven dependency provided and keeping it just for creating the AS module. Only keep an optional dependency to org.opensaml module in org.apache.ws.security (wss4j) module, as OpenSAML is not going to be shipped in AS7 and is required for WSS4J SAML/WS-Trust functionalities only. ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-blocked - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,15665 + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15743 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-25 09:02:00 -0500 (Sat, 25 Feb 2012) New Revision: 15743 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] Excluding org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase* to prevent Hudson from hanging Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-25 07:16:57 UTC (rev 15742) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-25 14:02:00 UTC (rev 15743) @@ -664,10 +664,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> @@ -850,10 +846,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase*</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> @@ -1120,10 +1112,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> @@ -1340,13 +1328,12 @@  <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> -  -  -  -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> </excludes>

12 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2012