Example file updates

Allow full path to clc
Remove cristal-dev dependency

5 files changed, 54 insertions, 40 deletions

diff --git a/bin/openldap/README b/bin/openldap/README
index 6bfdabc..daa0b9c 100644
--- a/bin/openldap/README
+++ b/bin/openldap/README
@@ -1,5 +1,5 @@
 cristal2.schema goes in OpenLDAP/schemas, or change the include line to point to it here.

 

-edit your slapd.conf to include it, and replace the env vars with your local path.

+edit your slapd.conf to include it.

 edit the suffix and rootdn and rootpass

 use this slapd to help you

diff --git a/bin/openldap/slapd.conf b/bin/openldap/slapd.conf
index 65cebf1..4502164 100644
--- a/bin/openldap/slapd.conf
+++ b/bin/openldap/slapd.conf
@@ -1,20 +1,13 @@
-# $OpenLDAP: pkg/ldap/servers/slapd/slapd.conf,v 1.8.8.7 2001/09/27 20:00:31 kurt Exp $

-#

-# See slapd.conf(5) for details on configuration options.

-# This file should NOT be world readable.

-#

-include		D:/openldap-2_0_19_debug/schema/core.schema

-include     D:/openldap-2_0_19_debug/schema/cristal2.schema

-pidfile		D:/openldap-2_0_19_debug/slapd.pid

-argsfile	D:/openldap-2_0_19_debug/slapd.args

+include     /etc/openldap/schema/core.schema

+include     cristal-kernel/bin/openldap/cristal2.schema

+pidfile		/var/run/slapd/slapd.pid

+argsfile	/var/run/slapd/slapd.args

 

+moduleload back_bdb.la

 

-# if no access controls are present, the default is:

-#	Allow read by all

-# rootdn can always write!

-

-database	ldbm

+database	bdb

 suffix		"o=cern,c=ch"

-rootdn		"cn=Directory Manager,o=cern,c=ch"

-rootpw		estrella

+rootdn		"cn=admin,o=cern,c=ch"

+rootpw		cristal

 index	objectClass	eq

+index   cn eq,pres,sub

diff --git a/connect/dev.clc.example b/connect/dev.clc.example
index d912536..fea32d9 100755
--- a/connect/dev.clc.example
+++ b/connect/dev.clc.example
@@ -2,28 +2,20 @@
 // Copy this and change things

 

 // This name appears on the login box

-Name=Another Cristal Server

+Name=Example Cristal Server

 Logo=http://path.to/image

 

-// Specify the URL for domain resources, or a package path

-DomainResourceURL=

-

-// Orbacus config

-ooc.iiop.port=1500

-

 // TCP server ports

 ItemServer.name=HOSTNAME

-ItemServer.HTTP.port=8000

+ItemServer.iiop=1500

 ItemServer.Proxy.port=1553

 ItemServer.Console.port=8080

-Incoming.port=89

 

 // LDAP Lookup config

 LDAP.GlobalPath=LDAPROOTPATH

-LDAP.RootPath=cn=cristal2

-LDAP.LocalPath=cn=LCNAME

+LDAP.RootPath=cn=cristal

+LDAP.LocalPath=cn=dev

 LDAP.port=389

 LDAP.host=LDAPHOSTNAME

-// note these two values should be removed when we're in production

 LDAP.user=LDAPROOTUSER

 LDAP.password=LDAPPASSWORD

diff --git a/pom.xml b/pom.xml
index 61985bf..dcd8bf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,10 +37,6 @@
 			<groupId>com.novell.ldap</groupId>

 			<artifactId>jldap</artifactId>

 		</dependency>

-		<dependency>

-			<groupId>cristal</groupId>

-			<artifactId>cristal-dev</artifactId>

-		</dependency>

 	</dependencies>

 	<dependencyManagement>

 		<dependencies>

@@ -70,11 +66,6 @@
 				<artifactId>jldap</artifactId>

 				<version>4.3</version>

 			</dependency>

-			<dependency>

-				<groupId>cristal</groupId>

-				<artifactId>cristal-dev</artifactId>

-				<version>0.4</version>

-			</dependency>

 		</dependencies>

 	</dependencyManagement>

 	<build>

@@ -215,4 +206,39 @@
 		<developerConnection>scm:git:ssh://wall.cccs.uwe.ac.uk/var/git/cristal-kernel.git</developerConnection>

 		<url>http://wall.cccs.uwe.ac.uk/redmine/projects/cristal-kernel/repository</url>

 	</scm>

+	<distributionManagement>

+    <repository>

+      <id>archiva.internal</id>

+      <url>http://wall.cccs.uwe.ac.uk:8080/archiva/repository/internal/</url>

+    </repository>

+    <snapshotRepository>

+      <id>archiva.snapshots</id>

+      <url>http://wall.cccs.uwe.ac.uk:8080/archiva/repository/snapshots/</url>

+    </snapshotRepository>

+  </distributionManagement>

+

+  <repositories>

+    <repository>

+      <id>archiva.internal</id>

+      <name>Archiva Managed Internal Repository</name>

+      <url>http://wall.cccs.uwe.ac.uk:8080/archiva/repository/internal/</url>

+      <releases>

+        <enabled>true</enabled>

+      </releases>

+      <snapshots>

+        <enabled>false</enabled>

+      </snapshots>

+    </repository>

+    <repository>

+      <id>archiva.snapshots</id>

+      <name>Archiva Managed Snapshot Repository</name>

+      <url>http://wall.cccs.uwe.ac.uk:8080/archiva/repository/snapshots/</url>

+      <releases>

+        <enabled>false</enabled>

+      </releases>

+      <snapshots>

+        <enabled>true</enabled>

+      </snapshots>

+    </repository>   

+  </repositories>

 </project>
\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/process/AbstractMain.java b/src/main/java/com/c2kernel/process/AbstractMain.java
index 7401d1b..093172c 100644
--- a/src/main/java/com/c2kernel/process/AbstractMain.java
+++ b/src/main/java/com/c2kernel/process/AbstractMain.java
@@ -122,8 +122,11 @@ abstract public class AbstractMain
                 if (connectPath == null) {

                     // see if LC is listed in the config

                     Logger.msg(6, "No connect file specified in arguments. Looking in config.");

-                    centreId = c2kProps.getProperty("LocalCentre");

-                    if (centreId!= null) connectPath = "connect/"+centreId+".clc";

+                    connectPath = c2kProps.getProperty("CLCPath");

+                    if (connectPath == null) {

+                    	centreId = c2kProps.getProperty("LocalCentre");

+                    	if (centreId!= null) connectPath = "connect/"+centreId+".clc";

+                    }

                 }

 

                 if (connectPath != null) {