directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r895106 - in /directory/apacheds/branches/apacheds-schema/kerberos-test: ./ src/test/java/org/apache/directory/server/kerberos/kdc/
Date Sat, 02 Jan 2010 02:17:09 GMT
Author: elecharny
Date: Sat Jan  2 02:17:08 2010
New Revision: 895106

URL: http://svn.apache.org/viewvc?rev=895106&view=rev
Log:
moved the protocol-kerberos tests to this project

Added:
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AS-REQ-PA-ENC-TS.pdu
      - copied unchanged from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/AS-REQ-PA-ENC-TS.pdu
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AS-REQ-TCP.pdu
      - copied unchanged from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/AS-REQ-TCP.pdu
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AS-REQ-UDP.pdu
      - copied unchanged from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/AS-REQ-UDP.pdu
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java
      - copied unchanged from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
      - copied, changed from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/ms_krb5.pcap
      - copied unchanged from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/ms_krb5.pcap
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/oracle_krb5.pcap
      - copied unchanged from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/oracle_krb5.pcap
    directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/pam_krb5.pcap
      - copied unchanged from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/pam_krb5.pcap
Modified:
    directory/apacheds/branches/apacheds-schema/kerberos-test/.classpath

Modified: directory/apacheds/branches/apacheds-schema/kerberos-test/.classpath
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/kerberos-test/.classpath?rev=895106&r1=895105&r2=895106&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/kerberos-test/.classpath (original)
+++ directory/apacheds/branches/apacheds-schema/kerberos-test/.classpath Sat Jan  2 02:17:08
2010
@@ -1,72 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/*.java" kind="src" path="target/maven-shared-archive-resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
-	<classpathentry kind="src" path="/apacheds-avl-partition"/>
-	<classpathentry kind="src" path="/apacheds-core"/>
-	<classpathentry kind="src" path="/apacheds-core-annotations"/>
-	<classpathentry kind="src" path="/apacheds-core-api"/>
-	<classpathentry kind="src" path="/apacheds-core-avl"/>
-	<classpathentry kind="src" path="/apacheds-core-constants"/>
-	<classpathentry kind="src" path="/apacheds-core-entry"/>
-	<classpathentry kind="src" path="/apacheds-core-jndi"/>
-	<classpathentry kind="src" path="/apacheds-core-mock"/>
-	<classpathentry kind="src" path="/apacheds-jdbm"/>
-	<classpathentry kind="src" path="/apacheds-jdbm-partition"/>
-	<classpathentry kind="src" path="/apacheds-jdbm-store"/>
-	<classpathentry kind="src" path="/apacheds-kerberos-shared"/>
-	<classpathentry kind="src" path="/apacheds-ldif-partition"/>
-	<classpathentry kind="src" path="/apacheds-protocol-kerberos"/>
-	<classpathentry kind="src" path="/apacheds-protocol-ldap"/>
-	<classpathentry kind="src" path="/apacheds-protocol-shared"/>
-	<classpathentry kind="src" path="/apacheds-server-annotations"/>
-	<classpathentry kind="src" path="/apacheds-test-framework"/>
-	<classpathentry kind="src" path="/apacheds-utils"/>
-	<classpathentry kind="src" path="/apacheds-xdbm-base"/>
-	<classpathentry kind="src" path="/apacheds-xdbm-search"/>
-	<classpathentry kind="src" path="/apacheds-xdbm-tools"/>
-	<classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar"
sourcepath="M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/elecharny/.m2/repository/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"
sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/elecharny/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"
sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/elecharny/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"
sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/elecharny/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.2/commons-pool-1.5.2.jar"
sourcepath="M2_REPO/commons-pool/commons-pool/1.5.2/commons-pool-1.5.2-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/elecharny/.m2/repository/commons-pool/commons-pool/1.5.2/commons-pool-1.5.2-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar"
sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar" sourcepath="M2_REPO/junit/junit/4.5/junit-4.5-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-RC1/mina-core-2.0.0-RC1.jar"
sourcepath="M2_REPO/org/apache/mina/mina-core/2.0.0-RC1/mina-core-2.0.0-RC1-sources.jar"/>
-	<classpathentry kind="src" path="/shared-asn1"/>
-	<classpathentry kind="src" path="/shared-asn1-codec"/>
-	<classpathentry kind="src" path="/shared-cursor"/>
-	<classpathentry kind="src" path="/shared-ldap"/>
-	<classpathentry kind="src" path="/shared-ldap-client-api"/>
-	<classpathentry kind="src" path="/shared-ldap-constants"/>
-	<classpathentry kind="src" path="/shared-ldap-schema"/>
-	<classpathentry kind="src" path="/shared-ldap-schema-loader"/>
-	<classpathentry kind="src" path="/shared-ldap-schema-manager"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar"
sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar"
sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="src" path="/apacheds-avl-partition"/>
+  <classpathentry kind="src" path="/apacheds-core"/>
+  <classpathentry kind="src" path="/apacheds-core-annotations"/>
+  <classpathentry kind="src" path="/apacheds-core-api"/>
+  <classpathentry kind="src" path="/apacheds-core-avl"/>
+  <classpathentry kind="src" path="/apacheds-core-constants"/>
+  <classpathentry kind="src" path="/apacheds-core-entry"/>
+  <classpathentry kind="src" path="/apacheds-core-jndi"/>
+  <classpathentry kind="src" path="/apacheds-core-mock"/>
+  <classpathentry kind="src" path="/apacheds-jdbm"/>
+  <classpathentry kind="src" path="/apacheds-jdbm-partition"/>
+  <classpathentry kind="src" path="/apacheds-jdbm-store"/>
+  <classpathentry kind="src" path="/apacheds-kerberos-shared"/>
+  <classpathentry kind="src" path="/apacheds-ldif-partition"/>
+  <classpathentry kind="src" path="/apacheds-protocol-kerberos"/>
+  <classpathentry kind="src" path="/apacheds-protocol-ldap"/>
+  <classpathentry kind="src" path="/apacheds-protocol-shared"/>
+  <classpathentry kind="src" path="/apacheds-server-annotations"/>
+  <classpathentry kind="src" path="/apacheds-test-framework"/>
+  <classpathentry kind="src" path="/apacheds-utils"/>
+  <classpathentry kind="src" path="/apacheds-xdbm-base"/>
+  <classpathentry kind="src" path="/apacheds-xdbm-search"/>
+  <classpathentry kind="src" path="/apacheds-xdbm-tools"/>
+  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar"
sourcepath="M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/Users/elecharny/.m2/repository/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140-javadoc.jar!/"
name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"
sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/Users/elecharny/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/"
name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"
sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/Users/elecharny/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/"
name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"
sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/Users/elecharny/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/"
name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.2/commons-pool-1.5.2.jar"
sourcepath="M2_REPO/commons-pool/commons-pool/1.5.2/commons-pool-1.5.2-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/Users/elecharny/.m2/repository/commons-pool/commons-pool/1.5.2/commons-pool-1.5.2-javadoc.jar!/"
name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar"
sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar" sourcepath="M2_REPO/junit/junit/4.5/junit-4.5-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-RC1/mina-core-2.0.0-RC1.jar"
sourcepath="M2_REPO/org/apache/mina/mina-core/2.0.0-RC1/mina-core-2.0.0-RC1-sources.jar"/>
+  <classpathentry kind="src" path="/shared-asn1"/>
+  <classpathentry kind="src" path="/shared-asn1-codec"/>
+  <classpathentry kind="src" path="/shared-cursor"/>
+  <classpathentry kind="src" path="/shared-ldap"/>
+  <classpathentry kind="src" path="/shared-ldap-client-api"/>
+  <classpathentry kind="src" path="/shared-ldap-constants"/>
+  <classpathentry kind="src" path="/shared-ldap-schema"/>
+  <classpathentry kind="src" path="/shared-ldap-schema-loader"/>
+  <classpathentry kind="src" path="/shared-ldap-schema-manager"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar"
sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar"
sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6-sources.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file

Copied: directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
(from r895056, directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?p2=directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java&p1=directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java&r1=895056&r2=895106&rev=895106&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
Sat Jan  2 02:17:08 2010
@@ -45,8 +45,8 @@
 
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.interceptor.Interceptor;
-import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
@@ -55,7 +55,6 @@
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.server.protocol.shared.transport.UdpTransport;
-import org.apache.directory.server.unit.AbstractServerTest;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -76,7 +75,7 @@
  * @version $Rev$, $Date$
  */
 @Ignore( "temporarily ignored till the schema branch is copied over to trunk" )
-public class SaslGssapiBindITest extends AbstractServerTest
+public class SaslGssapiBindITest extends AbstractLdapTestUnit
 {
     private DirContext ctx;
 



Mime
View raw message