diff options
author | Michael O'Brien <frank.obrien@amdocs.com> | 2018-01-14 19:03:01 -0500 |
---|---|---|
committer | Michael O'Brien <frank.obrien@amdocs.com> | 2018-01-14 19:04:02 -0500 |
commit | 84c036b3bc6d8313b86317d752b92c417bd89d7f (patch) | |
tree | b47703ce2be47c14d3fd91598412f00785beb0cc /reference/logging-demo/src | |
parent | f8b1ef78741ae64adf79f677296a5c33e7d07ae4 (diff) |
initial logging project structure
Issue-ID: LOG-120
Change-Id: If96346fa4f35b81ec01aacc087f96875011e5f82
Signed-off-by: Michael O'Brien <frank.obrien@amdocs.com>
Diffstat (limited to 'reference/logging-demo/src')
11 files changed, 336 insertions, 0 deletions
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<Class<?>> getClasses() { + Set<Class<?>> classes = new HashSet<Class<?>>(); + // 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans:beans xmlns="http://www.springframework.org/schema/mvc" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/mvc + http://www.springframework.org/schema/mvc/spring-mvc.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context.xsd"> + <annotation-driven /> +</beans:beans>
\ 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:util="http://www.springframework.org/schema/util" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:p="http://www.springframework.org/schema/p" + xmlns:jpa="http://www.springframework.org/schema/data/jpa" + xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:mvc="http://www.springframework.org/schema/mvc" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/data/jpa + http://www.springframework.org/schema/data/jpa/spring-jpa.xsd + http://www.springframework.org/schema/mvc + http://www.springframework.org/schema/mvc/spring-mvc.xsd + http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop/spring-aop.xsd" + default-lazy-init="true"> + + <context:annotation-config /> + <context:spring-configured /> + <!-- 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:include-filter type="annotation" expression="org.springframework.stereotype.Repository" /> + </context:component-scan> + <!-- Rest controllers --> + <context:component-scan base-package="org.onap.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 new file mode 100644 index 0000000..dd62a9c --- /dev/null +++ b/reference/logging-demo/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"> + <session-config> + <session-timeout>30</session-timeout> + </session-config> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + <!-- https://jersey.java.net/apidocs/2.0/jersey/org/glassfish/jersey/servlet/ServletContainer.html --> + <servlet> + <description>JAX-RS Tools Generated - Do not modify</description> + <servlet-name>JAX-RS Servlet</servlet-name> + <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> + </init-param> + <init-param> + <param-name>jersey.config.server.provider.packages</param-name> + <param-value>org.onap.logging</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>JAX-RS Servlet</servlet-name> + <url-pattern>/rest/*</url-pattern> + </servlet-mapping> + + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>/WEB-INF/spring.xml</param-value> + </context-param> + + <listener> + <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + </listener> + + <listener> + <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class> + </listener> +</web-app> 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 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"> + <jsp:directive.page contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" session="false"/> + <jsp:output doctype-root-element="html" + doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" + doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" + omit-xml-declaration="true" /> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>Test8</title> + +</head> +<body> +Test +</body> +</html> +</jsp:root>
\ No newline at end of file |