[lsc-changes] r459 - in lsc-webui/trunk: . etc src/main/java/org/lsc/webui/pages

jclarke at lsc-project.org jclarke at lsc-project.org
Wed Nov 25 17:23:00 CET 2009


Author: jclarke
Date: 2009-11-25 17:23:00 +0100 (Wed, 25 Nov 2009)
New Revision: 459

Added:
   lsc-webui/trunk/etc/
   lsc-webui/trunk/etc/database.properties
   lsc-webui/trunk/etc/lsc.properties
Removed:
   lsc-webui/trunk/database.properties
   lsc-webui/trunk/lsc.properties
Modified:
   lsc-webui/trunk/pom.xml
   lsc-webui/trunk/src/main/java/org/lsc/webui/pages/EditGlobalConfiguration.java
Log:
Update to work (at least a bit) with configuration directory

Deleted: lsc-webui/trunk/database.properties
===================================================================
--- lsc-webui/trunk/database.properties	2009-11-25 15:37:14 UTC (rev 458)
+++ lsc-webui/trunk/database.properties	2009-11-25 16:23:00 UTC (rev 459)
@@ -1,6 +0,0 @@
-#Generated content by LSC Web Management Interface
-#Fri Feb 27 23:16:04 CET 2009
-password=
-url=jdbc\:hsqldb\:file\:hsqldb/lsc
-driver=org.hsqldb.jdbcDriver
-username=sa

Copied: lsc-webui/trunk/etc/database.properties (from rev 456, lsc-webui/trunk/database.properties)
===================================================================
--- lsc-webui/trunk/etc/database.properties	                        (rev 0)
+++ lsc-webui/trunk/etc/database.properties	2009-11-25 16:23:00 UTC (rev 459)
@@ -0,0 +1,6 @@
+#Generated content by LSC Web Management Interface
+#Fri Feb 27 23:16:04 CET 2009
+password=
+url=jdbc\:hsqldb\:file\:hsqldb/lsc
+driver=org.hsqldb.jdbcDriver
+username=sa

Copied: lsc-webui/trunk/etc/lsc.properties (from rev 456, lsc-webui/trunk/lsc.properties)
===================================================================
--- lsc-webui/trunk/etc/lsc.properties	                        (rev 0)
+++ lsc-webui/trunk/etc/lsc.properties	2009-11-25 16:23:00 UTC (rev 459)
@@ -0,0 +1,30 @@
+src.java.naming.security.principal = cn=jon
+src.java.naming.security.credentials = secret
+src.java.naming.security.authentication = SIMPLE
+src.java.naming.referral = IGNORE
+src.java.naming.provider.url = ldap://localhost:33389/dc=lsc-project,dc=org
+src.java.naming.ldap.version = 3
+src.java.naming.ldap.derefAliases = NEVER
+src.java.naming.factory.initial = com.sun.jndi.ldap.LdapCtxFactory
+lsc.tasks.MySyncTask.type = db2ldap
+lsc.tasks.MySyncTask.srcService = org.lsc.service.InetOrgPersonJDBCService
+lsc.tasks.MySyncTask.object = org.lsc.objects.inetOrgPerson
+lsc.tasks.MySyncTask.dstService.pivotAttrs = employeeNumber
+lsc.tasks.MySyncTask.dstService.filterId = (&(objectClass=inetOrgPerson)(employeeNumber={employeeNumber}))
+lsc.tasks.MySyncTask.dstService.filterAll = (objectClass=inetOrgPerson)
+lsc.tasks.MySyncTask.dstService.baseDn = ou=People
+lsc.tasks.MySyncTask.dstService.attrs = uid cn sn givenName mail objectClass employeeNumber
+lsc.tasks.MySyncTask.dstService = org.lsc.jndi.SimpleJndiDstService
+lsc.tasks.MySyncTask.dn = \"uid=\" + srcBean.getAttributeValueById(\"uid\") + \",ou=People\"
+lsc.tasks.MySyncTask.bean = org.lsc.beans.inetOrgPersonBean
+lsc.tasks = MySyncTask
+dst.java.naming.security.principal = cn=Directory Manager
+dst.java.naming.security.credentials = secret
+dst.java.naming.security.authentication = SIMPLE
+dst.java.recursivedelete = true
+dst.java.naming.referral = IGNORE
+dst.java.naming.provider.url = ldap://localhost:33389/dc=lsc-project,dc=org
+dst.java.naming.ldap.version = 3
+dst.java.naming.ldap.derefAliases = NEVER
+dst.java.naming.factory.initial = com.sun.jndi.ldap.LdapCtxFactory
+dn.real_root = dc=lsc-project,dc=org

