8:08 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2012-03-06 09:08:37 -0500 (Tue, 06 Mar 2012)
New Revision: 15884
Removed:
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
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/pom.xml
Log:
[JBWS-3448] Move to Apache CXF 2.5.3-SNAPSHOT (including removing GCM algorithm suite
integration code, as that's already included in CXF 2.5.3)
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-03-06
13:52:29 UTC (rev 15883)
+++
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-03-06
14:08:37 UTC (rev 15884)
@@ -28,9 +28,7 @@
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;
/**
*
@@ -51,9 +49,6 @@
{
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-03-06
13:52:29 UTC (rev 15883)
+++
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-03-06
14:08:37 UTC (rev 15884)
@@ -32,8 +32,6 @@
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;
@@ -112,10 +110,6 @@
setConfigurer(bus);
- if (bus.getExtension(AlgorithmSuiteLoader.class) == null) {
- bus.setExtension(new DefaultAlgorithmSuiteLoader(),
AlgorithmSuiteLoader.class);
- }
-
possiblySetDefaultBus(bus);
initializeBus(bus);
Deleted:
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 2012-03-06
13:52:29 UTC (rev 15883)
+++
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/DefaultAlgorithmSuiteLoader.java 2012-03-06
14:08:37 UTC (rev 15884)
@@ -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;
- }
-
-}
Deleted:
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 2012-03-06
13:52:29 UTC (rev 15883)
+++
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/GCMAlgorithmSuite.java 2012-03-06
14:08:37 UTC (rev 15884)
@@ -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;
- }
- }
-}
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-03-06 13:52:29 UTC (rev 15883)
+++ stack/cxf/trunk/pom.xml 2012-03-06 14:08:37 UTC (rev 15884)
@@ -72,7 +72,7 @@
<jboss710.version>7.1.0.Final</jboss710.version>
<jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.5.2</cxf.version>
+ <cxf.version>2.5.3-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>