directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r125797 - in incubator/directory/kerberos/trunk/main: . src/java/org/apache/kerberos src/java/org/apache/kerberos/kdc
Date Thu, 20 Jan 2005 17:39:19 GMT
Author: erodriguez
Date: Thu Jan 20 09:39:16 2005
New Revision: 125797

URL: http://svn.apache.org/viewcvs?view=rev&rev=125797
Log:
Updated the Kerberos runnable jar to use MINA, Apache DER, and the ApacheDS renames.
Added:
   incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/kdc/
   incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/kdc/kerberos.properties
Modified:
   incubator/directory/kerberos/trunk/main/kerberos.properties
   incubator/directory/kerberos/trunk/main/project.properties
   incubator/directory/kerberos/trunk/main/project.xml
   incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/Main.java

Modified: incubator/directory/kerberos/trunk/main/kerberos.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/main/kerberos.properties?view=diff&rev=125797&p1=incubator/directory/kerberos/trunk/main/kerberos.properties&r1=125796&p2=incubator/directory/kerberos/trunk/main/kerberos.properties&r2=125797
==============================================================================
--- incubator/directory/kerberos/trunk/main/kerberos.properties	(original)
+++ incubator/directory/kerberos/trunk/main/kerberos.properties	Thu Jan 20 09:39:16 2005
@@ -46,22 +46,32 @@
 # -----------------------------------------------------------------------------
 # Eve Provider Properties
 # -----------------------------------------------------------------------------
+# create apache partition
+
+# Comma separated name of the partitions to attach/create
+server.db.partitions=apache example
+server.db.partition.suffix.apache=dc=apache,dc=org
+server.db.partition.indices.apache=objectClass ou uid
+server.db.partition.attributes.apache.objectClass=top domain extensibleObject
+server.db.partition.attributes.apache.dc=apache
 
 # The working directory where Eve stores it's partition database files
-eve.wkdir                                 = ./target/eve
+server.wkdir                                 = ./target/eve
+
+asn.1.berlib.provider=org.apache.ldap.common.berlib.asn1.SnickersProvider
+server.disable.anonymous=true
+server.net.ldap.port=10389
+
 # The published LDAP schema's to initialize: all listed are required for example.com
-eve.schemas                             = org.apache.eve.schema.bootstrap.SystemSchema org.apache.eve.schema.bootstrap.EveSchema
org.apache.eve.schema.bootstrap.CoreSchema org.apache.eve.schema.bootstrap.CosineSchema org.apache.eve.schema.bootstrap.InetorgpersonSchema
org.apache.eve.schema.bootstrap.Krb5kdcSchema
-# Comma separated name of the partitions to attach/create
-eve.db.partitions                         = example
+server.schemas = org.apache.ldap.server.schema.bootstrap.SystemSchema org.apache.ldap.server.schema.bootstrap.ApacheSchema
org.apache.ldap.server.schema.bootstrap.CoreSchema org.apache.ldap.server.schema.bootstrap.CosineSchema
org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema
 
 # Suffix for the example partition
-eve.db.partition.suffix.example     = dc=example,dc=com
+server.db.partition.suffix.example     = dc=example,dc=com
 # User defined indices for the example partition
-eve.db.partition.indices.example    = ou uid objectClass krb5PrincipalName
+server.db.partition.indices.example    = ou uid objectClass krb5PrincipalName
 # ObjectClass attribute values for the partition root at dc=example,dc=com
-eve.db.partition.attributes.example.dc =example
-eve.db.partition.attributes.example.objectClass =top domain example
-eve.net.disable.protocol=true
+server.db.partition.attributes.example.dc =example
+server.db.partition.attributes.example.objectClass =top domain example
 
 
 # -----------------------------------------------------------------------------
@@ -71,5 +81,5 @@
 # Base DN to conduct one level searches for kdc entries
 kdc.entry.basedn             = ou=Users,dc=example,dc=com
 # Initial LDIF file to import when first started
-kdc.entry.ldif.file          =kerberos.ldif
+kdc.entry.ldif.file          = kerberos.ldif
 

Modified: incubator/directory/kerberos/trunk/main/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/main/project.properties?view=diff&rev=125797&p1=incubator/directory/kerberos/trunk/main/project.properties&r1=125796&p2=incubator/directory/kerberos/trunk/main/project.properties&r2=125797
==============================================================================
--- incubator/directory/kerberos/trunk/main/project.properties	(original)
+++ incubator/directory/kerberos/trunk/main/project.properties	Thu Jan 20 09:39:16 2005
@@ -1,14 +1,13 @@
-
-
 #
 # Javaapp plugin properties
 #
 
 maven.javaapp.jar.exclude=junit, maven-javaapp-plugin
-maven.javaapp.mainclass=org.apache.kerberos.KerberosMain
+maven.javaapp.mainclass=org.apache.kerberos.Main
 maven.javaapp.jar.name=${maven.final.name}.jar
 maven.javaapp.sysproperties=
 maven.javaapp.jvmargs=
 
 maven.xdoc.includeProjectDocumentation=yes
 maven.license.licenseFile=${basedir}/../../../LICENSE.txt
+

Modified: incubator/directory/kerberos/trunk/main/project.xml
Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/main/project.xml?view=diff&rev=125797&p1=incubator/directory/kerberos/trunk/main/project.xml&r1=125796&p2=incubator/directory/kerberos/trunk/main/project.xml&r2=125797
==============================================================================
--- incubator/directory/kerberos/trunk/main/project.xml	(original)
+++ incubator/directory/kerberos/trunk/main/project.xml	Thu Jan 20 09:39:16 2005
@@ -101,12 +101,12 @@
     </dependency>
     <dependency>
       <groupId>incubator-directory</groupId>
