summaryrefslogtreecommitdiffstats
path: root/reference/logging-demo/src
diff options
context:
space:
mode:
Diffstat (limited to 'reference/logging-demo/src')
-rw-r--r--reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationService.java (renamed from reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java)2
-rw-r--r--reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationServiceLocal.java (renamed from reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java)4
-rw-r--r--reference/logging-demo/src/main/java/org/onap/demo/logging/RestApplication.java (renamed from reference/logging-demo/src/main/java/org/onap/logging/RestApplication.java)2
-rw-r--r--reference/logging-demo/src/main/java/org/onap/demo/logging/RestHealthServiceImpl.java (renamed from reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java)14
-rw-r--r--reference/logging-demo/src/main/java/org/onap/demo/logging/RestServiceImpl.java (renamed from reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java)14
-rw-r--r--reference/logging-demo/src/main/webapp/WEB-INF/spring.xml4
-rw-r--r--reference/logging-demo/src/main/webapp/WEB-INF/web.xml4
7 files changed, 11 insertions, 33 deletions
diff --git a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationService.java
index 09a8afb..d0355df 100644
--- a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java
+++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationService.java
@@ -18,7 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.logging;
+package org.onap.demo.logging;
import org.springframework.stereotype.Service;
@Service("daoFacade")
diff --git a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationServiceLocal.java
index cc583c9..ac585fb 100644
--- a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java
+++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationServiceLocal.java
@@ -18,9 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.logging;
-
-import java.util.List;
+package org.onap.demo.logging;
public interface ApplicationServiceLocal {
Boolean health();
diff --git a/reference/logging-demo/src/main/java/org/onap/logging/RestApplication.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestApplication.java
index 2b729ae..b9604f3 100644
--- a/reference/logging-demo/src/main/java/org/onap/logging/RestApplication.java
+++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestApplication.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.logging;
+package org.onap.demo.logging;
import java.util.HashSet;
import java.util.Set;
diff --git a/reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestHealthServiceImpl.java
index 24b4486..33e3874 100644
--- a/reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java
+++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestHealthServiceImpl.java
@@ -18,26 +18,16 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.logging;
+package org.onap.demo.logging;
-import java.util.List;
import javax.inject.Inject;
-import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
+
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.springframework.test.context.transaction.TransactionConfiguration;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
@Path("/health")
public class RestHealthServiceImpl extends Application {
diff --git a/reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestServiceImpl.java
index 515662e..9dfe884 100644
--- a/reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java
+++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestServiceImpl.java
@@ -18,26 +18,16 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.logging;
+package org.onap.demo.logging;
-import java.util.List;
import javax.inject.Inject;
-import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
+
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.springframework.test.context.transaction.TransactionConfiguration;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
@Path("/read")
public class RestServiceImpl extends Application {
diff --git a/reference/logging-demo/src/main/webapp/WEB-INF/spring.xml b/reference/logging-demo/src/main/webapp/WEB-INF/spring.xml
index fd3d6ab..32d1235 100644
--- a/reference/logging-demo/src/main/webapp/WEB-INF/spring.xml
+++ b/reference/logging-demo/src/main/webapp/WEB-INF/spring.xml
@@ -29,11 +29,11 @@
<!-- rest annotations -->
<mvc:annotation-driven />
<!-- read in DAO's via Repository annotation -->
- <context:component-scan base-package="org.onap.logging.*" use-default-filters="false" >
+ <context:component-scan base-package="org.onap.demo.logging.*" use-default-filters="false" >
<context:include-filter type="annotation" expression="org.springframework.stereotype.Repository" />
</context:component-scan>
<!-- Rest controllers -->
- <context:component-scan base-package="org.onap.logging" />
+ <context:component-scan base-package="org.onap.demo.logging" />
</beans>
diff --git a/reference/logging-demo/src/main/webapp/WEB-INF/web.xml b/reference/logging-demo/src/main/webapp/WEB-INF/web.xml
index dd62a9c..d9e3e5f 100644
--- a/reference/logging-demo/src/main/webapp/WEB-INF/web.xml
+++ b/reference/logging-demo/src/main/webapp/WEB-INF/web.xml
@@ -13,11 +13,11 @@
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
- <param-value>org.onap.logging.RestApplication</param-value>
+ <param-value>org.onap.demo.logging.RestApplication</param-value>
</init-param>
<init-param>
<param-name>jersey.config.server.provider.packages</param-name>
- <param-value>org.onap.logging</param-value>
+ <param-value>org.onap.demo.logging</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>