From 806f10825e94e5b1c5e63c30269a382cde24a8d9 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 6 Nov 2014 13:43:20 +0100
Subject: Config and project file changes before export to GitHub. This branch
 now no longer used.

---
 bin/Cristal Dev GUI.launch    |  2 +-
 bin/Cristal Dev Server.launch |  2 +-
 bin/client.conf               |  1 +
 bin/dev.clc.example           | 11 ++++++++++-
 bin/server.conf               |  4 +++-
 changelog                     | 13 -------------
 6 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100644 changelog

diff --git a/bin/Cristal Dev GUI.launch b/bin/Cristal Dev GUI.launch
index 0a4a447..51a72a2 100644
--- a/bin/Cristal Dev GUI.launch	
+++ b/bin/Cristal Dev GUI.launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cristal-gui/src/main/java/org/cristalise/gui/Main.java"/>
+<listEntry value="/cristalise-gui/src/main/java/org/cristalise/gui/Main.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
diff --git a/bin/Cristal Dev Server.launch b/bin/Cristal Dev Server.launch
index ce908a3..1ba9ff8 100644
--- a/bin/Cristal Dev Server.launch	
+++ b/bin/Cristal Dev Server.launch	
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="bad_container_name" value="\cristal-kernel\bin\eclip"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/cristal-kernel/src/main/java/com/c2kernel/process/StandardServer.java"/>
+<listEntry value="/cristalise-kernel/src/main/java/org/cristalise/kernel/process/StandardServer.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
diff --git a/bin/client.conf b/bin/client.conf
index 6667aae..08211de 100644
--- a/bin/client.conf
+++ b/bin/client.conf
@@ -1,2 +1,3 @@
 ClusterStorage=LDAPClientReader,ProxyLoader
+// UI setting to show Erase button on Items
 EnableItemErase=true
diff --git a/bin/dev.clc.example b/bin/dev.clc.example
index b2c40a7..4218c4b 100644
--- a/bin/dev.clc.example
+++ b/bin/dev.clc.example
@@ -1,11 +1,19 @@
-Name=Cristal Development Server
+// Cristal Connect Local Centre example file
+// Copy this and change things
+
+// This name appears on the login box
+Name=Example Cristal Server
+Logo=http://path.to/image
 
 // TCP server ports
 ItemServer.name=localhost
 ItemServer.iiop=1505
 ItemServer.Proxy.port=1555
+ItemServer.Console.port=8080
 
 // LDAP Lookup config
+Authenticator=org.cristalise.kernel.lookup.ldap.LDAPAuthManager
+Lookup=org.cristalise.kernel.lookup.ldap.LDAPLookup
 LDAP.GlobalPath=SUFFIX
 LDAP.RootPath=cn=cristal
 LDAP.LocalPath=cn=dev
@@ -14,6 +22,7 @@ LDAP.host=localhost
 LDAP.user=USER
 LDAP.password=PASS
 
+// XMLDB config
 XMLDB.URI=xmldb:exist://HOSTNAME:8080/exist/xmlrpc/db
 XMLDB.root=dev
 XMLDB.user=admin
diff --git a/bin/server.conf b/bin/server.conf
index eb692de..c6c9cc6 100644
--- a/bin/server.conf
+++ b/bin/server.conf
@@ -1,2 +1,4 @@
 ClusterStorage=LDAPClusterStorage,XMLDBClusterStorage
-ItemServer.Console.allow=localhost,pcuwe04
+
+//Add hostname here to allow connections to server console
+ItemServer.Console.allow=localhost
diff --git a/changelog b/changelog
deleted file mode 100644
index 922bb12..0000000
--- a/changelog
+++ /dev/null
@@ -1,13 +0,0 @@
-Release 0.5
------------
-	- GUI calls throw Errors in headless configurations. Disabled for now.
-	- Incorrect case on collection 'workflow'
- 
-0.2 - Description Factory
--------------------------
-	- DescriptionFactory
-	
-0.1 - Initial release
----------------------
-	- Extracted dev stuff from kernel 2.3
-		- Activity, Schema, Script Factories	
\ No newline at end of file
-- 
cgit v1.2.3