directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r329870 - in /directory/shared/protocol/trunk/common: ./ src/main/java/org/apache/protocol/common/ src/main/java/org/apache/protocol/common/store/
Date Mon, 31 Oct 2005 17:47:00 GMT
Author: erodriguez
Date: Mon Oct 31 09:46:55 2005
New Revision: 329870

URL: http://svn.apache.org/viewcvs?rev=329870&view=rev
Log:
Fix to resolve DIRKERBEROS-32, compilation cycle.

Added:
    directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java
  (with props)
Modified:
    directory/shared/protocol/trunk/common/project.xml
    directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java
    directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java

Modified: directory/shared/protocol/trunk/common/project.xml
URL: http://svn.apache.org/viewcvs/directory/shared/protocol/trunk/common/project.xml?rev=329870&r1=329869&r2=329870&view=diff
==============================================================================
--- directory/shared/protocol/trunk/common/project.xml (original)
+++ directory/shared/protocol/trunk/common/project.xml Mon Oct 31 09:46:55 2005
@@ -26,11 +26,6 @@
       <version>0.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>directory-shared</groupId>
-      <artifactId>kerberos-common</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.17</version>

Modified: directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java?rev=329870&r1=329869&r2=329870&view=diff
==============================================================================
--- directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java
(original)
+++ directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java
Mon Oct 31 09:46:55 2005
@@ -42,7 +42,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.kerberos.store.KerberosAttribute;
 import org.apache.ldap.common.ldif.LdifIterator;
 import org.apache.ldap.common.ldif.LdifParser;
 import org.apache.ldap.common.ldif.LdifParserImpl;
@@ -60,6 +59,7 @@
 import org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema;
 import org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema;
 import org.apache.ldap.server.schema.bootstrap.SystemSchema;
+import org.apache.protocol.common.store.KerberosAttribute;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Added: directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java
URL: http://svn.apache.org/viewcvs/directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java?rev=329870&view=auto
==============================================================================
--- directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java
(added)
+++ directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java
Mon Oct 31 09:46:55 2005
@@ -0,0 +1,35 @@
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.protocol.common.store;
+
+public class KerberosAttribute
+{
+    // ------------------------------------------------------------------------
+    // Krb5 Schema Attributes
+    // ------------------------------------------------------------------------
+
+    /** the krb5kdc schema key for a krb5KDCEntry */
+    public static final String KEY       = "krb5Key";
+    /** the krb5kdc schema key encryption type for a krb5KDCEntry */
+    public static final String TYPE      = "krb5EncryptionType";
+    /** the krb5kdc schema principal name for a krb5KDCEntry */
+    public static final String PRINCIPAL = "krb5PrincipalName";
+    /** the krb5kdc schema key version identifier for a krb5KDCEntry */
+    public static final String VERSION   = "krb5KeyVersionNumber";
+    /** the Apache specific SAM type attribute */
+    public static final String SAM_TYPE  = "apacheSamType";
+}

Propchange: directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java
URL: http://svn.apache.org/viewcvs/directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java?rev=329870&r1=329869&r2=329870&view=diff
==============================================================================
--- directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java
(original)
+++ directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java
Mon Oct 31 09:46:55 2005
@@ -1,16 +1,16 @@
 package org.apache.protocol.common.store;
 
 
-import org.apache.kerberos.store.KerberosAttribute;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.File;
 
+import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
-import javax.naming.NamingException;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
-import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**



Mime
View raw message