From fa15bf51602d30614cc98942763bcf1c9515eebf Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Mon, 3 Oct 2016 13:49:21 +0000 Subject: [PATCH] branch for release 4.1 git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/branches/vre-management/whn-manager-api/2.0@132447 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 10 +++ .project | 23 ++++++ .settings/org.eclipse.core.resources.prefs | 5 ++ .settings/org.eclipse.jdt.core.prefs | 12 +++ .settings/org.eclipse.m2e.core.prefs | 4 + distro/INSTALL | 1 + distro/LICENSE | 2 + distro/MANTAINERS | 2 + distro/README | Bin 0 -> 1515 bytes distro/changelog.xml | 9 +++ distro/descriptor.xml | 37 ++++++++++ distro/profile.xml | 28 +++++++ distro/svnpath.txt | 0 pom.xml | 69 ++++++++++++++++++ .../whnmanager/api/Costants.java | 5 ++ .../whnmanager/api/WhnManager.java | 25 +++++++ .../GCUBEUnrecoverableException.java | 30 ++++++++ .../GCUBEUnrecoverableExceptionInfo.java | 24 ++++++ .../api/types/AddContextInputParams.java | 29 ++++++++ .../whnmanager/api/types/RIData.java | 39 ++++++++++ .../whnmanager/api/types/ScopeRIParams.java | 53 ++++++++++++++ .../whnmanager/api/types/ShutdownOptions.java | 39 ++++++++++ 22 files changed, 446 insertions(+) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 distro/INSTALL create mode 100644 distro/LICENSE create mode 100644 distro/MANTAINERS create mode 100644 distro/README create mode 100644 distro/changelog.xml create mode 100644 distro/descriptor.xml create mode 100644 distro/profile.xml create mode 100644 distro/svnpath.txt create mode 100644 pom.xml create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/Costants.java create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/WhnManager.java create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableException.java create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableExceptionInfo.java create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/AddContextInputParams.java create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/RIData.java create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ScopeRIParams.java create mode 100644 src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ShutdownOptions.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..0f53f3e --- /dev/null +++ b/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..691dd1e --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + whnmanager-api + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..dc1b414 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..107056a --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/distro/INSTALL b/distro/INSTALL new file mode 100644 index 0000000..049006c --- /dev/null +++ b/distro/INSTALL @@ -0,0 +1 @@ +Used as library in the gCube Framework \ No newline at end of file diff --git a/distro/LICENSE b/distro/LICENSE new file mode 100644 index 0000000..7bca8c8 --- /dev/null +++ b/distro/LICENSE @@ -0,0 +1,2 @@ +${gcube.license} + diff --git a/distro/MANTAINERS b/distro/MANTAINERS new file mode 100644 index 0000000..e729771 --- /dev/null +++ b/distro/MANTAINERS @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..01364909a470c33cee0e4adb91913ee14a7750fc GIT binary patch literal 1515 zcmbtUL2p_y3`Ux?1HZzmIJDDvyH`7`1rA6pngF$jX@`)Qht<4E` zhl6>UoFP}{zYoYk9M8?Y$?ki&?ClnbtQo3^`zrzQ-J%Kz0TH55UXn$qX&SiDE9FYG zzAS!M_5#Ss4+>z2QAf|uu=LzGG3Fr7M+`;7?Iy*Q=Wrh0PcZch@ zOudi$FF%y2L~CUtDb8AzS&y(n#-H`rKzDeO?Ys`0#yIK0+YzUL{4(IzI2zo@WUXI! zt3{I5YtIqRBY2xi5tcI$+Axg25{CF!K8$sA5l=JNht5z4NmcW 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 literal 0 HcmV?d00001 diff --git a/distro/changelog.xml b/distro/changelog.xml new file mode 100644 index 0000000..b688dde --- /dev/null +++ b/distro/changelog.xml @@ -0,0 +1,9 @@ + + + first release + + + moved to Smartgears 2.0 + + + \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml new file mode 100644 index 0000000..0c4658b --- /dev/null +++ b/distro/descriptor.xml @@ -0,0 +1,37 @@ + + servicearchive + + tar.gz + + / + + + ${distroDirectory} + / + true + + README + LICENSE + changelog.xml + profile.xml + + 755 + true + + + + + ${distroDirectory}/profile.xml + / + true + + + target/${build.finalName}.jar + /${artifactId} + + + + \ No newline at end of file diff --git a/distro/profile.xml b/distro/profile.xml new file mode 100644 index 0000000..b475319 --- /dev/null +++ b/distro/profile.xml @@ -0,0 +1,28 @@ + + + + Service + + ${description} + VREManagement + ${artifactId} + 1.0.0 + + + ${description} + ${artifactId} + ${version} + + ${groupId} + ${artifactId} + ${version} + + library + + ${build.finalName}.jar + + + + + + diff --git a/distro/svnpath.txt b/distro/svnpath.txt new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..57dd65a --- /dev/null +++ b/pom.xml @@ -0,0 +1,69 @@ + + 4.0.0 + + org.gcube.tools + maven-parent + 1.0.0 + + + org.gcube.resourcemanagement + whnmanager-api + 2.0.0-SNAPSHOT + whn manager api interface + common libraries for whnmanager + + + distro + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + copy-profile + install + + copy-resources + + + target + + + ${distroDirectory} + true + + profile.xml + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${distroDirectory}/descriptor.xml + + + + + servicearchive + install + + single + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/Costants.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/Costants.java new file mode 100644 index 0000000..c0ca342 --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/Costants.java @@ -0,0 +1,5 @@ +package org.gcube.resourcemanagement.whnmanager.api; + +public class Costants { + public static final String TNS = "http://gcube-system.org/"; +} diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/WhnManager.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/WhnManager.java new file mode 100644 index 0000000..3474809 --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/WhnManager.java @@ -0,0 +1,25 @@ +package org.gcube.resourcemanagement.whnmanager.api; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.jws.soap.SOAPBinding.Style; +import javax.jws.soap.SOAPBinding.Use; + +import org.gcube.resourcemanagement.whnmanager.api.exception.GCUBEUnrecoverableException; + +//Service Endpoint Interface +@WebService(targetNamespace=WhnManager.TNS) +@SOAPBinding(style = Style.DOCUMENT, use=Use.LITERAL) +public interface WhnManager { + + public static final String SERVICE_NAME = "gcube/vremanagement/ws/whnmanager"; + public static final String TNS = "http://gcube-system.org/"; + + @SOAPBinding(parameterStyle=ParameterStyle.BARE) + public boolean addToContext(String context) throws GCUBEUnrecoverableException; + + @SOAPBinding(parameterStyle=ParameterStyle.BARE) + public boolean removeFromContext(String context) throws GCUBEUnrecoverableException; + +} diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableException.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableException.java new file mode 100644 index 0000000..7f4d659 --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableException.java @@ -0,0 +1,30 @@ +package org.gcube.resourcemanagement.whnmanager.api.exception; + +import javax.xml.ws.WebFault; + +import org.gcube.resourcemanagement.whnmanager.api.WhnManager; +import org.gcube.resourcemanagement.whnmanager.api.exception.GCUBEUnrecoverableExceptionInfo; + +@WebFault(name="GCUBEUnrecoverableException") +public class GCUBEUnrecoverableException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + + private GCUBEUnrecoverableExceptionInfo info ; + + public GCUBEUnrecoverableException(GCUBEUnrecoverableExceptionInfo faultInfo){ + info = faultInfo; + } + + public GCUBEUnrecoverableException(GCUBEUnrecoverableExceptionInfo faultInfo, Throwable cause){ + info = faultInfo; + } + + public GCUBEUnrecoverableExceptionInfo getFaultInfo(){ + return info; + } + +} diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableExceptionInfo.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableExceptionInfo.java new file mode 100644 index 0000000..0170a52 --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/exception/GCUBEUnrecoverableExceptionInfo.java @@ -0,0 +1,24 @@ +package org.gcube.resourcemanagement.whnmanager.api.exception; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class GCUBEUnrecoverableExceptionInfo { + + @XmlElement + public String details; + + protected GCUBEUnrecoverableExceptionInfo(){} + + public GCUBEUnrecoverableExceptionInfo(String details) { + super(); + this.details = details; + } + + public String getDetails() { + return details; + } + + +} diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/AddContextInputParams.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/AddContextInputParams.java new file mode 100644 index 0000000..7a7990a --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/AddContextInputParams.java @@ -0,0 +1,29 @@ +package org.gcube.resourcemanagement.whnmanager.api.types; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class AddContextInputParams{ + +// @XmlElement + public String context; +// @XmlElement + public String map; + + protected AddContextInputParams(){} + + public AddContextInputParams(String scope, String map){ + super(); + this.context=scope; + this.map=map; + } + + public String getContext() { + return context; + } + + public String getMap() { + return map; + } + +} diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/RIData.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/RIData.java new file mode 100644 index 0000000..21ea018 --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/RIData.java @@ -0,0 +1,39 @@ +package org.gcube.resourcemanagement.whnmanager.api.types; + +import javax.xml.bind.annotation.XmlRootElement; + +//@XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement +public class RIData{ +// @XmlElement + public String name; + +// @XmlElement + public String clazz; + + protected RIData(){} + + public RIData(String name, String clazz){ + super(); + this.name=name; + this.clazz=clazz; + } + + + public String getName() { + return name; + } + +// public void setName(String name) { +// this.name = name; +// } + + public String getClazz() { + return clazz; + } + +// public void setClazz(String clazz) { +// this.clazz = clazz; +// } +} + diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ScopeRIParams.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ScopeRIParams.java new file mode 100644 index 0000000..8fa68be --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ScopeRIParams.java @@ -0,0 +1,53 @@ +package org.gcube.resourcemanagement.whnmanager.api.types; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement +public class ScopeRIParams{ +// @XmlElement + public String scope; + +// @XmlElement + public String name; + +// @XmlElement + public String clazz; + + protected ScopeRIParams(){} + + public ScopeRIParams(String scope, String name, String clazz){ + super(); + this.scope=scope; + this.name=name; + this.clazz=clazz; + } + + public String getScope() { + return scope; + } + +// public void setScope(String scope) { +// this.scope = scope; +// } + + public String getName() { + return name; + } + +// public void setName(String name) { +// this.name = name; +// } + + public String getClazz() { + return clazz; + } + +// public void setClazz(String clazz) { +// this.clazz = clazz; +// } + +} diff --git a/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ShutdownOptions.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ShutdownOptions.java new file mode 100644 index 0000000..97d421b --- /dev/null +++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/api/types/ShutdownOptions.java @@ -0,0 +1,39 @@ +package org.gcube.resourcemanagement.whnmanager.api.types; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +//@XmlAccessorType(XmlAccessType.FIELD) +public class ShutdownOptions{ +// @XmlElement + public boolean restart; + +// @XmlElement + public boolean clean; + + protected ShutdownOptions(){} + public ShutdownOptions(boolean restart, boolean clean){ + super(); + this.restart=restart; + this.clean=clean; + + } + + public boolean isRestart() { + return restart; + } + +// public void setRestart(boolean restart) { +// this.restart = restart; +// } + + public boolean isClean() { + return clean; + } + +// public void setClean(boolean clean) { +// this.clean = clean; +// } + + +}