You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/12/11 19:48:38 UTC
svn commit: r725775 - in /cxf/branches/2.0.x-fixes: ./
common/common/src/main/java/org/apache/cxf/configuration/spring/
rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/
rt/transports/http/src/main/java/org/apache/cxf/transport...
Author: dkulp
Date: Thu Dec 11 10:48:37 2008
New Revision: 725775
URL: http://svn.apache.org/viewvc?rev=725775&view=rev
Log:
Merged revisions 725774 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r725774 | dkulp | 2008-12-11 13:46:42 -0500 (Thu, 11 Dec 2008) | 9 lines
Merged revisions 725773 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r725773 | dkulp | 2008-12-11 13:45:12 -0500 (Thu, 11 Dec 2008) | 2 lines
Remove unneeded mergeinfo propery
........
................
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl (props changed)
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 10:48:37 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725774
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,725773
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=725775&r1=725774&r2=725775&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Thu Dec 11 10:48:37 2008
@@ -240,7 +240,14 @@
if (data == null) {
return;
}
-
+ mapElementToJaxbProperty(data, bean, propertyName, c);
+ }
+
+ @SuppressWarnings("deprecation")
+ protected void mapElementToJaxbProperty(Element data,
+ BeanDefinitionBuilder bean,
+ String propertyName,
+ Class<?> c) {
JAXBContext context = null;
try {
String pkg = getJaxbPackage();
Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java?rev=725775&r1=725774&r2=725775&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java Thu Dec 11 10:48:37 2008
@@ -19,11 +19,20 @@
package org.apache.cxf.configuration.jsse.spring;
import java.io.IOException;
+import java.io.StringReader;
import java.security.GeneralSecurityException;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.configuration.security.TLSClientParametersType;
+import org.apache.cxf.staxutils.StaxUtils;
/**
* This class provides the TLSClientParameters that programmatically
@@ -31,39 +40,74 @@
* type TLSClientParametersType that was used in the Spring configuration
* of the http-conduit bean.
*/
-public class TLSClientParametersConfig
- extends TLSClientParameters {
+public class TLSClientParametersConfig {
+ static JAXBContext context = null;
- public TLSClientParametersConfig(TLSClientParametersType params)
+ private static synchronized JAXBContext getContext() throws JAXBException {
+ if (context == null) {
+ context = JAXBContext.newInstance(PackageUtils.getPackageName(TLSClientParametersType.class),
+ TLSClientParametersConfig.class.getClassLoader());
+ }
+ return context;
+ }
+
+ static TLSClientParameters createTLSClientParametersFromType(TLSClientParametersType params)
throws GeneralSecurityException,
IOException {
+ TLSClientParameters ret = new TLSClientParameters();
if (params.isDisableCNCheck()) {
- this.setDisableCNCheck(true);
+ ret.setDisableCNCheck(true);
}
if (params.isSetCipherSuitesFilter()) {
- this.setCipherSuitesFilter(params.getCipherSuitesFilter());
+ ret.setCipherSuitesFilter(params.getCipherSuitesFilter());
}
if (params.isSetCipherSuites()) {
- this.setCipherSuites(params.getCipherSuites().getCipherSuite());
+ ret.setCipherSuites(params.getCipherSuites().getCipherSuite());
}
if (params.isSetJsseProvider()) {
- this.setJsseProvider(params.getJsseProvider());
+ ret.setJsseProvider(params.getJsseProvider());
}
if (params.isSetSecureRandomParameters()) {
- this.setSecureRandom(
+ ret.setSecureRandom(
TLSParameterJaxBUtils.getSecureRandom(
params.getSecureRandomParameters()));
}
if (params.isSetKeyManagers()) {
- this.setKeyManagers(
+ ret.setKeyManagers(
TLSParameterJaxBUtils.getKeyManagers(params.getKeyManagers()));
}
if (params.isSetTrustManagers()) {
- this.setTrustManagers(
+ ret.setTrustManagers(
TLSParameterJaxBUtils.getTrustManagers(
params.getTrustManagers()));
}
+ return ret;
+ }
+
+
+
+ public static Object createTLSClientParameters(String s) {
+
+ StringReader reader = new StringReader(s);
+ XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
+ Unmarshaller u;
+ try {
+ u = getContext().createUnmarshaller();
+ Object obj = u.unmarshal(data, TLSClientParametersType.class);
+ if (obj instanceof JAXBElement<?>) {
+ JAXBElement<?> el = (JAXBElement<?>)obj;
+ obj = el.getValue();
+
+ }
+
+ TLSClientParametersType cpt = (TLSClientParametersType)obj;
+ return createTLSClientParametersFromType(cpt);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
}
Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java?rev=725775&r1=725774&r2=725775&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java Thu Dec 11 10:48:37 2008
@@ -18,10 +18,14 @@
*/
package org.apache.cxf.transport.http.spring;
+import java.io.StringWriter;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,6 +39,7 @@
import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
import org.apache.cxf.configuration.security.TLSClientParametersType;
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http.HttpBasicAuthSupplier;
import org.apache.cxf.transport.http.MessageTrustDecider;
@@ -90,7 +95,7 @@
} else if ("basicAuthSupplier".equals(elementName)) {
mapBeanOrClassElement((Element)n, bean, HttpBasicAuthSupplier.class);
} else if ("tlsClientParameters".equals(elementName)) {
- mapTLSClientParameters(n, bean);
+ mapTLSClientParameters((Element)n, bean);
}
}
@@ -101,23 +106,22 @@
* a TLSClientParametersConfig object initialized with the JAXB
* generated type unmarshalled from the selected node.
*/
- public void mapTLSClientParameters(Node n, BeanDefinitionBuilder bean) {
-
- // Unmarshal the JAXB Generated Type from Config and inject
- // the configured TLSClientParameters into the HTTPConduit.
- JAXBContext context = null;
+ @SuppressWarnings("deprecation")
+ public void mapTLSClientParameters(Element n, BeanDefinitionBuilder bean) {
+ StringWriter writer = new StringWriter();
+ XMLStreamWriter xmlWriter = StaxUtils.createXMLStreamWriter(writer);
try {
- context = JAXBContext.newInstance(PackageUtils.getPackageName(TLSClientParametersType.class),
- getClass().getClassLoader());
- Unmarshaller u = context.createUnmarshaller();
- JAXBElement<TLSClientParametersType> jaxb =
- u.unmarshal(n, TLSClientParametersType.class);
- TLSClientParameters params =
- new TLSClientParametersConfig(jaxb.getValue());
- bean.addPropertyValue("tlsClientParameters", params);
- } catch (Exception e) {
- throw new RuntimeException("Could not process configuration.", e);
+ StaxUtils.copy(n, xmlWriter);
+ xmlWriter.flush();
+ } catch (XMLStreamException e) {
+ throw new RuntimeException(e);
}
+
+ BeanDefinitionBuilder jaxbbean
+ = BeanDefinitionBuilder.rootBeanDefinition(TLSClientParametersConfig.class);
+ jaxbbean.getRawBeanDefinition().setFactoryMethodName("createTLSClientParameters");
+ jaxbbean.addConstructorArg(writer.toString());
+ bean.addPropertyValue("tlsClientParameters", jaxbbean.getBeanDefinition());
}
/**
Propchange: cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
('svn:mergeinfo' removed)