summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--bin/Cristal Dev GUI.launch19
-rw-r--r--bin/Cristal Dev Server.launch4
-rw-r--r--pom.xml11
-rw-r--r--src/main/resources/module.xml3
5 files changed, 34 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index a2416cd..4ccd40f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/.classpath
/target
/.project
+/cristal.preferences
diff --git a/bin/Cristal Dev GUI.launch b/bin/Cristal Dev GUI.launch
new file mode 100644
index 0000000..3b857b9
--- /dev/null
+++ b/bin/Cristal Dev GUI.launch
@@ -0,0 +1,19 @@
+<?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/com/c2kernel/gui/Main.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</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.gui.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config ${workspace_loc:cristal-gui}/bin/conf/client.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"/>
+</launchConfiguration>
diff --git a/bin/Cristal Dev Server.launch b/bin/Cristal Dev Server.launch
index a05863f..224343c 100644
--- a/bin/Cristal Dev Server.launch
+++ b/bin/Cristal Dev Server.launch
@@ -2,10 +2,10 @@
<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"/>
+<listEntry value="/cristal-kernel/src/main/java/com/c2kernel/process/StandardServer.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
+<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
diff --git a/pom.xml b/pom.xml
index 14f7fba..ff4f614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
</resource>
<resource>
<directory>src/main/resources</directory>
- <targetPath>ac/uk/uwe/cristaldev/resources</targetPath>
+ <targetPath>uk/ac/uwe/cristaldev/resources</targetPath>
<excludes>
<exclude>module.xml</exclude>
</excludes>
@@ -66,6 +66,11 @@
<artifactId>cristal-kernel</artifactId>
<version>2.3.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>cristal</groupId>
+ <artifactId>cristal-gui</artifactId>
+ <version>2.3.2-SNAPSHOT</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -73,5 +78,9 @@
<groupId>cristal</groupId>
<artifactId>cristal-kernel</artifactId>
</dependency>
+ <dependency>
+ <groupId>cristal</groupId>
+ <artifactId>cristal-gui</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 9650841..dd4d666 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -3,7 +3,8 @@
<Description>CRISTAL Development Items, such as resource factories and workflows. Also includes a demonstrative description factory</Description>
<Version>${version}</Version>
</Info>
- <ResourceURL>ac/uk/uwe/cristaldev/resources/</ResourceURL>
+ <ResourceURL>uk/ac/uwe/cristaldev/resources/</ResourceURL>
+ <Config name="Module.debug">true</Config>
<Imports>
<Resource name="NewLocalObjectDef" type="OD">boot/OD/NewLocalObjectDef.xsd</Resource>
<Resource name="NewDevObjectDef" type="OD">boot/OD/NewDevObjectDef.xsd</Resource>