Merge pull request #10 from qbicsoftware/development

Development
qbicsoftware-archive · Sep 7, 2017 · 7e33491 · 7e33491
2 parents 0269318 + d52941a
commit 7e33491
Show file tree

Hide file tree

Showing 80 changed files with 2,395 additions and 3,227 deletions.
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/.DS_Store b/QBiCMainPortlet/WebContent/WEB-INF/lib/.DS_Store
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/XMLManager.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/XMLManager.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/ant_unkown_version.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/ant_unkown_version.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/attachments.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/attachments.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/barcode_utils.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/barcode_utils.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/cisd-base.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/cisd-base.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-codec.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-codec.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-httpclient.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-httpclient.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-lang.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-lang.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-logging.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/commons-logging.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/dss_client.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/dss_client.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/openbis_client.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/openbis_client.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/openbis_reg.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/openbis_reg.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/raw-data-api.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/raw-data-api.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/spring.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/spring.jar
diff --git a/QBiCMainPortlet/WebContent/WEB-INF/lib/stream-supporting-httpinvoker.jar b/QBiCMainPortlet/WebContent/WEB-INF/lib/stream-supporting-httpinvoker.jar
diff --git a/...ntent/WEB-INF/lib/workflowapi_0568beb.jar → ...ntent/WEB-INF/lib/workflowapi_1087929.jar b/...ntent/WEB-INF/lib/workflowapi_0568beb.jar → ...ntent/WEB-INF/lib/workflowapi_1087929.jar
diff --git a/QBiCMainPortlet/ivy.xml b/QBiCMainPortlet/ivy.xml
@@ -49,6 +49,8 @@
 		<!-- filter table -->	
 		<!-- <dependency org="org.vaadin.addons" name="filteringtable" rev="0.9.11.v7" /> -->
 		<!-- expanding text area -->
+		<!-- https://mvnrepository.com/artifact/org.apache.ant/ant -->
+		<dependency org="org.apache.ant" name="ant" rev="1.10.1"/>
 		<dependency org="org.vaadin.addons" name="expandingtextarea" rev="1.2.0" />
 		<!--logging -->
 		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.2" />
@@ -60,12 +62,13 @@
   		<dependency org="com.github.lookfirst" name="sardine" rev="5.5" />
   		<dependency org="commons-io" name="commons-io" rev="2.4" />
   		<dependency org="org.apache.httpcomponents" name="httpclient"  rev="4.3" />
-
+  		<!--QBiC -->
+  		<dependency org="life.qbic.openbis" name="openbisclient" rev="1.1.3" />
   		<!--name conversion -->
   		<dependency org="org.apache.commons" name="commons-collections4" rev="4.0" />
 
   		<!--vaadin charts -->
-  		<dependency org="com.vaadin.addon" name="vaadin-charts" rev="3.2.0" />
+  		<!--<dependency org="com.vaadin.addon" name="vaadin-charts" rev="3.2.0" />-->
 
 	</dependencies>
 </ivy-module>
diff --git a/QBiCMainPortlet/ivysettings.xml b/QBiCMainPortlet/ivysettings.xml
@@ -5,7 +5,8 @@
 		<chain name="default">
 			<!-- Public Maven repository -->
 			<ibiblio name="public" m2compatible="true" />
-
+			<!-- <ibiblio name="nexus-snapshots" m2compatible="true" usepoms="true" root="https://peltzer.com.de/nexus/content/repositories/snapshots" changingPattern="*-SNAPSHOT" />-->
+			<ibiblio name="nexus-releases" m2compatible="true" usepoms="true" root="https://peltzer.com.de/nexus/content/repositories/releases" />
 			<!-- Vaadin Add-on repository -->
 			<ibiblio name="vaadin-addons" usepoms="true" m2compatible="true"
 				root="http://maven.vaadin.com/vaadin-addons" />

diff --git a/QBiCMainPortlet/src/controllers/BarcodeController.java b/QBiCMainPortlet/src/controllers/BarcodeController.java
diff --git a/QBiCMainPortlet/src/controllers/MultiscaleController.java b/QBiCMainPortlet/src/controllers/MultiscaleController.java
@@ -31,8 +31,8 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
-import main.OpenBisClient;
 import helpers.HistoryReader;
+import life.qbic.openbis.openbisclient.OpenBisClient;
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Experiment;
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Sample;
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SampleFetchOption;