1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

3 files changed, 1 insertions, 104 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/MSOInfrastructureApplication.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/MSOInfrastructureApplication.java
index 07ec8ff5dc..9fc494043d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/MSOInfrastructureApplication.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/MSOInfrastructureApplication.java
@@ -35,7 +35,7 @@ import org.openecomp.mso.logger.MsoLogger;
  * @since Version 1.0

  *

  */

-@ProcessApplication("MSO Infrastructure Application")

+@ProcessApplication(name="MSO Infrastructure Application", deploymentDescriptors={"../processes.xml"})

 public class MSOInfrastructureApplication extends ServletProcessApplication {

 	

 	private MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java
deleted file mode 100644
index 0cc81bf0c6..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.workflow.service;

-

-import javax.ws.rs.Path;

-

-import org.camunda.bpm.engine.ProcessEngineServices;

-import org.camunda.bpm.engine.ProcessEngines;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;

-

-

-/**

- * 

- * @version 1.0

- * Asynchronous Workflow processing using JAX RS RESTeasy implementation

- * Both Synchronous and Asynchronous BPMN process can benefit from this implementation since the workflow gets executed in the background

- * and the server thread is freed up, server scales better to process more incoming requests

- * 

- * Usage: For synchronous process, when you are ready to send the response invoke the callback to write the response

- * For asynchronous process - the activity may send a acknowledgement response and then proceed further on executing the process

- */

-@Path("/async")

-public class WorkflowAsyncInfrastructureResource extends WorkflowAsyncResource {

-	

-    protected ProcessEngineServices getProcessEngineServices() {

-        return pes4junit.orElse(ProcessEngines.getProcessEngine("infrastructure"));

-    }

-}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
deleted file mode 100644
index 84a9bae051..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.workflow.service;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import javax.ws.rs.ApplicationPath;

-import javax.ws.rs.core.Application;

-

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;

-

-/**

- * @version 1.0

- * RESTeasy workflow application which wires synchronous and asynchronous response

- *

- */

-@ApplicationPath("/")

-public class WorkflowResourceApplication extends Application {

-    private Set<Object> singletons = new HashSet<Object>();

-    private Set<Class<?>> classes = new HashSet<Class<?>>();

-

-    public WorkflowResourceApplication() {

-        singletons.add(new WorkflowResource());

-        singletons.add(new WorkflowAsyncInfrastructureResource());

-        singletons.add(new WorkflowMessageResource());

-    }

-

-    @Override

-    public Set<Class<?>> getClasses() {

-        return classes;

-    }

-

-    @Override

-    public Set<Object> getSingletons() {

-        return singletons;

-    }

-}