Admin GUI - DB system parameters management

- moved web/config Issue: OHFJIRA-55
OpenWiseSolutions · Mar 22, 2017 · 95482ef · 95482ef
1 parent dc9770a
commit 95482ef
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 35 deletions.
diff --git a/web-admin/src/main/java/org/openhubframework/openhub/OpenHubApplication.java b/web-admin/src/main/java/org/openhubframework/openhub/OpenHubApplication.java
@@ -33,13 +33,13 @@
 import org.openhubframework.openhub.api.route.CamelConfiguration;
 import org.openhubframework.openhub.common.AutoConfiguration;
 import org.openhubframework.openhub.common.log.LogContextFilter;
-import org.openhubframework.openhub.config.CamelRoutesConfig;
-import org.openhubframework.openhub.config.GlobalSecurityConfig;
-import org.openhubframework.openhub.config.WebContextConfig;
-import org.openhubframework.openhub.config.WebSecurityConfig;
 import org.openhubframework.openhub.core.config.CamelConfig;
 import org.openhubframework.openhub.core.config.JpaConfig;
 import org.openhubframework.openhub.core.config.WebServiceConfig;
+import org.openhubframework.openhub.web.config.CamelRoutesConfig;
+import org.openhubframework.openhub.web.config.GlobalSecurityConfig;
+import org.openhubframework.openhub.web.config.WebContextConfig;
+import org.openhubframework.openhub.web.config.WebSecurityConfig;
 
 
 /**

diff --git a/...ramework/openhub/config/package-info.java → ...configuration/rpc/DbConfigurationRpc.java b/...ramework/openhub/config/package-info.java → ...configuration/rpc/DbConfigurationRpc.java
@@ -1,11 +1,11 @@
 /*
- *  Copyright 2017 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * 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
+ * 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,
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
+package org.openhubframework.openhub.admin.web.configuration.rpc;
+
 /**
- * Package of general OpenHub configuration. 
- *
- * @author Tomas Hanus
+ * @author Petr Juza
  * @since 2.0
  */
-package org.openhubframework.openhub.config;
+public class DbConfigurationRpc {
+
+}
diff --git a/...admin/src/main/java/org/openhubframework/openhub/admin/web/console/ConsoleController.java b/...admin/src/main/java/org/openhubframework/openhub/admin/web/console/ConsoleController.java
@@ -16,13 +16,15 @@
 
 package org.openhubframework.openhub.admin.web.console;
 
