Author: darran.lofthouse(a)jboss.com
Date: 2010-06-16 12:49:46 -0400 (Wed, 16 Jun 2010)
New Revision: 12490
Modified:
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
Log:
Fix compilation failures.
Modified:
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
---
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2010-06-16
16:37:39 UTC (rev 12489)
+++
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2010-06-16
16:49:46 UTC (rev 12490)
@@ -125,7 +125,7 @@
}
}
- public void process(Document message, List<Target> targets, String alias, String
credential, String algorithm) throws WSSecurityException
+ public void process(Document message, List<Target> targets, String alias, String
credential, String algorithm, boolean digest, boolean useNonce, boolean useTimestamp)
throws WSSecurityException
{
if (! algorithms.containsKey(algorithm))
algorithm = DEFAULT_ALGORITHM;
Modified:
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java
===================================================================
---
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java 2010-06-16
16:37:39 UTC (rev 12489)
+++
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java 2010-06-16
16:49:46 UTC (rev 12490)
@@ -119,7 +119,7 @@
}
}
- public void process(Document message, List<Target> targets, String alias, String
credential, String algorithm) throws WSSecurityException
+ public void process(Document message, List<Target> targets, String alias, String
credential, String algorithm, boolean digest, boolean useNonce, boolean useTimestamp)
throws WSSecurityException
{
Element envelope = message.getDocumentElement();
XMLSignature sig;
Modified:
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java
===================================================================
---
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java 2010-06-16
16:37:39 UTC (rev 12489)
+++
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java 2010-06-16
16:49:46 UTC (rev 12490)
@@ -39,7 +39,7 @@
this.store = store;
}
- public void process(Document message, List<Target> targets, String alias, String
credential, String algorithm) throws WSSecurityException
+ public void process(Document message, List<Target> targets, String alias, String
credential, String algorithm, boolean digest, boolean useNonce, boolean useTimestamp)
throws WSSecurityException
{
Integer ttl = null;
Modified:
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
---
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2010-06-16
16:37:39 UTC (rev 12489)
+++
stack/native/branches/dlofthouse/JBPAPP-4447/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2010-06-16
16:49:46 UTC (rev 12490)
@@ -38,31 +38,16 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.CommonSOAPFaultException;
-<<<<<<< .working
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.extensions.security.nonce.DefaultNonceFactory;
+import org.jboss.ws.extensions.security.nonce.NonceFactory;
+import org.jboss.ws.extensions.security.nonce.NonceGenerator;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.wsse.Authenticate;
import org.jboss.ws.metadata.wsse.Authorize;
-=======
-import org.jboss.ws.extensions.security.exception.InvalidSecurityHeaderException;
-import org.jboss.ws.extensions.security.exception.WSSecurityException;
-import org.jboss.ws.extensions.security.nonce.DefaultNonceFactory;
-import org.jboss.ws.extensions.security.nonce.NonceFactory;
-import org.jboss.ws.extensions.security.nonce.NonceGenerator;
-import org.jboss.ws.extensions.security.operation.EncodingOperation;
-import org.jboss.ws.extensions.security.operation.EncryptionOperation;
-//import org.jboss.ws.extensions.security.operation.OperationDescription;
-import org.jboss.ws.extensions.security.operation.RequireEncryptionOperation;
-import org.jboss.ws.extensions.security.operation.RequireOperation;
-import org.jboss.ws.extensions.security.operation.RequireSignatureOperation;
-import org.jboss.ws.extensions.security.operation.RequireTimestampOperation;
-import org.jboss.ws.extensions.security.operation.SendUsernameOperation;
-import org.jboss.ws.extensions.security.operation.SignatureOperation;
-import org.jboss.ws.extensions.security.operation.TimestampOperation;
->>>>>>> .merge-right.r5945
import org.jboss.ws.metadata.wsse.Config;
import org.jboss.ws.metadata.wsse.Encrypt;
import org.jboss.ws.metadata.wsse.Operation;
Show replies by date