You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/05/05 10:54:01 UTC

svn commit: r1677753 - in /webservices/wss4j/trunk: integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java parent/pom.xml ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java

Author: coheigea
Date: Tue May  5 08:54:00 2015
New Revision: 1677753

URL: http://svn.apache.org/r1677753
Log:
Upgrading to Apache DS M20

Modified:
    webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
    webservices/wss4j/trunk/parent/pom.xml
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java

Modified: webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java?rev=1677753&r1=1677752&r2=1677753&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java (original)
+++ webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java Tue May  5 08:54:00 2015
@@ -124,8 +124,7 @@ import org.w3c.dom.NodeList;
 
 @CreateKdcServer(
     transports = {
-        // @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
-        @CreateTransport(protocol = "UDP", address = "127.0.0.1")
+        @CreateTransport(protocol = "KRB", address = "127.0.0.1")
     },
     primaryRealm = "service.ws.apache.org",
     kdcPrincipal = "krbtgt/service.ws.apache.org@service.ws.apache.org"

Modified: webservices/wss4j/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/parent/pom.xml?rev=1677753&r1=1677752&r2=1677753&view=diff
==============================================================================
--- webservices/wss4j/trunk/parent/pom.xml (original)
+++ webservices/wss4j/trunk/parent/pom.xml Tue May  5 08:54:00 2015
@@ -32,7 +32,7 @@
     <url>http://ws.apache.org/wss4j/</url>
 
     <properties>
-        <apacheds.version>2.0.0-M19</apacheds.version>
+        <apacheds.version>2.0.0-M20</apacheds.version>
         <bcprov.version>1.52</bcprov.version>
         <commons.compress.version>1.4.1</commons.compress.version>
         <ehcache.version>2.9.0</ehcache.version>

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java?rev=1677753&r1=1677752&r2=1677753&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java Tue May  5 08:54:00 2015
@@ -19,12 +19,12 @@
 
 package org.apache.wss4j.common.kerberos;
 
+import org.apache.directory.shared.kerberos.codec.KerberosDecoder;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
 import org.apache.directory.shared.kerberos.components.EncTicketPart;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.kerberos.exceptions.KerberosException;
 import org.apache.directory.shared.kerberos.messages.ApReq;
-import org.apache.directory.server.kerberos.protocol.codec.KerberosDecoder;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;