From d3b099dfc79602b9cfda125aaad39e6e6ae1b921 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 25 Jul 2012 16:26:49 +0200 Subject: Use Maven resource filtering for version string Cleanup warnings Rename demo instance to 'local' as cristal-dev now defines a server --- bin/conf/client.conf.example | 2 +- bin/conf/server.conf.example | 2 +- connect/dev.clc.example | 21 --------------------- connect/local.clc.example | 21 +++++++++++++++++++++ pom.xml | 1 + .../java/com/c2kernel/process/StandardClient.java | 3 +-- src/main/resources/textFiles/version.txt | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) delete mode 100755 connect/dev.clc.example create mode 100755 connect/local.clc.example diff --git a/bin/conf/client.conf.example b/bin/conf/client.conf.example index f054dc8..e433c2e 100644 --- a/bin/conf/client.conf.example +++ b/bin/conf/client.conf.example @@ -1,3 +1,3 @@ -LocalCentre=dev +LocalCentre=local ClusterStorage=LDAPClientReader,ProxyLoader EnableItemErase=true diff --git a/bin/conf/server.conf.example b/bin/conf/server.conf.example index 2e19619..46136ef 100644 --- a/bin/conf/server.conf.example +++ b/bin/conf/server.conf.example @@ -1,4 +1,4 @@ -LocalCentre=dev +LocalCentre=local ClusterStorage=LDAPClusterStorage,XMLClusterStorage XMLStorage.root=/path/to/xmldb/dir ItemServer.Console.allow=localhost diff --git a/connect/dev.clc.example b/connect/dev.clc.example deleted file mode 100755 index fea32d9..0000000 --- a/connect/dev.clc.example +++ /dev/null @@ -1,21 +0,0 @@ -// Cristal 2 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=HOSTNAME -ItemServer.iiop=1500 -ItemServer.Proxy.port=1553 -ItemServer.Console.port=8080 - -// LDAP Lookup config -LDAP.GlobalPath=LDAPROOTPATH -LDAP.RootPath=cn=cristal -LDAP.LocalPath=cn=dev -LDAP.port=389 -LDAP.host=LDAPHOSTNAME -LDAP.user=LDAPROOTUSER -LDAP.password=LDAPPASSWORD diff --git a/connect/local.clc.example b/connect/local.clc.example new file mode 100755 index 0000000..fea32d9 --- /dev/null +++ b/connect/local.clc.example @@ -0,0 +1,21 @@ +// Cristal 2 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=HOSTNAME +ItemServer.iiop=1500 +ItemServer.Proxy.port=1553 +ItemServer.Console.port=8080 + +// LDAP Lookup config +LDAP.GlobalPath=LDAPROOTPATH +LDAP.RootPath=cn=cristal +LDAP.LocalPath=cn=dev +LDAP.port=389 +LDAP.host=LDAPHOSTNAME +LDAP.user=LDAPROOTUSER +LDAP.password=LDAPPASSWORD diff --git a/pom.xml b/pom.xml index efc5aac..04f543d 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,7 @@ src/main/resources com/c2kernel/utils/resources + true diff --git a/src/main/java/com/c2kernel/process/StandardClient.java b/src/main/java/com/c2kernel/process/StandardClient.java index 2ef6107..c6df6e2 100644 --- a/src/main/java/com/c2kernel/process/StandardClient.java +++ b/src/main/java/com/c2kernel/process/StandardClient.java @@ -10,14 +10,13 @@ package com.c2kernel.process; -import com.c2kernel.entity.proxy.AgentProxy; abstract public class StandardClient extends AbstractMain { static public void main(String[] args) throws Exception { Gateway.init(readC2KArgs(args), false); - AgentProxy user = Gateway.connect("username", "password"); + //AgentProxy user = Gateway.connect("username", "password"); } } diff --git a/src/main/resources/textFiles/version.txt b/src/main/resources/textFiles/version.txt index f93ff28..e78e522 100644 --- a/src/main/resources/textFiles/version.txt +++ b/src/main/resources/textFiles/version.txt @@ -1 +1 @@ -C2Kernel V2.3.2 Build 1 \ No newline at end of file +${version} \ No newline at end of file -- cgit v1.2.3