diff --git a/web-admin/src/main/java/org/openhubframework/openhub/OpenHubApplication.java b/web-admin/src/main/java/org/openhubframework/openhub/OpenHubApplication.java
index c9a6761c..b92e4328 100644
--- 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/web-admin/src/main/java/org/openhubframework/openhub/config/package-info.java b/web-admin/src/main/java/org/openhubframework/openhub/admin/web/configuration/rpc/DbConfigurationRpc.java
similarity index 70%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/package-info.java
rename to web-admin/src/main/java/org/openhubframework/openhub/admin/web/configuration/rpc/DbConfigurationRpc.java
index bbaa964b..7eebb0f6 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/package-info.java
+++ b/web-admin/src/main/java/org/openhubframework/openhub/admin/web/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;
\ No newline at end of file
+public class DbConfigurationRpc {
+
+}
diff --git a/web-admin/src/main/java/org/openhubframework/openhub/admin/web/console/ConsoleController.java b/web-admin/src/main/java/org/openhubframework/openhub/admin/web/console/ConsoleController.java
index 167b192c..8fc82a13 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/admin/web/console/ConsoleController.java
+++ b/web-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/web-admin/src/main/java/org/openhubframework/openhub/admin/web/filter/RequestResponseLoggingFilter.java b/web-admin/src/main/java/org/openhubframework/openhub/web/RequestResponseLoggingFilter.java
similarity index 99%
rename from web-admin/src/main/java/org/openhubframework/openhub/admin/web/filter/RequestResponseLoggingFilter.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/RequestResponseLoggingFilter.java
index 62fe835d..22f5511a 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/admin/web/filter/RequestResponseLoggingFilter.java
+++ b/web-admin/src/main/java/org/openhubframework/openhub/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
index e890cb30..62f5ffb6 100644
--- 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/web-admin/src/main/java/org/openhubframework/openhub/config/CamelRoutesConfig.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/CamelRoutesConfig.java
similarity index 97%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/CamelRoutesConfig.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/CamelRoutesConfig.java
index a1f8be29..7b5924a0 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/CamelRoutesConfig.java
+++ b/web-admin/src/main/java/org/openhubframework/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/web-admin/src/main/java/org/openhubframework/openhub/config/DefaultSecurityUsers.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/DefaultSecurityUsers.java
similarity index 97%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/DefaultSecurityUsers.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/DefaultSecurityUsers.java
index fbcd254c..8872061c 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/DefaultSecurityUsers.java
+++ b/web-admin/src/main/java/org/openhubframework/openhub/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/web-admin/src/main/java/org/openhubframework/openhub/config/GlobalSecurityConfig.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/GlobalSecurityConfig.java
similarity index 98%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/GlobalSecurityConfig.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/GlobalSecurityConfig.java
index b936b608..7ffc7280 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/GlobalSecurityConfig.java
+++ b/web-admin/src/main/java/org/openhubframework/openhub/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/web-admin/src/main/java/org/openhubframework/openhub/config/JacksonConfiguration.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/JacksonConfiguration.java
similarity index 98%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/JacksonConfiguration.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/JacksonConfiguration.java
index 63e95949..360b5681 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/JacksonConfiguration.java
+++ b/web-admin/src/main/java/org/openhubframework/openhub/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/web-admin/src/main/java/org/openhubframework/openhub/config/JavaMelodyConfigurationProperties.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/JavaMelodyConfigurationProperties.java
similarity index 98%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/JavaMelodyConfigurationProperties.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/JavaMelodyConfigurationProperties.java
index 383b0cc4..535088a0 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/JavaMelodyConfigurationProperties.java
+++ b/web-admin/src/main/java/org/openhubframework/openhub/web/config/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/web-admin/src/main/java/org/openhubframework/openhub/web/WebConfigurer.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/WebConfigurer.java
similarity index 97%
rename from web-admin/src/main/java/org/openhubframework/openhub/web/WebConfigurer.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/WebConfigurer.java
index caaa51f2..abf9972f 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/web/WebConfigurer.java
+++ b/web-admin/src/main/java/org/openhubframework/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/web-admin/src/main/java/org/openhubframework/openhub/config/WebContextConfig.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/WebContextConfig.java
similarity index 96%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/WebContextConfig.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/WebContextConfig.java
index d21a3a57..d0ebc64e 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/WebContextConfig.java
+++ b/web-admin/src/main/java/org/openhubframework/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/web-admin/src/main/java/org/openhubframework/openhub/config/WebSecurityConfig.java b/web-admin/src/main/java/org/openhubframework/openhub/web/config/WebSecurityConfig.java
similarity index 96%
rename from web-admin/src/main/java/org/openhubframework/openhub/config/WebSecurityConfig.java
rename to web-admin/src/main/java/org/openhubframework/openhub/web/config/WebSecurityConfig.java
index 7b8cf958..737ce47f 100644
--- a/web-admin/src/main/java/org/openhubframework/openhub/config/WebSecurityConfig.java
+++ b/web-admin/src/main/java/org/openhubframework/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
index 38f097a9..77629017 100644
--- 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
\ No newline at end of file
+ org.openhubframework.openhub.web.config.GlobalSecurityConfig
\ No newline at end of file
diff --git a/web-admin/src/main/resources/application.properties b/web-admin/src/main/resources/application.properties
index e711c504..bce8f859 100644
--- 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
index 2dc54f06..1114a57b 100644
--- a/web-admin/src/main/resources/ohf-logback.xml
+++ b/web-admin/src/main/resources/ohf-logback.xml
@@ -60,7 +60,7 @@
-
+