JBossWS SVN: r17229 - framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-10 06:14:14 -0500 (Thu, 10 Jan 2013)
New Revision: 17229
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml
Log:
[JBPAPP-7601] Adding xmlsec.jar to classpath before jbossall-client.jar
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml 2013-01-10 11:09:48 UTC (rev 17228)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml 2013-01-10 11:14:14 UTC (rev 17229)
@@ -134,6 +134,7 @@
<pathelement location="${jboss.client}/jboss-jboss50.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/xmlsec.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/jbossws-jboss50.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
@@ -196,6 +197,7 @@
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jbossws-jboss42.jar"/>
+ <pathelement location="${jboss.client}/xmlsec.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
@@ -250,6 +252,7 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-saaj.jar"/>
<pathelement location="${jboss.client}/jbossws-jboss40.jar"/>
+ <pathelement location="${jboss.client}/xmlsec.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
11 years, 4 months
JBossWS SVN: r17228 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: ant-import and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-10 06:09:48 -0500 (Thu, 10 Jan 2013)
New Revision: 17228
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/macros-deploy-native.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/Constants.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties
Log:
[JBPAPP-7601] Move to Santuario 1.5.2 and add GCM algorithm support
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/macros-deploy-native.xml 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/macros-deploy-native.xml 2013-01-10 11:09:48 UTC (rev 17228)
@@ -143,6 +143,7 @@
<include name="policy.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="xmlsec.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
</copy>
@@ -182,6 +183,7 @@
<include name="policy.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="xmlsec.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/Constants.java 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/Constants.java 2013-01-10 11:09:48 UTC (rev 17228)
@@ -51,7 +51,7 @@
public static final String XML_ENCRYPTION_NS = EncryptionConstants.EncryptionSpecNS;
- public static final String XML_ENCRYPTION_PREFIX = "xenc";
+ public static final String XML_ENCRYPTION_PREFIX = "ds"; //xmlsec 1.4.2 requires this to be "ds" to correctly create KeyInfo elements
public static final String ID = "Id";
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-01-10 11:09:48 UTC (rev 17228)
@@ -71,6 +71,9 @@
algorithms.put("aes-128", new Algorithm("AES", XMLCipher.AES_128, 128));
algorithms.put("aes-192", new Algorithm("AES", XMLCipher.AES_192, 192));
algorithms.put("aes-256", new Algorithm("AES", XMLCipher.AES_256, 256));
+ algorithms.put("aes-128-gcm", new Algorithm("AES", XMLCipher.AES_128_GCM, 128));
+ algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
+ algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2013-01-10 11:09:48 UTC (rev 17228)
@@ -22,6 +22,7 @@
package org.jboss.ws.extensions.security;
import java.io.IOException;
+import java.io.OutputStream;
import javax.xml.parsers.ParserConfigurationException;
@@ -91,7 +92,14 @@
@Override
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) throws IOException, CanonicalizationException,
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform transformObject) throws IOException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
+ {
+ return enginePerformTransform(input, null, transformObject);
+ }
+
+ @Override
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, OutputStream os, Transform transformObject) throws IOException, CanonicalizationException,
InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
{
@@ -115,7 +123,7 @@
element = token.getSTRTransformElement();
// Obtain the canonicalizer specified in the transformation parameters
- Element parameters = XMLUtils.selectNode(this._transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
+ Element parameters = XMLUtils.selectNode(transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
"TransformationParameters", 0);
if (parameters == null)
throw new TransformationException("wsse:TransformationParameters expected!");
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-01-10 11:09:48 UTC (rev 17228)
@@ -75,6 +75,7 @@
try
{
cipher = XMLCipher.getInstance();
+ cipher.init(XMLCipher.DECRYPT_MODE, null);
key = cipher.loadEncryptedKey(element);
}
catch (XMLSecurityException e)
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java 2013-01-10 11:09:48 UTC (rev 17228)
@@ -172,6 +172,7 @@
Element element = document.createElementNS(Constants.WSSE_NS, Constants.WSSE_HEADER);
Util.addNamespace(element, Constants.WSSE_PREFIX, Constants.WSSE_NS);
Util.addNamespace(element, Constants.WSU_PREFIX, Constants.WSU_NS);
+ Util.addNamespace(element, Constants.XML_ENCRYPTION_PREFIX, Constants.XML_SIGNATURE_NS);
if (timestamp != null)
element.appendChild(timestamp.getElement());
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2013-01-10 11:09:48 UTC (rev 17228)
@@ -3,7 +3,7 @@
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<config>
- <encrypt type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" algorithm="aes-128-gcm" alias="wsse"/>
<requires>
<encryption/>
</requires>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2013-01-10 11:09:48 UTC (rev 17228)
@@ -7,7 +7,7 @@
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
<trust-store-password>jbossws</trust-store-password>
<config>
- <encrypt type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" algorithm="aes-128-gcm" alias="wsse"/>
<requires>
<encryption/>
</requires>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2013-01-10 06:59:53 UTC (rev 17227)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2013-01-10 11:09:48 UTC (rev 17228)
@@ -15,7 +15,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions that are referenced in component-info.xml
-apache-xmlsec=1.3.0
+apache-xmlsec=1.5.2
ibm-wsdl4j=1.6.2
jbpm-bpel=1.1.0.Beta5
stax-api=1.0
11 years, 4 months
JBossWS SVN: r17226 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: deployment/aspect and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-09 07:37:30 -0500 (Wed, 09 Jan 2013)
New Revision: 17226
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
Log:
[JBWS-3396] Few minor improvements and optimizations
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2013-01-09 10:37:23 UTC (rev 17225)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2013-01-09 12:37:30 UTC (rev 17226)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, 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.
*
@@ -65,26 +65,19 @@
private boolean configured = false;
protected BusApplicationContext ctx;
-
- protected GenericApplicationContext jbosswsCxfContext;
-
protected List<GenericApplicationContext> additionalCtx = new LinkedList<GenericApplicationContext>();
+
private ConfiguredBeanLocator delegatingBeanLocator;
+ protected URL jbosswsCxfLocation;
protected URL[] additionalLocations;
-
- protected URL jbosswsCXF;
public SpringBusHolder(URL location, URL jbosswscxf, URL... additionalLocations)
{
super();
createBus(location);
- jbosswsCXF = jbosswscxf;
+ jbosswsCxfLocation = jbosswscxf;
this.additionalLocations = additionalLocations;
- if (jbosswsCxfContext != null && jbosswsCxfContext.getBeanNamesForType(JBossWSSpringEndpointImpl.class).length >=1)
- {
- this.additionalLocations = new URL[]{};
- }
}
/**
@@ -139,28 +132,29 @@
}
super.configure(resolver, configurer, wsmd);
- if (jbosswsCXF != null)
+ GenericApplicationContext jbosswsCxfContext = null;
+ //load stuff from provided jbossws-cxf.xml DD
+ if (jbosswsCxfLocation != null)
{
try
{
- jbosswsCxfContext = loadAdditionalConfig(ctx, jbosswsCXF);
+ jbosswsCxfContext = loadAdditionalConfig(ctx, jbosswsCxfLocation);
}
catch (IOException e)
{
- DEPLOYMENT_LOGGER.unableToLoadAdditionalConfigurationFrom(jbosswsCXF, e);
+ throw MESSAGES.unableToLoadConfigurationFrom(jbosswsCxfLocation, e);
}
}
-
- if (jbosswsCxfContext != null
- && jbosswsCxfContext.getBeansOfType(JBossWSSpringEndpointImpl.class).isEmpty() && additionalLocations != null)
+ //possibly load stuff from additional DD / DD generated from metadata if the provided jbossws-cxf.xml did not specify endpoints
+ if (additionalLocations != null &&
+ (jbosswsCxfLocation == null || jbosswsCxfContext.getBeansOfType(JBossWSSpringEndpointImpl.class).isEmpty()))
{
-
for (URL additionXml : additionalLocations)
{
try
{
- loadAdditionalConfig(jbosswsCxfContext, additionXml);
+ loadAdditionalConfig(jbosswsCxfLocation != null ? jbosswsCxfContext : ctx, additionXml);
}
catch (IOException e)
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-01-09 10:37:23 UTC (rev 17225)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-01-09 12:37:30 UTC (rev 17226)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, 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.
*
@@ -88,7 +88,6 @@
final ResourceResolver deploymentResolver = aDep.getResourceResolver();
final org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
Map<String, String> contextParams = (Map<String, String>) dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
- String jbosswsGenXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_GEN_URL);
String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL);
BusHolder holder = null;
@@ -102,8 +101,8 @@
// Spring available and jbossws-cxf.xml provided
final URL cxfServletUrl = deploymentResolver.resolveFailSafe("WEB-INF/cxf-servlet.xml"); // TODO: decide not to support this?
final URL jbosswsCxfUrl = getResourceUrl(deploymentResolver, jbosswsCxfXml);
- final URL genCxfUrl = getResourceUrl(deploymentResolver, jbosswsGenXml);
- holder = new SpringBusHolder(cxfServletUrl, jbosswsCxfUrl, new URL[]{genCxfUrl});
+ final URL genCxfUrl = getResourceUrl(deploymentResolver, contextParams.get(BusHolder.PARAM_CXF_GEN_URL));
+ holder = new SpringBusHolder(cxfServletUrl, jbosswsCxfUrl, genCxfUrl);
}
else
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2013-01-09 10:37:23 UTC (rev 17225)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2013-01-09 12:37:30 UTC (rev 17226)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, 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.
*
@@ -42,8 +42,6 @@
import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
-import com.ibm.wsdl.util.xml.DOMUtils;
-
/**
* A deployer that locates or generates cxf.xml
*
@@ -67,16 +65,12 @@
putCXFConfigToDeployment(dep, BusHolder.PARAM_CXF_BEANS_URL, cxfURL);
}
}
- if (cxfURL == null) //no spring or no jbossws-cxf.xml
+ DDBeans dd = generateMetadataFromDeployment(dep); //metadata attached to deployment
+ //create additional DD if user provided jbossws-cxf.xml and Spring is available OR spring descriptor generation is forced
+ if (cxfURL != null || PREFER_SPRING_DESCRIPTOR_GENERATION)
{
- generateMetadataFromDeployment(dep);
- }
- else
- {
- DEPLOYMENT_LOGGER.actualConfFromFile(cxfURL);
- DDBeans dd = generateMetadataFromDeployment(dep);
URL generated = dd.createFileURL();
- DEPLOYMENT_LOGGER.jbwscxfConfGenerated(cxfURL);
+ DEPLOYMENT_LOGGER.jbwscxfConfGenerated(generated);
putCXFConfigToDeployment(dep, BusHolder.PARAM_CXF_GEN_URL, generated);
}
}
11 years, 4 months
JBossWS SVN: r17225 - thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-01-09 05:37:23 -0500 (Wed, 09 Jan 2013)
New Revision: 17225
Modified:
thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
Log:
[JBPAPP-10129] Merged patch from CXF-4735. Pick up @XMLJavaTypeAdapter on Setters in Exception classes
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java 2013-01-09 10:14:59 UTC (rev 17224)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java 2013-01-09 10:37:23 UTC (rev 17225)
@@ -147,21 +147,25 @@
}
private static boolean isGetter(Method m) {
- Class<?> declaringClass = m.getDeclaringClass();
- if (m.getReturnType() != Void.class && m.getParameterTypes().length == 0) {
- final int index = getterIndex(m.getName());
- if (index != -1) {
- String setterName = "set" + m.getName().substring(index);
- Class<?> paramTypes = m.getReturnType();
- Method setter = getDeclaredMethod(declaringClass, setterName, paramTypes);
- if (setter != null && !setter.isAnnotationPresent(XmlTransient.class)) {
- return true;
- }
+ if (m.getReturnType() != Void.class && m.getReturnType() != Void.TYPE && m.getParameterTypes().length == 0) {
+ Method setter = getSetter(m);
+ if (setter != null) {
+ return !setter.isAnnotationPresent(XmlTransient.class);
}
}
return false;
}
+ private static Method getSetter(Method m) {
+ final int index = getterIndex(m.getName());
+ if (index != -1) {
+ String setterName = "set" + m.getName().substring(index);
+ Class<?> paramTypes = m.getReturnType();
+ return getDeclaredMethod(m.getDeclaringClass(), setterName, paramTypes);
+ }
+ return null;
+ }
+
private static boolean isSetter(Method m) {
Class<?> declaringClass = m.getDeclaringClass();
boolean isVoidReturnType = m.getReturnType() == Void.class || m.getReturnType() == Void.TYPE;
@@ -263,6 +267,10 @@
static XmlJavaTypeAdapter getMethodXJTA(final Method m) {
XmlJavaTypeAdapter adapter = m.getAnnotation(XmlJavaTypeAdapter.class);
if (adapter == null) {
+ Method setter = getSetter(m);
+ adapter = setter.getAnnotation(XmlJavaTypeAdapter.class);
+ }
+ if (adapter == null) {
adapter = m.getReturnType().getAnnotation(XmlJavaTypeAdapter.class);
}
if (adapter == null) {
11 years, 4 months
JBossWS SVN: r17224 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-01-09 05:14:59 -0500 (Wed, 09 Jan 2013)
New Revision: 17224
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
[JBWS-3395/JBWS-3396]:Enable parse the spring configuration xml generated from web.xml
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-01-09 08:43:37 UTC (rev 17223)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-01-09 10:14:59 UTC (rev 17224)
@@ -64,6 +64,8 @@
public abstract class BusHolder
{
public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url";
+ public static final String PARAM_CXF_GEN_URL = "jbossws.cxf.gen.url";
+
protected Bus bus;
protected BusHolderLifeCycleListener busHolderListener;
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2013-01-09 08:43:37 UTC (rev 17223)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2013-01-09 10:14:59 UTC (rev 17224)
@@ -47,6 +47,7 @@
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver;
+import org.jboss.wsf.stack.cxf.spring.parser.JaxwsEndpointDefinitionParser.JBossWSSpringEndpointImpl;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
@@ -64,17 +65,26 @@
private boolean configured = false;
protected BusApplicationContext ctx;
+
+ protected GenericApplicationContext jbosswsCxfContext;
protected List<GenericApplicationContext> additionalCtx = new LinkedList<GenericApplicationContext>();
private ConfiguredBeanLocator delegatingBeanLocator;
protected URL[] additionalLocations;
+
+ protected URL jbosswsCXF;
- public SpringBusHolder(URL location, URL... additionalLocations)
+ public SpringBusHolder(URL location, URL jbosswscxf, URL... additionalLocations)
{
super();
+ createBus(location);
+ jbosswsCXF = jbosswscxf;
this.additionalLocations = additionalLocations;
- createBus(location);
+ if (jbosswsCxfContext != null && jbosswsCxfContext.getBeanNamesForType(JBossWSSpringEndpointImpl.class).length >=1)
+ {
+ this.additionalLocations = new URL[]{};
+ }
}
/**
@@ -106,6 +116,7 @@
DEPLOYMENT_LOGGER.unableToLoadAdditionalConfigurationFrom(location, e);
}
}
+
//Force servlet transport to prevent CXF from using Jetty / http server or other transports
bus.setExtension(new ServletDestinationFactory(), HttpDestinationFactory.class);
}
@@ -127,17 +138,33 @@
throw MESSAGES.busAlreadyConfigured(ctx);
}
super.configure(resolver, configurer, wsmd);
- if (additionalLocations != null)
+
+ if (jbosswsCXF != null)
{
- for (URL jbossCxfXml : additionalLocations)
+ try
{
+ jbosswsCxfContext = loadAdditionalConfig(ctx, jbosswsCXF);
+ }
+ catch (IOException e)
+ {
+ DEPLOYMENT_LOGGER.unableToLoadAdditionalConfigurationFrom(jbosswsCXF, e);
+ }
+ }
+
+
+ if (jbosswsCxfContext != null
+ && jbosswsCxfContext.getBeansOfType(JBossWSSpringEndpointImpl.class).isEmpty() && additionalLocations != null)
+ {
+
+ for (URL additionXml : additionalLocations)
+ {
try
{
- loadAdditionalConfig(ctx, jbossCxfXml);
+ loadAdditionalConfig(jbosswsCxfContext, additionXml);
}
catch (IOException e)
{
- throw MESSAGES.unableToLoadConfigurationFrom(jbossCxfXml, e);
+ throw MESSAGES.unableToLoadConfigurationFrom(additionXml, e);
}
}
}
@@ -174,13 +201,13 @@
return serverConfigurer;
}
- protected GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl)
+ protected GenericApplicationContext loadAdditionalConfig(ApplicationContext parent , URL locationUrl)
throws IOException
{
if (locationUrl == null)
throw MESSAGES.unableToLoadAdditionalConfigFromNull();
InputStream is = locationUrl.openStream();
- GenericApplicationContext childCtx = new GenericApplicationContext(ctx);
+ GenericApplicationContext childCtx = new GenericApplicationContext(parent);
additionalCtx.add(childCtx);
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx);
reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-01-09 08:43:37 UTC (rev 17223)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-01-09 10:14:59 UTC (rev 17224)
@@ -88,6 +88,7 @@
final ResourceResolver deploymentResolver = aDep.getResourceResolver();
final org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
Map<String, String> contextParams = (Map<String, String>) dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
+ String jbosswsGenXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_GEN_URL);
String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL);
BusHolder holder = null;
@@ -101,7 +102,8 @@
// Spring available and jbossws-cxf.xml provided
final URL cxfServletUrl = deploymentResolver.resolveFailSafe("WEB-INF/cxf-servlet.xml"); // TODO: decide not to support this?
final URL jbosswsCxfUrl = getResourceUrl(deploymentResolver, jbosswsCxfXml);
- holder = new SpringBusHolder(cxfServletUrl, jbosswsCxfUrl);
+ final URL genCxfUrl = getResourceUrl(deploymentResolver, jbosswsGenXml);
+ holder = new SpringBusHolder(cxfServletUrl, jbosswsCxfUrl, new URL[]{genCxfUrl});
}
else
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-01-09 08:43:37 UTC (rev 17223)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-01-09 10:14:59 UTC (rev 17224)
@@ -44,13 +44,8 @@
boolean springAvailable = SpringUtils.isSpringAvailable();
for (final Endpoint ep : dep.getService().getEndpoints())
{
- final ServerFactoryBean factory = ep.getAttachment(ServerFactoryBean.class);
- //TODO: remove this after JBWS-3396 resolved
- if (factory == null && springAvailable)
- {
- throw Messages.MESSAGES.endpointNotDefineInJbwsCxf(ep.getTargetBeanName());
- }
- ep.setInstanceProvider(new CXFInstanceProvider(factory));
+ final ServerFactoryBean factory = ep.getAttachment(ServerFactoryBean.class);
+ ep.setInstanceProvider(new CXFInstanceProvider(factory));
}
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2013-01-09 08:43:37 UTC (rev 17223)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2013-01-09 10:14:59 UTC (rev 17224)
@@ -42,6 +42,8 @@
import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
+import com.ibm.wsdl.util.xml.DOMUtils;
+
/**
* A deployer that locates or generates cxf.xml
*
@@ -59,25 +61,23 @@
URL cxfURL = null;
if (SpringUtils.isSpringAvailable())
{
- //only try reading jbossws-cxf.xml if Spring available...
cxfURL = getCXFConfigFromDeployment(dep);
- //... but do not generate it if it's not provided
- //or unless it's explicitly required to be generated
- if (cxfURL == null && PREFER_SPRING_DESCRIPTOR_GENERATION)
+ if (cxfURL != null)
{
- DDBeans dd = generateMetadataFromDeployment(dep);
- cxfURL = dd.createFileURL();
- DEPLOYMENT_LOGGER.jbwscxfConfGenerated(cxfURL);
+ putCXFConfigToDeployment(dep, BusHolder.PARAM_CXF_BEANS_URL, cxfURL);
}
}
- if (cxfURL == null)
+ if (cxfURL == null) //no spring or no jbossws-cxf.xml
{
generateMetadataFromDeployment(dep);
}
- else
- {
+ else
+ {
DEPLOYMENT_LOGGER.actualConfFromFile(cxfURL);
- putCXFConfigToDeployment(dep, cxfURL);
+ DDBeans dd = generateMetadataFromDeployment(dep);
+ URL generated = dd.createFileURL();
+ DEPLOYMENT_LOGGER.jbwscxfConfGenerated(cxfURL);
+ putCXFConfigToDeployment(dep, BusHolder.PARAM_CXF_GEN_URL, generated);
}
}
@@ -147,11 +147,12 @@
* Puts CXF config file reference to the stack specific context properties.
*
* @param dep webservice deployment
- * @param cxfURL CXF DD URL
+ * @param key the key to put in the context parameter
+ * @param value the cxf spring configuration url to put in the context parameter
* @see org.jboss.ws.common.integration.WSConstants.STACK_CONTEXT_PARAMS
*/
@SuppressWarnings("unchecked")
- private void putCXFConfigToDeployment(Deployment dep, URL cxfURL)
+ private void putCXFConfigToDeployment(Deployment dep, String key, URL value)
{
// get property map
Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
@@ -162,7 +163,7 @@
dep.setProperty(WSConstants.STACK_CONTEXT_PARAMS, contextParams);
}
// put cxf config URL to the property map
- contextParams.put(BusHolder.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm());
+ contextParams.put(key, value.toExternalForm());
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml 2013-01-09 08:43:37 UTC (rev 17223)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml 2013-01-09 10:14:59 UTC (rev 17224)
@@ -7,18 +7,9 @@
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding"
scope="prototype" />
-
- <bean id="aegis-service-factory" class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean"
- scope="prototype">
+ <!--Test for JBWS-3396 -->
+ <bean name="{http://aegis.cxf.jaxws.ws.test.jboss.org/}AegisGroupQueryImplPort.jaxws-endpoint" abstract="true">
<property name="dataBinding" ref="aegisBean" />
</bean>
-
- <jaxws:endpoint id='AegisGroupQueryService'
- address='http://@jboss.bind.address@:8080/jaxws-aegis'
- implementor='org.jboss.test.ws.jaxws.cxf.aegis.AegisGroupQueryImpl'>
- <jaxws:serviceFactory>
- <ref bean='aegis-service-factory' />
- </jaxws:serviceFactory>
- </jaxws:endpoint>
-
-</beans>
+</beans>
+
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2013-01-09 08:43:37 UTC (rev 17223)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2013-01-09 10:14:59 UTC (rev 17224)
@@ -46,9 +46,9 @@
{
if (SpringUtils.isSpringAvailable(Thread.currentThread().getContextClassLoader()))
{
- simpleShutdownTest(new SpringBusHolder(null, new URL[]{}));
- shutdownTestWithInnerShutdown(new SpringBusHolder(null, new URL[]{}));
- shutdownTestWithNoShutdown(new SpringBusHolder(null, new URL[]{}));
+ simpleShutdownTest(new SpringBusHolder(null, null, new URL[]{}));
+ shutdownTestWithInnerShutdown(new SpringBusHolder(null, null, new URL[]{}));
+ shutdownTestWithNoShutdown(new SpringBusHolder(null, null, new URL[]{}));
}
else
{
11 years, 4 months
JBossWS SVN: r17223 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-09 03:43:37 -0500 (Wed, 09 Jan 2013)
New Revision: 17223
Modified:
hudson/trunk/pom.xml
Log:
Moving to 4.2.0-SNAPSHOT
Modified: hudson/trunk/pom.xml
===================================================================
--- hudson/trunk/pom.xml 2013-01-09 08:43:00 UTC (rev 17222)
+++ hudson/trunk/pom.xml 2013-01-09 08:43:37 UTC (rev 17223)
@@ -20,7 +20,7 @@
<artifactId>jbossws-hudson</artifactId>
<packaging>pom</packaging>
<description>JBossWS Hudson Integration</description>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
11 years, 4 months
JBossWS SVN: r17222 - hudson/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-09 03:43:00 -0500 (Wed, 09 Jan 2013)
New Revision: 17222
Added:
hudson/branches/jbossws-hudson-4.1.x/
Log:
Creating 4.1.x branch
11 years, 4 months
JBossWS SVN: r17221 - in stack/native/trunk: modules/core and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 12:34:26 -0500 (Tue, 08 Jan 2013)
New Revision: 17221
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/dist/pom.xml
stack/native/trunk/modules/resources/pom.xml
stack/native/trunk/modules/services/pom.xml
stack/native/trunk/modules/testsuite/native-tests/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
Moving to 4.2.0-SNAPSHOT
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
+++ stack/native/trunk/modules/core/pom.xml 2013-01-08 17:34:26 UTC (rev 17221)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
+++ stack/native/trunk/modules/dist/pom.xml 2013-01-08 17:34:26 UTC (rev 17221)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/resources/pom.xml
===================================================================
--- stack/native/trunk/modules/resources/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
+++ stack/native/trunk/modules/resources/pom.xml 2013-01-08 17:34:26 UTC (rev 17221)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/services/pom.xml
===================================================================
--- stack/native/trunk/modules/services/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
+++ stack/native/trunk/modules/services/pom.xml 2013-01-08 17:34:26 UTC (rev 17221)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2013-01-08 17:34:26 UTC (rev 17221)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
+++ stack/native/trunk/modules/testsuite/pom.xml 2013-01-08 17:34:26 UTC (rev 17221)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
+++ stack/native/trunk/pom.xml 2013-01-08 17:34:26 UTC (rev 17221)
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -57,11 +57,11 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.1.Final</jbossws.api.version>
- <jbossws.spi.version>2.1.1-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.1.1-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>2.1.1.Final</jbossws.spi.version>
+ <jbossws.common.version>2.1.1.Final</jbossws.common.version>
<jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.1.0.Final</jbossws.shared.testsuite.version>
- <jbossws.jboss713.version>4.1.1-SNAPSHOT</jbossws.jboss713.version>
+ <jbossws.jboss713.version>4.1.1.Final</jbossws.jboss713.version>
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<javassist.version>3.15.0-GA</javassist.version>
11 years, 4 months
JBossWS SVN: r17220 - in stack/cxf/trunk: modules/addons and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 12:26:48 -0500 (Tue, 08 Jan 2013)
New Revision: 17220
Modified:
stack/cxf/trunk/modules/addons/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/endorsed/pom.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
stack/cxf/trunk/pom.xml
Log:
Moving to 4.2.0-SNAPSHOT and consuming Apache CXF 2.7.2
Modified: stack/cxf/trunk/modules/addons/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/addons/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/client/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/dist/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/endorsed/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/resources/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/server/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
+++ stack/cxf/trunk/pom.xml 2013-01-08 17:26:48 UTC (rev 17220)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -73,7 +73,7 @@
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.6.5</cxf.version>
+ <cxf.version>2.7.2</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
11 years, 4 months
JBossWS SVN: r17219 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 12:23:40 -0500 (Tue, 08 Jan 2013)
New Revision: 17219
Modified:
stack/cxf/trunk/pom.xml
Log:
Updating pom
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-01-08 17:17:43 UTC (rev 17218)
+++ stack/cxf/trunk/pom.xml 2013-01-08 17:23:40 UTC (rev 17219)
@@ -60,14 +60,14 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.1.Final</jbossws.api.version>
- <jbossws.spi.version>2.1.1-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.1.1-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.1.1-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss711.version>4.1.1-SNAPSHOT</jbossws.jboss711.version>
- <jbossws.jboss712.version>4.1.1-SNAPSHOT</jbossws.jboss712.version>
- <jbossws.jboss713.version>4.1.1-SNAPSHOT</jbossws.jboss713.version>
- <jbossws.native.version>4.1.1-SNAPSHOT</jbossws.native.version>
+ <jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version>
+ <jbossws.jboss711.version>4.1.1.Final</jbossws.jboss711.version>
+ <jbossws.jboss712.version>4.1.1.Final</jbossws.jboss712.version>
+ <jbossws.jboss713.version>4.1.1.Final</jbossws.jboss713.version>
+ <jbossws.native.version>4.1.1.Final</jbossws.native.version>
<jboss711.version>7.1.1.Final</jboss711.version>
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
11 years, 4 months