Author: dkulp
Date: Wed Jan 28 20:30:16 2009
New Revision: 738609
URL: http://svn.apache.org/viewvc?rev=738609&view=rev
Log:
Merged revisions 738588,738590,738594 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
........
r738588 | dkulp | 2009-01-28 14:17:05 -0500 (Wed, 28 Jan 2009) | 2 lines
Fix test failure
........
r738590 | dkulp | 2009-01-28 14:17:33 -0500 (Wed, 28 Jan 2009) | 2 lines
Remove unused @SuppressWarnings annotations
........
r738594 | dkulp | 2009-01-28 14:30:36 -0500 (Wed, 28 Jan 2009) | 2 lines
remove unneeded annotations, fix test failure
........
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-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.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/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 20:30:16 2009
@@ -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,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245
+/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,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594
/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,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244
/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=738609&r1=738608&r2=738609&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
Wed Jan 28 20:30:16 2009
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.configuration.spring;
+import java.io.StringReader;
import java.io.StringWriter;
import java.util.Map;
import java.util.StringTokenizer;
@@ -28,6 +29,8 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Attr;
@@ -243,7 +246,6 @@
mapElementToJaxbProperty(data, bean, propertyName, c);
}
- @SuppressWarnings("deprecation")
protected void mapElementToJaxbProperty(Element data,
BeanDefinitionBuilder bean,
String propertyName,
@@ -293,6 +295,72 @@
}
}
+
+ public void mapElementToJaxbPropertyFactory(Element data,
+ BeanDefinitionBuilder bean,
+ String propertyName,
+ Class<?> factory,
+ String method,
+ Object ... args) {
+ bean.addPropertyValue(propertyName, mapElementToJaxbBean(data, factory,
+ null, method,
args));
+ }
+
+ public AbstractBeanDefinition mapElementToJaxbBean(Element data,
+ Class<?> cls,
+ Class<?> factory,
+ String method,
+ Object ... args) {
+ StringWriter writer = new StringWriter();
+ XMLStreamWriter xmlWriter = StaxUtils.createXMLStreamWriter(writer);
+ try {
+ StaxUtils.copy(data, xmlWriter);
+ xmlWriter.flush();
+ } catch (XMLStreamException e) {
+ throw new RuntimeException(e);
+ }
+
+ BeanDefinitionBuilder jaxbbean
+ = BeanDefinitionBuilder.rootBeanDefinition(cls);
+ if (factory != null) {
+
jaxbbean.getRawBeanDefinition().setFactoryBeanName(factory.getName());
+ }
+ jaxbbean.getRawBeanDefinition().setFactoryMethodName(method);
+ jaxbbean.addConstructorArg(writer.toString());
+ if (args != null) {
+ for (Object o : args) {
+ jaxbbean.addConstructorArg(o);
+ }
+ }
+ return jaxbbean.getBeanDefinition();
+ }
+
+ protected static <T> T unmarshalFactoryString(String s, Class<T> cls) {
+ StringReader reader = new StringReader(s);
+ XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
+ try {
+ String pkg = cls.getPackage().getName();
+ JAXBContext context = packageContextCache.get(pkg);
+ if (context == null) {
+ context = JAXBContext.newInstance(pkg, cls.getClassLoader());
+ packageContextCache.put(pkg, context);
+ }
+
+ Unmarshaller u = context.createUnmarshaller();
+ Object obj = u.unmarshal(data, cls);
+ if (obj instanceof JAXBElement<?>) {
+ JAXBElement<?> el = (JAXBElement<?>)obj;
+ obj = el.getValue();
+
+ }
+ return cls.cast(obj);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
protected String getJaxbPackage() {
return "";
}
Modified:
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java?rev=738609&r1=738608&r2=738609&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
Wed Jan 28 20:30:16 2009
@@ -44,6 +44,8 @@
import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.ParserContext;
@@ -54,6 +56,19 @@
extends AbstractBeanDefinitionParser {
private static final String HTTP_JETTY_NS =
"http://cxf.apache.org/transports/http-jetty/configuration";;
+ protected String resolveId(Element elem, AbstractBeanDefinition
definition,
+ ParserContext ctx) throws
BeanDefinitionStoreException {
+ String id = this.getIdOrName(elem);
+ if (StringUtils.isEmpty(id)) {
+ return JettyHTTPServerEngineFactory.class.getName();
+ }
+ id = super.resolveId(elem, definition, ctx);
+ if
(!ctx.getRegistry().containsBeanDefinition(JettyHTTPServerEngineFactory.class.getName()))
{
+ ctx.getRegistry().registerAlias(id,
JettyHTTPServerEngineFactory.class.getName());
+ }
+ return id;
+ }
+
@Override
public void doParse(Element element, ParserContext ctx,
BeanDefinitionBuilder bean) {
//bean.setAbstract(true);
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=738609&r1=738608&r2=738609&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
Wed Jan 28 20:30:16 2009
@@ -100,7 +100,6 @@
* a TLSClientParametersConfig object initialized with the JAXB
* generated type unmarshalled from the selected node.
*/
- @SuppressWarnings("deprecation")
public void mapTLSClientParameters(Element n, BeanDefinitionBuilder bean) {
StringWriter writer = new StringWriter();
XMLStreamWriter xmlWriter = StaxUtils.createXMLStreamWriter(writer);
Modified:
cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=738609&r1=738608&r2=738609&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Wed Jan 28 20:30:16 2009
@@ -51,6 +51,7 @@
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
@@ -331,6 +332,24 @@
}
return cbHandler;
}
+ public Crypto loadSignatureCrypto(RequestData reqData)
+ throws WSSecurityException {
+ try {
+ return super.loadSignatureCrypto(reqData);
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+ protected Crypto loadDecryptionCrypto(RequestData reqData)
+ throws WSSecurityException {
+ try {
+ return super.loadDecryptionCrypto(reqData);
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+
+
/**
* @return the WSSecurityEngine in use by this interceptor.
Modified:
cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java?rev=738609&r1=738608&r2=738609&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
Wed Jan 28 20:30:16 2009
@@ -40,7 +40,7 @@
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String pass = (String)passwords.get(pc.getIdentifer());
+ String pass = (String)passwords.get(pc.getIdentifier());
if (pass != null) {
pc.setPassword(pass);
}
Modified:
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java?rev=738609&r1=738608&r2=738609&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java
(original)
+++
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java
Wed Jan 28 20:30:16 2009
@@ -49,7 +49,7 @@
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String pass = passwords.get(pc.getIdentifer());
+ String pass = passwords.get(pc.getIdentifier());
if (pass != null) {
pc.setPassword(pass);
return;
