moved core to jorgan-core, module jorgan builds zip now

svenmeier · Jan 22, 2012 · 477dd1c · 477dd1c
1 parent 840ff85
commit 477dd1c
Show file tree

Hide file tree

Showing 47 changed files with 130 additions and 68 deletions.
diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <project name="jorgan-all" default="all" basedir=".">
 
   <target name="all">
-    <ant dir="jorgan"/>
+    <ant dir="jorgan-core"/>
     <ant dir="jorgan-bootstrap"/>
     <ant dir="jorgan-gui"/>
     <ant dir="jorgan-exporter"/>

diff --git a/jorgan-bootstrap/.classpath b/jorgan-bootstrap/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
 	<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="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jorgan-bootstrap/build.xml b/jorgan-bootstrap/build.xml
@@ -15,7 +15,7 @@
 
 		<javac debug="true" source="1.6" target="1.6" destdir="./target/classes" srcdir="./src/main/java">
 			<compilerarg value="-Xlint:all,-serial"/>
-			<classpath path="../jorgan/target/classes" />
+			<classpath path="../jorgan-core/target/classes" />
 		</javac>
 
     	<copy todir="./target/classes">
@@ -36,7 +36,7 @@
 		        <attribute name="Implementation-Version" value="${jorgan.version}" />
 			</manifest>
 			<fileset dir="./target/classes" />
-			<fileset dir="../jorgan/target/classes">
+			<fileset dir="../jorgan-core/target/classes">
 				<include name="jorgan/util/ClassUtils.class" />
 				<include name="jorgan/util/IOUtils.class" />
 			</fileset>

diff --git a/jorgan-bundle/build.xml b/jorgan-bundle/build.xml
@@ -23,7 +23,7 @@
         <mkdir dir="${image}/jOrgan.app/Contents/Resources/Java"/>
         <copy todir="${image}/jOrgan.app/Contents/Resources/Java">
             <fileset dir="../jorgan-bootstrap/target/marshal" includes="jorgan.jar" />
-            <fileset dir="../jorgan/target/marshal" includes="lib/**" /> 
+            <fileset dir="../jorgan-core/target/marshal" includes="lib/**" /> 
             <fileset dir="../jorgan-gui/target/marshal" includes="lib/**" /> 
             <fileset dir="../jorgan-customizer/target/marshal" includes="lib/**" />
             <fileset dir="../jorgan-executor/target/marshal" includes="lib/**" />
@@ -44,7 +44,7 @@
 
         <mkdir dir="${image}/dispositions" />
         <copy todir="${image}">
-            <fileset dir="../jorgan/target/marshal" includes="dispositions/**" />          
+            <fileset dir="../jorgan-core/target/marshal" includes="dispositions/**" />          
             <fileset dir="../jorgan-executor/target/marshal" includes="dispositions/**" />
             <fileset dir="../jorgan-fluidsynth/target/marshal" includes="dispositions/**" />
             <fileset dir="../jorgan-lan/target/marshal" includes="dispositions/**" />

diff --git a/jorgan-core/.project b/jorgan-core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jorgan</name>
+	<name>jorgan-core</name>
 	<comment>Java Virtual Pipe Organ</comment>
 	<projects>
 	</projects>

diff --git a/jorgan-core/build.xml b/jorgan-core/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="jorgan" default="dist" basedir=".">
+<project name="jorgan-core" default="dist" basedir=".">
 
     <property file="../build.properties"/>
 

diff --git a/jorgan-creative/.classpath b/jorgan-creative/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-importer"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-jni"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

diff --git a/jorgan-creative/build.xml b/jorgan-creative/build.xml
@@ -10,11 +10,11 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath path="../jorgan-importer/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-customizer/.classpath b/jorgan-customizer/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-customizer/build.xml b/jorgan-customizer/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-executor/.classpath b/jorgan-executor/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-executor/build.xml b/jorgan-executor/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-exporter/.classpath b/jorgan-exporter/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-exporter/build.xml b/jorgan-exporter/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-fluidsynth/.classpath b/jorgan-fluidsynth/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-customizer"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-jni"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

diff --git a/jorgan-fluidsynth/build.xml b/jorgan-fluidsynth/build.xml
@@ -10,11 +10,11 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath path="../jorgan-customizer/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-graph/.classpath b/jorgan-graph/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry exported="true" kind="lib" path="lib/gj-core.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gj-layouts.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gj-ui.jar"/>

