You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/11/19 21:49:19 UTC
svn commit: r476916 - in /webservices/axis2/trunk/java: etc/
modules/secpolicy/src/org/apache/ws/secpolicy/
modules/security/src/org/apache/rampart/
modules/security/src/org/apache/rampart/handler/
Author: dims
Date: Sun Nov 19 12:49:18 2006
New Revision: 476916
URL: http://svn.apache.org/viewvc?view=rev&rev=476916
Log:
merge 476707-476773 and update the version of xml-security
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/Constants.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/RampartMessageData.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/RampartReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=476916&r1=476915&r2=476916
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Sun Nov 19 12:49:18 2006
@@ -127,7 +127,7 @@
xerces.version=2.8.1
xml_apis.version=1.3.03
XmlSchema.version=1.2
-xmlsec.version=1.3.0
+xmlsec.version=1.4-SNAPSHOT
xmlunit.version=1.0
log4j.version=1.2.13
Modified: webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/Constants.java?view=diff&rev=476916&r1=476915&r2=476916
==============================================================================
--- webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/Constants.java Sun Nov 19 12:49:18 2006
@@ -156,11 +156,11 @@
public final static String TRIPLE_DES = "http://www.w3.org/2001/04/xmlenc#tripledes-cbc";
- public final static String KW_AES128 = "http://www.w3.org/2001/04/xmlenc#kw-aes256";
+ public final static String KW_AES128 = "http://www.w3.org/2001/04/xmlenc#kw-aes128";
public final static String KW_AES192 = "http://www.w3.org/2001/04/xmlenc#kw-aes192";
- public final static String KW_AES256 = "http://www.w3.org/2001/04/xmlenc#kw-aes128";
+ public final static String KW_AES256 = "http://www.w3.org/2001/04/xmlenc#kw-aes256";
public final static String KW_TRIPLE_DES = "http://www.w3.org/2001/04/xmlenc#kw-tripledes";
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/RampartMessageData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/RampartMessageData.java?view=diff&rev=476916&r1=476915&r2=476916
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/RampartMessageData.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/RampartMessageData.java Sun Nov 19 12:49:18 2006
@@ -17,7 +17,6 @@
package org.apache.rampart;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -132,8 +131,6 @@
public RampartMessageData(MessageContext msgCtx, boolean sender) throws RampartException {
- DocumentBuilderFactoryImpl.setDOOMRequired(true);
-
this.msgContext = msgCtx;
try {
@@ -208,6 +205,12 @@
if(this.policyData != null) {
//Check for RST and RSTR for an SCT
RampartConfig rampartConfig = this.policyData.getRampartConfig();
+
+ if(rampartConfig == null) {
+ //We'r missing the extra info rampart needs
+ throw new RampartException("rampartConigMissing");
+ }
+
if((WSSHandlerConstants.RST_ACTON_SCT.equals(msgContext.getWSAAction())
|| WSSHandlerConstants.RSTR_ACTON_SCT.equals(msgContext.getWSAAction())) &&
this.policyData.getIssuerPolicy() != null) {
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties?view=diff&rev=476916&r1=476915&r2=476916
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties Sun Nov 19 12:49:18 2006
@@ -59,6 +59,9 @@
tokenToBeCancelledInvalid = Token to be cancelled is invalid or expired
errorCreatingRSTTemplateForSCT=Error in creating RST template for SCT
noSecurityToken = Missing security token
+noSecurityResults= No security processing results from the incoming message
+missingEncryptedKeyInRequest=There was no EncryptedKey in the request message
+rampartConigMissing = Please include configured RampartConfiguration assertion in policy
#Errors in processors
errorProcessingUT = Error in processing UsernameToken
@@ -67,4 +70,5 @@
trustVerificationError = The certificate used for the signature is not trusted
cannotFindAliasForCert = Could not get alias for certificate with {0}
noCertForAlias = Could not get certificates for alias {0}
-certPathVerificationFailed = Certificate path verification failed for certificate with subject
\ No newline at end of file
+certPathVerificationFailed = Certificate path verification failed for certificate with subject
+
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/RampartReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/RampartReceiver.java?view=diff&rev=476916&r1=476915&r2=476916
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/RampartReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/RampartReceiver.java Sun Nov 19 12:49:18 2006
@@ -17,7 +17,6 @@
package org.apache.rampart.handler;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
@@ -79,11 +78,7 @@
} catch (RampartException e) {
e.printStackTrace();
throw new AxisFault(e);
- } finally {
- // Reset the document builder factory
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
- Axis2Util.useDOOM(false);
- }
+ }
if(wsResult == null) {
return InvocationResponse.CONTINUE;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java?view=diff&rev=476916&r1=476915&r2=476916
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java Sun Nov 19 12:49:18 2006
@@ -18,7 +18,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -75,15 +74,6 @@
boolean disableDoom = disableDoomValue != null
&& Constants.VALUE_TRUE.equalsIgnoreCase(disableDoomValue);
- if (!disableDoom) {
- /**
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation
- * is required.
- */
- // Set the DOM impl to DOOM
- DocumentBuilderFactoryImpl.setDOOMRequired(true);
- }
RequestData reqData = new RequestData();
try {
@@ -112,15 +102,6 @@
reqData = null;
}
- /**
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation
- * is required.
- */
- // Reset the document builder factory
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
-
- Axis2Util.useDOOM(false);
if (doDebug) {
log.debug("WSDoAllReceiver: exit invoke()");
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java?view=diff&rev=476916&r1=476915&r2=476916
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java Sun Nov 19 12:49:18 2006
@@ -17,7 +17,6 @@
package org.apache.rampart.handler;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
@@ -73,14 +72,6 @@
String disableDoomValue = (String)msgContext.getProperty(WSSHandlerConstants.DISABLE_DOOM);
boolean disableDoom = disableDoomValue != null && Constants.VALUE_TRUE.equalsIgnoreCase(disableDoomValue);
- if(!disableDoom) {
- /*
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation is required.
- */
- // Set the DOM impl to DOOM
- DocumentBuilderFactoryImpl.setDOOMRequired(true);
- }
RequestData reqData = new RequestData();
try {
Parameter param = ConversationConfiguration.getParameter(msgContext);
@@ -102,13 +93,6 @@
reqData.clear();
reqData = null;
}
-
- /**
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation is required.
- */
- //Reset the document builder factory
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
}
}
@@ -448,4 +432,4 @@
sct.getElement(), false);
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org