Deleted: lsc-webui/trunk/lsc.properties
===================================================================
--- lsc-webui/trunk/lsc.properties	2009-11-25 15:37:14 UTC (rev 458)
+++ lsc-webui/trunk/lsc.properties	2009-11-25 16:23:00 UTC (rev 459)
@@ -1,30 +0,0 @@
-src.java.naming.security.principal = cn=jon
-src.java.naming.security.credentials = secret
-src.java.naming.security.authentication = SIMPLE
-src.java.naming.referral = IGNORE
-src.java.naming.provider.url = ldap://localhost:33389/dc=lsc-project,dc=org
-src.java.naming.ldap.version = 3
-src.java.naming.ldap.derefAliases = NEVER
-src.java.naming.factory.initial = com.sun.jndi.ldap.LdapCtxFactory
-lsc.tasks.MySyncTask.type = db2ldap
-lsc.tasks.MySyncTask.srcService = org.lsc.service.InetOrgPersonJDBCService
-lsc.tasks.MySyncTask.object = org.lsc.objects.inetOrgPerson
-lsc.tasks.MySyncTask.dstService.pivotAttrs = employeeNumber
-lsc.tasks.MySyncTask.dstService.filterId = (&(objectClass=inetOrgPerson)(employeeNumber={employeeNumber}))
-lsc.tasks.MySyncTask.dstService.filterAll = (objectClass=inetOrgPerson)
-lsc.tasks.MySyncTask.dstService.baseDn = ou=People
-lsc.tasks.MySyncTask.dstService.attrs = uid cn sn givenName mail objectClass employeeNumber
-lsc.tasks.MySyncTask.dstService = org.lsc.jndi.SimpleJndiDstService
-lsc.tasks.MySyncTask.dn = \"uid=\" + srcBean.getAttributeValueById(\"uid\") + \",ou=People\"
-lsc.tasks.MySyncTask.bean = org.lsc.beans.inetOrgPersonBean
-lsc.tasks = MySyncTask
-dst.java.naming.security.principal = cn=Directory Manager
-dst.java.naming.security.credentials = secret
-dst.java.naming.security.authentication = SIMPLE
-dst.java.recursivedelete = true
-dst.java.naming.referral = IGNORE
-dst.java.naming.provider.url = ldap://localhost:33389/dc=lsc-project,dc=org
-dst.java.naming.ldap.version = 3
-dst.java.naming.ldap.derefAliases = NEVER
-dst.java.naming.factory.initial = com.sun.jndi.ldap.LdapCtxFactory
-dn.real_root = dc=lsc-project,dc=org

Modified: lsc-webui/trunk/pom.xml
===================================================================
--- lsc-webui/trunk/pom.xml	2009-11-25 15:37:14 UTC (rev 458)
+++ lsc-webui/trunk/pom.xml	2009-11-25 16:23:00 UTC (rev 459)
@@ -194,7 +194,7 @@
 		<dependency>
 			<groupId>org.lsc</groupId>
 			<artifactId>lsc-core</artifactId>
-			<version>1.1-beta1</version>
+			<version>1.1.1</version>
 		</dependency>
 	</dependencies>
 

Modified: lsc-webui/trunk/src/main/java/org/lsc/webui/pages/EditGlobalConfiguration.java
===================================================================
--- lsc-webui/trunk/src/main/java/org/lsc/webui/pages/EditGlobalConfiguration.java	2009-11-25 15:37:14 UTC (rev 458)
+++ lsc-webui/trunk/src/main/java/org/lsc/webui/pages/EditGlobalConfiguration.java	2009-11-25 16:23:00 UTC (rev 459)
@@ -79,6 +79,8 @@
 	private ErrorPage errorPage;
 
 	public EditGlobalConfiguration() {
+		Configuration.setLocation("etc/");
+
 		if(sourceDirectoryProperties == null) {
 			sourceDirectoryProperties = Configuration.getSrcProperties();
 		}



More information about the lsc-changes mailing list