Merge pull request #486 from openworm/development

Release 0.2.9
openworm · Apr 11, 2016 · 4fceae9 · 4fceae9
2 parents fedef23 + e250ac0
commit 4fceae9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/geppetto.plan b/geppetto.plan
@@ -7,21 +7,21 @@
             http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd">
 
 
-    <artifact type="bundle" name="org.geppetto.model" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.core" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.model.swc" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.simulation" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.frontend" version="0.2.8"/>
+    <artifact type="bundle" name="org.geppetto.model" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.core" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.model.neuroml" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.model.swc" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.simulation" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.frontend" version="0.2.9"/>
 
 
     <!-- 
-    <artifact type="bundle" name="org.geppetto.testbackend" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.model.sph" version="0.2.8"/> 
-    <artifact type="bundle" name="org.geppetto.solver.sph" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.simulator.sph" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.simulator.jlems" version="0.2.8"/>
-    <artifact type="bundle" name="org.geppetto.testbackend" version="0.2.8"/> -->
+    <artifact type="bundle" name="org.geppetto.testbackend" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.model.sph" version="0.2.9"/> 
+    <artifact type="bundle" name="org.geppetto.solver.sph" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.simulator.sph" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.simulator.jlems" version="0.2.9"/>
+    <artifact type="bundle" name="org.geppetto.testbackend" version="0.2.9"/> -->
 
 
 </plan>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>org.geppetto</artifactId>
 	<name>Geppetto</name>
-	<version>0.2.8</version>
+	<version>0.2.9</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>../org.geppetto.model</module>

diff --git a/utilities/release/build_server_package.py b/utilities/release/build_server_package.py
@@ -60,7 +60,8 @@
 virgo_version = "3.6.3.RELEASE"
 urls = ["https://dl.dropboxusercontent.com/u/7538688/virgo-tomcat-server-3.6.3.RELEASE.zip?dl=1"]
 
-openwormpackages = ['org.geppetto.core',
+openwormpackages = ['org.geppetto.model',
+'org.geppetto.core',
 'org.geppetto.model.neuroml',
 'org.geppetto.model.swc',
 'org.geppetto.simulation',

diff --git a/utilities/source_setup/update_server.py b/utilities/source_setup/update_server.py
@@ -33,8 +33,10 @@ def main(argv):
         if not eclipse:
             copyext(targetdir, 'jar')
             copyext(targetdir, 'war')
+            copyext(targetdir, 'libd')
         copyext(os.path.join(targetdir, 'classes', 'lib'), 'jar')
         copyext(os.path.join(targetdir, 'classes', 'lib'), 'war')
+        copyext(os.path.join(targetdir, 'classes', 'lib'), 'libd')
 
     if not eclipse:
 	    shutil.copy2(os.path.join(sourcesdir, 'org.geppetto', 'geppetto.plan'), os.path.join(serverHome, 'pickup'))