2 files changed, 48 insertions, 10 deletions
diff --git a/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties b/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties
index 28971c7b0..86d9b5515 100644
--- a/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties
+++ b/appc-common/src/main/resources/org/openecomp/appc/i18n/MessageResources.properties
@@ -956,24 +956,58 @@ OAM_OPERATION_EXCEPTION=APPC0153E|\
     state of the thread at the time of the exception.|\
   Correct the cause of the exception and rerun.
 
-OAM_OPERATION_STOPPING=APPC0154W|\
-  Application {0} is stopping... |\
+OAM_OPERATION_ENTERING_MAINTENANCE_MODE=APPC0154W|\
+  Application {0} is {1}|\
   No recovery required|\
   The APPC will no longer accept new LCM requests. Previously accepted LCM requests will be allowed to complete.
 
-OAM_OPERATION_STOPPED=APPC0155W|\
-  Application {0} is stopped|\
+OAM_OPERATION_MAINTENANCE_MODE=APPC0155W|\
+  Application {0} is in {1}|\
   No recovery required|\
-  The APPC is not accepting new LCM requests and all previously accepted LCM requests have completed.    
+  The APPC is not accepting new LCM requests and all previously accepted LCM requests have completed.
 
 OAM_OPERATION_STARTING=APPC0156I|\
-  Application {0} is starting...|\
+  Application {0} is {1}|\
   No recovery required|\
-  The APPC has initiated its startup procedure. Its internal components are coming online.  Once completed it will start accepting LCM requests.   \
-  
+  The APPC has initiated its startup procedure. Its internal components are coming online.  Once completed it will start accepting LCM requests.
+
 OAM_OPERATION_STARTED=APPC0157I|\
-  Application {0} is started|\
+  Application {0} is {1}|\
+  No recovery required|\
+  The APPC will now accept new LCM requests for processing.
+
+INVALID_STATE_TRANSITION=APPC0158E|\
+  A {1} API is not allowed when {0} in the {2} state|\
+  No recovery required|\
+  The Operation requested cannot be performed as per the current state of APPC.
+
+OAM_OPERATION_STOPPING=APPC0159W|\
+  Application {0} is {1}|\
+  No recovery required|\
+  The APPC has initiated its stop procedure. Its internal LCM bundles are stopping.
+
+OAM_OPERATION_STOPPED=APPC0160W|\
+  Application {0} is {1}|\
+  No recovery required|\
+  The APPC LCM bundles have now stopped.
+
+REQUEST_HANDLER_UNAVAILABLE=APPC0161E|\
+  Application {0} was unable to find the Request Handler service |\
+  The application controller attempted to get a handle on Request Handler service \
+    but was unable to locate it in  the OSGi Service Registry.|\
+  Verify if the Request Handler bundle is running.
+
+OAM_OPERATION_RESTARTING=APPC0162W|\
+  Application {0} is {1}|\
   No recovery required|\
-  The APPC will now accept new LCM requests for processing.     
+  The APPC has initiated its restart procedure. Its internal LCM bundles are stopping and will then start again.
 
+OAM_OPERATION_RESTARTED=APPC0163W|\
+  Application {0} is {1} for restart|\
+  No recovery required|\
+  The APPC LCM bundles have been restared (stopped and then started).
 
+OAM_OPERATION_INVALID_INPUT=APPC0162E|\
+  {0}|\
+  No recovery required|\
+  Fix the input parameter and retry.
diff --git a/appc-common/src/main/resources/org/openecomp/appc/org.ops4j.pax.logging.cfg b/appc-common/src/main/resources/org/openecomp/appc/org.ops4j.pax.logging.cfg
index 78b50cf55..a3a3f5837 100644
--- a/appc-common/src/main/resources/org/openecomp/appc/org.ops4j.pax.logging.cfg
+++ b/appc-common/src/main/resources/org/openecomp/appc/org.ops4j.pax.logging.cfg
@@ -110,6 +110,10 @@
     #Store to the same log file messages from upper level appender or not
     log4j.additivity.org.openecomp=false
 
+    #org.openecomp logger
+    log4j.logger.org.openecomp=TRACE, debug, error
+    log4j.additivity.org.openecomp=false
+
     #EELFManager loggers
     #EELF parent logger
     log4j.logger.com.att.eelf=TRACE, debug