43 files changed, 36 insertions, 61 deletions
diff --git a/.classpath b/.classpath
index fba9c0e..5d389a9 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/cristal-kernel"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.project b/.project
index ce40b92..d9e6b9b 100644
--- a/.project
+++ b/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index dcf8af1..cbb750c 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-#Wed Sep 14 14:08:10 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 0b934cb..0000000
--- a/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="jar" name="cristal-dev">
-	<property name="name" value="cristal-dev"/>
-	<property name="version" value="1.0"/>
-	<property name="src.dir" value="src"/>
-	<property name="res.dir" value="ch/cern/cristaldev/resources"/>
-	<property name="build.dir" value="bin"/>
-	<property name="resource.dir" value="resources"/>
-	<property name="debug" value="true"/>
-	<property name="deprecation" value="false"/>
-	<property name="optimize" value="true"/>
-
-	<!-- Resource file patterns -->
-	<patternset id="resource.files">
-		<include name="boot/**/*.txt"/>
-		<include name="boot/**/*.xml"/>
-		<include name="boot/**/*.xsd"/>
-		<include name="images/**/*.gif"/>
-		<include name="images/**/*.jpg"/>		
-		<include name="images/**/*.png"/>
-	</patternset>
-
-	<target name="prepare">
-		<tstamp/>
-	</target>
-
-	<target name="resources" depends="prepare" description="Moves all resources to the build directory for the Resource class to read">
-		<mkdir dir="${build.dir}/${res.dir}"/>
-		<copy todir="${build.dir}/${res.dir}">
-			<fileset dir="${resource.dir}">
-				<patternset refid="resource.files"/>
-			</fileset>
-		</copy>
-		<copy todir="${build.dir}">
-			<fileset dir="${src.dir}">
-				<filename name="module.xml"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="jar" depends="resources" description="make jar">
-		<jar basedir="${build.dir}" includes="**" jarfile="cristaldev.jar"/>
-	</target>
-
-	<target name="clean" description="cleans up the build directories">
-		<delete dir="${build.dir}"/>
-	</target>	
-
-	<target name="rebuild" depends="clean, jar" description="deletes and rebuilds the cristal-dev module"/>
-	
-
-</project>
diff --git a/cristaldev.jar b/cristaldev.jar
index d8be001..6a8fd14 100644
--- a/cristaldev.jar
+++ b/cristaldev.jar
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a12775a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>cristal</groupId>
+	<artifactId>cristal-dev</artifactId>
+	<version>0.2</version>
+	<name>Cristal Development Module</name>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main</directory>
+				<includes>
+					<include>module.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<targetPath>ac/uk/uwe/cristaldev/resources</targetPath>
+			</resource>
+		</resources>
+	</build>
+</project>
+\ No newline at end of file
diff --git a/src/module.xml b/src/main/module.xml
index 83bc461..7667b0e 100644
--- a/src/module.xml
+++ b/src/main/module.xml
@@ -4,7 +4,7 @@
 		<Description>CRISTAL Development Items, such as resource factories and workflows. Also includes a demonstrative description factory</Description>
 		<Version>0.2</Version>
 	</Info>
-	<ResourceURL>ch/cern/cristaldev/resources/</ResourceURL>
+	<ResourceURL>ac/uk/uwe/cristaldev/resources/</ResourceURL>
 	<Imports>
 		<Resource type="OD" name="NewLocalObjectDef">boot/OD/NewLocalObjectDef.xsd</Resource>
 		<Resource type="OD" name="NewDevObjectDef">boot/OD/NewDevObjectDef.xsd</Resource>
