refinement[ats_ATS104396]: Use Slf4J for JAX-RS CXF logging

Change-Id: I92ba08bd61b57a1c9d0e55d57de1861cd35b1069

13 files changed, 30 insertions, 35 deletions

diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml
index 5a08d07da5f..b8bd0ff6533 100644
--- a/features/org.eclipse.osee.external.feature/feature.xml
+++ b/features/org.eclipse.osee.external.feature/feature.xml
@@ -469,4 +469,12 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.cxf.core.config"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.osee.external.feature/pom.xml b/features/org.eclipse.osee.external.feature/pom.xml
index c2c08dcbb5d..06223474480 100644
--- a/features/org.eclipse.osee.external.feature/pom.xml
+++ b/features/org.eclipse.osee.external.feature/pom.xml
@@ -37,6 +37,7 @@
 								<plugin id="jms.libraries" />
 								<plugin id="net.jini" />
 								<plugin id="org.json" />
+								<plugin id="org.apache.cxf.core.config" />
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/features/org.eclipse.osee.x.core.external.feature/feature.xml b/features/org.eclipse.osee.x.core.external.feature/feature.xml
index 68fdeda8843..e570cffd1d6 100644
--- a/features/org.eclipse.osee.x.core.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.external.feature/feature.xml
@@ -533,4 +533,12 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.cxf.core.config"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.osee.x.core.external.feature/pom.xml b/features/org.eclipse.osee.x.core.external.feature/pom.xml
index 314be7610cb..595e8a381ef 100644
--- a/features/org.eclipse.osee.x.core.external.feature/pom.xml
+++ b/features/org.eclipse.osee.x.core.external.feature/pom.xml
@@ -32,6 +32,7 @@
 								<plugin id="org.json" />
 								<plugin id="org.eclipse.persistence.core" />
 								<plugin id="org.eclipse.persistence.moxy" />
+								<plugin id="org.apache.cxf.core.config" />
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/logback-test.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/logback-test.xml
index 925057f12cc..6e2c97abe67 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/logback-test.xml
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/logback-test.xml
@@ -8,7 +8,7 @@
 		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder 
 			by default -->
 		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 			</pattern>
 		</encoder>
 	</appender>
@@ -20,9 +20,6 @@
 	<logger name="org.eclipse.osee" level="WARN" />
 	<!-- <logger name="org.eclipse.osee.framework.core.server" level="INFO" />-->
 
-	<!-- Vaadin Servlet URL Requests -->
-	<!-- <logger name="org.eclipse.osee.vaadin" level="TRACE" /> -->
-
 	<root level="WARN">
 		<appender-ref ref="STDOUT" />
 	</root>
diff --git a/plugins/org.eclipse.osee.client.integration.tests/logback-test.xml b/plugins/org.eclipse.osee.client.integration.tests/logback-test.xml
index 925057f12cc..6e2c97abe67 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/logback-test.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/logback-test.xml
@@ -8,7 +8,7 @@
 		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder 
 			by default -->
 		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 			</pattern>
 		</encoder>
 	</appender>
@@ -20,9 +20,6 @@
 	<logger name="org.eclipse.osee" level="WARN" />
 	<!-- <logger name="org.eclipse.osee.framework.core.server" level="INFO" />-->
 
-	<!-- Vaadin Servlet URL Requests -->
-	<!-- <logger name="org.eclipse.osee.vaadin" level="TRACE" /> -->
-
 	<root level="WARN">
 		<appender-ref ref="STDOUT" />
 	</root>
diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/logback-test.xml b/plugins/org.eclipse.osee.coverage.integration.tests/logback-test.xml
index 925057f12cc..6e2c97abe67 100644
--- a/plugins/org.eclipse.osee.coverage.integration.tests/logback-test.xml
+++ b/plugins/org.eclipse.osee.coverage.integration.tests/logback-test.xml
@@ -8,7 +8,7 @@
 		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder 
 			by default -->
 		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 			</pattern>
 		</encoder>
 	</appender>
@@ -20,9 +20,6 @@
 	<logger name="org.eclipse.osee" level="WARN" />
 	<!-- <logger name="org.eclipse.osee.framework.core.server" level="INFO" />-->
 
-	<!-- Vaadin Servlet URL Requests -->
-	<!-- <logger name="org.eclipse.osee.vaadin" level="TRACE" /> -->
-
 	<root level="WARN">
 		<appender-ref ref="STDOUT" />
 	</root>
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java
index 539774387f9..ed251248738 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/internal/ext/CxfJaxRsClientConfigurator.java
@@ -51,11 +51,9 @@ public final class CxfJaxRsClientConfigurator implements JaxRsClientConfigurator
 
    }
 
-   private static final String APACHE_CXF_LOGGER = "org.apache.cxf.Logger";
    private static final String JAVAX_WS_RS_CLIENT_BUILDER_PROPERTY = "javax.ws.rs.client.ClientBuilder";
 
    private static final String DEFAULT_JAXRS_CLIENT_BUILDER_IMPL = "org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl";
-   private static final String DEFAULT_CXF_LOGGING_IMPL = "org.apache.cxf.common.logging.Slf4jLogger";
 
    private final OAuthFactory oauthFactory;
 
