Updated to StorageHub 2

2 years ago · dc4eb759d5
parent 97498c259d
commit dc4eb759d5
78 changed files with 15 additions and 5 deletions
--- a/.classpath
+++ b/.classpath
--- a/.gitignore
+++ b/.gitignore
--- a/.project
+++ b/.project
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
--- a/.settings/org.eclipse.m2e.core.prefs
+++ b/.settings/org.eclipse.m2e.core.prefs
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="nlphub-1.1.0">
+    <wb-module deploy-name="nlphub-1.2.0-SNAPSHOT">
        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
--- a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
--- a/.settings/org.eclipse.wst.validation.prefs
+++ b/.settings/org.eclipse.wst.validation.prefs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

 # Changelog for "nlphub"

+
+## [v1.2.0-SNAPSHOT] - 2022-05-20
+
+### Features
+
+- Updated to StorageHub 2
+
+
+
 ## [v1.1.0] - 2021-09-08

 ### Features
--- a/FUNDING.md
+++ b/FUNDING.md
--- a/LICENSE.md
+++ b/LICENSE.md
--- a/README.md
+++ b/README.md
--- a/changelog.xml
+++ b/changelog.xml
@ -1,4 +1,7 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.data.analysis.nlphub.1-2-0" date="2022-05-20">
+		<Change>Updated to StorageHub 2</Change>
+	</Changeset>
 	<Changeset component="org.gcube.data.analysis.nlphub.1-1-0" date="2021-09-08">
 		<Change>Updated to StorageHub [#21970]</Change>
 	</Changeset>
--- a/descriptor.xml
+++ b/descriptor.xml
--- a/pom.xml
+++ b/pom.xml
@ -12,7 +12,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.data.analysis</groupId>
 	<artifactId>nlphub</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>war</packaging>

 	<scm>
@ -50,7 +50,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.0.1</version>
+				<version>2.1.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@ -67,7 +67,6 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@ -136,7 +135,6 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>storagehub-client-library</artifactId>
-			<version>[1.2.0,2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		
--- a/profile.xml
+++ b/profile.xml
--- a/src/main/java/org/gcube/data/analysis/nlphub/DiscoverDataMinerService.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/DiscoverDataMinerService.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/NLPHub.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/NLPHub.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/NLPInit.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/NLPInit.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/NLPMapper.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/NLPMapper.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/NLPUploader.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/NLPUploader.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/RequestType.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/RequestType.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/is/DMDiscover.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/is/DMDiscover.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/is/InformationSystemUtils.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/is/InformationSystemUtils.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/AsyncHttpRequest.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/AsyncHttpRequest.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/DataminerException.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/DataminerException.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/JsonManager.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/JsonManager.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAlgorithm.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAlgorithm.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAnnotationData.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAnnotationData.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerEntity.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerEntity.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerOutput.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerOutput.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/legacy/NlpHubException.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NlpHubException.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/mapper/DefaultMapper.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/mapper/DefaultMapper.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/mapper/JsonMapper.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/mapper/JsonMapper.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/nlp/NLpLanguageRecognizer.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NLpLanguageRecognizer.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpAsyncNerRunner.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpAsyncNerRunner.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpParameter.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpParameter.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpUtils.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpUtils.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/nlp/RunnerCommander.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/RunnerCommander.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/session/SessionUtils.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/session/SessionUtils.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/shared/Constants.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/shared/Constants.java
--- a/src/main/java/org/gcube/data/analysis/nlphub/workspace/WorkspaceManager.java
+++ b/src/main/java/org/gcube/data/analysis/nlphub/workspace/WorkspaceManager.java
--- a/src/main/webapp/WEB-INF/gcube-app.xml
+++ b/src/main/webapp/WEB-INF/gcube-app.xml
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
--- a/src/main/webapp/colors.html
+++ b/src/main/webapp/colors.html
--- a/src/main/webapp/css/custom.css
+++ b/src/main/webapp/css/custom.css
--- a/src/main/webapp/css/materialize.css
+++ b/src/main/webapp/css/materialize.css
--- a/src/main/webapp/css/materialize.min.css
+++ b/src/main/webapp/css/materialize.min.css
--- a/src/main/webapp/external-test.html
+++ b/src/main/webapp/external-test.html
--- a/src/main/webapp/fonts/roboto/Roboto-Bold.woff
+++ b/src/main/webapp/fonts/roboto/Roboto-Bold.woff
--- a/src/main/webapp/fonts/roboto/Roboto-Bold.woff2
+++ b/src/main/webapp/fonts/roboto/Roboto-Bold.woff2
--- a/src/main/webapp/fonts/roboto/Roboto-Light.woff
+++ b/src/main/webapp/fonts/roboto/Roboto-Light.woff
--- a/src/main/webapp/fonts/roboto/Roboto-Light.woff2
+++ b/src/main/webapp/fonts/roboto/Roboto-Light.woff2
--- a/src/main/webapp/fonts/roboto/Roboto-Medium.woff
+++ b/src/main/webapp/fonts/roboto/Roboto-Medium.woff
--- a/src/main/webapp/fonts/roboto/Roboto-Medium.woff2
+++ b/src/main/webapp/fonts/roboto/Roboto-Medium.woff2
--- a/src/main/webapp/fonts/roboto/Roboto-Regular.woff
+++ b/src/main/webapp/fonts/roboto/Roboto-Regular.woff
--- a/src/main/webapp/fonts/roboto/Roboto-Regular.woff2
+++ b/src/main/webapp/fonts/roboto/Roboto-Regular.woff2
--- a/src/main/webapp/fonts/roboto/Roboto-Thin.woff
+++ b/src/main/webapp/fonts/roboto/Roboto-Thin.woff
--- a/src/main/webapp/fonts/roboto/Roboto-Thin.woff2
+++ b/src/main/webapp/fonts/roboto/Roboto-Thin.woff2
--- a/src/main/webapp/img/info-2.png
+++ b/src/main/webapp/img/info-2.png
--- a/src/main/webapp/img/nlphub-logo-2.png
+++ b/src/main/webapp/img/nlphub-logo-2.png
--- a/src/main/webapp/img/nlphub-logo-2.svg
+++ b/src/main/webapp/img/nlphub-logo-2.svg
--- a/src/main/webapp/img/nlphub-logo-3.png
+++ b/src/main/webapp/img/nlphub-logo-3.png
--- a/src/main/webapp/img/nlphub-logo.png
+++ b/src/main/webapp/img/nlphub-logo.png
--- a/src/main/webapp/img/nlphub-logo.svg
+++ b/src/main/webapp/img/nlphub-logo.svg
--- a/src/main/webapp/img/upload.png
+++ b/src/main/webapp/img/upload.png
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
--- a/src/main/webapp/js/jquery.simple.websocket.min.js
+++ b/src/main/webapp/js/jquery.simple.websocket.min.js
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
--- a/src/main/webapp/js/materialize.js
+++ b/src/main/webapp/js/materialize.js
--- a/src/main/webapp/js/materialize.min.js
+++ b/src/main/webapp/js/materialize.min.js
--- a/src/main/webapp/js/merge.js
+++ b/src/main/webapp/js/merge.js
--- a/src/main/webapp/merge.html
+++ b/src/main/webapp/merge.html