From fdd8de8305343fd63347fcd7757577aab52a483a Mon Sep 17 00:00:00 2001 From: Michael O'Brien Date: Sun, 21 Jan 2018 19:50:22 -0500 Subject: add eclipse proj/cp for ide debug Issue-ID: LOG-153 Change-Id: I8f7d2075c30eb32f67155b892175af94972f87be Signed-off-by: Michael O'Brien --- .../org/onap/demo/logging/ApplicationService.java | 34 +++++++++++++ .../onap/demo/logging/ApplicationServiceLocal.java | 25 +++++++++ .../org/onap/demo/logging/RestApplication.java | 42 +++++++++++++++ .../onap/demo/logging/RestHealthServiceImpl.java | 46 +++++++++++++++++ .../org/onap/demo/logging/RestServiceImpl.java | 49 ++++++++++++++++++ .../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/WEB-INF/spring.xml | 4 +- .../logging-demo/src/main/webapp/WEB-INF/web.xml | 4 +- 12 files changed, 200 insertions(+), 222 deletions(-) create mode 100644 reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationService.java create mode 100644 reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationServiceLocal.java create mode 100644 reference/logging-demo/src/main/java/org/onap/demo/logging/RestApplication.java create mode 100644 reference/logging-demo/src/main/java/org/onap/demo/logging/RestHealthServiceImpl.java create mode 100644 reference/logging-demo/src/main/java/org/onap/demo/logging/RestServiceImpl.java delete mode 100644 reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java delete mode 100644 reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java delete mode 100644 reference/logging-demo/src/main/java/org/onap/logging/RestApplication.java delete mode 100644 reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java delete mode 100644 reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java (limited to 'reference/logging-demo/src/main') diff --git a/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationService.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationService.java new file mode 100644 index 0000000..d0355df --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/demo/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.demo.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/demo/logging/ApplicationServiceLocal.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationServiceLocal.java new file mode 100644 index 0000000..ac585fb --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/ApplicationServiceLocal.java @@ -0,0 +1,25 @@ +/** + * ============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.demo.logging; + +public interface ApplicationServiceLocal { + Boolean health(); +} diff --git a/reference/logging-demo/src/main/java/org/onap/demo/logging/RestApplication.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestApplication.java new file mode 100644 index 0000000..b9604f3 --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/demo/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.demo.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/demo/logging/RestHealthServiceImpl.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestHealthServiceImpl.java new file mode 100644 index 0000000..33e3874 --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestHealthServiceImpl.java @@ -0,0 +1,46 @@ +/** + * ============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.demo.logging; + +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.MediaType; + +import org.springframework.beans.factory.annotation.Qualifier; + +@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/demo/logging/RestServiceImpl.java b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestServiceImpl.java new file mode 100644 index 0000000..9dfe884 --- /dev/null +++ b/reference/logging-demo/src/main/java/org/onap/demo/logging/RestServiceImpl.java @@ -0,0 +1,49 @@ +/** + * ============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.demo.logging; + +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.MediaType; + +import org.springframework.beans.factory.annotation.Qualifier; + +@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/java/org/onap/logging/ApplicationService.java b/reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java deleted file mode 100644 index 09a8afb..0000000 --- a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationService.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * ============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 deleted file mode 100644 index cc583c9..0000000 --- a/reference/logging-demo/src/main/java/org/onap/logging/ApplicationServiceLocal.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * ============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 deleted file mode 100644 index 2b729ae..0000000 --- a/reference/logging-demo/src/main/java/org/onap/logging/RestApplication.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * ============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 deleted file mode 100644 index 24b4486..0000000 --- a/reference/logging-demo/src/main/java/org/onap/logging/RestHealthServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * ============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 deleted file mode 100644 index 515662e..0000000 --- a/reference/logging-demo/src/main/java/org/onap/logging/RestServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * ============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/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 @@ - + - + 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 @@ org.glassfish.jersey.servlet.ServletContainer javax.ws.rs.Application - org.onap.logging.RestApplication + org.onap.demo.logging.RestApplication jersey.config.server.provider.packages - org.onap.logging + org.onap.demo.logging 1 -- cgit 1.2.3-korg