From 000b6e49fc226e4a79248b213eea078be06041a8 Mon Sep 17 00:00:00 2001
From: lucio <lucio@mb-lelii.isti.cnr.it>
Date: Wed, 24 Jan 2024 16:25:09 +0100
Subject: [PATCH] updated with configuration for smartgears 4

---
 .classpath                                    |   8 +--
 .project                                      |   8 +++
 .settings/.jsdtscope                          |  13 +++++
 .settings/org.eclipse.jdt.core.prefs          |   8 +--
 .settings/org.eclipse.wst.common.component    |  24 +++++++++
 ....eclipse.wst.common.project.facet.core.xml |   7 +++
 ...rg.eclipse.wst.jsdt.ui.superType.container |   1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |   1 +
 .settings/org.eclipse.wst.validation.prefs    |   2 +
 CHANGELOG.md                                  |   2 +-
 distro/INSTALL                                |   1 -
 distro/LICENSE                                |   2 -
 distro/MAINTAINERS                            |   2 -
 distro/README                                 | Bin 1515 -> 0 bytes
 distro/changelog.xml                          |   9 ----
 distro/descriptor.xml                         |  32 -----------
 distro/gcube-app.xml                          |   7 ---
 distro/profile.xml                            |  29 ----------
 distro/svnpath.txt                            |   0
 .../extra-resources/WEB-INF/application.yaml  |   5 ++
 .../extra-resources}/WEB-INF/sun-jaxws.xml    |   0
 .../extra-resources}/WEB-INF/web.xml          |   0
 pom.xml                                       |  51 ++++--------------
 src/main/webapp/WEB-INF/gcube-app.xml         |   7 ---
 24 files changed, 77 insertions(+), 142 deletions(-)
 create mode 100644 .settings/.jsdtscope
 create mode 100644 .settings/org.eclipse.wst.common.component
 create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 .settings/org.eclipse.wst.validation.prefs
 delete mode 100644 distro/INSTALL
 delete mode 100644 distro/LICENSE
 delete mode 100644 distro/MAINTAINERS
 delete mode 100644 distro/README
 delete mode 100644 distro/changelog.xml
 delete mode 100644 distro/descriptor.xml
 delete mode 100644 distro/gcube-app.xml
 delete mode 100644 distro/profile.xml
 delete mode 100644 distro/svnpath.txt
 create mode 100644 gcube/extra-resources/WEB-INF/application.yaml
 rename {src/main/webapp => gcube/extra-resources}/WEB-INF/sun-jaxws.xml (100%)
 rename {src/main/webapp => gcube/extra-resources}/WEB-INF/web.xml (100%)
 delete mode 100644 src/main/webapp/WEB-INF/gcube-app.xml

diff --git a/.classpath b/.classpath
index 002ad57..4918979 100644
--- a/.classpath
+++ b/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -24,7 +19,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -32,6 +27,7 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/.project b/.project
index d011549..8945c1a 100644
--- a/.project
+++ b/.project
@@ -15,6 +15,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -22,8 +27,11 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644
index 0000000..e4a0c2d
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index db24ee7..ec55441 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -10,6 +10,6 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..e424036
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+        
+    <wb-module deploy-name="whn-manager">
+        <wb-resource deploy-path="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>
+                
+        <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"/>
+        <dependent-module archiveName="common-smartgears-app-3.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/common-smartgears-app/common-smartgears-app">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="whnmanager-api-2.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/whnmanager-api/whnmanager-api">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                
+        <property name="context-root" value="whn-manager"/>
+                
+        <property name="java-output-path" value="/Whn-Manager/target/classes"/>
+            
+    </wb-module>
+    
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..c82abf3
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="11"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.web" version="4.0"/>
+</faceted-project>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a939bd0..49a4f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-# Changelog for Test WebApp
+# Changelog for Test WhnManager
 
 ## [v3.0.0-SNAPSHOT] - 2022-06-10
 
diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 049006c..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-Used as library in the gCube Framework
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
deleted file mode 100644
index 7bca8c8..0000000
--- a/distro/LICENSE
+++ /dev/null
@@ -1,2 +0,0 @@
-${gcube.license}
-
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index e729771..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Roberto Cirillo (roberto.cirillo@isti.cnr.it), CNR Pisa, 
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
diff --git a/distro/README b/distro/README
deleted file mode 100644
index 01364909a470c33cee0e4adb91913ee14a7750fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1515
zcmbtUL2p_y3`Ux?1HZzmIJDDvyH`7`1rA6pngF$jX@`)Qht<4<ISH&n{P+32JSLc0
zX{C{Jabo-X?9ZOB5XwPXAk3aa#0vV*+c{O?zT1EE=|Z=+GZ-|}I+AyLG1R6~OM>E`
zhl6>UoFP}{zYoYk9M8?Y$?ki&?ClnbtQo3^`zrzQ-J%Kz0TH55UXn$qX&SiDE9FYG
zzAS!M_5#Ss4+>z2QAf|uu=LzGG3Fr7M+`;7?Iy*Q=Wrh0PcZch<mh2QOxAk1<ZLK(
zHhiNHsnCuKidUauJe!aEgUK}KzE|X;T;Y72UvRxM@X&9a^~y*ognFgwRvu^gPhAL*
znNO?{v^NM+QngWJ)j~?YWM9GTVR9`3k<;4+T@{IKt%6%}iU|W~<v@gKS~$|H#;xvO
zmh2W6fg<K02R*gMtf#RHQCa&A3da!yicS?u)$5X+GV-o(r59N~2Y`?CMAt3DJOo>@
zOudi$FF%y2L~CUtDb8AzS&y(n#-H`rKzDeO?Ys`0#yIK0+YzUL{4(IzI2zo@WUXI!
zt3{I5YtIqRBY2xi5tcI$+Axg25{CF!K8$sA5l=JNht5z4Nmc<X{Upl=qWAW+QO$>W
z`<}&gM;cv_@8=<%*IOm{W!x%m#=$o61et6=sZg!!h+GAD_6aH_i-&|)3;TFu-HivM
c$!zq(t|~g651mfutK5%r+cO>A4DUyO0N{(WCjbBd

diff --git a/distro/changelog.xml b/distro/changelog.xml
deleted file mode 100644
index 2e8bce0..0000000
--- a/distro/changelog.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ReleaseNotes> 
-	<Changeset component="org.gcube.vremanagement.whnmanager.1-0-0" date="2013-12-12"> 
-		<Change>first release</Change>
-	</Changeset>
-	<Changeset component="org.gcube.vremanagement.whnmanager.1-0-0" date="2013-12-12"> 
-		<Change>porting to authorization 2.0 and smartgears 2.0</Change>
-	</Changeset>
-	
-</ReleaseNotes>
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index 3ec7706..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-                <include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target/${build.finalName}.war</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-		
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/distro/gcube-app.xml b/distro/gcube-app.xml
deleted file mode 100644
index fcfff7c..0000000
--- a/distro/gcube-app.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<application proxable='false'>
-		<name>WhnManager</name>
-		<group>VREManagement</group>
-		<version>${version}</version>
-		<description>Web Hosting Node Service</description>
-</application>
-
diff --git a/distro/profile.xml b/distro/profile.xml
deleted file mode 100644
index 70ad93d..0000000
--- a/distro/profile.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource>
-    <ID></ID>
-    <Type>Service</Type>
-    <Profile>
-    	<Description>${description}</Description>
-        <Class>VREManagement</Class>
-        <Name>${artifactId}</Name>
-		<Version>1.0.0</Version>
-        <Packages>
-            <Software>
-                <Description>${description}</Description>
-            	<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Type>library</Type>
-				<Files>
-					<File>${build.finalName}.jar</File>
-				</Files>
-			</Software>           
-        </Packages>
-    </Profile>
-</Resource>
-
-
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/gcube/extra-resources/WEB-INF/application.yaml b/gcube/extra-resources/WEB-INF/application.yaml
new file mode 100644
index 0000000..fdad0e4
--- /dev/null
+++ b/gcube/extra-resources/WEB-INF/application.yaml
@@ -0,0 +1,5 @@
+name: WhnManager
+group: VREManagement
+version: ${version}
+description: Web Hosting Node Service
+proxable: false
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/sun-jaxws.xml b/gcube/extra-resources/WEB-INF/sun-jaxws.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/sun-jaxws.xml
rename to gcube/extra-resources/WEB-INF/sun-jaxws.xml
diff --git a/src/main/webapp/WEB-INF/web.xml b/gcube/extra-resources/WEB-INF/web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/web.xml
rename to gcube/extra-resources/WEB-INF/web.xml
diff --git a/pom.xml b/pom.xml
index cc13717..35ef1c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.gcube.tools</groupId>
 		<artifactId>maven-parent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 	</parent>
 	<groupId>org.gcube.resourcemanagement</groupId>
 	<artifactId>whn-manager</artifactId>
@@ -14,8 +14,8 @@
 	<properties>
 		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -44,6 +44,12 @@
 			<version>4.0.1</version>
 			<scope>provided</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-smartgears-app</artifactId>
@@ -54,16 +60,6 @@
 			<artifactId>gxHTTP</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.sun.xml.ws</groupId>
-			<artifactId>jaxws-rt</artifactId>
-			<version>2.1.7</version>
-		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.jboss.weld.servlet</groupId> -->
-		<!-- <artifactId>weld-servlet</artifactId> -->
-		<!-- <version>1.1.9.Final</version> -->
-		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.jboss.weld.servlet</groupId>
 			<artifactId>weld-servlet-core</artifactId>
@@ -103,35 +99,6 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<!-- interpolates profiles and copies from distribution location to configuration 
-				location, where it is need for embedding into stub artifact, gar generation, 
-				and service archive. -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>copy-profile</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<phase>process-resources</phase>
-						<configuration>
-							<outputDirectory>${webappDirectory}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${distroDirectory}</directory>
-									<includes>
-										<include>gcube-app.xml</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml
deleted file mode 100644
index 67a1c96..0000000
--- a/src/main/webapp/WEB-INF/gcube-app.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<application proxable='false'>
-		<name>WhnManager</name>
-		<group>VREManagement</group>
-		<version>3.0.0-SNAPSHOT</version>
-		<description>Web Hosting Node Service</description>
-</application>
-