@@ -82,8 +80,6 @@ public final class CxfJaxRsClientConfigurator implements JaxRsClientConfigurator
 
    @Override
    public void configureJaxRsRuntime() {
-      System.setProperty(APACHE_CXF_LOGGER, DEFAULT_CXF_LOGGING_IMPL);
-
       // Ensure CXF JAX-RS implementation is loaded 
       RuntimeDelegate runtimeDelegate = new org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl();
       RuntimeDelegate.setInstance(runtimeDelegate);
diff --git a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java
index b5629a07efa..305b7cca4e7 100644
--- a/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java
+++ b/plugins/org.eclipse.osee.jaxrs.server/src/org/eclipse/osee/jaxrs/server/internal/ext/CxfJaxRsFactory.java
@@ -53,9 +53,6 @@ import org.osgi.service.http.HttpService;
  */
 public final class CxfJaxRsFactory implements JaxRsFactory {
 
-   private static final String APACHE_CXF_LOGGER = "org.apache.cxf.Logger";
-   private static final String DEFAULT_CXF_LOGGING_IMPL = "org.apache.cxf.common.logging.Slf4jLogger";
-
    private Log logger;
    private HttpService httpService;
 
@@ -75,8 +72,6 @@ public final class CxfJaxRsFactory implements JaxRsFactory {
    public void start(Map<String, Object> props) {
       logger.debug("Starting [%s]...", getClass().getSimpleName());
 
-      System.setProperty(APACHE_CXF_LOGGER, DEFAULT_CXF_LOGGING_IMPL);
-
       // Ensure CXF JAX-RS implementation is loaded 
       RuntimeDelegate runtimeDelegate = new org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl();
       RuntimeDelegate.setInstance(runtimeDelegate);
diff --git a/plugins/org.eclipse.osee.logback.config/logback-dev.xml b/plugins/org.eclipse.osee.logback.config/logback-test.xml
index 7139ecfbbbe..a65465d1bdb 100644
--- a/plugins/org.eclipse.osee.logback.config/logback-dev.xml
+++ b/plugins/org.eclipse.osee.logback.config/logback-test.xml
@@ -8,7 +8,7 @@
 		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder 
 			by default -->
 		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 			</pattern>
 		</encoder>
 	</appender>
@@ -16,12 +16,10 @@
 	<!-- Configure OSEE log messages -->
 	<logger name="org.eclipse.osee.orcs.db" level="TRACE" />
 	<logger name="org.eclipse.osee.database" level="TRACE" />
-	<logger name="org.eclipse.osee.orcs.core" level="TRACE" />
-	<logger name="org.eclipse.osee" level="WARN" />
+	<!-- <logger name="org.eclipse.osee.orcs.core" level="TRACE" /> -->
 	<logger name="org.eclipse.osee.framework.core.server" level="INFO" />
 
-	<!-- Vaadin Servlet URL Requests -->
-	<!-- <logger name="org.eclipse.osee.vaadin" level="TRACE" /> -->
+	<!-- <logger name="org.apache.cxf" level="INFO" /> -->
 
 	<root level="WARN">
 		<appender-ref ref="STDOUT" />
diff --git a/plugins/org.eclipse.osee.logback.config/logback.xml b/plugins/org.eclipse.osee.logback.config/logback.xml
index 3fdce1b516e..d126ed391a0 100644
--- a/plugins/org.eclipse.osee.logback.config/logback.xml
+++ b/plugins/org.eclipse.osee.logback.config/logback.xml
@@ -1,11 +1,11 @@
-<configuration>
+<configuration debug="true">
 	<!-- See documentation at http://logback.qos.ch/manual/joran.html -->
 
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder 
 			by default -->
 		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 			</pattern>
 		</encoder>
 	</appender>
@@ -14,8 +14,8 @@
 	<logger name="org.eclipse.osee" level="WARN" />
 	<logger name="org.eclipse.osee.framework.core.server" level="INFO" />
 	
-	<!-- Explicit logging as per action hrid: B2207  -->
-	<logger name="org.eclipse.osee.orcs.db" level="DEBUG" />
+	<!-- <logger name="org.eclipse.osee.orcs.db" level="DEBUG" /> -->
+	<!-- <logger name="org.apache.cxf" level="INFO" />-->
 
 	<root level="WARN">
 		<appender-ref ref="STDOUT" />
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/logback-test.xml b/plugins/org.eclipse.osee.x.server.integration.tests/logback-test.xml
index 925057f12cc..6e2c97abe67 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/logback-test.xml
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/logback-test.xml
@@ -8,7 +8,7 @@
 		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder 
 			by default -->
 		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
 			</pattern>
 		</encoder>
 	</appender>
@@ -20,9 +20,6 @@
 	<logger name="org.eclipse.osee" level="WARN" />
 	<!-- <logger name="org.eclipse.osee.framework.core.server" level="INFO" />-->
 
-	<!-- Vaadin Servlet URL Requests -->
-	<!-- <logger name="org.eclipse.osee.vaadin" level="TRACE" /> -->
-
 	<root level="WARN">
 		<appender-ref ref="STDOUT" />
 	</root>
diff --git a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
index 4706caf8b86..685d8c254f7 100644
--- a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
+++ b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
@@ -133,7 +133,7 @@
 							</then>
 						</elseif>
 						<elseif>
-							<equals arg1="${projectName}" arg2="org.eclipse.osee.vaadin.themes" />
+							<equals arg1="${projectName}" arg2="org.apache.cxf.core.config" />
 							<then>
 								<echo file="@{configPath}/config.ini" message="${projectName}" append="true" />
 							</then>