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 2009/06/05 20:22:09 UTC
svn commit: r782090 - in /cxf/trunk:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
systests/pom.xml
Author: dkulp
Date: Fri Jun 5 18:22:09 2009
New Revision: 782090
URL: http://svn.apache.org/viewvc?rev=782090&view=rev
Log:
Forgot to commit these files
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
cxf/trunk/systests/pom.xml
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java?rev=782090&r1=782089&r2=782090&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java Fri Jun 5 18:22:09 2009
@@ -22,6 +22,8 @@
import java.util.Collection;
import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -29,6 +31,8 @@
import org.w3c.dom.Element;
import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.ws.policy.AssertionInfo;
import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.cxf.ws.security.policy.SPConstants;
@@ -57,6 +61,9 @@
*
*/
public class AsymmetricBindingHandler extends AbstractBindingBuilder {
+
+ private static final Logger LOG = LogUtils.getL7dLogger(AsymmetricBindingHandler.class);
+
AsymmetricBinding abinding;
private WSSecEncryptedKey encrKey;
@@ -133,8 +140,9 @@
doEncryption(recToken, enc, false);
} catch (Exception e) {
- e.printStackTrace();
- //REVISIT!!
+ String reason = e.getMessage();
+ LOG.log(Level.WARNING, "Sign before encryption failed due to : " + reason);
+ throw new Fault(e);
}
}
Modified: cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/pom.xml?rev=782090&r1=782089&r2=782090&view=diff
==============================================================================
--- cxf/trunk/systests/pom.xml (original)
+++ cxf/trunk/systests/pom.xml Fri Jun 5 18:22:09 2009
@@ -123,6 +123,51 @@
<goal>wsdl2java</goal>
</goals>
</execution>
+ <execution>
+ <id>generate-wssec10-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>${basedir}/src/test/resources/wsdl_systest/wssec10/WsSecurity10.wsdl</wsdl>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-wssec11-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>${basedir}/src/test/resources/wsdl_systest/wssec11/WsSecurity11.wsdl</wsdl>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-wssc-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>${basedir}/src/test/resources/wsdl_systest/wssc/WSSecureConversation.wsdl</wsdl>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>