ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gi...@apache.org
Subject svn commit: r1389486 - in /webservices/wss4j/trunk/ws-security-stax: ./ src/main/java/org/apache/ws/security/stax/impl/processor/output/ src/test/java/org/apache/ws/security/stax/test/
Date Mon, 24 Sep 2012 17:09:15 GMT
Author: giger
Date: Mon Sep 24 17:09:14 2012
New Revision: 1389486

URL: http://svn.apache.org/viewvc?rev=1389486&view=rev
Log:
remove useless test class
adapt changes from santuario in 1389478.

Removed:
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/ProfilingTest.java
Modified:
    webservices/wss4j/trunk/ws-security-stax/pom.xml
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptEndingOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java

Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1389486&r1=1389485&r2=1389486&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-stax/pom.xml Mon Sep 24 17:09:14 2012
@@ -236,7 +236,6 @@
                     </systemPropertyVariables>
                     <!--<debugForkedProcess>true</debugForkedProcess>-->
                     <excludes>
-                        <exclude>**/ProfilingTest.java</exclude>
                         <exclude>**/PerformanceMemoryTest.java</exclude>
                         <exclude>**/PerformanceTimingTest.java</exclude>
                     </excludes>

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptEndingOutputProcessor.java?rev=1389486&r1=1389485&r2=1389486&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptEndingOutputProcessor.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptEndingOutputProcessor.java
Mon Sep 24 17:09:14 2012
@@ -30,10 +30,7 @@ import org.apache.ws.security.stax.ext.W
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * Processor buffers encrypted XMLEvents and forwards them when final is called
@@ -74,15 +71,15 @@ public class EncryptEndingOutputProcesso
 
     @Override
     public void flushBufferAndCallbackAfterTokenID(OutputProcessorChain outputProcessorChain,
-                                                   Iterator<XMLSecEvent> xmlSecEventIterator)
+                                                   Deque<XMLSecEvent> xmlSecEventDeque)
             throws XMLStreamException, XMLSecurityException {
 
         final String actor = ((WSSSecurityProperties) getSecurityProperties()).getActor();
 
         //loop until we reach our security header
         loop:
-        while (xmlSecEventIterator.hasNext()) {
-            XMLSecEvent xmlSecEvent = xmlSecEventIterator.next();
+        while (!xmlSecEventDeque.isEmpty()) {
+            XMLSecEvent xmlSecEvent = xmlSecEventDeque.pop();
             switch (xmlSecEvent.getEventType()) {
                 case XMLStreamConstants.START_ELEMENT:
                     XMLSecStartElement xmlSecStartElement = xmlSecEvent.asStartElement();
@@ -98,6 +95,6 @@ public class EncryptEndingOutputProcesso
             outputProcessorChain.reset();
             outputProcessorChain.processEvent(xmlSecEvent);
         }
-        super.flushBufferAndCallbackAfterTokenID(outputProcessorChain, xmlSecEventIterator);
+        super.flushBufferAndCallbackAfterTokenID(outputProcessorChain, xmlSecEventDeque);
     }
 }

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java?rev=1389486&r1=1389485&r2=1389486&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
Mon Sep 24 17:09:14 2012
@@ -38,10 +38,7 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author $Author: coheigea $
@@ -205,15 +202,15 @@ public class WSSSignatureEndingOutputPro
 
     @Override
     public void flushBufferAndCallbackAfterTokenID(OutputProcessorChain outputProcessorChain,
-                                                   Iterator<XMLSecEvent> xmlSecEventIterator)
+                                                   Deque<XMLSecEvent> xmlSecEventDeque)
             throws XMLStreamException, XMLSecurityException {
 
         final String actor = ((WSSSecurityProperties) getSecurityProperties()).getActor();
 
         //loop until we reach our security header
         loop:
-        while (xmlSecEventIterator.hasNext()) {
-            XMLSecEvent xmlSecEvent = xmlSecEventIterator.next();
+        while (!xmlSecEventDeque.isEmpty()) {
+            XMLSecEvent xmlSecEvent = xmlSecEventDeque.pop();
             switch (xmlSecEvent.getEventType()) {
                 case XMLStreamConstants.START_ELEMENT:
                     XMLSecStartElement xmlSecStartElement = xmlSecEvent.asStartElement();
@@ -229,6 +226,6 @@ public class WSSSignatureEndingOutputPro
             outputProcessorChain.reset();
             outputProcessorChain.processEvent(xmlSecEvent);
         }
-        super.flushBufferAndCallbackAfterTokenID(outputProcessorChain, xmlSecEventIterator);
+        super.flushBufferAndCallbackAfterTokenID(outputProcessorChain, xmlSecEventDeque);
     }
 }



Mime
View raw message