Refactor web package from gitop.core to gitop.web.

commons.hibernate/pom.xml

@@ -7,7 +7,7 @@
         <groupId>com.pmease</groupId>  
         <version>1.0.28</version> 
     </parent>  
-    <artifactId>commons.persistence</artifactId>  
+    <artifactId>commons.hibernate</artifactId>  
     <build> 
         <plugins> 
             <plugin> 
@@ -102,7 +102,7 @@
         </repository> 
     </repositories>  
     <properties> 
-        <moduleClass>com.pmease.commons.persistence.PersistenceModule</moduleClass>  
+        <moduleClass>com.pmease.commons.hibernate.HibernateModule</moduleClass>  
         <hibernateVersion>4.2.0.Final</hibernateVersion>  
         <bonecpVersion>0.8.0-rc1</bonecpVersion> 
     </properties>  

commons.hibernate/src/main/java/com/pmease/commons/hibernate/AbstractEntity.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import java.io.Serializable;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/ConfigurationProvider.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import java.lang.reflect.Modifier;
 import java.util.Collection;
@@ -14,8 +14,8 @@ import org.hibernate.cfg.NamingStrategy;
 
 import com.google.inject.Provider;
 import com.pmease.commons.bootstrap.Bootstrap;
+import com.pmease.commons.hibernate.extensionpoints.ModelContribution;
 import com.pmease.commons.loader.PluginManager;
-import com.pmease.commons.persistence.extensionpoints.ModelContribution;
 import com.pmease.commons.util.ClassUtils;
 import com.pmease.commons.util.StringUtils;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/Hibernate.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/HibernateFilter.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import java.io.IOException;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/HibernateModule.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import java.util.Properties;
 
@@ -10,12 +10,12 @@ import org.hibernate.cfg.NamingStrategy;
 
 import com.google.inject.matcher.Matchers;
 import com.google.inject.util.Providers;
+import com.pmease.commons.hibernate.dao.DefaultGeneralDao;
+import com.pmease.commons.hibernate.dao.GeneralDao;
 import com.pmease.commons.loader.AbstractPlugin;
 import com.pmease.commons.loader.AbstractPluginModule;
-import com.pmease.commons.persistence.dao.GeneralDao;
-import com.pmease.commons.persistence.dao.DefaultGeneralDao;
 
