Author: werner
Date: Wed Sep 7 01:26:49 2005
New Revision: 279277
URL: http://svn.apache.org/viewcvs?rev=279277&view=rev
Log:
Make sandbox code compile clean after changes to remove old namespaces.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConvHandlerConstants.java
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationClientHandler.java
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationServerHandler.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConvHandlerConstants.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConvHandlerConstants.java?rev=279277&r1=279276&r2=279277&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConvHandlerConstants.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConvHandlerConstants.java
Wed Sep 7 01:26:49 2005
@@ -114,4 +114,4 @@
sctEstablishmentMapper.put("InteropHandshake",
new
Integer(ConversationConstants.INTEROP_SCENE1));
}
-}
\ No newline at end of file
+}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationClientHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationClientHandler.java?rev=279277&r1=279276&r2=279277&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationClientHandler.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationClientHandler.java
Wed Sep 7 01:26:49 2005
@@ -213,7 +213,7 @@
// add the relavent SCT
Element securityHeader =
-
WSSecurityUtil.findWsseSecurityHeaderBlock(WSSConfig.getDefaultWSConfig(),
+ WSSecurityUtil.findWsseSecurityHeaderBlock(
doc,
doc.getDocumentElement(),
true);
@@ -595,7 +595,7 @@
this.serverAlias);
Element secHeader =
-
WSSecurityUtil.findWsseSecurityHeaderBlock(WSSConfig.getDefaultWSConfig(),
+ WSSecurityUtil.findWsseSecurityHeaderBlock(
doc,
doc.getDocumentElement(),
true);
@@ -853,4 +853,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationServerHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationServerHandler.java?rev=279277&r1=279276&r2=279277&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationServerHandler.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/sandbox/axis/security/conversation/ConversationServerHandler.java
Wed Sep 7 01:26:49 2005
@@ -342,7 +342,7 @@
if(session.isAddBase2Message()){
//add the relavent SCT
Element securityHeader =
-
WSSecurityUtil.findWsseSecurityHeaderBlock(WSSConfig.getDefaultWSConfig(),
+ WSSecurityUtil.findWsseSecurityHeaderBlock(
doc,
doc.getDocumentElement(),
true);
@@ -361,8 +361,8 @@
if(session.getRef2Base()==null){
//do nothing
}else{
- stRef2Base = new
SecurityTokenReference(WSSConfig.getDefaultWSConfig(),doc);
- Reference ref = new
Reference(WSSConfig.getDefaultWSConfig(),doc);
+ stRef2Base = new SecurityTokenReference(doc);
+ Reference ref = new Reference(doc);
Reference oldRef = session.getRef2Base();
ref.setURI(oldRef.getURI());
@@ -561,7 +561,4 @@
encryptParts.add(encPart);
}
}
-
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