diff --git a/jorgan-graph/build.xml b/jorgan-graph/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-gui/.classpath b/jorgan-gui/.classpath
@@ -6,6 +6,6 @@
 	<classpathentry kind="lib" path="lib/AppleJavaExtensions.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
 	<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="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jorgan-gui/build.xml b/jorgan-gui/build.xml
@@ -12,9 +12,9 @@
 
     	<javac debug="true" source="1.6" target="1.6" destdir="./target/classes" srcdir="./src/main/java">
         	<compilerarg value="-Xlint:all,-serial"/>
-			<classpath path="../jorgan/target/classes" />
+			<classpath path="../jorgan-core/target/classes" />
         	<classpath>
-                <fileset dir="../jorgan/lib">
+                <fileset dir="../jorgan-core/lib">
     	            <include name="*" />
                 </fileset>
 			    <fileset dir="./lib">

diff --git a/jorgan-importer/.classpath b/jorgan-importer/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-importer/build.xml b/jorgan-importer/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-installer/jorgan.iss b/jorgan-installer/jorgan.iss
@@ -18,7 +18,7 @@ OutputDir=.\target
 DefaultDirName={pf}\jOrgan
 DefaultGroupName=jOrgan
 DisableProgramGroupPage=no
-LicenseFile=..\jorgan\docs\license.txt
+LicenseFile=..\jorgan-core\docs\license.txt
 SetupIconFile=.\src\jorgan.ico
 Compression=lzma
 SolidCompression=yes
@@ -64,7 +64,7 @@ Name: "skins"; Description: "Skins"; Types: standard
 Source: ".\target\jOrgan.exe"; DestDir: "{app}"; Components: core
 Source: ".\src\jOrgan.l4j.ini"; DestDir: "{app}"; Components: core
 Source: "..\jorgan-bootstrap\target\marshal\*"; DestDir: "{app}"; Components: core; Flags: recursesubdirs createallsubdirs
-Source: "..\jorgan\target\marshal\*"; DestDir: "{app}"; Components: core; Flags: recursesubdirs createallsubdirs
+Source: "..\jorgan-core\target\marshal\*"; DestDir: "{app}"; Components: core; Flags: recursesubdirs createallsubdirs
 Source: "..\jorgan-gui\target\marshal\*"; DestDir: "{app}"; Components: gui; Flags: recursesubdirs createallsubdirs
 Source: "..\jorgan-creative\target\marshal\*"; DestDir: "{app}"; Components: creative; Flags: recursesubdirs createallsubdirs
 Source: "..\jorgan-customizer\target\marshal\*"; DestDir: "{app}"; Components: customizer; Flags: recursesubdirs createallsubdirs

diff --git a/jorgan-jni/.classpath b/jorgan-jni/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jorgan-keyboard/.classpath b/jorgan-keyboard/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-keyboard/build.xml b/jorgan-keyboard/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-lan/.classpath b/jorgan-lan/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-lan/build.xml b/jorgan-lan/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-lcd/.classpath b/jorgan-lcd/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-lcd/build.xml b/jorgan-lcd/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-linuxsampler/.classpath b/jorgan-linuxsampler/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/jorgan-linuxsampler/build.xml b/jorgan-linuxsampler/build.xml
@@ -10,10 +10,10 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-memory/.classpath b/jorgan-memory/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-exporter"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-lcd"/>

diff --git a/jorgan-memory/build.xml b/jorgan-memory/build.xml
@@ -10,12 +10,12 @@
     <mkdir dir="./target/classes" />
 
   	<javac debug="true" source="1.6" target="1.6" srcdir="./src/main/java" destdir="./target/classes">
-    	<classpath path="../jorgan/target/classes" />
+    	<classpath path="../jorgan-core/target/classes" />
     	<classpath path="../jorgan-gui/target/classes" />
     	<classpath path="../jorgan-exporter/target/classes" />
   		<classpath path="../jorgan-lcd/target/classes" />
     	<classpath>
-            <fileset dir="../jorgan/lib">
+            <fileset dir="../jorgan-core/lib">
 	            <include name="*" />
             </fileset>
             <fileset dir="../jorgan-gui/lib">

diff --git a/jorgan-midimerger/.classpath b/jorgan-midimerger/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jorgan"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jorgan-core"/>
 	<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="/jorgan-gui"/>
 	<classpathentry kind="output" path="target/classes"/>