You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2013/05/30 01:09:38 UTC
svn commit: r1487671 - in /webservices/wss4j/trunk/ws-security-stax/src:
main/java/org/apache/wss4j/stax/ext/ main/java/org/apache/wss4j/stax/impl/
main/java/org/apache/wss4j/stax/impl/processor/input/
main/java/org/apache/wss4j/stax/impl/processor/out...
Author: dkulp
Date: Wed May 29 23:09:37 2013
New Revision: 1487671
URL: http://svn.apache.org/r1487671
Log:
Remainder of eclipse warnings
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java Wed May 29 23:09:37 2013
@@ -138,7 +138,7 @@ public class InboundWSSec {
if (securityEvent instanceof TokenSecurityEvent) {
@SuppressWarnings("unchecked")
final TokenSecurityEvent<? extends InboundSecurityToken> tokenSecurityEvent =
- (TokenSecurityEvent)securityEvent;
+ (TokenSecurityEvent<? extends InboundSecurityToken>)securityEvent;
if (WSSecurityEventConstants.HttpsToken.equals(securityEvent.getSecurityEventType())) {
securityContextImpl.registerSecurityEvent(securityEvent);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java Wed May 29 23:09:37 2013
@@ -32,6 +32,7 @@ import org.apache.wss4j.common.crypto.Me
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityToken;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -431,11 +432,11 @@ public class WSSUtils extends XMLSecurit
}
@SuppressWarnings("unchecked")
- public static TokenSecurityEvent<? extends InboundSecurityToken> createTokenSecurityEvent(
- final InboundSecurityToken inboundSecurityToken, String correlationID) throws WSSecurityException {
+ public static TokenSecurityEvent<? extends InboundSecurityToken>
+ createTokenSecurityEvent(final InboundSecurityToken inboundSecurityToken, String correlationID) throws WSSecurityException {
WSSecurityTokenConstants.TokenType tokenType = inboundSecurityToken.getTokenType();
- TokenSecurityEvent tokenSecurityEvent;
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent;
if (WSSecurityTokenConstants.X509V1Token.equals(tokenType) ||
WSSecurityTokenConstants.X509V3Token.equals(tokenType) ||
WSSecurityTokenConstants.X509Pkcs7Token.equals(tokenType) ||
@@ -468,9 +469,9 @@ public class WSSUtils extends XMLSecurit
} else {
throw new WSSecurityException(WSSecurityException.ErrorCode.UNSUPPORTED_SECURITY_TOKEN);
}
- tokenSecurityEvent.setSecurityToken(inboundSecurityToken);
+ ((TokenSecurityEvent<SecurityToken>)tokenSecurityEvent).setSecurityToken(inboundSecurityToken);
tokenSecurityEvent.setCorrelationID(correlationID);
- return tokenSecurityEvent;
+ return (TokenSecurityEvent<? extends InboundSecurityToken>)tokenSecurityEvent;
}
public static boolean pathMatches(List<QName> path1, List<QName> path2, boolean matchAnySoapNS, boolean lastElementWildCard) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java Wed May 29 23:09:37 2013
@@ -365,7 +365,7 @@ public class InboundWSSecurityContextImp
private boolean containsSecurityToken(List<TokenSecurityEvent<? extends InboundSecurityToken>> supportingTokens, SecurityToken securityToken) {
for (int i = 0; i < supportingTokens.size(); i++) {
- TokenSecurityEvent tokenSecurityEvent = supportingTokens.get(i);
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = supportingTokens.get(i);
if (tokenSecurityEvent.getSecurityToken() == securityToken) {
return true;
}
@@ -402,21 +402,21 @@ public class InboundWSSecurityContextImp
}
}
for (int i = 0; i < signedEndorsingSupportingTokens.size(); i++) {
- TokenSecurityEvent tokenSecurityEvent = signedEndorsingSupportingTokens.get(i);
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = signedEndorsingSupportingTokens.get(i);
List<InboundSecurityToken> signingSecurityTokens = getSigningToken(tokenSecurityEvent, securityEventDeque);
if (signingSecurityTokens.size() == 1) {
return signingSecurityTokens.get(0);
}
}
for (int i = 0; i < signedEncryptedSupportingTokens.size(); i++) {
- TokenSecurityEvent tokenSecurityEvent = signedEncryptedSupportingTokens.get(i);
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = signedEncryptedSupportingTokens.get(i);
List<InboundSecurityToken> signingSecurityTokens = getSigningToken(tokenSecurityEvent, securityEventDeque);
if (signingSecurityTokens.size() == 1) {
return signingSecurityTokens.get(0);
}
}
for (int i = 0; i < signedEndorsingEncryptedSupportingTokens.size(); i++) {
- TokenSecurityEvent tokenSecurityEvent = signedEndorsingEncryptedSupportingTokens.get(i);
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = signedEndorsingEncryptedSupportingTokens.get(i);
List<InboundSecurityToken> signingSecurityTokens = getSigningToken(tokenSecurityEvent, securityEventDeque);
if (signingSecurityTokens.size() == 1) {
return signingSecurityTokens.get(0);
@@ -425,7 +425,7 @@ public class InboundWSSecurityContextImp
return null;
}
- private List<InboundSecurityToken> getSigningToken(TokenSecurityEvent tokenSecurityEvent, Deque<SecurityEvent> securityEventDeque) throws XMLSecurityException {
+ private List<InboundSecurityToken> getSigningToken(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent, Deque<SecurityEvent> securityEventDeque) throws XMLSecurityException {
List<InboundSecurityToken> signingSecurityTokens = new ArrayList<InboundSecurityToken>();
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
@@ -458,7 +458,7 @@ public class InboundWSSecurityContextImp
tokenSecurityEvent.getSecurityToken().addTokenUsage(tokenUsage);
}
- private List<InboundSecurityToken> isSignedToken(TokenSecurityEvent tokenSecurityEvent,
+ private List<InboundSecurityToken> isSignedToken(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent,
Deque<SecurityEvent> securityEventDeque,
HttpsTokenSecurityEvent httpsTokenSecurityEvent) throws XMLSecurityException {
List<InboundSecurityToken> securityTokenList = new ArrayList<InboundSecurityToken>();
@@ -482,7 +482,7 @@ public class InboundWSSecurityContextImp
return securityTokenList;
}
- private List<InboundSecurityToken> isEncryptedToken(TokenSecurityEvent tokenSecurityEvent,
+ private List<InboundSecurityToken> isEncryptedToken(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent,
Deque<SecurityEvent> securityEventDeque,
HttpsTokenSecurityEvent httpsTokenSecurityEvent) throws XMLSecurityException {
@@ -507,7 +507,7 @@ public class InboundWSSecurityContextImp
return securityTokenList;
}
- private boolean signsElement(TokenSecurityEvent tokenSecurityEvent, List<QName> elementPath,
+ private boolean signsElement(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent, List<QName> elementPath,
Deque<SecurityEvent> securityEventDeque) throws XMLSecurityException {
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
SecurityEvent securityEvent = iterator.next();
@@ -523,7 +523,7 @@ public class InboundWSSecurityContextImp
return false;
}
- private boolean encryptsElement(TokenSecurityEvent tokenSecurityEvent, List<QName> elementPath,
+ private boolean encryptsElement(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent, List<QName> elementPath,
Deque<SecurityEvent> securityEventDeque) throws XMLSecurityException {
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
SecurityEvent securityEvent = iterator.next();
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java Wed May 29 23:09:37 2013
@@ -37,6 +37,7 @@ import org.apache.xml.security.stax.ext.
import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
import javax.xml.bind.JAXBElement;
@@ -91,7 +92,7 @@ public class BinarySecurityTokenInputHan
wsInboundSecurityContext.registerSecurityTokenProvider(binarySecurityTokenType.getId(), securityTokenProvider);
- TokenSecurityEvent tokenSecurityEvent;
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent;
//fire a tokenSecurityEvent
if (binarySecurityTokenType.getValueType().startsWith(WSSConstants.NS_X509TOKEN_PROFILE)) {
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java Wed May 29 23:09:37 2013
@@ -53,6 +53,7 @@ import org.apache.wss4j.stax.ext.WSSSecu
import org.apache.wss4j.stax.ext.WSSUtils;
import org.apache.wss4j.stax.securityEvent.EncryptedPartSecurityEvent;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityToken;
/**
* Processor for decryption of EncryptedData XML structures
@@ -190,7 +191,7 @@ public class DecryptInputProcessor exten
protected void handleSecurityToken(InboundSecurityToken inboundSecurityToken, InboundSecurityContext inboundSecurityContext,
EncryptedDataType encryptedDataType) throws XMLSecurityException {
inboundSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_Encryption);
- TokenSecurityEvent tokenSecurityEvent = WSSUtils.createTokenSecurityEvent(inboundSecurityToken, encryptedDataType.getId());
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent = WSSUtils.createTokenSecurityEvent(inboundSecurityToken, encryptedDataType.getId());
inboundSecurityContext.registerSecurityEvent(tokenSecurityEvent);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java Wed May 29 23:09:37 2013
@@ -40,6 +40,7 @@ import org.apache.xml.security.stax.secu
import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityTokenFactory;
import java.math.BigInteger;
@@ -167,7 +168,8 @@ public class WSSSignatureInputHandler ex
//we have to emit a TokenSecurityEvent here too since it could be an embedded token
inboundSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_Signature);
- TokenSecurityEvent tokenSecurityEvent = WSSUtils.createTokenSecurityEvent(inboundSecurityToken, signatureType.getId());
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent
+ = WSSUtils.createTokenSecurityEvent(inboundSecurityToken, signatureType.getId());
inboundSecurityContext.registerSecurityEvent(tokenSecurityEvent);
return inboundSecurityToken;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java Wed May 29 23:09:37 2013
@@ -35,6 +35,7 @@ import org.apache.xml.security.stax.impl
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
import javax.crypto.spec.SecretKeySpec;
@@ -192,7 +193,9 @@ public class BinarySecurityTokenOutputPr
for (int i = 0; i < securityEventList.size(); i++) {
SecurityEvent securityEvent = securityEventList.get(i);
if (securityEvent instanceof TokenSecurityEvent) {
- TokenSecurityEvent tokenSecurityEvent = (TokenSecurityEvent) securityEvent;
+ @SuppressWarnings("unchecked")
+ TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent
+ = (TokenSecurityEvent<? extends SecurityToken>) securityEvent;
if (!tokenSecurityEvent.getSecurityToken().getTokenUsages().contains(WSSecurityTokenConstants.TokenUsage_MainSignature)) {
continue;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java Wed May 29 23:09:37 2013
@@ -42,7 +42,7 @@ public class STRTransformer extends Tran
}
@Override
- public void setList(List list) throws XMLSecurityException {
+ public void setList(@SuppressWarnings("rawtypes") List list) throws XMLSecurityException {
throw new UnsupportedOperationException();
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Wed May 29 23:09:37 2013
@@ -937,7 +937,6 @@ public class EncDecryptionTest extends A
@Test
public void testExceptionOnElementToEncryptNotFound() throws Exception {
- ByteArrayOutputStream baos;
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.ENCRYPT};
@@ -948,7 +947,7 @@ public class EncDecryptionTest extends A
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
try {
- baos = doOutboundSecurity(securityProperties, sourceDocument);
+ doOutboundSecurity(securityProperties, sourceDocument);
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java Wed May 29 23:09:37 2013
@@ -73,7 +73,7 @@ public class PerformanceMemoryTest exten
@DataProvider(name = "xmlsizes")
public Object[][] getXMLSizes() throws Exception {
- File input = genBigFile(1);
+ genBigFile(1);
int tagCount = 0;
File target = new File("target/performanceMemoryTest/tmp.xml");
XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(new BufferedInputStream(new FileInputStream(target)));
@@ -200,7 +200,7 @@ public class PerformanceMemoryTest exten
//warm up.
@BeforeMethod(groups = {"memory-in"}, dependsOnGroups = {"memory-out"})
public void setUpIn() throws Exception {
- File input = genBigFile(1);
+ genBigFile(1);
doDOMInSecurity(new File("target/performanceMemoryTest/bigfile-dom.xml"));
doStreamingInSecurity(new File("target/performanceMemoryTest/bigfile-stream.xml"));
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java?rev=1487671&r1=1487670&r2=1487671&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java Wed May 29 23:09:37 2013
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Properties;
import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -50,8 +49,6 @@ import org.apache.wss4j.stax.securityEve
import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
import org.apache.wss4j.stax.test.utils.StAX2DOM;
import org.apache.wss4j.stax.test.utils.XmlReaderToWriter;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.SecurePart;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
import org.testng.Assert;