-import org.openhubframework.openhub.config.JavaMelodyConfigurationProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.openhubframework.openhub.web.config.JavaMelodyConfigurationProperties;
+
+
 /**
  * Controller for displaying admin console directory of actions
  *

diff --git a/.../filter/RequestResponseLoggingFilter.java → ...hub/web/RequestResponseLoggingFilter.java b/.../filter/RequestResponseLoggingFilter.java → ...hub/web/RequestResponseLoggingFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.admin.web.filter;
+package org.openhubframework.openhub.web;
 
 import static org.springframework.util.StringUtils.hasText;
 

diff --git a/web-admin/src/main/java/org/openhubframework/openhub/web/config/AdminSecurityConfig.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/AdminSecurityConfig.java
@@ -17,7 +17,7 @@
 package org.openhubframework.openhub.web.config;
 
 import static org.openhubframework.openhub.api.route.RouteConstants.WEB_URI_PREFIX;
-import static org.openhubframework.openhub.config.GlobalSecurityConfig.DEFAULT_PATH_PATTERN;
+import static org.openhubframework.openhub.web.config.GlobalSecurityConfig.DEFAULT_PATH_PATTERN;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -28,8 +28,6 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 import org.openhubframework.openhub.api.route.RouteConstants;
-import org.openhubframework.openhub.config.GlobalSecurityConfig;
-import org.openhubframework.openhub.config.WebSecurityConfig;
 
 
 /**

diff --git a/...ork/openhub/config/CamelRoutesConfig.java → ...openhub/web/config/CamelRoutesConfig.java b/...ork/openhub/config/CamelRoutesConfig.java → ...openhub/web/config/CamelRoutesConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.config;
+package org.openhubframework.openhub.web.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

diff --git a/.../openhub/config/DefaultSecurityUsers.java → ...nhub/web/config/DefaultSecurityUsers.java b/.../openhub/config/DefaultSecurityUsers.java → ...nhub/web/config/DefaultSecurityUsers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.config;
+package org.openhubframework.openhub.web.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

diff --git a/.../openhub/config/GlobalSecurityConfig.java → ...nhub/web/config/GlobalSecurityConfig.java b/.../openhub/config/GlobalSecurityConfig.java → ...nhub/web/config/GlobalSecurityConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.config;
+package org.openhubframework.openhub.web.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;

diff --git a/.../openhub/config/JacksonConfiguration.java → ...nhub/web/config/JacksonConfiguration.java b/.../openhub/config/JacksonConfiguration.java → ...nhub/web/config/JacksonConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.config;
+package org.openhubframework.openhub.web.config;
 
 import java.util.TimeZone;
 

diff --git a/...ig/JavaMelodyConfigurationProperties.java → ...ig/JavaMelodyConfigurationProperties.java b/...ig/JavaMelodyConfigurationProperties.java → ...ig/JavaMelodyConfigurationProperties.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.config;
+package org.openhubframework.openhub.web.config;
+
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Configuration properties for JavaMelody.
  *

diff --git a/...bframework/openhub/web/WebConfigurer.java → ...ork/openhub/web/config/WebConfigurer.java b/...bframework/openhub/web/WebConfigurer.java → ...ork/openhub/web/config/WebConfigurer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.web;
+package org.openhubframework.openhub.web.config;
 
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -26,7 +26,6 @@
 import org.springframework.ws.transport.http.WebServiceMessageReceiverHandlerAdapter;
 
 import org.openhubframework.openhub.api.route.RouteConstants;
-import org.openhubframework.openhub.config.WebContextConfig;
 import org.openhubframework.openhub.core.common.ws.ErrorCodeAwareWebServiceMessageReceiverHandlerAdapter;
 
 

diff --git a/...work/openhub/config/WebContextConfig.java → .../openhub/web/config/WebContextConfig.java b/...work/openhub/config/WebContextConfig.java → .../openhub/web/config/WebContextConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.config;
+package org.openhubframework.openhub.web.config;
 
 import static org.openhubframework.openhub.api.route.RouteConstants.WEB_URI_PREFIX_MAPPING;
 
@@ -45,16 +45,13 @@
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
-import org.openhubframework.openhub.web.config.AdminMvcConfig;
-import org.openhubframework.openhub.web.config.CorsProperties;
-import org.openhubframework.openhub.admin.web.filter.RequestResponseLoggingFilter;
 import org.openhubframework.openhub.api.exception.ErrorExtEnum;
 import org.openhubframework.openhub.api.route.RouteConstants;
 import org.openhubframework.openhub.common.AutoConfiguration;
 import org.openhubframework.openhub.common.Profiles;
 import org.openhubframework.openhub.core.confcheck.ConfigurationChecker;
 import org.openhubframework.openhub.modules.ErrorEnum;
-import org.openhubframework.openhub.web.WebConfigurer;
+import org.openhubframework.openhub.web.RequestResponseLoggingFilter;
 
 
 /**

diff --git a/...ork/openhub/config/WebSecurityConfig.java → ...openhub/web/config/WebSecurityConfig.java b/...ork/openhub/config/WebSecurityConfig.java → ...openhub/web/config/WebSecurityConfig.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.openhubframework.openhub.config;
+package org.openhubframework.openhub.web.config;
 
 import static org.openhubframework.openhub.api.route.RouteConstants.WS_AUTH_POLICY;
 import static org.openhubframework.openhub.api.route.RouteConstants.WS_URI_PREFIX;
-import static org.openhubframework.openhub.config.GlobalSecurityConfig.DEFAULT_PATH_PATTERN;
+import static org.openhubframework.openhub.web.config.GlobalSecurityConfig.DEFAULT_PATH_PATTERN;
 
 import java.util.Collections;
 

diff --git a/web-admin/src/main/resources/META-INF/spring.factories b/web-admin/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-	org.openhubframework.openhub.config.GlobalSecurityConfig
+	org.openhubframework.openhub.web.config.GlobalSecurityConfig
diff --git a/web-admin/src/main/resources/application.properties b/web-admin/src/main/resources/application.properties
@@ -32,7 +32,7 @@ logging.file=openhub.log
 #logging.level.*= # levels for loggers, e.g. "logging.level.org.springframework=DEBUG" (TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF)
 logging.level.org.openhubframework.openhub=INFO
 # DEBUG level for logging request/response for REST layer
-logging.level.org.openhubframework.openhub.admin.web.filter.RequestResponseLoggingFilter=DEBUG
+logging.level.org.openhubframework.openhub.web.RequestResponseLoggingFilter=DEBUG
 
 
 # ===============================

diff --git a/web-admin/src/main/resources/ohf-logback.xml b/web-admin/src/main/resources/ohf-logback.xml
@@ -60,7 +60,7 @@
 
     <!-- OpenHub integration framework namespaces -->
     <logger name="org.openhubframework.openhub" level="${logging.level.org.openhubframework.openhub:-INFO}"/>
-    <logger name="org.openhubframework.openhub.admin.web.filter.RequestResponseLoggingFilter" level="${logging.level.org.openhubframework.openhub.admin.web.filter.RequestResponseLoggingFilter:-DEBUG}"/>
+    <logger name="org.openhubframework.openhub.web.RequestResponseLoggingFilter" level="${logging.level.org.openhubframework.openhub.admin.web.filter.RequestResponseLoggingFilter:-DEBUG}"/>
     <!-- Spring namespaces -->
     <logger name="org.springframework.ws" level="${logging.level.org.springframework.ws:-INFO}"/>
     <!--