ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1245438 - in /webservices/wss4j/branches/swssf/streaming-ws-policy/src: main/java/org/swssf/policy/ main/java/org/swssf/policy/assertionStates/ test/java/org/swssf/policy/test/
Date Fri, 17 Feb 2012 13:08:07 GMT
Author: coheigea
Date: Fri Feb 17 13:08:06 2012
New Revision: 1245438

URL: http://svn.apache.org/viewvc?rev=1245438&view=rev
Log:
Some minor spelling updates

Modified:
    webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java
    webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java
    webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java
    webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AbstractPolicyTestBase.java
    webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/VulnerabliltyVectorsTest.java

Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java?rev=1245438&r1=1245437&r2=1245438&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java
(original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java
Fri Feb 17 13:08:06 2012
@@ -105,7 +105,6 @@ public class PolicyEnforcer implements S
             List<Map<SecurityEvent.Event, Map<Assertion, List<Assertable>>>>
assertionStateMap) throws WSSPolicyException {
         if (policyComponent instanceof PolicyOperator) {
             PolicyOperator policyOperator = (PolicyOperator) policyComponent;
-            @SuppressWarnings("unchecked")
             List<PolicyComponent> policyComponents = policyOperator.getPolicyComponents();
             int alternative = 0;
             for (int i = 0; i < policyComponents.size(); i++) {
@@ -127,7 +126,6 @@ public class PolicyEnforcer implements S
             List<Map<SecurityEvent.Event, Map<Assertion, List<Assertable>>>>
assertionStateMap, int alternative) throws WSSPolicyException {
         if (policyComponent instanceof PolicyOperator) {
             PolicyOperator policyOperator = (PolicyOperator) policyComponent;
-            @SuppressWarnings("unchecked")
             List<PolicyComponent> policyComponents = policyOperator.getPolicyComponents();
             for (int i = 0; i < policyComponents.size(); i++) {
                 PolicyComponent curPolicyComponent = policyComponents.get(i);
@@ -291,7 +289,7 @@ public class PolicyEnforcer implements S
             }
         }
         //if the notAssertedCount equals the size of the list (the size of the list is equal
to the alternatives)
-        //then we could not satify any alternative
+        //then we could not satisfy any alternative
         if (notAssertedCount == assertionStateMap.size()) {
             logFailedAssertions();
             throw new PolicyViolationException("No policy alternative could be satisfied");

Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java?rev=1245438&r1=1245437&r2=1245438&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java
(original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java
Fri Feb 17 13:08:06 2012
@@ -23,7 +23,6 @@ import org.apache.ws.secpolicy.model.Abs
 import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
 import org.swssf.policy.Assertable;
 import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.TimestampSecurityEvent;
 
 /**
  * @author $Author$
@@ -43,7 +42,7 @@ public class IncludeTimeStampAssertionSt
     }
 
     public boolean assertEvent(SecurityEvent securityEvent) {
-        TimestampSecurityEvent timestampSecurityEvent = (TimestampSecurityEvent) securityEvent;
+        // TimestampSecurityEvent timestampSecurityEvent = (TimestampSecurityEvent) securityEvent;
         boolean isIncludeTimestamp = ((AbstractBinding) getAssertion()).isIncludeTimestamp();
 
         if (isIncludeTimestamp) {

Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java?rev=1245438&r1=1245437&r2=1245438&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java
(original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java
Fri Feb 17 13:08:06 2012
@@ -18,16 +18,21 @@
  */
 package org.swssf.policy.assertionStates;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
 import org.apache.ws.secpolicy.AssertionState;
 import org.apache.ws.secpolicy.WSSPolicyException;
 import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
-import org.apache.ws.secpolicy.model.AbstractSymmetricAsymmetricBinding;
 import org.swssf.policy.Assertable;
-import org.swssf.wss.securityEvent.*;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.List;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.EncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.EncryptedPartSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SignedElementSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
 
 /**
  * @author $Author$
@@ -56,7 +61,7 @@ public class ProtectionOrderAssertionSta
 
     @Override
     public boolean assertEvent(SecurityEvent securityEvent) throws WSSPolicyException {
-        AbstractSymmetricAsymmetricBinding.ProtectionOrder protectionOrder = ((AbstractSymmetricAsymmetricBinding)
getAssertion()).getProtectionOrder();
+        // AbstractSymmetricAsymmetricBinding.ProtectionOrder protectionOrder = ((AbstractSymmetricAsymmetricBinding)
getAssertion()).getProtectionOrder();
         setAsserted(true);
         switch (securityEvent.getSecurityEventType()) {
             case SignedElement:

Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AbstractPolicyTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AbstractPolicyTestBase.java?rev=1245438&r1=1245437&r2=1245438&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AbstractPolicyTestBase.java
(original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AbstractPolicyTestBase.java
Fri Feb 17 13:08:06 2012
@@ -50,9 +50,9 @@ public class AbstractPolicyTestBase exte
         NodeList nodeList = document.getElementsByTagNameNS("*", SPConstants.P_LOCALNAME);
 
         Document policyDocument = documentBuilder.parse(new ByteArrayInputStream(policyString.getBytes("UTF-8")));
-        Node polcyNode = document.importNode(policyDocument.getDocumentElement(), true);
+        Node policyNode = document.importNode(policyDocument.getDocumentElement(), true);
         Element element = (Element) nodeList.item(0);
-        element.appendChild(polcyNode);
+        element.appendChild(policyNode);
         PolicyEnforcerFactory policyEnforcerFactory = PolicyEnforcerFactory.newInstance(document);
         PolicyEnforcer policyEnforcer = policyEnforcerFactory.newPolicyEnforcer("");
 

Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/VulnerabliltyVectorsTest.java?rev=1245438&r1=1245437&r2=1245438&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/VulnerabliltyVectorsTest.java
(original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/VulnerabliltyVectorsTest.java
Fri Feb 17 13:08:06 2012
@@ -82,7 +82,7 @@ public class VulnerabliltyVectorsTest ex
         inSecurityProperties.addInputProcessor(new PolicyInputProcessor(policyEnforcer, null));
 
         try {
-            Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()),
policyEnforcer);
+            doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()),
policyEnforcer);
             Assert.fail("Expected XMLStreamException");
         } catch (XMLStreamException e) {
             Throwable throwable = e.getCause();
@@ -132,7 +132,7 @@ public class VulnerabliltyVectorsTest ex
         inSecurityProperties.addInputProcessor(new PolicyInputProcessor(policyEnforcer, null));
 
         try {
-            Document document = doInboundSecurity(inSecurityProperties, xmlInputFactory.createXMLStreamReader(new
ByteArrayInputStream(baos.toByteArray())), policyEnforcer);
+            doInboundSecurity(inSecurityProperties, xmlInputFactory.createXMLStreamReader(new
ByteArrayInputStream(baos.toByteArray())), policyEnforcer);
             Assert.fail("Expected XMLStreamException");
         } catch (XMLStreamException e) {
             Throwable throwable = e.getCause();



Mime
View raw message