svn commit: r360013 - in /directory/trunk: ./ kerberos-common/ kerberos-common/src/main/java/org/apache/kerberos/exceptions/ kerberos-common/src/main/java/org/apache/kerberos/store/operations/

[ak...@apache.org]

Author: akarasulu
Date: Thu Dec 29 23:51:50 2005
New Revision: 360013

URL: http://svn.apache.org/viewcvs?rev=360013&view=rev
Log:
changes ...

 o fixed 1.4 incompatibility based on J2SE LdapName implementation 
 o added serialVersionId to get rid of eclipse complaint
 o added pom which builds and passes tests
 o included kerberos-common in global build


Added:
    directory/trunk/kerberos-common/pom.xml
Modified:
    directory/trunk/kerberos-common/   (props changed)
    directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/exceptions/KerberosException.java
    directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/store/operations/AddPrincipal.java
    directory/trunk/pom.xml

Propchange: directory/trunk/kerberos-common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 29 23:51:50 2005
@@ -1,3 +1,6 @@
+.wtpmodules
+.settings
+.deployables
 bin
 *.iml
 build

Added: directory/trunk/kerberos-common/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/kerberos-common/pom.xml?rev=360013&view=auto
==============================================================================
--- directory/trunk/kerberos-common/pom.xml (added)
+++ directory/trunk/kerberos-common/pom.xml Thu Dec 29 23:51:50 2005
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory</groupId>
+    <artifactId>build</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.directory</groupId>
+  <version>0.7-SNAPSHOT</version>
+  <artifactId>org.apache.directory.kerberos.common</artifactId>
+  <name>kerberos-common</name>
+  <packaging>jar</packaging>  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory</groupId>
+      <artifactId>org.apache.directory.protocol.common</artifactId>
+      <version>0.7.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>bouncycastle</groupId>
+      <artifactId>bcprov-jdk14</artifactId>
+      <version>124</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/Abstract*</exclude>
+            <exclude>**/CatalogTest.java</exclude>
+            <exclude>**/TestUtils.java</exclude>
+            <exclude>**/KerberosTest.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+

Modified: directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/exceptions/KerberosException.java
URL: http://svn.apache.org/viewcvs/directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/exceptions/KerberosException.java?rev=360013&r1=360012&r2=360013&view=diff
==============================================================================
--- directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/exceptions/KerberosException.java (original)
+++ directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/exceptions/KerberosException.java Thu Dec 29 23:51:50 2005
@@ -24,6 +24,8 @@
  */
 public class KerberosException extends Exception
 {
+    private static final long serialVersionUID = 2968072183596955597L;
+
     /**
      * The Kerberos error code associated with this exception
      */

Modified: directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/store/operations/AddPrincipal.java
URL: http://svn.apache.org/viewcvs/directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/store/operations/AddPrincipal.java?rev=360013&r1=360012&r2=360013&view=diff
==============================================================================
--- directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/store/operations/AddPrincipal.java (original)
+++ directory/trunk/kerberos-common/src/main/java/org/apache/kerberos/store/operations/AddPrincipal.java Thu Dec 29 23:51:50 2005
@@ -21,11 +21,15 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
-import javax.naming.ldap.LdapName;
+
+// this is a jdk 1.5 dep which would make us 1.4 incompatible 
+// reverted to using LdapName for now until a better alt is found
+// import javax.naming.ldap.LdapName;
 import javax.naming.spi.DirStateFactory;
 import javax.naming.spi.DirStateFactory.Result;
 
 import org.apache.kerberos.store.PrincipalStoreEntry;
+import org.apache.ldap.common.name.LdapName;
 import org.apache.protocol.common.store.ContextOperation;
 
 /**

Modified: directory/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/pom.xml?rev=360013&r1=360012&r2=360013&view=diff
==============================================================================
--- directory/trunk/pom.xml (original)
+++ directory/trunk/pom.xml Thu Dec 29 23:51:50 2005
@@ -8,10 +8,11 @@
   <packaging>pom</packaging>
   <modules>
     <module>mina-build</module>
-    <module>asn1</module>
-    <module>ldap-common</module>
     <module>apacheds-build</module>
+    <module>asn1</module>
     <module>protocol-common</module>
+    <module>kerberos-common</module>
+    <module>ldap-common</module>
   </modules>
   <repositories>
     <!-- For ibiblio standard: might want to add a mirror as well later