cristal-dev defines its own server, and depends on cristal-kernel rather

than the other way around.

6 files changed, 55 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 8794ec2..a2416cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/bin
+/db
 /cristaldev.jar
 /.settings
 /.classpath
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..0dc19c3
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1 @@
+/*.clc
diff --git a/bin/Cristal Dev Server.launch b/bin/Cristal Dev Server.launch
new file mode 100644
index 0000000..a05863f
--- /dev/null
+++ b/bin/Cristal Dev Server.launch
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<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-dev"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="4"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>

+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.process.StandardServer"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config ${workspace_loc:cristal-kernel}/bin/conf/server.conf -connect bin/dev.clc"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-dev"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256m"/>

+</launchConfiguration>

diff --git a/bin/dev.clc.example b/bin/dev.clc.example
new file mode 100644
index 0000000..7a61c89
--- /dev/null
+++ b/bin/dev.clc.example
@@ -0,0 +1,15 @@
+Name=Cristal Development Server

+

+// TCP server ports

+ItemServer.name=localhost

+ItemServer.iiop=1505

+ItemServer.Proxy.port=1555

+

+// LDAP Lookup config

+LDAP.GlobalPath=SUFFIX

+LDAP.RootPath=cn=cristal2

+LDAP.LocalPath=cn=dev

+LDAP.port=389

+LDAP.host=localhost

+LDAP.user=USER

+LDAP.password=PASS

diff --git a/pom.xml b/pom.xml
index 7cab919..14f7fba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
 			<resource>

 				<directory>src/main/resources</directory>

 				<targetPath>META-INF/cristal</targetPath>

+				<filtering>true</filtering>

 				<includes>

 					<include>module.xml</include>

 				</includes>

@@ -58,4 +59,19 @@
       </snapshots>

     </repository>   

   </repositories>

+  <dependencyManagement>

+  	<dependencies>

+  		<dependency>

+  			<groupId>cristal</groupId>

+  			<artifactId>cristal-kernel</artifactId>

+  			<version>2.3.2-SNAPSHOT</version>

+  		</dependency>

+  	</dependencies>

+  </dependencyManagement>

+  <dependencies>

+  	<dependency>

+  		<groupId>cristal</groupId>

+  		<artifactId>cristal-kernel</artifactId>

+  	</dependency>

+  </dependencies>

 </project>
\ No newline at end of file
diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index 4754c7d..9650841 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -1,7 +1,7 @@
 <CristalModule ns="dev" name="CristalDev">

 	<Info>

 		<Description>CRISTAL Development Items, such as resource factories and workflows. Also includes a demonstrative description factory</Description>

-		<Version>0.4</Version>

+		<Version>${version}</Version>

 	</Info>

 	<ResourceURL>ac/uk/uwe/cristaldev/resources/</ResourceURL>

 	<Imports>