Update java files with correct license text

Change-Id: I95dab947ad10ec85ae4234aa3396dd374e313739
Issue-ID: APPC-575
Signed-off-by: Skip Wonnell <skip@att.com>

41 files changed, 722 insertions, 679 deletions

diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
index 2101f51aa..064d2ba29 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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
+ *      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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -65,7 +67,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             auditPassword = props.getProperty("auditComponent.passwd", "");
             configCallbackUrl = props.getProperty("service-configuration-notification-url", "");
             auditCallbackUrl = props.getProperty("audit-configuration-notification-url", "");
-        } 
+        }
     }
 
     @Override
@@ -917,4 +919,4 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         cca.configure(key, parameters, ctx);
     }
 
-}
\ No newline at end of file
+}
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java
index 45ad37c44..d1be5e6c0 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -41,7 +43,7 @@ public class DbServiceUtil
     private static Properties props;
     private static DBResourceManager jdbcDataSource = null;
 
-    public static boolean updateDB(String tableName, ArrayList inputArgs, 
+    public static boolean updateDB(String tableName, ArrayList inputArgs,
         String scema, String whereClause, String setCluase) throws SQLException
     {
             String updatePasswordString = "update " + tableName + " set " +  setCluase +  " where " + whereClause ;
@@ -49,7 +51,7 @@ public class DbServiceUtil
             return result;
     }
 
-    public static CachedRowSet getData(String tableName, ArrayList argList, String schema, 
+    public static CachedRowSet getData(String tableName, ArrayList argList, String schema,
         String getselectData, String getDataClasue ) throws SQLException
      {
          String selectQuery = "select " + getselectData + "from " + tableName + " where " + getDataClasue ;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/FlowControllerActivator.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/FlowControllerActivator.java
index 20729df9f..9a7b5935d 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/FlowControllerActivator.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/FlowControllerActivator.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -39,23 +41,23 @@ public class FlowControllerActivator implements BundleActivator{
 
 
     private static final EELFLogger log = EELFManager.getInstance().getLogger(FlowControllerActivator.class);
-    
+
     @Override
     public void start(BundleContext ctx) throws Exception
     {
 
         try {
-            
+
             FlowControlNode flowExecutorNode = new FlowControlNode();
             log.debug("Registering service "+ flowExecutorNode.getClass().getName());
             registrations.add(ctx.registerService(flowExecutorNode.getClass().getName(), flowExecutorNode, null));
             log.debug("Registering service sccessful for  "+ flowExecutorNode.getClass().getName());
-            
+
             RestServiceNode restServiceNode = new RestServiceNode();
             log.debug("Registering service "+ restServiceNode.getClass().getName());
             registrations.add(ctx.registerService(restServiceNode.getClass().getName(), restServiceNode, null));
             log.debug("Registering service sccessful for  "+ restServiceNode.getClass().getName());
-            
+
             JsonParsingNode jsonParsingNode = new JsonParsingNode();
             log.debug("Registering service "+ jsonParsingNode.getClass().getName());
             registrations.add(ctx.registerService(jsonParsingNode.getClass().getName(), jsonParsingNode, null));
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
index d240915d6..36cb899c6 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.ResponseHandlerImpl;
 
 
@@ -37,9 +38,9 @@ public class DefaultResponseHandler {
 
         log.info("Transaction Input params " + transaction.toString());
         ResponseAction responseAction = new ResponseAction();
-        if(transaction.getResponses() != null && !transaction.getResponses().isEmpty()){        
-            for(Response response : transaction.getResponses()){                
-                if(response.getResponseCode() != null && response.getResponseCode().equals(transaction.getStatusCode())){    
+        if(transaction.getResponses() != null && !transaction.getResponses().isEmpty()) {
+            for(Response response : transaction.getResponses()) {
+                if(response.getResponseCode() != null && response.getResponseCode().equals(transaction.getStatusCode())) {
                     responseAction = response.getResponseAction();
                     break;
                 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java
index 9fc1527eb..09bc5d328 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java
@@ -1,9 +1,9 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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
@@ -15,6 +15,8 @@
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Parameters.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Parameters.java
index 8320b15fe..2b31e81d2 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Parameters.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Parameters.java
@@ -1,37 +1,37 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Parameters {
-    
+
 
     @JsonProperty("name")
     private String paramName ;
-    
+
     @JsonProperty("value")
     private String paramValue ;
-    
-    
+
     public String getParamValue() {
         return paramValue;
     }
@@ -77,6 +77,5 @@ public class Parameters {
             return false;
         return true;
     }
-    
 
 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PreCheck.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PreCheck.java
index db76895ab..8e9342d6c 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PreCheck.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PreCheck.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.data;
 
 import java.util.List;
@@ -26,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class PreCheck {
 
-    
+
     @JsonProperty("precheck-operator")
     private String  precheckOperator;
 
@@ -49,7 +50,6 @@ public class PreCheck {
         this.precheckOptions = precheckOptions;
     }
 
-    
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -85,9 +85,5 @@ public class PreCheck {
     public String toString() {
         return "PreCheck [precheckOperator=" + precheckOperator + ", precheckOptions=" + precheckOptions + "]";
     }
-    
-    
-    
-    
 
 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PrecheckOption.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PrecheckOption.java
index b3f146fdb..deadd1798 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PrecheckOption.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/PrecheckOption.java
@@ -1,42 +1,43 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class PrecheckOption {
 
-    
+
     @JsonProperty("pre-transaction-id")
-    private int  pTransactionID ;
+    private int pTransactionID;
 
     @JsonProperty("param-name")
-    private String  paramName ;
-    
-    
+    private String paramName;
+
+
     @JsonProperty("param-value")
-    private String  paramValue ;
-    
+    private String paramValue;
+
     @JsonProperty("rule")
-    private String  rule ;
+    private String rule;
 
     public int getpTransactionID() {
         return pTransactionID;
@@ -62,15 +63,12 @@ public class PrecheckOption {
         this.paramValue = paramValue;
     }
 
-    
-
     @Override
     public String toString() {
         return "PrecheckOption [pTransactionID=" + pTransactionID + ", paramName=" + paramName + ", paramValue="
                 + paramValue + ", rule=" + rule + "]";
     }
 
-    
     public String getRule() {
         return rule;
     }
@@ -79,17 +77,17 @@ public class PrecheckOption {
         this.rule = rule;
     }
 
-	 @Override
-		public int hashCode() {
-		  final int prime = 31;
-		  int result = 1;
-		  result = prime * result + this.pTransactionID;
-		  result = prime * result + this.paramName.hashCode();
-		  result = prime * result + this.paramValue.hashCode();
-		  result = prime * result + this.rule.hashCode();
-		  return result;
-		}
-		
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + this.pTransactionID;
+        result = prime * result + this.paramName.hashCode();
+        result = prime * result + this.paramValue.hashCode();
+        result = prime * result + this.rule.hashCode();
+        return result;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj)
@@ -115,6 +113,4 @@ public class PrecheckOption {
             return false;
         return true;
     }
-    
-    
 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Response.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Response.java
index 067e68b94..67440dbd5 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Response.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Response.java
@@ -1,39 +1,40 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
-package org.onap.appc.flow.controller.data;    
+package org.onap.appc.flow.controller.data;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Response {
-    
+
     @JsonProperty("response-code")
     private String responseCode;
-    
+
     @JsonProperty("response-message")
     private String responseMessage;
-    
+
     @JsonProperty("response-action")
     private ResponseAction responseAction;
-    
+
     private String responseActionHanlder;
 
     public String getResponseCode() {
@@ -68,7 +69,7 @@ public class Response {
     public void setResponseAction(ResponseAction responseAction) {
         this.responseAction = responseAction;
     }
-    
+
     @Override
     public String toString() {
         return "Response [responseCode=" + responseCode + ", responseMessage=" + responseMessage + ", responseAction="
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ResponseAction.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ResponseAction.java
index 3768941df..5527088a9 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ResponseAction.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ResponseAction.java
@@ -1,44 +1,45 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ResponseAction {
-    
+
     @JsonProperty("wait")
     private String wait;
-    
+
     @JsonProperty("retry")
     private String retry;
-    
+
     @JsonProperty("jump")
     private String jump;
-    
+
     @JsonProperty("ignore")
     private boolean  ignore;
-    
+
     @JsonProperty("stop")
     private boolean stop;
-    
+
     @JsonProperty("intermediate-message")
     private boolean intermediateMessage;
 
@@ -97,7 +98,5 @@ public class ResponseAction {
     public void setIntermediateMessage(boolean intermediateMessage) {
         this.intermediateMessage = intermediateMessage;
     }
-    
-    
 
 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transaction.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transaction.java
index 52fd566c4..a267baf2d 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transaction.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transaction.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -42,27 +44,27 @@ public class Transaction {
 
     @JsonProperty("action-identifier")
     private ActionIdentifier actionIdentifier ;
-    
+
     @JsonProperty("parameters")
     private List<Parameters> parameters ;
 
     private String executionType;
-    
+
     private String uId;
-    
+
     private String statusCode;
 
     private String pswd;
-    
+
     private String executionEndPoint;
-    
+
     private String executionModule;
-    
+
     private String executionRPC;
-    
+
     @JsonProperty("state")
     private String state;
-    
+
     @JsonProperty("precheck")
     private PreCheck precheck;
 
@@ -71,10 +73,10 @@ public class Transaction {
 
     @JsonProperty("responses")
     private List<Response> responses ;
-    
-    
+
+
     private String status = "PENDING";
-    
+
     public String getuId() {
         return uId;
     }
@@ -90,7 +92,7 @@ public class Transaction {
     public void setPswd(String pswd) {
         this.pswd = pswd;
     }
-    
+
     public String getExecutionEndPoint() {
         return executionEndPoint;
     }
@@ -136,7 +138,7 @@ public class Transaction {
     public void setParameters(List<Parameters> parameters) {
         this.parameters = parameters;
     }
-    
+
     public String getState() {
         return state;
     }
@@ -220,7 +222,7 @@ public class Transaction {
     public void setActionIdentifier(ActionIdentifier actionIdentifier) {
         this.actionIdentifier = actionIdentifier;
     }
-    
+
     public String getStatusCode() {
         return statusCode;
     }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transactions.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transactions.java
index d8dc8472c..3b416b2f5 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transactions.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/Transactions.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.data;
 
 import java.util.List;
@@ -26,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Transactions {
 
-    
+
     @JsonProperty("transactions")
     private List<Transaction> transactions ;
 
@@ -42,9 +43,5 @@ public class Transactions {
     public String toString() {
         return "Transactions [transactions=" + transactions + "]";
     }
-    
-    
-}
-
-
 
+}
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java
index 9da9bcde9..f3260947d 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.dbervices;
 
 import java.util.Map;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/GraphExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/GraphExecutor.java
index 5582a30cb..0ce249ff2 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/GraphExecutor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/GraphExecutor.java
@@ -1,29 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.executorImpl;
 
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Properties;
-
 import org.onap.appc.flow.controller.data.Transaction;
 import org.onap.appc.flow.controller.interfaces.FlowExecutorInterface;
 import org.onap.appc.flow.controller.utils.FlowControllerConstants;
@@ -33,7 +33,6 @@ import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
-
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
@@ -45,117 +44,127 @@ public class GraphExecutor implements FlowExecutorInterface {
     private SvcLogicService svcLogic = null;
 
     public GraphExecutor() {
-        BundleContext bctx = FrameworkUtil.getBundle(SvcLogicService.class)
-                .getBundleContext();
-        
+        BundleContext bctx = FrameworkUtil.getBundle(SvcLogicService.class).getBundleContext();
+
         ServiceReference sref = bctx.getServiceReference(SvcLogicService.NAME);
         if (sref != null) {
             svcLogic = (SvcLogicService) bctx.getService(sref);
-            
+
 
         } else {
-            log.warn("Cannot find service reference for "
-                    + SvcLogicService.NAME);
+            log.warn("Cannot find service reference for " + SvcLogicService.NAME);
         }
         log.debug("Graph Executor Initialized successfully");
     }
 
-    public boolean hasGraph(String module, String rpc, String version,
-            String mode) throws SvcLogicException {
+    public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException {
         return (svcLogic.hasGraph(module, rpc, version, mode));
     }
 
-    public Properties executeGraph(String module, String rpc, String version,
-            String mode,  Properties parms) throws SvcLogicException {
+    public Properties executeGraph(String module, String rpc, String version, String mode, Properties parms)
+            throws SvcLogicException {
         log.debug("Parameters passed to SLI");
 
-//        for (Object key : parms.keySet()) {
-//            String parmName = (String) key;
-//            String parmValue = parms.getProperty(parmName);
-//
-//            log.debug(parmName + " = " + parmValue);
-//        }
-
-    Properties respProps = svcLogic.execute(module, rpc, version, mode,parms);
-    if (log.isDebugEnabled()) {
-        log.debug("Parameters returned by SLI");
-        for (Object key : respProps.keySet()) {
-            String parmName = (String) key;
-            String parmValue = respProps.getProperty(parmName);
-
-            log.debug(parmName + " = " + parmValue);
+        // for (Object key : parms.keySet()) {
+        // String parmName = (String) key;
+        // String parmValue = parms.getProperty(parmName);
+        //
+        // log.debug(parmName + " = " + parmValue);
+        // }
+
+        Properties respProps = svcLogic.execute(module, rpc, version, mode, parms);
+        if (log.isDebugEnabled()) {
+            log.debug("Parameters returned by SLI");
+            for (Object key : respProps.keySet()) {
+                String parmName = (String) key;
+                String parmValue = respProps.getProperty(parmName);
+
+                log.debug(parmName + " = " + parmValue);
+            }
+        }
+        if ("failure".equalsIgnoreCase(respProps.getProperty("SvcLogic.status"))) {
+            return (respProps);
         }
-    }    
-    if ("failure"
-            .equalsIgnoreCase(respProps.getProperty("SvcLogic.status"))) {
         return (respProps);
     }
-    return (respProps);
-}
 
-@Override
-public HashMap<String, String> execute(Transaction transaction, SvcLogicContext ctx) throws Exception {
+    @Override
+    public HashMap<String, String> execute(Transaction transaction, SvcLogicContext ctx) throws Exception {
 
-    String fn = "GraphExecutor.execute ";
-    log.debug(fn + "About to execute graph : " + transaction.getExecutionRPC())    ;
-    
-    Properties parms = new Properties();
-    for (Object key : ctx.getAttributeKeySet()) {
+        String fn = "GraphExecutor.execute ";
+        log.debug(fn + "About to execute graph : " + transaction.getExecutionRPC());
+
+        Properties parms = new Properties();
+        for (Object key : ctx.getAttributeKeySet()) {
             String parmName = (String) key;
             String parmValue = ctx.getAttribute(parmName);
             parms.put(parmName, parmValue);
-            log.info(fn + "Setting Key= "  + parmName + "and Value = " +  parmValue);
-            
-    }
-    Properties returnParams = executeGraph(transaction.getExecutionModule(),transaction.getExecutionRPC(), null, "sync",  parms);
-    
-    //log.debug("Return Params executing DG :"  + returnParams.toString());
+            log.info(fn + "Setting Key= " + parmName + "and Value = " + parmValue);
 
-    log.debug("Returned Params from DG Module: " + transaction.getExecutionModule() + "and DG NAME: "  + transaction.getExecutionRPC()
-     + returnParams.toString());
+        }
+        Properties returnParams =
+                executeGraph(transaction.getExecutionModule(), transaction.getExecutionRPC(), null, "sync", parms);
 
-    Enumeration e = returnParams.propertyNames();
+        // log.debug("Return Params executing DG :" + returnParams.toString());
 
-    while (e.hasMoreElements()) {
-         String key = (String) e.nextElement();
-         log.info("NEW KEY =  " + key + " -- " + returnParams.getProperty(key));
+        log.debug("Returned Params from DG Module: " + transaction.getExecutionModule() + "and DG NAME: "
+                + transaction.getExecutionRPC() + returnParams.toString());
+
+        Enumeration e = returnParams.propertyNames();
+
+        while (e.hasMoreElements()) {
+            String key = (String) e.nextElement();
+            log.info("NEW KEY =  " + key + " -- " + returnParams.getProperty(key));
 
             ctx.setAttribute(key, returnParams.getProperty(key));
+        }
+
+
+        // Get the correct code from the SVC Logic and set it in transaction
+        // transaction.setStatusCode(returnParams.getProperty("SvcLogic.code"));
+
+        if (FlowControllerConstants.FAILURE.equalsIgnoreCase(returnParams.getProperty("SvcLogic.status"))) {
+            transaction.setStatus(FlowControllerConstants.FAILURE);
+            ctx.setAttribute(
+                    ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX)
+                            + FlowControllerConstants.OUTPUT_PARAM_STATUS,
+                    FlowControllerConstants.OUTPUT_STATUS_FAILURE);
+            ctx.setAttribute(ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX)
+                    + FlowControllerConstants.OUTPUT_STATUS_MESSAGE, returnParams.getProperty("error-message"));
+            transaction.setStatusCode("401");
+            transaction.setState((ctx.getAttribute(transaction.getExecutionModule() + "."
+                    + transaction.getExecutionRPC() + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE)) != null
+                            ? ctx.getAttribute(transaction.getExecutionModule() + "." + transaction.getExecutionRPC()
+                                    + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE)
+                            : null);
+            // Get error code from above instead setting here ...its for testing purpose
+
+
+        } else if (FlowControllerConstants.SUCCESS.equalsIgnoreCase(returnParams.getProperty("SvcLogic.status"))) {
+            transaction.setStatus(FlowControllerConstants.SUCCESS);
+            transaction.setStatusCode("400");
+            ctx.setAttribute(
+                    ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX)
+                            + FlowControllerConstants.OUTPUT_PARAM_STATUS,
+                    FlowControllerConstants.OUTPUT_STATUS_SUCCESS);
+            transaction.setState((ctx.getAttribute(transaction.getExecutionModule() + "."
+                    + transaction.getExecutionRPC() + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE)) != null
+                            ? ctx.getAttribute(transaction.getExecutionModule() + "." + transaction.getExecutionRPC()
+                                    + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE)
+                            : null);
+            // Get error code from above instead setting here ...its for testing purpose
+        } else {
+            transaction.setStatus(FlowControllerConstants.OTHERS);
+            ctx.setAttribute(
+                    ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX)
+                            + FlowControllerConstants.OUTPUT_PARAM_STATUS,
+                    FlowControllerConstants.OUTPUT_STATUS_FAILURE);
+            transaction.setStatusCode("401");
+            ctx.setAttribute(ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX)
+                    + FlowControllerConstants.OUTPUT_STATUS_MESSAGE, returnParams.getProperty("error-message"));
+        }
+
+        return null;
+        // Change null to required value if required in upper level
     }
-    
-
-    //Get the correct code from the SVC Logic and set it in transaction  
-//    transaction.setStatusCode(returnParams.getProperty("SvcLogic.code"));
-    
-    if (FlowControllerConstants.FAILURE
-            .equalsIgnoreCase(returnParams.getProperty("SvcLogic.status")))    {
-        transaction.setStatus(FlowControllerConstants.FAILURE);
-        ctx.setAttribute(ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX) + FlowControllerConstants.OUTPUT_PARAM_STATUS, FlowControllerConstants.OUTPUT_STATUS_FAILURE);
-        ctx.setAttribute(ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX) + FlowControllerConstants.OUTPUT_STATUS_MESSAGE, returnParams.getProperty("error-message"));
-        transaction.setStatusCode("401");
-        transaction.setState((ctx.getAttribute(transaction.getExecutionModule() + "." + transaction.getExecutionRPC() + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE)) !=null ? 
-                ctx.getAttribute(transaction.getExecutionModule() + "." + transaction.getExecutionRPC() + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE): null);
-        //Get error code from above instead setting here ...its for testing purpose
-        
-        
-    }
-    else if(FlowControllerConstants.SUCCESS
-            .equalsIgnoreCase(returnParams.getProperty("SvcLogic.status")))    {        
-        transaction.setStatus(FlowControllerConstants.SUCCESS);
-        transaction.setStatusCode("400");
-        ctx.setAttribute(ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX) + FlowControllerConstants.OUTPUT_PARAM_STATUS, FlowControllerConstants.OUTPUT_STATUS_SUCCESS);
-        transaction.setState((ctx.getAttribute(transaction.getExecutionModule() + "." + transaction.getExecutionRPC() + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE)) !=null ? 
-                ctx.getAttribute(transaction.getExecutionModule() + "." + transaction.getExecutionRPC() + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE): null);
-        //Get error code from above instead setting here ...its for testing purpose
-    }
-    else {        
-        transaction.setStatus(FlowControllerConstants.OTHERS);
-        ctx.setAttribute(ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX) + FlowControllerConstants.OUTPUT_PARAM_STATUS, FlowControllerConstants.OUTPUT_STATUS_FAILURE);
-        transaction.setStatusCode("401");
-        ctx.setAttribute(ctx.getAttribute(FlowControllerConstants.RESPONSE_PREFIX) + FlowControllerConstants.OUTPUT_STATUS_MESSAGE, returnParams.getProperty("error-message"));
-    }
-    
-    return null;
-    //Change null to required value if required in upper level
-}
 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/NodeExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/NodeExecutor.java
index 84380b0cd..81d97ce8c 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/NodeExecutor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/NodeExecutor.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.executorImpl;
 
 import java.util.HashMap;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java
index 0f901e0fe..4770aba28 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/RestExecutor.java
@@ -1,9 +1,9 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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
@@ -15,9 +15,10 @@
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.executorImpl;
 
 import java.io.FileInputStream;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java
index cbe5de28b..1a438d706 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/executorImpl/SecureRestClientTrustManager.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.executorImpl;
 
 import java.security.cert.CertificateException;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ActionIdentifier.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ActionIdentifier.java
index 2784dcc15..2d416f876 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ActionIdentifier.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ActionIdentifier.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -39,9 +40,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -55,8 +56,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
+ *
+ *
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
@@ -79,11 +80,11 @@ public class ActionIdentifier {
 
     /**
      * Gets the value of the vnfId property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfId() {
         return vnfId;
@@ -91,11 +92,11 @@ public class ActionIdentifier {
 
     /**
      * Sets the value of the vnfId property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfId(String value) {
         this.vnfId = value;
@@ -103,11 +104,11 @@ public class ActionIdentifier {
 
     /**
      * Gets the value of the vserverId property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVserverId() {
         return vserverId;
@@ -115,11 +116,11 @@ public class ActionIdentifier {
 
     /**
      * Sets the value of the vserverId property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVserverId(String value) {
         this.vserverId = value;
@@ -127,11 +128,11 @@ public class ActionIdentifier {
 
     /**
      * Gets the value of the vnfcName property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfcName() {
         return vnfcName;
@@ -139,11 +140,11 @@ public class ActionIdentifier {
 
     /**
      * Sets the value of the vnfcName property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfcName(String value) {
         this.vnfcName = value;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Capabilities.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Capabilities.java
index 91414d3b2..9e68e7d43 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Capabilities.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Capabilities.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -67,25 +68,25 @@ public class Capabilities {
 
     /**
      * Gets the value of the vnf property.
-     * 
+     *
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the vnf property.
-     * 
+     *
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getVnf().add(newItem);
      * </pre>
-     * 
-     * 
+     *
+     *
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * 
-     * 
+     *
+     *
      */
     public List<String> getVnf() {
         if (vnf == null) {
@@ -96,25 +97,25 @@ public class Capabilities {
 
     /**
      * Gets the value of the vfModule property.
-     * 
+     *
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the vfModule property.
-     * 
+     *
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getVfModule().add(newItem);
      * </pre>
-     * 
-     * 
+     *
+     *
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * 
-     * 
+     *
+     *
      */
     public List<String> getVfModule() {
         if (vfModule == null) {
@@ -125,25 +126,25 @@ public class Capabilities {
 
     /**
      * Gets the value of the vm property.
-     * 
+     *
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the vm property.
-     * 
+     *
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getVm().add(newItem);
      * </pre>
-     * 
-     * 
+     *
+     *
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * 
-     * 
+     *
+     *
      */
     public List<String> getVm() {
         if (vm == null) {
@@ -154,25 +155,25 @@ public class Capabilities {
 
     /**
      * Gets the value of the vnfc property.
-     * 
+     *
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the vnfc property.
-     * 
+     *
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getVnfc().add(newItem);
      * </pre>
-     * 
-     * 
+     *
+     *
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * 
-     * 
+     *
+     *
      */
     public List<String> getVnfc() {
         if (vnfc == null) {
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/DependencyInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/DependencyInfo.java
index 1dfe961b7..11f3a483a 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/DependencyInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/DependencyInfo.java
@@ -1,28 +1,30 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -51,25 +53,25 @@ public class DependencyInfo {
 
     /**
      * Gets the value of the vnfcs property.
-     * 
+     *
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the vnfcs property.
-     * 
+     *
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getVnfcs().add(newItem);
      * </pre>
-     * 
-     * 
+     *
+     *
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link Vnfcs }
-     * 
-     * 
+     *
+     *
      */
     public List<Vnfcs> getVnfcs() {
         if (vnfcs == null) {
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Input.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Input.java
index ed95268d1..e6da3be09 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Input.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Input.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -70,11 +71,11 @@ public class Input {
 
     /**
      * Gets the value of the requestInfo property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link RequestInfo }
-     *     
+     *
      */
     public RequestInfo getRequestInfo() {
         return requestInfo;
@@ -82,11 +83,11 @@ public class Input {
 
     /**
      * Sets the value of the requestInfo property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link RequestInfo }
-     *     
+     *
      */
     public void setRequestInfo(RequestInfo value) {
         this.requestInfo = value;
@@ -94,11 +95,11 @@ public class Input {
 
     /**
      * Gets the value of the inventoryInfo property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link InventoryInfo }
-     *     
+     *
      */
     public InventoryInfo getInventoryInfo() {
         return inventoryInfo;
@@ -106,11 +107,11 @@ public class Input {
 
     /**
      * Sets the value of the inventoryInfo property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link InventoryInfo }
-     *     
+     *
      */
     public void setInventoryInfo(InventoryInfo value) {
         this.inventoryInfo = value;
@@ -118,11 +119,11 @@ public class Input {
 
     /**
      * Gets the value of the dependencyInfo property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link DependencyInfo }
-     *     
+     *
      */
     public DependencyInfo getDependencyInfo() {
         return dependencyInfo;
@@ -130,11 +131,11 @@ public class Input {
 
     /**
      * Sets the value of the dependencyInfo property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link DependencyInfo }
-     *     
+     *
      */
     public void setDependencyInfo(DependencyInfo value) {
         this.dependencyInfo = value;
@@ -142,11 +143,11 @@ public class Input {
 
     /**
      * Gets the value of the tunableParameters property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link TunableParameters }
-     *     
+     *
      */
     public TunableParameters getTunableParameters() {
         return tunableParameters;
@@ -154,11 +155,11 @@ public class Input {
 
     /**
      * Sets the value of the tunableParameters property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link TunableParameters }
-     *     
+     *
      */
     public void setTunableParameters(TunableParameters value) {
         this.tunableParameters = value;
@@ -166,11 +167,11 @@ public class Input {
 
     /**
      * Gets the value of the capabilities property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link Capabilities }
-     *     
+     *
      */
     public Capabilities getCapabilities() {
         return capabilities;
@@ -178,11 +179,11 @@ public class Input {
 
     /**
      * Sets the value of the capabilities property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link Capabilities }
-     *     
+     *
      */
     public void setCapabilities(Capabilities value) {
         this.capabilities = value;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/InventoryInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/InventoryInfo.java
index 24da512b1..86c8c2579 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/InventoryInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/InventoryInfo.java
@@ -1,28 +1,30 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -50,11 +52,11 @@ public class InventoryInfo {
 
     /**
      * Gets the value of the vnfInfo property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link VnfInfo }
-     *     
+     *
      */
     public VnfInfo getVnfInfo() {
         return vnfInfo;
@@ -62,11 +64,11 @@ public class InventoryInfo {
 
     /**
      * Sets the value of the vnfInfo property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link VnfInfo }
-     *     
+     *
      */
     public void setVnfInfo(VnfInfo value) {
         this.vnfInfo = value;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ObjectFactory.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ObjectFactory.java
index a52634b97..83afb10f2 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ObjectFactory.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/ObjectFactory.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -32,18 +33,18 @@ import javax.xml.bind.annotation.XmlRegistry;
 
 
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.onap.appc.flow.controller.interfaceData package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.onap.appc.flow.controller.interfaceData package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups.  Factory methods for each of these are
  * provided in this class.
- * 
+ *
  */
 @XmlRegistry
 public class ObjectFactory {
@@ -51,14 +52,14 @@ public class ObjectFactory {
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.onap.appc.flow.controller.interfaceData
-     * 
+     *
      */
     public ObjectFactory() {
     }
 
     /**
      * Create an instance of {@link Capabilities }
-     * 
+     *
      */
     public Capabilities createCapabilities() {
         return new Capabilities();
@@ -66,7 +67,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link RequestInfo }
-     * 
+     *
      */
     public RequestInfo createRequestInfo() {
         return new RequestInfo();
@@ -74,7 +75,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link ActionIdentifier }
-     * 
+     *
      */
     public ActionIdentifier createActionIdentifier() {
         return new ActionIdentifier();
@@ -82,7 +83,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link DependencyInfo }
-     * 
+     *
      */
     public DependencyInfo createDependencyInfo() {
         return new DependencyInfo();
@@ -90,7 +91,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link Vnfcs }
-     * 
+     *
      */
     public Vnfcs createVnfcs() {
         return new Vnfcs();
@@ -98,7 +99,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link Vm }
-     * 
+     *
      */
     public Vm createVm() {
         return new Vm();
@@ -106,7 +107,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link Vnfcslist }
-     * 
+     *
      */
     public Vnfcslist createVnfcslist() {
         return new Vnfcslist();
@@ -114,7 +115,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link TunableParameters }
-     * 
+     *
      */
     public TunableParameters createTunableParameters() {
         return new TunableParameters();
@@ -122,7 +123,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link VnfInfo }
-     * 
+     *
      */
     public VnfInfo createVnfInfo() {
         return new VnfInfo();
@@ -130,7 +131,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link InventoryInfo }
-     * 
+     *
      */
     public InventoryInfo createInventoryInfo() {
         return new InventoryInfo();
@@ -138,7 +139,7 @@ public class ObjectFactory {
 
     /**
      * Create an instance of {@link Input }
-     * 
+     *
      */
     public Input createInput() {
         return new Input();
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/RequestInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/RequestInfo.java
index 2cca748e6..7804bacdd 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/RequestInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/RequestInfo.java
@@ -1,28 +1,30 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -60,11 +62,11 @@ public class RequestInfo {
 
     /**
      * Gets the value of the action property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getAction() {
         return action;
@@ -72,11 +74,11 @@ public class RequestInfo {
 
     /**
      * Sets the value of the action property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setAction(String value) {
         this.action = value;
@@ -84,11 +86,11 @@ public class RequestInfo {
 
     /**
      * Gets the value of the actionLevel property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getActionLevel() {
         return actionLevel;
@@ -96,11 +98,11 @@ public class RequestInfo {
 
     /**
      * Sets the value of the actionLevel property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setActionLevel(String value) {
         this.actionLevel = value;
@@ -108,11 +110,11 @@ public class RequestInfo {
 
     /**
      * Gets the value of the actionIdentifier property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link ActionIdentifier }
-     *     
+     *
      */
     public ActionIdentifier getActionIdentifier() {
         return actionIdentifier;
@@ -120,11 +122,11 @@ public class RequestInfo {
 
     /**
      * Sets the value of the actionIdentifier property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link ActionIdentifier }
-     *     
+     *
      */
     public void setActionIdentifier(ActionIdentifier value) {
         this.actionIdentifier = value;
@@ -132,11 +134,11 @@ public class RequestInfo {
 
     /**
      * Gets the value of the payload property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getPayload() {
         return payload;
@@ -144,11 +146,11 @@ public class RequestInfo {
 
     /**
      * Sets the value of the payload property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setPayload(String value) {
         this.payload = value;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/TunableParameters.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/TunableParameters.java
index ceb3e2ade..3ba1e7eed 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/TunableParameters.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/TunableParameters.java
@@ -1,28 +1,30 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -37,9 +39,9 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for anonymous complex type.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ *
  * <pre>
  * &lt;complexType>
  *   &lt;complexContent>
@@ -53,8 +55,8 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
+ *
+ *
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
@@ -74,11 +76,11 @@ public class TunableParameters {
 
     /**
      * Gets the value of the strategy property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getStrategy() {
         return strategy;
@@ -86,11 +88,11 @@ public class TunableParameters {
 
     /**
      * Sets the value of the strategy property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setStrategy(String value) {
         this.strategy = value;
@@ -98,11 +100,11 @@ public class TunableParameters {
 
     /**
      * Gets the value of the waitTime property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getWaitTime() {
         return waitTime;
@@ -110,11 +112,11 @@ public class TunableParameters {
 
     /**
      * Sets the value of the waitTime property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setWaitTime(String value) {
         this.waitTime = value;
@@ -122,11 +124,11 @@ public class TunableParameters {
 
     /**
      * Gets the value of the retryCount property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getRetryCount() {
         return retryCount;
@@ -134,11 +136,11 @@ public class TunableParameters {
 
     /**
      * Sets the value of the retryCount property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setRetryCount(String value) {
         this.retryCount = value;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vm.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vm.java
index 49a98ea0d..2e579ab81 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vm.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vm.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -54,11 +55,11 @@ public class Vm {
 
     /**
      * Gets the value of the vserverId property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVserverId() {
         return vserverId;
@@ -66,11 +67,11 @@ public class Vm {
 
     /**
      * Sets the value of the vserverId property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVserverId(String value) {
         this.vserverId = value;
@@ -78,11 +79,11 @@ public class Vm {
 
     /**
      * Gets the value of the vnfc property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link Vnfcslist }
-     *     
+     *
      */
     public Vnfcslist getVnfc() {
         return vnfc;
@@ -90,11 +91,11 @@ public class Vm {
 
     /**
      * Sets the value of the vnfc property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link Vnfcslist }
-     *     
+     *
      */
     public void setVnfc(Vnfcslist value) {
         this.vnfc = value;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/VnfInfo.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/VnfInfo.java
index d4a6d65b7..ee21c109c 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/VnfInfo.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/VnfInfo.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -64,11 +65,11 @@ public class VnfInfo {
 
     /**
      * Gets the value of the vnfId property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfId() {
         return vnfId;
@@ -76,11 +77,11 @@ public class VnfInfo {
 
     /**
      * Sets the value of the vnfId property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfId(String value) {
         this.vnfId = value;
@@ -88,11 +89,11 @@ public class VnfInfo {
 
     /**
      * Gets the value of the vnfName property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfName() {
         return vnfName;
@@ -100,11 +101,11 @@ public class VnfInfo {
 
     /**
      * Sets the value of the vnfName property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfName(String value) {
         this.vnfName = value;
@@ -112,11 +113,11 @@ public class VnfInfo {
 
     /**
      * Gets the value of the vnfType property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfType() {
         return vnfType;
@@ -124,11 +125,11 @@ public class VnfInfo {
 
     /**
      * Sets the value of the vnfType property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfType(String value) {
         this.vnfType = value;
@@ -136,25 +137,25 @@ public class VnfInfo {
 
     /**
      * Gets the value of the vm property.
-     * 
+     *
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the vm property.
-     * 
+     *
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getVm().add(newItem);
      * </pre>
-     * 
-     * 
+     *
+     *
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link Vm }
-     * 
-     * 
+     *
+     *
      */
     public List<Vm> getVm() {
         if (vm == null) {
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcs.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcs.java
index 7adf05d3c..6d025ea94 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcs.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcs.java
@@ -1,28 +1,30 @@
+
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -68,11 +70,11 @@ public class Vnfcs {
 
     /**
      * Gets the value of the vnfcType property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfcType() {
         return vnfcType;
@@ -80,11 +82,11 @@ public class Vnfcs {
 
     /**
      * Sets the value of the vnfcType property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfcType(String value) {
         this.vnfcType = value;
@@ -92,11 +94,11 @@ public class Vnfcs {
 
     /**
      * Gets the value of the mandatory property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getMandatory() {
         return mandatory;
@@ -104,11 +106,11 @@ public class Vnfcs {
 
     /**
      * Sets the value of the mandatory property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setMandatory(String value) {
         this.mandatory = value;
@@ -116,11 +118,11 @@ public class Vnfcs {
 
     /**
      * Gets the value of the resilience property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getResilience() {
         return resilience;
@@ -128,11 +130,11 @@ public class Vnfcs {
 
     /**
      * Sets the value of the resilience property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setResilience(String value) {
         this.resilience = value;
@@ -140,25 +142,25 @@ public class Vnfcs {
 
     /**
      * Gets the value of the parents property.
-     * 
+     *
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the parents property.
-     * 
+     *
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getParents().add(newItem);
      * </pre>
-     * 
-     * 
+     *
+     *
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link String }
-     * 
-     * 
+     *
+     *
      */
     public List<String> getParents() {
         if (parents == null) {
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcslist.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcslist.java
index 849f7cad9..5bb47b3b1 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcslist.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnfcslist.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 
@@ -38,9 +39,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * <p>Java class for vnfcslist complex type.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ *
  * <pre>
  * &lt;complexType name="vnfcslist">
  *   &lt;complexContent>
@@ -53,8 +54,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
+ *
+ *
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "vnfcslist", propOrder = {
@@ -72,11 +73,11 @@ public class Vnfcslist {
 
     /**
      * Gets the value of the vnfcType property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfcType() {
         return vnfcType;
@@ -84,11 +85,11 @@ public class Vnfcslist {
 
     /**
      * Sets the value of the vnfcType property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfcType(String value) {
         this.vnfcType = value;
@@ -96,11 +97,11 @@ public class Vnfcslist {
 
     /**
      * Gets the value of the vnfcName property.
-     * 
+     *
      * @return
      *     possible object is
      *     {@link String }
-     *     
+     *
      */
     public String getVnfcName() {
         return vnfcName;
@@ -108,11 +109,11 @@ public class Vnfcslist {
 
     /**
      * Sets the value of the vnfcName property.
-     * 
+     *
      * @param value
      *     allowed object is
      *     {@link String }
-     *     
+     *
      */
     public void setVnfcName(String value) {
         this.vnfcName = value;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnflist.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnflist.java
index 1d63f6e53..0fccaff57 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnflist.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/Vnflist.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.03 at 03:13:44 PM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.03 at 03:13:44 PM EDT
 //
 
 
@@ -35,7 +36,7 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * <p>Java class for vnflist.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
  * <pre>
@@ -70,7 +71,7 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
- * 
+ *
  */
 @XmlType(name = "vnflist")
 @XmlEnum
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/package-info.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/package-info.java
index 926dfafd8..8384ca119 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/package-info.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaceData/package-info.java
@@ -1,28 +1,29 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.07.31 at 10:30:39 AM EDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2017.07.31 at 10:30:39 AM EDT
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http:org.onap.appc/sequence/v1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaces/FlowExecutorInterface.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaces/FlowExecutorInterface.java
index 522093d0c..dccd78222 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaces/FlowExecutorInterface.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/interfaces/FlowExecutorInterface.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -30,6 +32,5 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 public interface FlowExecutorInterface {
 
     public HashMap<String, String> execute(Transaction transaction, SvcLogicContext ctx) throws Exception;
-    
-    
+
 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java
index e0ef5fd7e..8e4925b76 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java
@@ -1,9 +1,9 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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
@@ -15,9 +15,10 @@
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.node;
 
 import java.io.FileInputStream;
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowGenerator.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowGenerator.java
index 74a513fc8..b6491e921 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowGenerator.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowGenerator.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java
index d6d3ee120..861f0dd83 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java
index f3b9b0495..23d332ba0 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java
@@ -1,20 +1,22 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/EscapeUtils.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/EscapeUtils.java
index 40bf7593f..6f76cee73 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/EscapeUtils.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/EscapeUtils.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.utils;
 
 import org.apache.commons.lang3.StringUtils;
@@ -35,5 +36,5 @@ public class EscapeUtils {
         String replacementList[] = new String[]{ "''","\\\\" ,"\\\""};
         return StringUtils.replaceEach(str,searchList, replacementList);
     }
-    
+
 }
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java
index d2ceae91c..f3f58b8e8 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java
@@ -1,9 +1,9 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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
@@ -15,9 +15,10 @@
  * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.controller.utils;
 
 public class FlowControllerConstants {
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java
index 3fe545334..12f2850ae 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java
@@ -1,30 +1,30 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Properties;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -35,45 +35,44 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TestFlowExecutorNode {
-    
+
     private final Logger logger = LoggerFactory.getLogger(TestFlowExecutorNode.class);
-    
-            
-    //@Before
-            public void setUp() {
-                Properties props = new Properties();
-                InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
-                if (propStr == null) {
-                }
-                try {
-                    props.load(propStr);
-                    propStr.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                // Add properties to global properties
 
-                Enumeration propNames = props.keys();
 
-                while (propNames.hasMoreElements()) {
-                    
-                    String propName = (String) propNames.nextElement();
-                    System.setProperty(propName, props.getProperty(propName));
-                }
+    // @Before
+    public void setUp() {
+        Properties props = new Properties();
+        InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
+        if (propStr == null) {
+        }
+        try {
+            props.load(propStr);
+            propStr.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // Add properties to global properties
+
+        Enumeration propNames = props.keys();
+
+        while (propNames.hasMoreElements()) {
+            String propName = (String) propNames.nextElement();
+            System.setProperty(propName, props.getProperty(propName));
+        }
+
+    }
 
-	}
-            
     @Ignore("Test is taking 60 seconds")
-	@Test(expected=Exception.class)
-	public void testFlowExecutorNode() throws Exception {
-		
-		SvcLogicContext ctx = new SvcLogicContext();
-		ctx.setAttribute(FlowControllerConstants.VNF_TYPE, "vUSP - vDBE-IPX HUB");
-		ctx.setAttribute(FlowControllerConstants.REQUEST_ACTION, "Configure");
-		ctx.setAttribute(FlowControllerConstants.VNFC_TYPE, "");;
-		ctx.setAttribute(FlowControllerConstants.REQUEST_ID,"TESTCOMMONFRMWK");
-		HashMap inParams = new HashMap();
-		FlowControlNode fen = new FlowControlNode();
-		fen.processFlow(inParams, ctx);
-	}
+    @Test(expected = Exception.class)
+    public void testFlowExecutorNode() throws Exception {
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute(FlowControllerConstants.VNF_TYPE, "vUSP - vDBE-IPX HUB");
+        ctx.setAttribute(FlowControllerConstants.REQUEST_ACTION, "Configure");
+        ctx.setAttribute(FlowControllerConstants.VNFC_TYPE, "");;
+        ctx.setAttribute(FlowControllerConstants.REQUEST_ID, "TESTCOMMONFRMWK");
+        HashMap inParams = new HashMap();
+        FlowControlNode fen = new FlowControlNode();
+        fen.processFlow(inParams, ctx);
+    }
 }
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java
index ca84ca56a..ff8d4f09d 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java
index ef661e3db..802601e5c 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java
@@ -1,23 +1,25 @@
+
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
@@ -41,10 +43,10 @@ import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestRestServiceNode {
-    
+
     @Test(expected=Exception.class)
     public void testRestServiceNode() throws Exception {
-        
+
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute(FlowControllerConstants.VNF_TYPE, "vUSP - vDBE-IPX HUB");
         ctx.setAttribute(FlowControllerConstants.REQUEST_ACTION, "healthcheck");
@@ -54,22 +56,22 @@ public class TestRestServiceNode {
         ctx.setAttribute("port-number","8888");
         ctx.setAttribute("request-action-type","GET");
         ctx.setAttribute("context", "loader/restconf/operations/appc-provider-lcm:health-check");
-        
+
         HashMap<String, String> inParams = new HashMap<String, String>();
         RestServiceNode rsn = new RestServiceNode();
         inParams.put("output-state", "state");
         inParams.put("responsePrefix", "healthcheck");
         rsn.sendRequest(inParams, ctx);
-        
+
         for (Object key : ctx.getAttributeKeySet()) {
             String parmName = (String) key;
             String parmValue = ctx.getAttribute(parmName);
         }
-        
-        
+
+
     }
-    
-    
+
+
     @Test(expected=Exception.class)
     public void testInputParamsRestServiceNode() throws Exception {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -78,10 +80,10 @@ public class TestRestServiceNode {
         ctx.setAttribute("tmp.vnfInfo.vm[0].vnfc-count", "1");
         RestExecutor restExe = new RestExecutor();
         Transaction transaction = new Transaction();
-        
+
         FlowControlNode node = new FlowControlNode();
         HashMap<String,String>flowSeq= restExe.execute(transaction, ctx);
         String flowSequnce=flowSeq.get("restResponse");
-        
+
     }
 }