-public class PersistenceModule extends AbstractPluginModule {
+public class HibernateModule extends AbstractPluginModule {
 
 	@Override
 	protected void configure() {
@@ -46,7 +46,7 @@ public class PersistenceModule extends AbstractPluginModule {
 
 	@Override
 	protected Class<? extends AbstractPlugin> getPluginClass() {
-		return PersistencePlugin.class;
+		return HibernatePlugin.class;
 	}
 	
 }

commons.hibernate/src/main/java/com/pmease/commons/hibernate/HibernatePlugin.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import java.util.Collection;
 import java.util.EnumSet;
@@ -13,14 +13,14 @@ import com.google.inject.Inject;
 import com.pmease.commons.jetty.extensionpoints.ServletContextConfigurator;
 import com.pmease.commons.loader.AbstractPlugin;
 
-public class PersistencePlugin extends AbstractPlugin {
+public class HibernatePlugin extends AbstractPlugin {
 
 	private final PersistService persistService;
 	
 	private final HibernateFilter hibernateFilter;
 
 	@Inject
-	public PersistencePlugin(PersistService persistService, HibernateFilter hibernateFilter) {
+	public HibernatePlugin(PersistService persistService, HibernateFilter hibernateFilter) {
 		this.persistService = persistService;
 		this.hibernateFilter = hibernateFilter;
 	}

commons.hibernate/src/main/java/com/pmease/commons/hibernate/HibernateUtils.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import org.hibernate.proxy.HibernateProxy;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/PersistService.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import com.pmease.commons.bootstrap.Lifecycle;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/PersistServiceImpl.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import org.hibernate.SessionFactory;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/PrefixedNamingStrategy.java

@@ -6,7 +6,7 @@
  * 
  * Revision: $Id: PersistenceNamingStrategy.java 1209 2008-07-28 00:16:18Z robin $
  */
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.cfg.ImprovedNamingStrategy;

commons.hibernate/src/main/java/com/pmease/commons/hibernate/SessionProvider.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import javax.inject.Provider;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/TransactionInterceptor.java

@@ -6,7 +6,7 @@
  * 
  * Revision: $Id: TransactionInterceptor.java 1209 2008-07-28 00:16:18Z robin $
  */
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

commons.hibernate/src/main/java/com/pmease/commons/hibernate/Transactional.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

commons.hibernate/src/main/java/com/pmease/commons/hibernate/UnitOfWork.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;

commons.hibernate/src/main/java/com/pmease/commons/hibernate/UnitOfWorkImpl.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence;
+package com.pmease.commons.hibernate;
 
 import java.util.Stack;
 

commons.hibernate/src/main/java/com/pmease/commons/hibernate/dao/DefaultGeneralDao.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence.dao;
+package com.pmease.commons.hibernate.dao;
 
 import java.util.List;
 
@@ -11,8 +11,8 @@ import org.hibernate.criterion.Projections;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
-import com.pmease.commons.persistence.AbstractEntity;
-import com.pmease.commons.persistence.Transactional;
+import com.pmease.commons.hibernate.AbstractEntity;
+import com.pmease.commons.hibernate.Transactional;
 
 @Singleton
 @SuppressWarnings("unchecked")

commons.hibernate/src/main/java/com/pmease/commons/hibernate/dao/DefaultGenericDao.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence.dao;
+package com.pmease.commons.hibernate.dao;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Order;
 
 import com.google.inject.Inject;
-import com.pmease.commons.persistence.AbstractEntity;
+import com.pmease.commons.hibernate.AbstractEntity;
 import com.pmease.commons.util.ClassUtils;
 
 public class DefaultGenericDao<T extends AbstractEntity> implements GenericDao<T> {

commons.hibernate/src/main/java/com/pmease/commons/hibernate/dao/GeneralDao.java

@@ -1,11 +1,11 @@
-package com.pmease.commons.persistence.dao;
+package com.pmease.commons.hibernate.dao;
 
 import java.util.List;
 
 import org.hibernate.HibernateException;
 import org.hibernate.criterion.DetachedCriteria;
 
-import com.pmease.commons.persistence.AbstractEntity;
+import com.pmease.commons.hibernate.AbstractEntity;
 
 public interface GeneralDao {
 	

commons.hibernate/src/main/java/com/pmease/commons/hibernate/dao/GenericDao.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.persistence.dao;
+package com.pmease.commons.hibernate.dao;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 
-import com.pmease.commons.persistence.AbstractEntity;
+import com.pmease.commons.hibernate.AbstractEntity;
 
 public interface GenericDao<T extends AbstractEntity> {
 	

commons.hibernate/src/main/java/com/pmease/commons/hibernate/extensionpoints/ModelContribution.java

@@ -1,8 +1,8 @@
-package com.pmease.commons.persistence.extensionpoints;
+package com.pmease.commons.hibernate.extensionpoints;
 
 import java.util.Collection;
 
-import com.pmease.commons.persistence.AbstractEntity;
+import com.pmease.commons.hibernate.AbstractEntity;
 
 public interface ModelContribution {
 	Collection<Class<? extends AbstractEntity>> getModelClasses();

commons.jersey/pom.xml

@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">  
     <modelVersion>4.0.0</modelVersion>  
-    <artifactId>commons.rest</artifactId>  
+    <artifactId>commons.jersey</artifactId>  
     <parent> 
         <groupId>com.pmease</groupId>  
         <artifactId>parent.general</artifactId>  
@@ -45,7 +45,7 @@
         </dependency>  
         <dependency> 
             <groupId>com.pmease</groupId>  
-            <artifactId>commons.security</artifactId>  
+            <artifactId>commons.shiro</artifactId>  
             <version>1.0.30</version> 
         </dependency> 
     </dependencies>  
@@ -67,7 +67,7 @@
         </repository> 
     </repositories>  
     <properties> 
-        <moduleClass>com.pmease.commons.rest.RestModule</moduleClass>  
+        <moduleClass>com.pmease.commons.jersey.JerseyModule</moduleClass>  
         <jerseyVersion>1.17</jerseyVersion> 
     </properties>  
     <version>1.0.30</version> 

commons.jersey/src/main/java/com/pmease/commons/jersey/DummyResource.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.rest;
+package com.pmease.commons.jersey;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

commons.jersey/src/main/java/com/pmease/commons/jersey/JerseyModule.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.rest;
+package com.pmease.commons.jersey;
 
 import com.pmease.commons.loader.AbstractPlugin;
 import com.pmease.commons.loader.AbstractPluginModule;
@@ -11,7 +11,7 @@ import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
  * you've renamed this class.
  * 
  */
-public class RestModule extends AbstractPluginModule {
+public class JerseyModule extends AbstractPluginModule {
 
 	@Override
 	protected void configure() {
@@ -30,7 +30,7 @@ public class RestModule extends AbstractPluginModule {
 			}
 			
 			protected String getRestPath() {
-				return "/" + RestPlugin.REST_PATH + "/*";
+				return "/" + JerseyPlugin.REST_PATH + "/*";
 			}
 			
 		});
@@ -38,7 +38,7 @@ public class RestModule extends AbstractPluginModule {
 
 	@Override
 	protected Class<? extends AbstractPlugin> getPluginClass() {
-		return RestPlugin.class;
+		return JerseyPlugin.class;
 	}
 
 }

commons.jersey/src/main/java/com/pmease/commons/jersey/JerseyPlugin.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.rest;
+package com.pmease.commons.jersey;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -6,9 +6,9 @@ import java.util.Collection;
 import org.apache.shiro.web.filter.mgt.FilterChainManager;
 
 import com.pmease.commons.loader.AbstractPlugin;
-import com.pmease.commons.security.extensionpoint.FilterChainConfigurator;
+import com.pmease.commons.shiro.extensionpoint.FilterChainConfigurator;
 
-public class RestPlugin extends AbstractPlugin {
+public class JerseyPlugin extends AbstractPlugin {
 
 	public static final String REST_PATH = "rest";
 	

commons.shiro/pom.xml

@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">  
     <modelVersion>4.0.0</modelVersion>  
-    <artifactId>commons.security</artifactId>  
+    <artifactId>commons.shiro</artifactId>  
     <parent> 
         <groupId>com.pmease</groupId>  
         <artifactId>parent.general</artifactId>  
@@ -45,7 +45,7 @@
         </dependency>  
         <dependency> 
             <groupId>com.pmease</groupId>  
-            <artifactId>commons.persistence</artifactId>  
+            <artifactId>commons.hibernate</artifactId>  
             <version>1.0.30</version> 
         </dependency>  
         <dependency> 
@@ -72,7 +72,7 @@
         </repository> 
     </repositories>  
     <properties> 
-        <moduleClass>com.pmease.commons.security.SecurityModule</moduleClass>  
+        <moduleClass>com.pmease.commons.shiro.ShiroModule</moduleClass>  
         <shiroVersion>1.2.2</shiroVersion> 
     </properties>  
     <version>1.0.30</version> 

commons.shiro/src/main/java/com/pmease/commons/shiro/AbstractRealm.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -18,7 +18,7 @@ import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Restrictions;
 
 import com.google.inject.Inject;
-import com.pmease.commons.persistence.dao.GeneralDao;
+import com.pmease.commons.hibernate.dao.GeneralDao;
 import com.pmease.commons.util.ClassUtils;
 
 public abstract class AbstractRealm<T extends AbstractUser> extends AuthorizingRealm {

commons.shiro/src/main/java/com/pmease/commons/shiro/AbstractUser.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
@@ -7,7 +7,7 @@ import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.apache.shiro.subject.SimplePrincipalCollection;
 
-import com.pmease.commons.persistence.AbstractEntity;
+import com.pmease.commons.hibernate.AbstractEntity;
 
 @SuppressWarnings("serial")
 @MappedSuperclass

commons.shiro/src/main/java/com/pmease/commons/shiro/BasicAuthenticationFilter.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import java.io.IOException;
 import java.util.Locale;

commons.shiro/src/main/java/com/pmease/commons/shiro/DefaultFilterChainResolver.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -7,7 +7,7 @@ import org.apache.shiro.web.filter.mgt.FilterChainManager;
 import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
 
 import com.pmease.commons.loader.PluginManager;
-import com.pmease.commons.security.extensionpoint.FilterChainConfigurator;
+import com.pmease.commons.shiro.extensionpoint.FilterChainConfigurator;
 
 @Singleton
 public class DefaultFilterChainResolver extends PathMatchingFilterChainResolver {

commons.shiro/src/main/java/com/pmease/commons/shiro/DefaultPasswordMatcher.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

commons.shiro/src/main/java/com/pmease/commons/shiro/DefaultWebEnvironment.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import org.apache.shiro.ShiroException;
 import org.apache.shiro.util.Destroyable;

commons.shiro/src/main/java/com/pmease/commons/shiro/DefaultWebSecurityManager.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

commons.shiro/src/main/java/com/pmease/commons/shiro/SecurityHelper.java

@@ -1,10 +1,10 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import org.apache.shiro.SecurityUtils;
 
 import com.google.common.base.Preconditions;
+import com.pmease.commons.hibernate.dao.GeneralDao;
 import com.pmease.commons.loader.AppLoader;
-import com.pmease.commons.persistence.dao.GeneralDao;
 
 public class SecurityHelper extends SecurityUtils {
 	

commons.shiro/src/main/java/com/pmease/commons/shiro/ShiroModule.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import javax.inject.Singleton;
 
@@ -16,7 +16,7 @@ import com.pmease.commons.loader.AbstractPluginModule;
  * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
  *
  */
-public class SecurityModule extends AbstractPluginModule {
+public class ShiroModule extends AbstractPluginModule {
 
 	@Override
 	protected void configure() {
@@ -34,7 +34,7 @@ public class SecurityModule extends AbstractPluginModule {
 
 	@Override
 	protected Class<? extends AbstractPlugin> getPluginClass() {
-		return SecurityPlugin.class;
+		return ShiroPlugin.class;
 	}
 
 }

commons.shiro/src/main/java/com/pmease/commons/shiro/ShiroPlugin.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security;
+package com.pmease.commons.shiro;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -15,7 +15,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
 import com.pmease.commons.jetty.extensionpoints.ServletContextConfigurator;
 import com.pmease.commons.loader.AbstractPlugin;
 
-public class SecurityPlugin extends AbstractPlugin {
+public class ShiroPlugin extends AbstractPlugin {
 	
 	@Override
 	public Collection<?> getExtensions() {

commons.shiro/src/main/java/com/pmease/commons/shiro/extensionpoint/FilterChainConfigurator.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.security.extensionpoint;
+package com.pmease.commons.shiro.extensionpoint;
 
 import org.apache.shiro.web.filter.mgt.FilterChainManager;
 

commons.wicket/pom.xml

@@ -7,7 +7,7 @@
         <groupId>com.pmease</groupId>  
         <version>1.0.28</version> 
     </parent>  
-    <artifactId>commons.web</artifactId>  
+    <artifactId>commons.wicket</artifactId>  
     <build> 
         <plugins> 
             <plugin> 
@@ -60,7 +60,7 @@
         </dependency> 
     </dependencies>  
     <properties> 
-        <moduleClass>com.pmease.commons.web.WebModule</moduleClass>  
+        <moduleClass>com.pmease.commons.wicket.WicketModule</moduleClass>  
         <wicketVersion>6.8.0</wicketVersion> 
     </properties>  
     <repositories> 

commons.wicket/src/main/java/com/pmease/commons/wicket/AbstractWicketConfig.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web;
+package com.pmease.commons.wicket;
 
 import javax.servlet.http.HttpServletRequest;
 

commons.wicket/src/main/java/com/pmease/commons/wicket/DefaultWicketFilter.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web;
+package com.pmease.commons.wicket;
 
 import org.apache.wicket.protocol.http.IWebApplicationFactory;
 import org.apache.wicket.protocol.http.WebApplication;

commons.wicket/src/main/java/com/pmease/commons/wicket/DefaultWicketServlet.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web;
+package com.pmease.commons.wicket;
 
 import javax.inject.Inject;
 

commons.wicket/src/main/java/com/pmease/commons/wicket/WicketModule.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web;
+package com.pmease.commons.wicket;
 
 import org.apache.wicket.protocol.http.WicketFilter;
 import org.apache.wicket.protocol.http.WicketServlet;
@@ -6,7 +6,7 @@ import org.apache.wicket.protocol.http.WicketServlet;
 import com.pmease.commons.loader.AbstractPlugin;
 import com.pmease.commons.loader.AbstractPluginModule;
 
-public class WebModule extends AbstractPluginModule {
+public class WicketModule extends AbstractPluginModule {
 
 	@Override
 	protected void configure() {
@@ -18,7 +18,7 @@ public class WebModule extends AbstractPluginModule {
 
 	@Override
 	protected Class<? extends AbstractPlugin> getPluginClass() {
-		return WebPlugin.class;
+		return WicketPlugin.class;
 	}
 
 }

commons.wicket/src/main/java/com/pmease/commons/wicket/WicketPlugin.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web;
+package com.pmease.commons.wicket;
 
 import java.util.Collection;
 
@@ -12,12 +12,12 @@ import com.google.common.collect.ImmutableList;
 import com.pmease.commons.jetty.extensionpoints.ServletContextConfigurator;
 import com.pmease.commons.loader.AbstractPlugin;
 
-public class WebPlugin extends AbstractPlugin {
+public class WicketPlugin extends AbstractPlugin {
 
 	private final WicketServlet wicketServlet;
 	
 	@Inject
-	public WebPlugin(WicketServlet wicketServlet) {
+	public WicketPlugin(WicketServlet wicketServlet) {
 		this.wicketServlet = wicketServlet;
 	}
 	

commons.wicket/src/main/java/com/pmease/commons/wicket/ajaxlistener/CompositeAjaxCallListener.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.ajaxlistener;
+package com.pmease.commons.wicket.ajaxlistener;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.attributes.IAjaxCallListener;

commons.wicket/src/main/java/com/pmease/commons/wicket/ajaxlistener/ajaxloadingindicator/AjaxLoadingIndicator.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.ajaxlistener.ajaxloadingindicator;
+package com.pmease.commons.wicket.ajaxlistener.ajaxloadingindicator;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.attributes.IAjaxCallListener;

commons.wicket/src/main/java/com/pmease/commons/wicket/ajaxlistener/ajaxloadingoverlay/AjaxLoadingOverlay.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.ajaxlistener.ajaxloadingoverlay;
+package com.pmease.commons.wicket.ajaxlistener.ajaxloadingoverlay;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.attributes.IAjaxCallListener;

commons.wicket/src/main/java/com/pmease/commons/wicket/asset/CommonResourceReference.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.asset;
+package com.pmease.commons.wicket.asset;
 
 import java.util.Arrays;
 
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
-import com.pmease.commons.web.asset.bootstrap.BootstrapResourceReference;
+import com.pmease.commons.wicket.asset.bootstrap.BootstrapResourceReference;
 
 public class CommonResourceReference extends JavaScriptResourceReference {
 

commons.wicket/src/main/java/com/pmease/commons/wicket/asset/bootstrap/BootstrapResourceReference.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.asset.bootstrap;
+package com.pmease.commons.wicket.asset.bootstrap;
 
 import java.util.Arrays;
 

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/confirm/ConfirmBehavior.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.confirm;
+package com.pmease.commons.wicket.behavior.confirm;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.wicket.Component;
@@ -14,7 +14,7 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
 import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.web.behavior.modal.ModalResourceReference;
+import com.pmease.commons.wicket.behavior.modal.ModalResourceReference;
 
 @SuppressWarnings("serial")
 public class ConfirmBehavior extends Behavior {

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/dropdown/DropdownAlignment.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.dropdown;
+package com.pmease.commons.wicket.behavior.dropdown;
 
 import java.io.Serializable;
 

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/dropdown/DropdownBehavior.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.dropdown;
+package com.pmease.commons.wicket.behavior.dropdown;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/dropdown/DropdownPanel.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.dropdown;
+package com.pmease.commons.wicket.behavior.dropdown;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/dropdown/DropdownResourceReference.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.dropdown;
+package com.pmease.commons.wicket.behavior.dropdown;
 
 import java.util.Arrays;
 
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
-import com.pmease.commons.web.asset.bootstrap.BootstrapResourceReference;
+import com.pmease.commons.wicket.asset.bootstrap.BootstrapResourceReference;
 
 public class DropdownResourceReference extends JavaScriptResourceReference {
 

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/menu/ContentPanel.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.menu;
+package com.pmease.commons.wicket.behavior.menu;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.LoadableDetachableModel;
 
-import com.pmease.commons.web.behavior.dropdown.DropdownAlignment;
+import com.pmease.commons.wicket.behavior.dropdown.DropdownAlignment;
 
 @SuppressWarnings("serial")
 abstract class ContentPanel extends Panel {

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/menu/Menu.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.menu;
+package com.pmease.commons.wicket.behavior.menu;
 
 import java.util.List;
 

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/menu/MenuBehavior.java

@@ -1,11 +1,11 @@
-package com.pmease.commons.web.behavior.menu;
+package com.pmease.commons.wicket.behavior.menu;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.request.resource.CssResourceReference;
 
-import com.pmease.commons.web.behavior.dropdown.DropdownBehavior;
+import com.pmease.commons.wicket.behavior.dropdown.DropdownBehavior;
 
 @SuppressWarnings("serial")
 public class MenuBehavior extends DropdownBehavior {

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/menu/MenuDivider.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.menu;
+package com.pmease.commons.wicket.behavior.menu;
 
 import org.apache.wicket.Component;
 

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/menu/MenuItem.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.menu;
+package com.pmease.commons.wicket.behavior.menu;
 
 import java.io.Serializable;
 

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/menu/MenuPanel.java

@@ -1,11 +1,11 @@
-package com.pmease.commons.web.behavior.menu;
+package com.pmease.commons.wicket.behavior.menu;
 
 import java.util.List;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 
-import com.pmease.commons.web.behavior.dropdown.DropdownPanel;
+import com.pmease.commons.wicket.behavior.dropdown.DropdownPanel;
 
 @SuppressWarnings("serial")
 public abstract class MenuPanel extends DropdownPanel {

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/modal/ModalBehavior.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.modal;
+package com.pmease.commons.wicket.behavior.modal;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/modal/ModalPanel.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.modal;
+package com.pmease.commons.wicket.behavior.modal;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/modal/ModalResourceReference.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.modal;
+package com.pmease.commons.wicket.behavior.modal;
 
 import java.util.Arrays;
 
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
-import com.pmease.commons.web.asset.bootstrap.BootstrapResourceReference;
+import com.pmease.commons.wicket.asset.bootstrap.BootstrapResourceReference;
 
 public class ModalResourceReference extends JavaScriptResourceReference {
 

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/popover/ContentPanel.java

@@ -1,4 +1,4 @@
-package com.pmease.commons.web.behavior.popover;
+package com.pmease.commons.wicket.behavior.popover;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.basic.Label;

commons.wicket/src/main/java/com/pmease/commons/wicket/behavior/popover/PopoverBehavior.java

@@ -1,13 +1,13 @@
-package com.pmease.commons.web.behavior.popover;
+package com.pmease.commons.wicket.behavior.popover;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.request.resource.CssResourceReference;
 
-import com.pmease.commons.web.behavior.dropdown.DropdownAlignment;
-import com.pmease.commons.web.behavior.dropdown.DropdownBehavior;
-import com.pmease.commons.web.behavior.dropdown.DropdownAlignment.INDICATOR_MODE;
+import com.pmease.commons.wicket.behavior.dropdown.DropdownAlignment;
+import com.pmease.commons.wicket.behavior.dropdown.DropdownBehavior;
+import com.pmease.commons.wicket.behavior.dropdown.DropdownAlignment.INDICATOR_MODE;
 
 @SuppressWarnings("serial")
 public class PopoverBehavior extends DropdownBehavior {