Test8

From 84c036b3bc6d8313b86317d752b92c417bd89d7f Mon Sep 17 00:00:00 2001 From: Michael O'Brien Date: Sun, 14 Jan 2018 19:03:01 -0500 Subject: initial logging project structure Issue-ID: LOG-120 Change-Id: If96346fa4f35b81ec01aacc087f96875011e5f82 Signed-off-by: Michael O'Brien --- reference/.gitignore | 2 + reference/logging-demo/.gitignore | 3 + reference/logging-demo/pom.xml | 270 +++++++++++++++++++++ .../src/main/java/META-INF/MANIFEST.MF | 3 + .../java/org/onap/logging/ApplicationService.java | 34 +++ .../org/onap/logging/ApplicationServiceLocal.java | 27 +++ .../java/org/onap/logging/RestApplication.java | 42 ++++ .../org/onap/logging/RestHealthServiceImpl.java | 56 +++++ .../java/org/onap/logging/RestServiceImpl.java | 59 +++++ .../src/main/webapp/META-INF/MANIFEST.MF | 3 + .../src/main/webapp/WEB-INF/servlet-context.xml | 13 + .../src/main/webapp/WEB-INF/spring.xml | 40 +++ .../logging-demo/src/main/webapp/WEB-INF/web.xml | 41 ++++ reference/logging-demo/src/main/webapp/index.jsp | 18 ++ reference/logging-library/.gitignore | 2 + reference/logging-library/pom.xml | 66 +++++ .../java/org/onap/logging/LoggingReference.java | 26 ++ reference/logging-mock-service/.gitignore | 2 + reference/logging-mock-service/pom.xml | 72 ++++++ .../java/org/onap/logging/LoggingReference.java | 26 ++ reference/pom.xml | 115 +++++++++ 21 files changed, 920 insertions(+) create mode 100644 reference/.gitignore create mode 100644 reference/logging-demo/.gitignore create mode 100644 reference/logging-demo/pom.xml create mode 100644 reference/logging-demo/src/main/java/META-INF/MANIFEST.MF create mode 100644 reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java create mode 100644 reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java create mode 100644 reference/logging-demo/src/main/java/org/onap/logging/RestApplication.java create mode 100644 reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java create mode 100644 reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java create mode 100644 reference/logging-demo/src/main/webapp/META-INF/MANIFEST.MF create mode 100644 reference/logging-demo/src/main/webapp/WEB-INF/servlet-context.xml create mode 100644 reference/logging-demo/src/main/webapp/WEB-INF/spring.xml create mode 100644 reference/logging-demo/src/main/webapp/WEB-INF/web.xml create mode 100644 reference/logging-demo/src/main/webapp/index.jsp create mode 100644 reference/logging-library/.gitignore create mode 100644 reference/logging-library/pom.xml create mode 100644 reference/logging-library/src/main/java/org/onap/logging/LoggingReference.java create mode 100644 reference/logging-mock-service/.gitignore create mode 100644 reference/logging-mock-service/pom.xml create mode 100644 reference/logging-mock-service/src/main/java/org/onap/logging/LoggingReference.java create mode 100644 reference/pom.xml diff --git a/reference/.gitignore b/reference/.gitignore new file mode 100644 index 0000000..99d2bb1 --- /dev/null +++ b/reference/.gitignore @@ -0,0 +1,2 @@ +/target/ +/build/ diff --git a/reference/logging-demo/.gitignore b/reference/logging-demo/.gitignore new file mode 100644 index 0000000..eeca7fe --- /dev/null +++ b/reference/logging-demo/.gitignore @@ -0,0 +1,3 @@ +/target/ +/build/ +/bin/ diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml new file mode 100644 index 0000000..da22ff8 --- /dev/null +++ b/reference/logging-demo/pom.xml @@ -0,0 +1,270 @@ + + 4.0.0 + + org.onap.logging + logging-reference + 1.2.0-SNAPSHOT + + + logging-demo + war + + logging-demo + + + 2.5.1 + 4.3.6.RELEASE + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.8 + 1.8 + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-compiler-plugin + + + [3.2,) + + + testCompile + + + + + + + + + + + + + + + + org.onap.logging + logging-library + 1.2.0-SNAPSHOT + + + org.onap.logging + logging-mock-service + 1.2.0-SNAPSHOT + + + + + + javax.ws.rs + javax.ws.rs-api + 2.0.1 + + + org.glassfish.jersey.containers + jersey-container-servlet + 2.23 + + + org.glassfish.jersey.core + jersey-server + 2.23 + + + org.glassfish.jersey.core + jersey-client + 2.23 + + + org.glassfish.jersey.media + jersey-media-multipart + 2.23 + + + + org.glassfish.jersey.media + jersey-media-json-jackson + 2.23 + + + + org.glassfish.jersey.ext + jersey-spring3 + 2.23 + + + + spring-context + org.springframework + + + spring-core + org.springframework + + + spring-web + org.springframework + + + spring-beans + org.springframework + + + + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson-2-version} + + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-2-version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-2-version} + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson-2-version} + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-2-version} + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson-2-version} + + + com.owlike + genson + 1.1 + + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-orm + ${spring.version} + + + org.springframework + spring-oxm + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + + + + org.springframework + spring-aspects + ${spring.version} + + + org.aspectj + aspectjrt + 1.8.1 + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + + + diff --git a/reference/logging-demo/src/main/java/META-INF/MANIFEST.MF b/reference/logging-demo/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000..254272e --- /dev/null +++ b/reference/logging-demo/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java b/reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java new file mode 100644 index 0000000..09a8afb --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java @@ -0,0 +1,34 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.logging; + +import org.springframework.stereotype.Service; +@Service("daoFacade") +public class ApplicationService implements ApplicationServiceLocal { + + @Override + public Boolean health() { + Boolean health = true; + // TODO: check database + return health; + } + +} diff --git a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java b/reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java new file mode 100644 index 0000000..cc583c9 --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java @@ -0,0 +1,27 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.logging; + +import java.util.List; + +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/logging/RestApplication.java new file mode 100644 index 0000000..2b729ae --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/logging/RestApplication.java @@ -0,0 +1,42 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.logging; + +import java.util.HashSet; +import java.util.Set; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("read") +public class RestApplication extends Application { + + @Override + public Set> getClasses() { + Set> classes = new HashSet>(); + // http://127.0.0.1:8180/logging-demo/rest/health/health + // http://127.0.0.1:8180/logging-demo/rest/read/test + classes.add(RestServiceImpl.class); + classes.add(RestHealthServiceImpl.class); + return classes; + } +} diff --git a/reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java b/reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java new file mode 100644 index 0000000..24b4486 --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java @@ -0,0 +1,56 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.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 { + @Inject + @Qualifier("daoFacade") + private ApplicationServiceLocal applicationServiceLocal; + + @GET + @Path("/health") + @Produces(MediaType.TEXT_HTML) + public String getHealth() { + return applicationServiceLocal.health().toString(); + } + +} + diff --git a/reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java b/reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java new file mode 100644 index 0000000..515662e --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java @@ -0,0 +1,59 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.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 { + @Inject + @Qualifier("daoFacade") + private ApplicationServiceLocal applicationServiceLocal; + + @GET + @Path("/test") + @Produces(MediaType.TEXT_HTML) + public String getTest() { + return "testing: " + applicationServiceLocal; + } + + private ApplicationServiceLocal getApplicationService() { + return applicationServiceLocal; + } +} + diff --git a/reference/logging-demo/src/main/webapp/META-INF/MANIFEST.MF b/reference/logging-demo/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000..254272e --- /dev/null +++ b/reference/logging-demo/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/reference/logging-demo/src/main/webapp/WEB-INF/servlet-context.xml b/reference/logging-demo/src/main/webapp/WEB-INF/servlet-context.xml new file mode 100644 index 0000000..18b1154 --- /dev/null +++ b/reference/logging-demo/src/main/webapp/WEB-INF/servlet-context.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/reference/logging-demo/src/main/webapp/WEB-INF/spring.xml b/reference/logging-demo/src/main/webapp/WEB-INF/spring.xml new file mode 100644 index 0000000..fd3d6ab --- /dev/null +++ b/reference/logging-demo/src/main/webapp/WEB-INF/spring.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + diff --git a/reference/logging-demo/src/main/webapp/WEB-INF/web.xml b/reference/logging-demo/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..dd62a9c --- /dev/null +++ b/reference/logging-demo/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,41 @@ + + + + 30 + + + index.jsp + + + + JAX-RS Tools Generated - Do not modify + JAX-RS Servlet + org.glassfish.jersey.servlet.ServletContainer + + javax.ws.rs.Application + org.onap.logging.RestApplication + + + jersey.config.server.provider.packages + org.onap.logging + + 1 + + + JAX-RS Servlet + /rest/* + + + + contextConfigLocation + /WEB-INF/spring.xml + + + + org.springframework.web.context.ContextLoaderListener + + + + org.springframework.web.context.request.RequestContextListener + + diff --git a/reference/logging-demo/src/main/webapp/index.jsp b/reference/logging-demo/src/main/webapp/index.jsp new file mode 100644 index 0000000..734e905 --- /dev/null +++ b/reference/logging-demo/src/main/webapp/index.jsp @@ -0,0 +1,18 @@ + + + + + + +Test8 + + + +Test + + + \ No newline at end of file diff --git a/reference/logging-library/.gitignore b/reference/logging-library/.gitignore new file mode 100644 index 0000000..99d2bb1 --- /dev/null +++ b/reference/logging-library/.gitignore @@ -0,0 +1,2 @@ +/target/ +/build/ diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml new file mode 100644 index 0000000..2bd9f6d --- /dev/null +++ b/reference/logging-library/pom.xml @@ -0,0 +1,66 @@ + + 4.0.0 + + org.onap.logging + logging-reference + 1.2.0-SNAPSHOT + + + logging-library + jar + 1.2.0-SNAPSHOT + logging-library + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.8 + 1.8 + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-compiler-plugin + + + [3.2,) + + + testCompile + + + + + + + + + + + + + + + + + + diff --git a/reference/logging-library/src/main/java/org/onap/logging/LoggingReference.java b/reference/logging-library/src/main/java/org/onap/logging/LoggingReference.java new file mode 100644 index 0000000..ccca682 --- /dev/null +++ b/reference/logging-library/src/main/java/org/onap/logging/LoggingReference.java @@ -0,0 +1,26 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.logging; + +public class LoggingReference { + +} diff --git a/reference/logging-mock-service/.gitignore b/reference/logging-mock-service/.gitignore new file mode 100644 index 0000000..99d2bb1 --- /dev/null +++ b/reference/logging-mock-service/.gitignore @@ -0,0 +1,2 @@ +/target/ +/build/ diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml new file mode 100644 index 0000000..79f68af --- /dev/null +++ b/reference/logging-mock-service/pom.xml @@ -0,0 +1,72 @@ + + 4.0.0 + + org.onap.logging + logging-reference + 1.2.0-SNAPSHOT + + + logging-mock-service + jar + 1.2.0-SNAPSHOT + logging-mock-service + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.8 + 1.8 + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-compiler-plugin + + + [3.2,) + + + testCompile + + + + + + + + + + + + + + + + + + org.onap.logging + logging-library + 1.2.0-SNAPSHOT + + + + diff --git a/reference/logging-mock-service/src/main/java/org/onap/logging/LoggingReference.java b/reference/logging-mock-service/src/main/java/org/onap/logging/LoggingReference.java new file mode 100644 index 0000000..ccca682 --- /dev/null +++ b/reference/logging-mock-service/src/main/java/org/onap/logging/LoggingReference.java @@ -0,0 +1,26 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.logging + * ================================================================================ + * Copyright © 2018 Amdocs + * 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.logging; + +public class LoggingReference { + +} diff --git a/reference/pom.xml b/reference/pom.xml new file mode 100644 index 0000000..a52ff5f --- /dev/null +++ b/reference/pom.xml @@ -0,0 +1,115 @@ + + 4.0.0 + + org.onap.oparent + oparent + 1.1.0-SNAPSHOT + + + org.onap.logging + logging-reference + pom + 1.2.0-SNAPSHOT + logging-reference + + http://maven.apache.org + + + logging-demo + logging-library + logging-mock-service + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + maven-release-plugin + 2.4.2 + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.8.1 + + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-compiler-plugin + + + [3.2,) + + + compile + + + + + + + + + + + + + + + UTF-8 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + + checkstyle + + + + + + + + + com.att.eelf + eelf-core + 1.0.0 + + + -- cgit 1.2.3-korg