aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--reference/.classpath13
-rw-r--r--reference/.project44
-rw-r--r--reference/logging-demo/.classpath22
-rw-r--r--reference/logging-demo/.project44
-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
-rw-r--r--reference/logging-library/.classpath10
-rw-r--r--reference/logging-library/.project53
-rw-r--r--reference/logging-library/src/main/java/org/onap/logging/library/LoggingReference.java (renamed from reference/logging-library/src/main/java/org/onap/logging/LoggingReference.java)2
-rw-r--r--reference/logging-mock-service/.classpath10
-rw-r--r--reference/logging-mock-service/.project53
16 files changed, 261 insertions, 34 deletions
diff --git a/reference/.classpath b/reference/.classpath
new file mode 100644
index 0000000..e6312a8
--- /dev/null
+++ b/reference/.classpath
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="logging-demo/src/main/java"/>
+ <classpathentry kind="src" path="logging-library/src/main/java"/>
+ <classpathentry kind="src" path="logging-mock-service/src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="module" value="true"/>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target"/>
+</classpath>
diff --git a/reference/.project b/reference/.project
new file mode 100644
index 0000000..15686ec
--- /dev/null
+++ b/reference/.project
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>logging-reference</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.springframework.ide.eclipse.core.springnature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
diff --git a/reference/logging-demo/.classpath b/reference/logging-demo/.classpath
new file mode 100644
index 0000000..159bf9a
--- /dev/null
+++ b/reference/logging-demo/.classpath
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/logging-library">
+ <attributes>
+ <attribute name="module" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/reference/logging-demo/.project b/reference/logging-demo/.project
new file mode 100644
index 0000000..ee4ad0b
--- /dev/null
+++ b/reference/logging-demo/.project
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>logging-demo</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.springframework.ide.eclipse.core.springnature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
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>
diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath
new file mode 100644
index 0000000..16bf974
--- /dev/null
+++ b/reference/logging-library/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/reference/logging-library/.project b/reference/logging-library/.project
new file mode 100644
index 0000000..5ffa62b
--- /dev/null
+++ b/reference/logging-library/.project
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>logging-library</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.springframework.ide.eclipse.core.springbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.springframework.ide.eclipse.core.springnature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/reference/logging-library/src/main/java/org/onap/logging/LoggingReference.java b/reference/logging-library/src/main/java/org/onap/logging/library/LoggingReference.java
index ccca682..534e7cf 100644
--- a/reference/logging-library/src/main/java/org/onap/logging/LoggingReference.java
+++ b/reference/logging-library/src/main/java/org/onap/logging/library/LoggingReference.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.logging;
+package org.onap.logging.library;
public class LoggingReference {
diff --git a/reference/logging-mock-service/.classpath b/reference/logging-mock-service/.classpath
new file mode 100644
index 0000000..16bf974
--- /dev/null
+++ b/reference/logging-mock-service/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/reference/logging-mock-service/.project b/reference/logging-mock-service/.project
new file mode 100644
index 0000000..8e8b873
--- /dev/null
+++ b/reference/logging-mock-service/.project
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>logging-mock-service</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.springframework.ide.eclipse.core.springbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.springframework.ide.eclipse.core.springnature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>