diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2012-07-25 16:26:49 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2012-07-25 16:26:49 +0200 |
| commit | d3b099dfc79602b9cfda125aaad39e6e6ae1b921 (patch) | |
| tree | b5388917539fa85dc84bc70cfb8487fe46161225 | |
| parent | 63ab46b929f77345fc4b58a95bde3f4a1bf55a7e (diff) | |
Use Maven resource filtering for version string
Cleanup warnings
Rename demo instance to 'local' as cristal-dev now defines a server
| -rw-r--r-- | bin/conf/client.conf.example | 2 | ||||
| -rw-r--r-- | bin/conf/server.conf.example | 2 | ||||
| -rwxr-xr-x | connect/local.clc.example (renamed from connect/dev.clc.example) | 0 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/StandardClient.java | 3 | ||||
| -rw-r--r-- | src/main/resources/textFiles/version.txt | 2 |
6 files changed, 5 insertions, 5 deletions
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/local.clc.example index fea32d9..fea32d9 100755 --- a/connect/dev.clc.example +++ b/connect/local.clc.example @@ -73,6 +73,7 @@ <resource>
<directory>src/main/resources</directory>
<targetPath>com/c2kernel/utils/resources</targetPath>
+ <filtering>true</filtering>
</resource>
</resources>
<pluginManagement>
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 |