Update for 1.4.

servicecatalog · Oct 26, 2018 · 4430290 · 4430290
1 parent 7a06610
commit 4430290
Show file tree

Hide file tree

Showing 16 changed files with 284 additions and 295 deletions.
diff --git a/.classpath b/.classpath
@@ -11,5 +11,6 @@
 	<classpathentry kind="src" path="oscm-psp-extsvc/src/main/java"/>
 	<classpathentry kind="var" path="M2_REPO/javax/javaee-api/7.0/javaee-api-7.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.16/slf4j-api-1.7.16.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/oscm-app-extsvc/pom.xml b/oscm-app-extsvc/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>oscm-interfaces</artifactId>
     <groupId>org.oscm</groupId>
-    <version>1.3.1</version>
+    <version>1.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>oscm-app-extsvc</artifactId>
-  <version>1.3.1</version>
+  <version>1.4</version>
 
   <dependencies>
     <dependency>

diff --git a/oscm-app-extsvc/src/main/java/org/oscm/app/v2_0/intf/APPTemplateService.java b/oscm-app-extsvc/src/main/java/org/oscm/app/v2_0/intf/APPTemplateService.java
@@ -40,8 +40,6 @@ public interface APPTemplateService {
      *            a <code>PasswordAuthentication</code> object identifying a
      *            technology manager registered in the organization which is
      *            responsible for the controller
-     * @throws AuthenticationException
-     *             if the authentication of the user fails
      * @throws APPlatformException
      *             if a general problem occurs in accessing APP
      */
@@ -60,8 +58,6 @@ void saveTemplate(Template template, String controllerId,
      *            a <code>PasswordAuthentication</code> object identifying a
      *            technology manager registered in the organization which is
      *            responsible for the controller
-     * @throws AuthenticationException
-     *             if the authentication of the user fails
      * @throws APPlatformException
      *             if a general problem occurs in accessing APP
      */
@@ -78,8 +74,6 @@ void deleteTemplate(String fileName, String controllerId,
      *            a <code>PasswordAuthentication</code> object identifying a
      *            technology manager registered in the organization which is
      *            responsible for the controller
-     * @throws AuthenticationException
-     *             if the authentication of the user fails
      * @throws APPlatformException
      *             if a general problem occurs in accessing APP
      */
@@ -98,8 +92,6 @@ List<Template> getTemplateList(String controllerId,
      *            a <code>PasswordAuthentication</code> object identifying a
      *            technology manager registered in the organization which is
      *            responsible for the controller
-     * @throws AuthenticationException
-     *             if the authentication of the user fails
      * @throws APPlatformException
      *             if a general problem occurs in accessing APP
      */

diff --git a/oscm-billing-external-interfaces/pom.xml b/oscm-billing-external-interfaces/pom.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright FUJITSU LIMITED 2018-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright FUJITSU LIMITED 2018 -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.oscm</groupId>
     <artifactId>oscm-interfaces</artifactId>
-    <version>1.3.1</version>
+    <version>1.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>oscm-billing-external-interfaces</artifactId>
-  <version>1.3.1</version>
+  <version>1.4</version>
 
   <dependencies>
     <dependency>

diff --git a/oscm-extsvc-internal/pom.xml b/oscm-extsvc-internal/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <artifactId>oscm-interfaces</artifactId>
     <groupId>org.oscm</groupId>
-    <version>1.3.1</version>
+    <version>1.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
 
   <artifactId>oscm-extsvc-internal</artifactId>
-  <version>1.3.1</version>
+  <version>1.4</version>
 
   <dependencies>
     <dependency>

diff --git a/oscm-extsvc-internal/src/main/java/org/oscm/internal/intf/AccountService.java b/oscm-extsvc-internal/src/main/java/org/oscm/internal/intf/AccountService.java
@@ -635,8 +635,6 @@ public boolean savePaymentConfiguration(
      * @throws ConcurrentModificationException
      *             if the stored discount information is changed by another user
      *             in the time between reading and writing it
-     * @throws EJBException
-     *             if the calling user does not have the service manager role
      */
 
     public VOOrganization updateCustomerDiscount(VOOrganization organization)

diff --git a/...rc/main/java/org/oscm/internal/types/exception/beans/DeletionConstraintExceptionBean.java b/...rc/main/java/org/oscm/internal/types/exception/beans/DeletionConstraintExceptionBean.java
@@ -16,7 +16,7 @@
 
 /**
  * Bean for JAX-WS exception serialization, specific for
- * {@link DeletionConstraintException}.
+* {@link org.oscm.internal.types.exception.DeletionConstraintException}.
  * 
  */
 @XmlRootElement(name = "DeletionConstraintExceptionBean")

diff --git a/...java/org/oscm/internal/types/exception/beans/DigitalSignatureValidationExceptionBean.java b/...java/org/oscm/internal/types/exception/beans/DigitalSignatureValidationExceptionBean.java
@@ -16,7 +16,7 @@
 
 /**
  * Bean for JAX-WS exception serialization, specific for
- * {@link DigitalSignatureValidationException}.
+ * {@link org.oscm.internal.types.exception.DigitalSignatureValidationException}.
  */
 @XmlRootElement(name = "DigitalSignatureValidationExceptionBean")
 @XmlAccessorType(XmlAccessType.PROPERTY)

diff --git a/oscm-extsvc-notification/pom.xml b/oscm-extsvc-notification/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>oscm-interfaces</artifactId>
     <groupId>org.oscm</groupId>
-    <version>1.3.1</version>
+    <version>1.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>oscm-extsvc-notification</artifactId>
-  <version>1.3.1</version>
+  <version>1.4</version>
 
   <dependencies>
     <dependency>

diff --git a/oscm-extsvc-operation/pom.xml b/oscm-extsvc-operation/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>oscm-interfaces</artifactId>
     <groupId>org.oscm</groupId>
-    <version>1.3.1</version>
+    <version>1.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>oscm-extsvc-operation</artifactId>
-  <version>1.3.1</version>
+  <version>1.4</version>
   <build>
     <plugins>
       <plugin>

diff --git a/oscm-extsvc-provisioning/pom.xml b/oscm-extsvc-provisioning/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>oscm-interfaces</artifactId>
     <groupId>org.oscm</groupId>
-    <version>1.3.1</version>
+    <version>1.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>oscm-extsvc-provisioning</artifactId>
-  <version>1.3.1</version>
+  <version>1.4</version>
 
   <dependencies>
     <dependency>