Updates to data generation ant scripts for Git migration
diff --git a/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.cvsignore b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.cvsignore
deleted file mode 100644
index 302df74..0000000
--- a/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-resources
-plugin.xml
diff --git a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.gitignore
similarity index 71%
rename from population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
rename to geography/org.eclipse.stem.data.geography.infrastructure.transportation/.gitignore
index 34bf8fe..e15926f 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
+++ b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.gitignore
@@ -1,3 +1,3 @@
-plugin.xml
+resources/
plugin.properties
-resources
+plugin.xml
\ No newline at end of file
diff --git a/geography/org.eclipse.stem.data.geography.models/.cvsignore b/geography/org.eclipse.stem.data.geography.models/.cvsignore
deleted file mode 100644
index c234e9b..0000000
--- a/geography/org.eclipse.stem.data.geography.models/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-resources
-plugin.xml
-plugin.properties
diff --git a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore b/geography/org.eclipse.stem.data.geography.models/.gitignore
similarity index 71%
copy from population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
copy to geography/org.eclipse.stem.data.geography.models/.gitignore
index 34bf8fe..e15926f 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
+++ b/geography/org.eclipse.stem.data.geography.models/.gitignore
@@ -1,3 +1,3 @@
-plugin.xml
+resources/
plugin.properties
-resources
+plugin.xml
\ No newline at end of file
diff --git a/geography/org.eclipse.stem.data.geography/.cvsignore b/geography/org.eclipse.stem.data.geography/.cvsignore
deleted file mode 100644
index 8d6685b..0000000
--- a/geography/org.eclipse.stem.data.geography/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-resources
-plugin.properties
-plugin.xml
diff --git a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore b/geography/org.eclipse.stem.data.geography/.gitignore
similarity index 71%
copy from population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
copy to geography/org.eclipse.stem.data.geography/.gitignore
index 34bf8fe..e15926f 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
+++ b/geography/org.eclipse.stem.data.geography/.gitignore
@@ -1,3 +1,3 @@
-plugin.xml
+resources/
plugin.properties
-resources
+plugin.xml
\ No newline at end of file
diff --git a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/.cvsignore b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/.gitignore
similarity index 97%
rename from geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/.cvsignore
rename to geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/.gitignore
index f84f1fd..863280c 100644
--- a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/.cvsignore
+++ b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/.gitignore
@@ -1,2 +1,2 @@
*_names.properties
-level0ISONames.properties
+level0ISONames.properties
\ No newline at end of file
diff --git a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/.cvsignore b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/.cvsignore
deleted file mode 100644
index 778e556..0000000
--- a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*centers.properties
diff --git a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/.gitignore b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/.gitignore
new file mode 100644
index 0000000..563af51
--- /dev/null
+++ b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/.gitignore
@@ -0,0 +1 @@
+*_centers.properties
diff --git a/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.cvsignore b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.gitignore
similarity index 100%
rename from geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.cvsignore
rename to geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.gitignore
diff --git a/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/update.xml b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/update.xml
index 0b5f15d..f08553c 100644
--- a/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/update.xml
+++ b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/update.xml
@@ -84,17 +84,17 @@
<!-- The class path to use -->
<path id="classpath.runtime">
<pathelement location="${path.sourceplugin}/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.core/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.definitions/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../${ID_ROOT}.internal.data/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.data.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.transport/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.transport/${targetBin}" />
<fileset dir="${baseLocation}/plugins/">
<include name="*emf*.jar" />
</fileset>
- <fileset dir="${pluginRootDirectory}/${ID_ROOT}.internal.data/lib/">
+ <fileset dir="${pluginRootDirectory}/../${ID_ROOT}.internal.data/lib/">
<include name="*emf*.jar" />
</fileset>
</path>
diff --git a/geography/org.eclipse.stem.internal.data.geography.models/.cvsignore b/geography/org.eclipse.stem.internal.data.geography.models/.gitignore
similarity index 100%
rename from geography/org.eclipse.stem.internal.data.geography.models/.cvsignore
rename to geography/org.eclipse.stem.internal.data.geography.models/.gitignore
diff --git a/geography/org.eclipse.stem.internal.data.geography.models/update.xml b/geography/org.eclipse.stem.internal.data.geography.models/update.xml
index a1e1b23..d0f9187 100644
--- a/geography/org.eclipse.stem.internal.data.geography.models/update.xml
+++ b/geography/org.eclipse.stem.internal.data.geography.models/update.xml
@@ -90,16 +90,16 @@
<!-- The class path to use -->
<path id="classpath.runtime">
<pathelement location="${path.sourceplugin}/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.core/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.definitions/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../${ID_ROOT}.internal.data/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.data.geography/${targetBin}" />
<fileset dir="${baseLocation}/plugins/">
<include name="*emf*.jar" />
</fileset>
- <fileset dir="${pluginRootDirectory}/${ID_ROOT}.internal.data/lib/">
+ <fileset dir="${pluginRootDirectory}/../${ID_ROOT}.internal.data/lib/">
<include name="*emf*.jar" />
</fileset>
</path>
diff --git a/geography/org.eclipse.stem.internal.data.geography/.cvsignore b/geography/org.eclipse.stem.internal.data.geography/.gitignore
similarity index 100%
rename from geography/org.eclipse.stem.internal.data.geography/.cvsignore
rename to geography/org.eclipse.stem.internal.data.geography/.gitignore
diff --git a/geography/org.eclipse.stem.internal.data.geography/update.xml b/geography/org.eclipse.stem.internal.data.geography/update.xml
index 76b9bb1..fcac5a1 100644
--- a/geography/org.eclipse.stem.internal.data.geography/update.xml
+++ b/geography/org.eclipse.stem.internal.data.geography/update.xml
@@ -93,15 +93,15 @@
<!-- The class path to use -->
<path id="classpath.runtime">
<pathelement location="${path.sourceplugin}/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.core/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.definitions/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../${ID_ROOT}.internal.data/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.data.geography/${targetBin}" />
<fileset dir="${baseLocation}/plugins/">
<include name="*emf*.jar" />
</fileset>
- <fileset dir="${pluginRootDirectory}/${ID_ROOT}.internal.data/lib/">
+ <fileset dir="${pluginRootDirectory}/../${ID_ROOT}.internal.data/lib/">
<include name="*emf*.jar" />
</fileset>
</path>
diff --git a/org.eclipse.stem.internal.data/update.xml b/org.eclipse.stem.internal.data/update.xml
index 2da527a..b21cf77 100644
--- a/org.eclipse.stem.internal.data/update.xml
+++ b/org.eclipse.stem.internal.data/update.xml
@@ -25,19 +25,19 @@
</condition>
<!-- The buildDirectory property is set in a headless build -->
- <condition property="pluginRootDirectory" value="${buildDirectory}/plugins" else="..">
+ <condition property="pluginRootDirectory" value="${buildDirectory}/plugins" else="../..">
<isset property="runningHeadless" />
</condition>
<target name="update_all" description="Run all of the child and files">
- <ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography" antfile="update.xml"/>
- <ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.population.human" antfile="update.xml"/>
+ <ant inheritAll="false" dir="${pluginRootDirectory}/org.eclipse.stem.data/geography/${ID_ROOT}.internal.data.geography" antfile="update.xml"/>
+ <ant inheritAll="false" dir="${pluginRootDirectory}/org.eclipse.stem.data/population/${ID_ROOT}.internal.data.geography.population.human" antfile="update.xml"/>
<!--<ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.earthscience" antfile="update.xml"/>-->
- <ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.models" antfile="update.xml"/>
- <ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.infrastructure.transportation" antfile="update.xml"/>
- <ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.population.human.models" antfile="update.xml"/>
+ <ant inheritAll="false" dir="${pluginRootDirectory}/org.eclipse.stem.data/geography/${ID_ROOT}.internal.data.geography.models" antfile="update.xml"/>
+ <ant inheritAll="false" dir="${pluginRootDirectory}/org.eclipse.stem.data/geography/${ID_ROOT}.internal.data.geography.infrastructure.transportation" antfile="update.xml"/>
+ <ant inheritAll="false" dir="${pluginRootDirectory}/org.eclipse.stem.data/population/${ID_ROOT}.internal.data.geography.population.human.models" antfile="update.xml"/>
<!--<ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.earthscience.models" antfile="update.xml"/>-->
- <ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.diseasemodels.models" antfile="update.xml"/>
- <ant dir="${pluginRootDirectory}/${ID_ROOT}.internal.diseasemodels.scenarios" antfile="update.xml"/>
+ <ant inheritAll="false" dir="${pluginRootDirectory}/org.eclipse.stem/models/epidemiology/${ID_ROOT}.internal.diseasemodels.models" antfile="update.xml"/>
+ <ant inheritAll="false" dir="${pluginRootDirectory}/org.eclipse.stem/models/epidemiology/${ID_ROOT}.internal.diseasemodels.scenarios" antfile="update.xml"/>
</target>
</project>
diff --git a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore b/population/org.eclipse.stem.data.geography.population.human.models/.gitignore
similarity index 71%
copy from population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
copy to population/org.eclipse.stem.data.geography.population.human.models/.gitignore
index 34bf8fe..e15926f 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
+++ b/population/org.eclipse.stem.data.geography.population.human.models/.gitignore
@@ -1,3 +1,3 @@
-plugin.xml
+resources/
plugin.properties
-resources
+plugin.xml
\ No newline at end of file
diff --git a/population/org.eclipse.stem.data.geography.population.human/.cvsignore b/population/org.eclipse.stem.data.geography.population.human/.cvsignore
deleted file mode 100644
index fb53e0b..0000000
--- a/population/org.eclipse.stem.data.geography.population.human/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-plugin.properties
-plugin.xml
-resources
diff --git a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore b/population/org.eclipse.stem.data.geography.population.human/.gitignore
similarity index 71%
copy from population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
copy to population/org.eclipse.stem.data.geography.population.human/.gitignore
index 34bf8fe..e15926f 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/.cvsignore
+++ b/population/org.eclipse.stem.data.geography.population.human/.gitignore
@@ -1,3 +1,3 @@
-plugin.xml
+resources/
plugin.properties
-resources
+plugin.xml
\ No newline at end of file
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human.models/.cvsignore b/population/org.eclipse.stem.internal.data.geography.population.human.models/.gitignore
similarity index 100%
rename from population/org.eclipse.stem.internal.data.geography.population.human.models/.cvsignore
rename to population/org.eclipse.stem.internal.data.geography.population.human.models/.gitignore
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelGenerator.java b/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelGenerator.java
index 6bcc9a4..cbcaabf 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelGenerator.java
+++ b/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelGenerator.java
@@ -16,6 +16,7 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,6 +52,9 @@
System.err.println("Missing specification of the plugin file"); //$NON-NLS-1$
} // if
else {
+
+
+ System.err.println(Arrays.toString(args));
final String GENERATED_FILES_PATH = args[0];
final String sourceGeographicModelProjecName = args[1];
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelSpecification.java b/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelSpecification.java
index 4588462..adb0c0a 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelSpecification.java
+++ b/population/org.eclipse.stem.internal.data.geography.population.human.models/src/org/eclipse/stem/internal/data/geography/population/human/models/PopulationModelSpecification.java
@@ -13,6 +13,9 @@
*******************************************************************************/
import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Collections;
import java.util.Map;
import org.eclipse.emf.common.util.URI;
@@ -116,18 +119,29 @@
// plugins as projects (they aren't plugged into our running version
// of Eclipse). Substitute "resource" for "plugin" in the URI's we
// use and all will be well.
-
- retValue
- .getModels()
- .add(
- (Model) Utility
- .getIdentifiable(getIdentifiableProjectURI(countryGeographicModelDC)));
-
- retValue
- .getGraphs()
- .add(
- (Graph) Utility
- .getIdentifiable(getIdentifiableProjectURI(populationGraphDC)));
+
+ try {
+
+ File geoModelFile = new File(getIdentifiableProjectURI(countryGeographicModelDC).path().replace("/resource/", "../../geography/"));
+
+ retValue
+ .getModels()
+ .add(
+ (Model) Utility
+ .getIdentifiableFromStream(getIdentifiableProjectURI(countryGeographicModelDC),
+ new FileInputStream(geoModelFile), Collections
+ .<String, Object> emptyMap(),false));
+
+ File popGraphFile = new File(getIdentifiableProjectURI(populationGraphDC).path().replace("/resource/", "../../population/"));
+
+ retValue
+ .getGraphs()
+ .add(
+ (Graph) Utility.getIdentifiableFromStream(getIdentifiableProjectURI(populationGraphDC),
+ new FileInputStream(popGraphFile), Collections.<String, Object>emptyMap(), false));
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
return retValue;
} // createIdentifiableInstance
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human.models/update.xml b/population/org.eclipse.stem.internal.data.geography.population.human.models/update.xml
index ec7bc05..ce21dc7 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human.models/update.xml
+++ b/population/org.eclipse.stem.internal.data.geography.population.human.models/update.xml
@@ -49,7 +49,7 @@
<property name="ID_ROOT" value="org.eclipse.stem" />
<!-- The name of the plugin that contains the plugin.xml file to scan -->
- <property name="scan.plugin" value="${ID_ROOT}.data.geography.models" />
+ <property name="scan.plugin" value="../geography/${ID_ROOT}.data.geography.models" />
<!-- The name of the plugin that contains the plugin.xml file to scan -->
<property name="population.plugin" value="${ID_ROOT}.data.geography.population.human" />
@@ -93,17 +93,18 @@
<!-- The class path to use -->
<path id="classpath.runtime">
<pathelement location="${path.sourceplugin}/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.models/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.data.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.core/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.definitions/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../${ID_ROOT}.internal.data/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../geography/${ID_ROOT}.internal.data.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../geography/${ID_ROOT}.internal.data.geography.models/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../geography/${ID_ROOT}.data.geography/${targetBin}" />
<fileset dir="${baseLocation}/plugins/">
<include name="*emf*.jar" />
- </fileset>
- <fileset dir="${pluginRootDirectory}/${ID_ROOT}.internal.data/lib/">
+ <include name="*osgi*.jar" />
+ </fileset>
+ <fileset dir="${pluginRootDirectory}/../${ID_ROOT}.internal.data/lib/">
<include name="*emf*.jar" />
</fileset>
</path>
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human/.cvsignore b/population/org.eclipse.stem.internal.data.geography.population.human/.gitignore
similarity index 100%
rename from population/org.eclipse.stem.internal.data.geography.population.human/.cvsignore
rename to population/org.eclipse.stem.internal.data.geography.population.human/.gitignore
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human/update.xml b/population/org.eclipse.stem.internal.data.geography.population.human/update.xml
index 2c8381d..285437a 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human/update.xml
+++ b/population/org.eclipse.stem.internal.data.geography.population.human/update.xml
@@ -84,17 +84,17 @@
<!-- The class path to use -->
<path id="classpath.runtime">
<pathelement location="${path.sourceplugin}/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.core/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.definitions/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../${ID_ROOT}.internal.data/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.data.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../geography/${ID_ROOT}.internal.data.geography/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.population/${targetBin}" />
<fileset dir="${baseLocation}/plugins/">
<include name="*emf*.jar" />
</fileset>
- <fileset dir="${pluginRootDirectory}/${ID_ROOT}.internal.data/lib/">
+ <fileset dir="${pluginRootDirectory}/../${ID_ROOT}.internal.data/lib/">
<include name="*emf*.jar" />
</fileset>
</path>
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human/.cvsignore b/population/org.eclipse.stem.internal.data.geography.population/.gitignore
similarity index 100%
copy from population/org.eclipse.stem.internal.data.geography.population.human/.cvsignore
copy to population/org.eclipse.stem.internal.data.geography.population/.gitignore
diff --git a/population/org.eclipse.stem.internal.data.geography.population/update.xml b/population/org.eclipse.stem.internal.data.geography.population/update.xml
index 13d8104..5675e97 100644
--- a/population/org.eclipse.stem.internal.data.geography.population/update.xml
+++ b/population/org.eclipse.stem.internal.data.geography.population/update.xml
@@ -84,15 +84,15 @@
<!-- The class path to use -->
<path id="classpath.runtime">
<pathelement location="${path.sourceplugin}/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
- <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.core/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.definitions/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../../org.eclipse.stem/core/${ID_ROOT}.geography/${targetBin}" />
+ <pathelement location="${pluginRootDirectory}/../${ID_ROOT}.internal.data/${targetBin}" />
<pathelement location="${pluginRootDirectory}/${ID_ROOT}.data.population/${targetBin}" />
<fileset dir="${baseLocation}/plugins/">
<include name="*emf*.jar" />
</fileset>
- <fileset dir="${pluginRootDirectory}/${ID_ROOT}.internal.data/lib/">
+ <fileset dir="${pluginRootDirectory}/../${ID_ROOT}.internal.data/lib/">
<include name="*emf*.jar" />
</fileset>
</path>
