Merge pull request #27 from openworm/development

development -> master

.gitignore

@@ -1,7 +1,7 @@
-target
+/target
+/bin
 src/main/java/META-INF/MANIFEST.MF
 *.DS_Store
 /.externalToolBuilders/
 /.settings/
-/.project
-/.classpath
+.classpath

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Virgo Runtime"/>
+  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
+</faceted-project>

pom.xml

@@ -8,7 +8,7 @@
 	<packaging>bundle</packaging>
 	<version>0.1.9</version>
 	<properties>
-		<spring.version>3.0.0.RELEASE</spring.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<dependencies>

src/main/java/META-INF/spring/app-config.xml

@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-							http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+							http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 							http://www.springframework.org/schema/context
-							http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+							http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
 	<!--  <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"/>--> 
 	<!-- Instructs Spring to scan for internal service components to instantiate and configure -->

src/main/java/META-INF/spring/module-config.xml

@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"		
 		xsi:schemaLocation="http://www.springframework.org/schema/beans
-							http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+							http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 							http://www.springframework.org/schema/context
-							http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+							http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
 	<!--  <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"/>--> 
 	<!-- Instructs Spring to scan for internal service components to instantiate and configure -->

src/main/java/META-INF/spring/osgi-config.xml

@@ -4,11 +4,11 @@
 		xmlns:osgi="http://www.springframework.org/schema/osgi"	
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans
-							http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+							http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 							http://www.springframework.org/schema/osgi
-							http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+							http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
 							http://www.springframework.org/schema/aop 
-       						http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+       						http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
 
 	<!-- Exports the service implementation to other bundles by its service interface -->
 	<osgi:service id="SPHSimulatorExporter" ref="sphSimulatorService" interface="org.geppetto.core.simulator.ISimulator">