Merge pull request #61 from VirtualFlyBrain/development

updating to latest Development
VirtualFlyBrain · Jul 9, 2019 · 65e480f · 65e480f
2 parents 39c5516 + 768d06e
commit 65e480f
Show file tree

Hide file tree

Showing 8 changed files with 563 additions and 63 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,30 +6,34 @@ install:
     - cd org.geppetto.model
     - git checkout development
     - git checkout $TRAVIS_BRANCH || true
-    - mvn install
+    - mvn  -Dhttps.protocols=TLSv1.2 -DskipTests --quiet install
     - cd ..
     - git clone https://github.com/openworm/org.geppetto.core.git
     - cd org.geppetto.core
     - git checkout development
     - git checkout $TRAVIS_BRANCH || true
-    - mvn install
+    - mvn  -Dhttps.protocols=TLSv1.2 -DskipTests --quiet install
     - cd .. 
     - git clone https://github.com/openworm/org.geppetto.simulation.git
     - cd org.geppetto.simulation
     - git checkout development
     - git checkout $TRAVIS_BRANCH || true
-    - mvn install
+    - mvn  -Dhttps.protocols=TLSv1.2 -DskipTests --quiet install
     - cd ..
     - git clone https://github.com/openworm/org.geppetto.datasources.git
     - cd org.geppetto.datasources
     - git checkout development
     - git checkout $TRAVIS_BRANCH || true
-    - mvn install
+    - mvn  -Dhttps.protocols=TLSv1.2 -DskipTests --quiet install
     - cd .. 
     - cd uk.ac.vfb.geppetto
-    - mvn install
+    - mvn -Dhttps.protocols=TLSv1.2 -DskipTests --quiet install
 
-
+before_script:
+- npm install travis-ci
+
+after_success:
+- node travis/trigger-build.js
 
 
 

diff --git a/src/main/java/META-INF/spring/osgi-config.xml b/src/main/java/META-INF/spring/osgi-config.xml
@@ -151,9 +151,14 @@
 	<bean id="nblastQueryProcessor" scope="prototype" class="uk.ac.vfb.geppetto.NBLASTQueryProcessor">
 	<aop:scoped-proxy proxy-target-class="false"/>
 	</bean>
+
+	<osgi:service id="neo4jQueryProcessorExporter" ref="neo4jQueryProcessor"
+		interface="org.geppetto.core.datasources.IQueryProcessor">
+	</osgi:service>
+	<bean id="neo4jQueryProcessor" scope="prototype" class="uk.ac.vfb.geppetto.NEO4JQueryProcessor">
+	<aop:scoped-proxy proxy-target-class="false"/>
+	</bean>
 
 	<bean id="eventListenerBean" class="org.geppetto.core.services.registry.ApplicationListenerBean" />
 
-
-
 </beans>
diff --git a/src/main/java/uk/ac/vfb/geppetto/CreateImagesForQueryResultsQueryProcessor.java b/src/main/java/uk/ac/vfb/geppetto/CreateImagesForQueryResultsQueryProcessor.java
@@ -162,7 +162,7 @@ public QueryResults process(ProcessQuery query, DataSource dataSource, Variable
 				i++;
 			}
 			System.out.println("CreateImagesForQueryResultsQueryProcessor returning " + Integer.toString(i) + " rows");
-			System.out.println(GeppettoSerializer.serializeToJSON(processedResults));
+			//System.out.println(GeppettoSerializer.serializeToJSON(processedResults));
 			return processedResults;
 		}
 		catch(GeppettoVisitingException e)