diff --git a/resources/boot/CA/CompositeActivityFactory.xml b/src/main/resources/boot/CA/CompositeActivityFactory.xml
index 1a963cb..1a963cb 100644
--- a/resources/boot/CA/CompositeActivityFactory.xml
+++ b/src/main/resources/boot/CA/CompositeActivityFactory.xml
diff --git a/resources/boot/CA/ElementaryActivityFactory.xml b/src/main/resources/boot/CA/ElementaryActivityFactory.xml
index bf14607..bf14607 100644
--- a/resources/boot/CA/ElementaryActivityFactory.xml
+++ b/src/main/resources/boot/CA/ElementaryActivityFactory.xml
diff --git a/resources/boot/CA/ItemDescriptionFactoryWf.xml b/src/main/resources/boot/CA/ItemDescriptionFactoryWf.xml
index 270c473..270c473 100644
--- a/resources/boot/CA/ItemDescriptionFactoryWf.xml
+++ b/src/main/resources/boot/CA/ItemDescriptionFactoryWf.xml
diff --git a/resources/boot/CA/ItemDescriptionWf.xml b/src/main/resources/boot/CA/ItemDescriptionWf.xml
index e8c294f..e8c294f 100644
--- a/resources/boot/CA/ItemDescriptionWf.xml
+++ b/src/main/resources/boot/CA/ItemDescriptionWf.xml
diff --git a/resources/boot/CA/ManageCompositeActDef.xml b/src/main/resources/boot/CA/ManageCompositeActDef.xml
index 9a48f1c..9a48f1c 100644
--- a/resources/boot/CA/ManageCompositeActDef.xml
+++ b/src/main/resources/boot/CA/ManageCompositeActDef.xml
diff --git a/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml
index 1aa3840..1aa3840 100644
--- a/resources/boot/CA/ManageElementaryActDef.xml
+++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml
diff --git a/resources/boot/CA/ManageSchema.xml b/src/main/resources/boot/CA/ManageSchema.xml
index da501e4..da501e4 100644
--- a/resources/boot/CA/ManageSchema.xml
+++ b/src/main/resources/boot/CA/ManageSchema.xml
diff --git a/resources/boot/CA/ManageScript.xml b/src/main/resources/boot/CA/ManageScript.xml
index f8100b0..f8100b0 100644
--- a/resources/boot/CA/ManageScript.xml
+++ b/src/main/resources/boot/CA/ManageScript.xml
diff --git a/resources/boot/CA/SchemaFactoryWf.xml b/src/main/resources/boot/CA/SchemaFactoryWf.xml
index a6496f3..a6496f3 100644
--- a/resources/boot/CA/SchemaFactoryWf.xml
+++ b/src/main/resources/boot/CA/SchemaFactoryWf.xml
diff --git a/resources/boot/CA/ScriptFactoryWf.xml b/src/main/resources/boot/CA/ScriptFactoryWf.xml
index 5f51f9d..5f51f9d 100644
--- a/resources/boot/CA/ScriptFactoryWf.xml
+++ b/src/main/resources/boot/CA/ScriptFactoryWf.xml
diff --git a/resources/boot/EA/AssignNewVersionFromLast.xml b/src/main/resources/boot/EA/AssignNewVersionFromLast.xml
index 248dfee..248dfee 100644
--- a/resources/boot/EA/AssignNewVersionFromLast.xml
+++ b/src/main/resources/boot/EA/AssignNewVersionFromLast.xml
diff --git a/resources/boot/EA/CreateItem.xml b/src/main/resources/boot/EA/CreateItem.xml
index d54cd4d..d54cd4d 100644
--- a/resources/boot/EA/CreateItem.xml
+++ b/src/main/resources/boot/EA/CreateItem.xml
diff --git a/resources/boot/EA/CreateNewLocalObjectDef.xml b/src/main/resources/boot/EA/CreateNewLocalObjectDef.xml
index 840c32d..840c32d 100644
--- a/resources/boot/EA/CreateNewLocalObjectDef.xml
+++ b/src/main/resources/boot/EA/CreateNewLocalObjectDef.xml
diff --git a/resources/boot/EA/EditActivityDef.xml b/src/main/resources/boot/EA/EditActivityDef.xml
index e90c225..e90c225 100644
--- a/resources/boot/EA/EditActivityDef.xml
+++ b/src/main/resources/boot/EA/EditActivityDef.xml
diff --git a/resources/boot/EA/EditPropertyDescription.xml b/src/main/resources/boot/EA/EditPropertyDescription.xml
index 2cbf763..2cbf763 100644
--- a/resources/boot/EA/EditPropertyDescription.xml
+++ b/src/main/resources/boot/EA/EditPropertyDescription.xml
diff --git a/resources/boot/EA/EditSchema.xml b/src/main/resources/boot/EA/EditSchema.xml
index 3b01fdc..3b01fdc 100644
--- a/resources/boot/EA/EditSchema.xml
+++ b/src/main/resources/boot/EA/EditSchema.xml
diff --git a/resources/boot/EA/EditScriptDefinition.xml b/src/main/resources/boot/EA/EditScriptDefinition.xml
index 11c14ec..11c14ec 100644
--- a/resources/boot/EA/EditScriptDefinition.xml
+++ b/src/main/resources/boot/EA/EditScriptDefinition.xml
diff --git a/resources/boot/EA/SetInstanceWorkflow.xml b/src/main/resources/boot/EA/SetInstanceWorkflow.xml
index a9e7d7b..a9e7d7b 100644
--- a/resources/boot/EA/SetInstanceWorkflow.xml
+++ b/src/main/resources/boot/EA/SetInstanceWorkflow.xml
diff --git a/resources/boot/OD/ChooseWorkflow.xsd b/src/main/resources/boot/OD/ChooseWorkflow.xsd
index 9927231..9927231 100644
--- a/resources/boot/OD/ChooseWorkflow.xsd
+++ b/src/main/resources/boot/OD/ChooseWorkflow.xsd
diff --git a/resources/boot/OD/New.xsd b/src/main/resources/boot/OD/New.xsd
index 91755c8..91755c8 100644
--- a/resources/boot/OD/New.xsd
+++ b/src/main/resources/boot/OD/New.xsd
diff --git a/resources/boot/OD/NewDevObjectDef.xsd b/src/main/resources/boot/OD/NewDevObjectDef.xsd
index 637581e..637581e 100644
--- a/resources/boot/OD/NewDevObjectDef.xsd
+++ b/src/main/resources/boot/OD/NewDevObjectDef.xsd
diff --git a/resources/boot/OD/NewLocalObjectDef.xsd b/src/main/resources/boot/OD/NewLocalObjectDef.xsd
index 0186872..0186872 100644
--- a/resources/boot/OD/NewLocalObjectDef.xsd
+++ b/src/main/resources/boot/OD/NewLocalObjectDef.xsd
diff --git a/resources/boot/SC/CreateNewNumberedVersionFromLast.xml b/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
index 321855a..321855a 100644
--- a/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
+++ b/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
diff --git a/resources/boot/SC/InstantiateItem.xml b/src/main/resources/boot/SC/InstantiateItem.xml
index 4e80e9d..4e80e9d 100644
--- a/resources/boot/SC/InstantiateItem.xml
+++ b/src/main/resources/boot/SC/InstantiateItem.xml
diff --git a/resources/boot/SC/LocalObjectDefCreator.xml b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
index 32b154c..32b154c 100644
--- a/resources/boot/SC/LocalObjectDefCreator.xml
+++ b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
diff --git a/resources/boot/SC/New.xml b/src/main/resources/boot/SC/New.xml
index a07a7b9..a07a7b9 100644
--- a/resources/boot/SC/New.xml
+++ b/src/main/resources/boot/SC/New.xml
diff --git a/resources/boot/SC/SetWorkflow.xml b/src/main/resources/boot/SC/SetWorkflow.xml
index 88a061f..88a061f 100644
--- a/resources/boot/SC/SetWorkflow.xml
+++ b/src/main/resources/boot/SC/SetWorkflow.xml
diff --git a/resources/boot/property/CAProp.xml b/src/main/resources/boot/property/CAProp.xml
index d5b2bea..d5b2bea 100644
--- a/resources/boot/property/CAProp.xml
+++ b/src/main/resources/boot/property/CAProp.xml
diff --git a/resources/boot/property/DescProp.xml b/src/main/resources/boot/property/DescProp.xml
index 95a41c9..95a41c9 100644
--- a/resources/boot/property/DescProp.xml
+++ b/src/main/resources/boot/property/DescProp.xml
diff --git a/resources/boot/property/EAProp.xml b/src/main/resources/boot/property/EAProp.xml
index ddf07c1..ddf07c1 100644
--- a/resources/boot/property/EAProp.xml
+++ b/src/main/resources/boot/property/EAProp.xml
diff --git a/resources/boot/property/ODProp.xml b/src/main/resources/boot/property/ODProp.xml
index 0c85444..0c85444 100644
--- a/resources/boot/property/ODProp.xml
+++ b/src/main/resources/boot/property/ODProp.xml
diff --git a/resources/boot/property/SCProp.xml b/src/main/resources/boot/property/SCProp.xml
index 356f2f9..356f2f9 100644
--- a/resources/boot/property/SCProp.xml
+++ b/src/main/resources/boot/property/SCProp.xml
diff --git a/resources/images/typeicons/factory_16.png b/src/main/resources/images/typeicons/factory_16.png
index 9979ee7..9979ee7 100644
--- a/resources/images/typeicons/factory_16.png
+++ b/src/main/resources/images/typeicons/factory_16.png
diff --git a/resources/images/typeicons/factory_32.png b/src/main/resources/images/typeicons/factory_32.png
index f43f44f..f43f44f 100644
--- a/resources/images/typeicons/factory_32.png
+++ b/src/main/resources/images/typeicons/factory_32.png
diff --git a/resources/images/typeicons/itemdescription_16.png b/src/main/resources/images/typeicons/itemdescription_16.png
index 7c80fd6..7c80fd6 100644
--- a/resources/images/typeicons/itemdescription_16.png
+++ b/src/main/resources/images/typeicons/itemdescription_16.png
diff --git a/resources/images/typeicons/itemdescription_32.png b/src/main/resources/images/typeicons/itemdescription_32.png
index d0afc4d..d0afc4d 100644
--- a/resources/images/typeicons/itemdescription_32.png
+++ b/src/main/resources/images/typeicons/itemdescription_32.png