-      <artifactId>server-shared</artifactId>
+      <artifactId>apacheds-shared</artifactId>
       <version>0.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>incubator-directory</groupId>
-      <artifactId>server-protocol</artifactId>
+      <artifactId>apacheds-protocol</artifactId>
       <version>0.8-SNAPSHOT</version>
     </dependency>
     <dependency>
@@ -126,13 +126,23 @@
     </dependency>
     <dependency>
       <groupId>incubator-directory</groupId>
+      <artifactId>asn1-der</artifactId>
+      <version>0.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>incubator-directory</groupId>
       <artifactId>apseda</artifactId>
       <version>0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>incubator-directory</groupId>
-      <artifactId>server-core</artifactId>
+      <artifactId>apacheds-core</artifactId>
       <version>0.8-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>incubator-directory</groupId>
+      <artifactId>mina</artifactId>
+      <version>0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>maven-plugins</groupId>

Modified: incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/Main.java
Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/Main.java?view=diff&rev=125797&p1=incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/Main.java&r1=125796&p2=incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/Main.java&r2=125797
==============================================================================
--- incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/Main.java	(original)
+++ incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/Main.java	Thu Jan
20 09:39:16 2005
@@ -45,23 +45,13 @@
     private final BootstrapStore bootstrap = new BootstrapStore( config );
     private PrincipalStore store;
     
-    public Main( Properties env )
+    public static void main( String[] args )
     {
-        store = new EmbeddedEveStore( env );
-
-        init();
-
-        try
-        {
-            setup();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
+    	Main main = new Main();
+    	main.go( args );
     }
     
-    public static void main( String[] args )
+    public void go( String[] args )
     {
         long startTime = System.currentTimeMillis();
 
@@ -93,8 +83,19 @@
 
             System.exit( 3 );
         }
+        
+        store = new EmbeddedEveStore( env );
+
+        init();
 
-        new Main( env );
+        try
+        {
+            setup();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
 
         System.out.println( "Apache Kerberos: started in "
                 + ( System.currentTimeMillis() - startTime )

Added: incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/kdc/kerberos.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/kdc/kerberos.properties?view=auto&rev=125797
==============================================================================
--- (empty file)
+++ incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/kdc/kerberos.properties
Thu Jan 20 09:39:16 2005
@@ -0,0 +1,75 @@
+kdc.default.port         = 88
+
+# -----------------------------------------------------------------------------
+# Kerberos Specific Properties
+# -----------------------------------------------------------------------------
+
+# these are the minimum required parameters
+kdc.primary.realm        = EXAMPLE.COM
+kdc.principal            = krbtgt/EXAMPLE.COM@EXAMPLE.COM
+kdc.keys.location        = kerberoskeys.ser
+kdc.encryption.types     = des-cbc-md5 des3-cbc-sha1 des3-cbc-md5 des-cbc-md4 des-cbc-crc
+
+changepw.principal       = kadmin/changepw@EXAMPLE.COM
+
+# all times in minutes
+kdc.allowable.clockskew        = 5
+# 1440 minutes is 1 day
+tgs.maximum.ticket.lifetime    = 1440
+# 10080 minutes is 1 week
+tgs.maximum.renewable.lifetime = 10080
+
+kdc.pa.enc.timestamp.required = true
+tgs.empty.addresses.allowed   = true
+tgs.forwardable.allowed       = true
+tgs.proxiable.allowed         = true
+tgs.postdate.allowed          = true
+tgs.renewable.allowed         = true
+
+
+# -----------------------------------------------------------------------------
+# JNDI Properties
+# -----------------------------------------------------------------------------
+
+# The URL of for the provider: for Eve this is just a DN
+java.naming.provider.url                  = dc=example,dc=com
+# The principal will be fixed for the hard system super user in Eve
+java.naming.security.principal            = uid=admin,ou=system
+# Authentication into Eve which is local is kept simple
+java.naming.security.authentication       = simple
+# Use default password for admin (bad eek)
+java.naming.security.credentials          = secret
+# Set up environment for initial context
+java.naming.factory.initial               = org.apache.ldap.server.jndi.ServerContextFactory
+
+
+# -----------------------------------------------------------------------------
+# Eve Provider Properties
+# -----------------------------------------------------------------------------
+
+# The working directory where Eve stores it's partition database files
+eve.wkdir                                 = ./target/eve
+# The published LDAP schema's to initialize: all listed are required for example.com
+eve.schemas                             = org.apache.ldap.server.schema.bootstrap.SystemSchema
org.apache.ldap.server.schema.bootstrap.EveSchema org.apache.ldap.server.schema.bootstrap.CoreSchema
org.apache.ldap.server.schema.bootstrap.CosineSchema org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema
org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema
+# Comma separated name of the partitions to attach/create
+eve.db.partitions                         = example
+
+# Suffix for the example partition
+eve.db.partition.suffix.example     = dc=example,dc=com
+# User defined indices for the example partition
+eve.db.partition.indices.example    = ou uid objectClass krb5PrincipalName
+# ObjectClass attribute values for the partition root at dc=example,dc=com
+eve.db.partition.attributes.example.dc =example
+eve.db.partition.attributes.example.objectClass =top domain example
+eve.net.disable.protocol=true
+
+
+# -----------------------------------------------------------------------------
+# Eve PrincipalStore Properties
+# -----------------------------------------------------------------------------
+
+# Base DN to conduct one level searches for kdc entries
+kdc.entry.basedn             = ou=Users,dc=example,dc=com
+# Initial LDIF file to import when first started
+kdc.entry.ldif.file          = kerberos.ldif
+

Mime
View raw message