From: erik Date: Wed, 14 Apr 2010 20:53:12 +0000 (+0000) Subject: (no commit message) X-Git-Tag: wamblee-utils-0.2.2~4 X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=a503959a4290a415cfe6f668a301e44b4dcde445;p=utils --- diff --git a/trunk/ABOUT.txt b/ABOUT.txt similarity index 100% rename from trunk/ABOUT.txt rename to ABOUT.txt diff --git a/trunk/LICENSE b/LICENSE similarity index 100% rename from trunk/LICENSE rename to LICENSE diff --git a/trunk/README.txt b/README.txt similarity index 100% rename from trunk/README.txt rename to README.txt diff --git a/trunk/TODO.txt b/TODO.txt similarity index 100% rename from trunk/TODO.txt rename to TODO.txt diff --git a/trunk/baseline/pom.xml b/baseline/pom.xml similarity index 100% rename from trunk/baseline/pom.xml rename to baseline/pom.xml diff --git a/trunk/build/checkstyle-noframes.xsl b/build/checkstyle-noframes.xsl similarity index 100% rename from trunk/build/checkstyle-noframes.xsl rename to build/checkstyle-noframes.xsl diff --git a/trunk/build/checkstyle-simple.xsl b/build/checkstyle-simple.xsl similarity index 100% rename from trunk/build/checkstyle-simple.xsl rename to build/checkstyle-simple.xsl diff --git a/trunk/build/style.xml b/build/style.xml similarity index 100% rename from trunk/build/style.xml rename to build/style.xml diff --git a/trunk/hibernate-jpa/pom.xml b/hibernate-jpa/pom.xml similarity index 100% rename from trunk/hibernate-jpa/pom.xml rename to hibernate-jpa/pom.xml diff --git a/trunk/pom.xml b/pom.xml similarity index 100% rename from trunk/pom.xml rename to pom.xml diff --git a/trunk/release.sh b/release.sh similarity index 100% rename from trunk/release.sh rename to release.sh diff --git a/trunk/security/pom.xml b/security/pom.xml similarity index 100% rename from trunk/security/pom.xml rename to security/pom.xml diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/AllOperation.java b/security/src/main/java/org/wamblee/security/authorization/AllOperation.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/AllOperation.java rename to security/src/main/java/org/wamblee/security/authorization/AllOperation.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java b/security/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java rename to security/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationException.java b/security/src/main/java/org/wamblee/security/authorization/AuthorizationException.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationException.java rename to security/src/main/java/org/wamblee/security/authorization/AuthorizationException.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationInitializer.java b/security/src/main/java/org/wamblee/security/authorization/AuthorizationInitializer.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationInitializer.java rename to security/src/main/java/org/wamblee/security/authorization/AuthorizationInitializer.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationResult.java b/security/src/main/java/org/wamblee/security/authorization/AuthorizationResult.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationResult.java rename to security/src/main/java/org/wamblee/security/authorization/AuthorizationResult.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java b/security/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java rename to security/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationService.java b/security/src/main/java/org/wamblee/security/authorization/AuthorizationService.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/AuthorizationService.java rename to security/src/main/java/org/wamblee/security/authorization/AuthorizationService.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/CreateOperation.java b/security/src/main/java/org/wamblee/security/authorization/CreateOperation.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/CreateOperation.java rename to security/src/main/java/org/wamblee/security/authorization/CreateOperation.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java b/security/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java rename to security/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/DefaultOperationRegistry.java b/security/src/main/java/org/wamblee/security/authorization/DefaultOperationRegistry.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/DefaultOperationRegistry.java rename to security/src/main/java/org/wamblee/security/authorization/DefaultOperationRegistry.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/DeleteOperation.java b/security/src/main/java/org/wamblee/security/authorization/DeleteOperation.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/DeleteOperation.java rename to security/src/main/java/org/wamblee/security/authorization/DeleteOperation.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java b/security/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java rename to security/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java b/security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java rename to security/src/main/java/org/wamblee/security/authorization/IsaOperationCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/Operation.java b/security/src/main/java/org/wamblee/security/authorization/Operation.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/Operation.java rename to security/src/main/java/org/wamblee/security/authorization/Operation.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/OperationCondition.java b/security/src/main/java/org/wamblee/security/authorization/OperationCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/OperationCondition.java rename to security/src/main/java/org/wamblee/security/authorization/OperationCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/OperationRegistry.java b/security/src/main/java/org/wamblee/security/authorization/OperationRegistry.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/OperationRegistry.java rename to security/src/main/java/org/wamblee/security/authorization/OperationRegistry.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/PathCondition.java b/security/src/main/java/org/wamblee/security/authorization/PathCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/PathCondition.java rename to security/src/main/java/org/wamblee/security/authorization/PathCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/ReadOperation.java b/security/src/main/java/org/wamblee/security/authorization/ReadOperation.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/ReadOperation.java rename to security/src/main/java/org/wamblee/security/authorization/ReadOperation.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/RegexpPathCondition.java b/security/src/main/java/org/wamblee/security/authorization/RegexpPathCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/RegexpPathCondition.java rename to security/src/main/java/org/wamblee/security/authorization/RegexpPathCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/StartsWithPathCondition.java b/security/src/main/java/org/wamblee/security/authorization/StartsWithPathCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/StartsWithPathCondition.java rename to security/src/main/java/org/wamblee/security/authorization/StartsWithPathCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java b/security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java rename to security/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/UserCondition.java b/security/src/main/java/org/wamblee/security/authorization/UserCondition.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/UserCondition.java rename to security/src/main/java/org/wamblee/security/authorization/UserCondition.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/WriteOperation.java b/security/src/main/java/org/wamblee/security/authorization/WriteOperation.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/WriteOperation.java rename to security/src/main/java/org/wamblee/security/authorization/WriteOperation.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java b/security/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java rename to security/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java diff --git a/trunk/security/src/main/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationService.java b/security/src/main/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationService.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationService.java rename to security/src/main/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationService.java diff --git a/trunk/security/src/main/java/org/wamblee/security/encryption/Md5HexMessageDigester.java b/security/src/main/java/org/wamblee/security/encryption/Md5HexMessageDigester.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/encryption/Md5HexMessageDigester.java rename to security/src/main/java/org/wamblee/security/encryption/Md5HexMessageDigester.java diff --git a/trunk/security/src/main/java/org/wamblee/security/encryption/MessageDigester.java b/security/src/main/java/org/wamblee/security/encryption/MessageDigester.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/security/encryption/MessageDigester.java rename to security/src/main/java/org/wamblee/security/encryption/MessageDigester.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/AbstractUserSet.java b/security/src/main/java/org/wamblee/usermgt/AbstractUserSet.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/AbstractUserSet.java rename to security/src/main/java/org/wamblee/usermgt/AbstractUserSet.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/Group.java b/security/src/main/java/org/wamblee/usermgt/Group.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/Group.java rename to security/src/main/java/org/wamblee/usermgt/Group.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/GroupSet.java b/security/src/main/java/org/wamblee/usermgt/GroupSet.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/GroupSet.java rename to security/src/main/java/org/wamblee/usermgt/GroupSet.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/InMemoryGroupSet.java b/security/src/main/java/org/wamblee/usermgt/InMemoryGroupSet.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/InMemoryGroupSet.java rename to security/src/main/java/org/wamblee/usermgt/InMemoryGroupSet.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java b/security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java rename to security/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java b/security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java rename to security/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/NameValidator.java b/security/src/main/java/org/wamblee/usermgt/NameValidator.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/NameValidator.java rename to security/src/main/java/org/wamblee/usermgt/NameValidator.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/RegexpNameValidator.java b/security/src/main/java/org/wamblee/usermgt/RegexpNameValidator.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/RegexpNameValidator.java rename to security/src/main/java/org/wamblee/usermgt/RegexpNameValidator.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/User.java b/security/src/main/java/org/wamblee/usermgt/User.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/User.java rename to security/src/main/java/org/wamblee/usermgt/User.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/UserAccessor.java b/security/src/main/java/org/wamblee/usermgt/UserAccessor.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/UserAccessor.java rename to security/src/main/java/org/wamblee/usermgt/UserAccessor.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/UserAdminInitializer.java b/security/src/main/java/org/wamblee/usermgt/UserAdminInitializer.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/UserAdminInitializer.java rename to security/src/main/java/org/wamblee/usermgt/UserAdminInitializer.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/UserAdministration.java b/security/src/main/java/org/wamblee/usermgt/UserAdministration.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/UserAdministration.java rename to security/src/main/java/org/wamblee/usermgt/UserAdministration.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java b/security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java rename to security/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java b/security/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java rename to security/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/UserMgtException.java b/security/src/main/java/org/wamblee/usermgt/UserMgtException.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/UserMgtException.java rename to security/src/main/java/org/wamblee/usermgt/UserMgtException.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/UserSet.java b/security/src/main/java/org/wamblee/usermgt/UserSet.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/UserSet.java rename to security/src/main/java/org/wamblee/usermgt/UserSet.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java rename to security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java rename to security/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java b/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java rename to security/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java b/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java rename to security/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java rename to security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java rename to security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java diff --git a/trunk/security/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java b/security/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java similarity index 100% rename from trunk/security/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java rename to security/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java diff --git a/trunk/security/src/main/resources/hbm/AuthorizationRule.hbm.xml b/security/src/main/resources/hbm/AuthorizationRule.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/AuthorizationRule.hbm.xml rename to security/src/main/resources/hbm/AuthorizationRule.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/AuthorizationService.hbm.xml b/security/src/main/resources/hbm/AuthorizationService.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/AuthorizationService.hbm.xml rename to security/src/main/resources/hbm/AuthorizationService.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/Group.hbm.xml b/security/src/main/resources/hbm/Group.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/Group.hbm.xml rename to security/src/main/resources/hbm/Group.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/OperationCondition.hbm.xml b/security/src/main/resources/hbm/OperationCondition.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/OperationCondition.hbm.xml rename to security/src/main/resources/hbm/OperationCondition.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/OperationCondition.hbm.xmlxx b/security/src/main/resources/hbm/OperationCondition.hbm.xmlxx similarity index 100% rename from trunk/security/src/main/resources/hbm/OperationCondition.hbm.xmlxx rename to security/src/main/resources/hbm/OperationCondition.hbm.xmlxx diff --git a/trunk/security/src/main/resources/hbm/PageAuthorizationRule.hbm.xml b/security/src/main/resources/hbm/PageAuthorizationRule.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/PageAuthorizationRule.hbm.xml rename to security/src/main/resources/hbm/PageAuthorizationRule.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/PathCondition.hbm.xml b/security/src/main/resources/hbm/PathCondition.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/PathCondition.hbm.xml rename to security/src/main/resources/hbm/PathCondition.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/PhotoAuthorizationRule.hbm.xml b/security/src/main/resources/hbm/PhotoAuthorizationRule.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/PhotoAuthorizationRule.hbm.xml rename to security/src/main/resources/hbm/PhotoAuthorizationRule.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/TestAuthorizationRule.hbm.xml b/security/src/main/resources/hbm/TestAuthorizationRule.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/TestAuthorizationRule.hbm.xml rename to security/src/main/resources/hbm/TestAuthorizationRule.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/User.hbm.xml b/security/src/main/resources/hbm/User.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/User.hbm.xml rename to security/src/main/resources/hbm/User.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/UserCondition.hbm.xml b/security/src/main/resources/hbm/UserCondition.hbm.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/UserCondition.hbm.xml rename to security/src/main/resources/hbm/UserCondition.hbm.xml diff --git a/trunk/security/src/main/resources/hbm/ehcache.xml b/security/src/main/resources/hbm/ehcache.xml similarity index 100% rename from trunk/security/src/main/resources/hbm/ehcache.xml rename to security/src/main/resources/hbm/ehcache.xml diff --git a/trunk/security/src/main/resources/hbm/hibernate.properties b/security/src/main/resources/hbm/hibernate.properties similarity index 100% rename from trunk/security/src/main/resources/hbm/hibernate.properties rename to security/src/main/resources/hbm/hibernate.properties diff --git a/trunk/security/src/main/resources/properties/org.wamblee.security.ehcache.xml b/security/src/main/resources/properties/org.wamblee.security.ehcache.xml similarity index 100% rename from trunk/security/src/main/resources/properties/org.wamblee.security.ehcache.xml rename to security/src/main/resources/properties/org.wamblee.security.ehcache.xml diff --git a/trunk/security/src/main/resources/spring/org.wamblee.security.authorization.xml b/security/src/main/resources/spring/org.wamblee.security.authorization.xml similarity index 100% rename from trunk/security/src/main/resources/spring/org.wamblee.security.authorization.xml rename to security/src/main/resources/spring/org.wamblee.security.authorization.xml diff --git a/trunk/security/src/main/resources/spring/org.wamblee.security.usermgt-repositories.xml b/security/src/main/resources/spring/org.wamblee.security.usermgt-repositories.xml similarity index 100% rename from trunk/security/src/main/resources/spring/org.wamblee.security.usermgt-repositories.xml rename to security/src/main/resources/spring/org.wamblee.security.usermgt-repositories.xml diff --git a/trunk/security/src/main/resources/spring/org.wamblee.security.usermgt.xml b/security/src/main/resources/spring/org.wamblee.security.usermgt.xml similarity index 100% rename from trunk/security/src/main/resources/spring/org.wamblee.security.usermgt.xml rename to security/src/main/resources/spring/org.wamblee.security.usermgt.xml diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java b/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java rename to security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/DefaultOperationRegistryTest.java b/security/src/test/java/org/wamblee/security/authorization/DefaultOperationRegistryTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/DefaultOperationRegistryTest.java rename to security/src/test/java/org/wamblee/security/authorization/DefaultOperationRegistryTest.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/RegexpPathConditionTest.java b/security/src/test/java/org/wamblee/security/authorization/RegexpPathConditionTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/RegexpPathConditionTest.java rename to security/src/test/java/org/wamblee/security/authorization/RegexpPathConditionTest.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/StartsWithPathConditionTest.java b/security/src/test/java/org/wamblee/security/authorization/StartsWithPathConditionTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/StartsWithPathConditionTest.java rename to security/src/test/java/org/wamblee/security/authorization/StartsWithPathConditionTest.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java b/security/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java rename to security/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/TestResource.java b/security/src/test/java/org/wamblee/security/authorization/TestResource.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/TestResource.java rename to security/src/test/java/org/wamblee/security/authorization/TestResource.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java b/security/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java rename to security/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java b/security/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java rename to security/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java b/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java rename to security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java diff --git a/trunk/security/src/test/java/org/wamblee/security/encryption/MessageDigesterTest.java b/security/src/test/java/org/wamblee/security/encryption/MessageDigesterTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/security/encryption/MessageDigesterTest.java rename to security/src/test/java/org/wamblee/security/encryption/MessageDigesterTest.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java b/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java rename to security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java b/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java rename to security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java b/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java rename to security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/UsermgtTestUtils.java b/security/src/test/java/org/wamblee/usermgt/UsermgtTestUtils.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/UsermgtTestUtils.java rename to security/src/test/java/org/wamblee/usermgt/UsermgtTestUtils.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java rename to security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java rename to security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java rename to security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java b/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java similarity index 100% rename from trunk/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java rename to security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java diff --git a/trunk/security/src/test/resources/properties/test.org.wamblee.security.database.properties b/security/src/test/resources/properties/test.org.wamblee.security.database.properties similarity index 100% rename from trunk/security/src/test/resources/properties/test.org.wamblee.security.database.properties rename to security/src/test/resources/properties/test.org.wamblee.security.database.properties diff --git a/trunk/security/src/test/resources/properties/test.org.wamblee.security.usermgt.properties b/security/src/test/resources/properties/test.org.wamblee.security.usermgt.properties similarity index 100% rename from trunk/security/src/test/resources/properties/test.org.wamblee.security.usermgt.properties rename to security/src/test/resources/properties/test.org.wamblee.security.usermgt.properties diff --git a/trunk/security/src/test/resources/spring/test.org.wamblee.security.datasource.xml b/security/src/test/resources/spring/test.org.wamblee.security.datasource.xml similarity index 100% rename from trunk/security/src/test/resources/spring/test.org.wamblee.security.datasource.xml rename to security/src/test/resources/spring/test.org.wamblee.security.datasource.xml diff --git a/trunk/security/src/test/resources/spring/test.org.wamblee.security.properties.xml b/security/src/test/resources/spring/test.org.wamblee.security.properties.xml similarity index 100% rename from trunk/security/src/test/resources/spring/test.org.wamblee.security.properties.xml rename to security/src/test/resources/spring/test.org.wamblee.security.properties.xml diff --git a/trunk/security/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml b/security/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml similarity index 100% rename from trunk/security/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml rename to security/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml diff --git a/trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml b/security/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml similarity index 100% rename from trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml rename to security/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml diff --git a/trunk/support/general/pom.xml b/support/general/pom.xml similarity index 100% rename from trunk/support/general/pom.xml rename to support/general/pom.xml diff --git a/trunk/support/general/src/main/java/org/wamblee/cache/Cache.java b/support/general/src/main/java/org/wamblee/cache/Cache.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/cache/Cache.java rename to support/general/src/main/java/org/wamblee/cache/Cache.java diff --git a/trunk/support/general/src/main/java/org/wamblee/cache/CachedObject.java b/support/general/src/main/java/org/wamblee/cache/CachedObject.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/cache/CachedObject.java rename to support/general/src/main/java/org/wamblee/cache/CachedObject.java diff --git a/trunk/support/general/src/main/java/org/wamblee/cache/EhCache.java b/support/general/src/main/java/org/wamblee/cache/EhCache.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/cache/EhCache.java rename to support/general/src/main/java/org/wamblee/cache/EhCache.java diff --git a/trunk/support/general/src/main/java/org/wamblee/cache/ForeverCache.java b/support/general/src/main/java/org/wamblee/cache/ForeverCache.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/cache/ForeverCache.java rename to support/general/src/main/java/org/wamblee/cache/ForeverCache.java diff --git a/trunk/support/general/src/main/java/org/wamblee/cache/ZeroCache.java b/support/general/src/main/java/org/wamblee/cache/ZeroCache.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/cache/ZeroCache.java rename to support/general/src/main/java/org/wamblee/cache/ZeroCache.java diff --git a/trunk/support/general/src/main/java/org/wamblee/cache/package.html b/support/general/src/main/java/org/wamblee/cache/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/cache/package.html rename to support/general/src/main/java/org/wamblee/cache/package.html diff --git a/trunk/support/general/src/main/java/org/wamblee/collections/CollectionFilter.java b/support/general/src/main/java/org/wamblee/collections/CollectionFilter.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/collections/CollectionFilter.java rename to support/general/src/main/java/org/wamblee/collections/CollectionFilter.java diff --git a/trunk/support/general/src/main/java/org/wamblee/concurrency/JvmLock.java b/support/general/src/main/java/org/wamblee/concurrency/JvmLock.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/concurrency/JvmLock.java rename to support/general/src/main/java/org/wamblee/concurrency/JvmLock.java diff --git a/trunk/support/general/src/main/java/org/wamblee/concurrency/Lock.java b/support/general/src/main/java/org/wamblee/concurrency/Lock.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/concurrency/Lock.java rename to support/general/src/main/java/org/wamblee/concurrency/Lock.java diff --git a/trunk/support/general/src/main/java/org/wamblee/concurrency/ReadWriteLock.java b/support/general/src/main/java/org/wamblee/concurrency/ReadWriteLock.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/concurrency/ReadWriteLock.java rename to support/general/src/main/java/org/wamblee/concurrency/ReadWriteLock.java diff --git a/trunk/support/general/src/main/java/org/wamblee/concurrency/package.html b/support/general/src/main/java/org/wamblee/concurrency/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/concurrency/package.html rename to support/general/src/main/java/org/wamblee/concurrency/package.html diff --git a/trunk/support/general/src/main/java/org/wamblee/conditions/AndCondition.java b/support/general/src/main/java/org/wamblee/conditions/AndCondition.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/conditions/AndCondition.java rename to support/general/src/main/java/org/wamblee/conditions/AndCondition.java diff --git a/trunk/support/general/src/main/java/org/wamblee/conditions/Condition.java b/support/general/src/main/java/org/wamblee/conditions/Condition.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/conditions/Condition.java rename to support/general/src/main/java/org/wamblee/conditions/Condition.java diff --git a/trunk/support/general/src/main/java/org/wamblee/conditions/FixedCondition.java b/support/general/src/main/java/org/wamblee/conditions/FixedCondition.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/conditions/FixedCondition.java rename to support/general/src/main/java/org/wamblee/conditions/FixedCondition.java diff --git a/trunk/support/general/src/main/java/org/wamblee/conditions/OrCondition.java b/support/general/src/main/java/org/wamblee/conditions/OrCondition.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/conditions/OrCondition.java rename to support/general/src/main/java/org/wamblee/conditions/OrCondition.java diff --git a/trunk/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java b/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java rename to support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java diff --git a/trunk/support/general/src/main/java/org/wamblee/conditions/package.html b/support/general/src/main/java/org/wamblee/conditions/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/conditions/package.html rename to support/general/src/main/java/org/wamblee/conditions/package.html diff --git a/trunk/support/general/src/main/java/org/wamblee/general/BeanFactory.java b/support/general/src/main/java/org/wamblee/general/BeanFactory.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/general/BeanFactory.java rename to support/general/src/main/java/org/wamblee/general/BeanFactory.java diff --git a/trunk/support/general/src/main/java/org/wamblee/general/BeanFactoryException.java b/support/general/src/main/java/org/wamblee/general/BeanFactoryException.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/general/BeanFactoryException.java rename to support/general/src/main/java/org/wamblee/general/BeanFactoryException.java diff --git a/trunk/support/general/src/main/java/org/wamblee/general/BeanKernel.java b/support/general/src/main/java/org/wamblee/general/BeanKernel.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/general/BeanKernel.java rename to support/general/src/main/java/org/wamblee/general/BeanKernel.java diff --git a/trunk/support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java b/support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java rename to support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java diff --git a/trunk/support/general/src/main/java/org/wamblee/general/Pair.java b/support/general/src/main/java/org/wamblee/general/Pair.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/general/Pair.java rename to support/general/src/main/java/org/wamblee/general/Pair.java diff --git a/trunk/support/general/src/main/java/org/wamblee/general/package.html b/support/general/src/main/java/org/wamblee/general/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/general/package.html rename to support/general/src/main/java/org/wamblee/general/package.html diff --git a/trunk/support/general/src/main/java/org/wamblee/io/ClassPathResource.java b/support/general/src/main/java/org/wamblee/io/ClassPathResource.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/io/ClassPathResource.java rename to support/general/src/main/java/org/wamblee/io/ClassPathResource.java diff --git a/trunk/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java b/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java rename to support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java diff --git a/trunk/support/general/src/main/java/org/wamblee/io/FileResource.java b/support/general/src/main/java/org/wamblee/io/FileResource.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/io/FileResource.java rename to support/general/src/main/java/org/wamblee/io/FileResource.java diff --git a/trunk/support/general/src/main/java/org/wamblee/io/InputResource.java b/support/general/src/main/java/org/wamblee/io/InputResource.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/io/InputResource.java rename to support/general/src/main/java/org/wamblee/io/InputResource.java diff --git a/trunk/support/general/src/main/java/org/wamblee/io/SimpleProcess.java b/support/general/src/main/java/org/wamblee/io/SimpleProcess.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/io/SimpleProcess.java rename to support/general/src/main/java/org/wamblee/io/SimpleProcess.java diff --git a/trunk/support/general/src/main/java/org/wamblee/io/StreamResource.java b/support/general/src/main/java/org/wamblee/io/StreamResource.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/io/StreamResource.java rename to support/general/src/main/java/org/wamblee/io/StreamResource.java diff --git a/trunk/support/general/src/main/java/org/wamblee/io/package.html b/support/general/src/main/java/org/wamblee/io/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/io/package.html rename to support/general/src/main/java/org/wamblee/io/package.html diff --git a/trunk/support/general/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java b/support/general/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java rename to support/general/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java diff --git a/trunk/support/general/src/main/java/org/wamblee/observer/Observable.java b/support/general/src/main/java/org/wamblee/observer/Observable.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/observer/Observable.java rename to support/general/src/main/java/org/wamblee/observer/Observable.java diff --git a/trunk/support/general/src/main/java/org/wamblee/observer/Observer.java b/support/general/src/main/java/org/wamblee/observer/Observer.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/observer/Observer.java rename to support/general/src/main/java/org/wamblee/observer/Observer.java diff --git a/trunk/support/general/src/main/java/org/wamblee/observer/ObserverNotifier.java b/support/general/src/main/java/org/wamblee/observer/ObserverNotifier.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/observer/ObserverNotifier.java rename to support/general/src/main/java/org/wamblee/observer/ObserverNotifier.java diff --git a/trunk/support/general/src/main/java/org/wamblee/observer/package.html b/support/general/src/main/java/org/wamblee/observer/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/observer/package.html rename to support/general/src/main/java/org/wamblee/observer/package.html diff --git a/trunk/support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java b/support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java rename to support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java diff --git a/trunk/support/general/src/main/java/org/wamblee/persistence/Persistent.java b/support/general/src/main/java/org/wamblee/persistence/Persistent.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/persistence/Persistent.java rename to support/general/src/main/java/org/wamblee/persistence/Persistent.java diff --git a/trunk/support/general/src/main/java/org/wamblee/persistence/package.html b/support/general/src/main/java/org/wamblee/persistence/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/persistence/package.html rename to support/general/src/main/java/org/wamblee/persistence/package.html diff --git a/trunk/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java b/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java rename to support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java diff --git a/trunk/support/general/src/main/java/org/wamblee/xml/ClasspathUriResolver.java b/support/general/src/main/java/org/wamblee/xml/ClasspathUriResolver.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/xml/ClasspathUriResolver.java rename to support/general/src/main/java/org/wamblee/xml/ClasspathUriResolver.java diff --git a/trunk/support/general/src/main/java/org/wamblee/xml/DomUtils.java b/support/general/src/main/java/org/wamblee/xml/DomUtils.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/xml/DomUtils.java rename to support/general/src/main/java/org/wamblee/xml/DomUtils.java diff --git a/trunk/support/general/src/main/java/org/wamblee/xml/XMLException.java b/support/general/src/main/java/org/wamblee/xml/XMLException.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/xml/XMLException.java rename to support/general/src/main/java/org/wamblee/xml/XMLException.java diff --git a/trunk/support/general/src/main/java/org/wamblee/xml/XslTransformer.java b/support/general/src/main/java/org/wamblee/xml/XslTransformer.java similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/xml/XslTransformer.java rename to support/general/src/main/java/org/wamblee/xml/XslTransformer.java diff --git a/trunk/support/general/src/main/java/org/wamblee/xml/package.html b/support/general/src/main/java/org/wamblee/xml/package.html similarity index 100% rename from trunk/support/general/src/main/java/org/wamblee/xml/package.html rename to support/general/src/main/java/org/wamblee/xml/package.html diff --git a/trunk/support/general/src/main/resources/log4j.properties b/support/general/src/main/resources/log4j.properties similarity index 100% rename from trunk/support/general/src/main/resources/log4j.properties rename to support/general/src/main/resources/log4j.properties diff --git a/trunk/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java b/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java rename to support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/collections/CollectionFilterTest.java b/support/general/src/test/java/org/wamblee/collections/CollectionFilterTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/collections/CollectionFilterTest.java rename to support/general/src/test/java/org/wamblee/collections/CollectionFilterTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java b/support/general/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java rename to support/general/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java diff --git a/trunk/support/general/src/test/java/org/wamblee/concurrency/JvmLockTest.java b/support/general/src/test/java/org/wamblee/concurrency/JvmLockTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/concurrency/JvmLockTest.java rename to support/general/src/test/java/org/wamblee/concurrency/JvmLockTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java b/support/general/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java rename to support/general/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java b/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java rename to support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/conditions/GreaterThanCondition.java b/support/general/src/test/java/org/wamblee/conditions/GreaterThanCondition.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/conditions/GreaterThanCondition.java rename to support/general/src/test/java/org/wamblee/conditions/GreaterThanCondition.java diff --git a/trunk/support/general/src/test/java/org/wamblee/conditions/LessThanCondition.java b/support/general/src/test/java/org/wamblee/conditions/LessThanCondition.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/conditions/LessThanCondition.java rename to support/general/src/test/java/org/wamblee/conditions/LessThanCondition.java diff --git a/trunk/support/general/src/test/java/org/wamblee/conditions/OrConditionTest.java b/support/general/src/test/java/org/wamblee/conditions/OrConditionTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/conditions/OrConditionTest.java rename to support/general/src/test/java/org/wamblee/conditions/OrConditionTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java b/support/general/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java rename to support/general/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/conditions/TestBean.java b/support/general/src/test/java/org/wamblee/conditions/TestBean.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/conditions/TestBean.java rename to support/general/src/test/java/org/wamblee/conditions/TestBean.java diff --git a/trunk/support/general/src/test/java/org/wamblee/general/BeanKernelTest.java b/support/general/src/test/java/org/wamblee/general/BeanKernelTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/general/BeanKernelTest.java rename to support/general/src/test/java/org/wamblee/general/BeanKernelTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/general/PairTest.java b/support/general/src/test/java/org/wamblee/general/PairTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/general/PairTest.java rename to support/general/src/test/java/org/wamblee/general/PairTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/general/TestBeanFactory.java b/support/general/src/test/java/org/wamblee/general/TestBeanFactory.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/general/TestBeanFactory.java rename to support/general/src/test/java/org/wamblee/general/TestBeanFactory.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/ClassPathResourceTest.java b/support/general/src/test/java/org/wamblee/io/ClassPathResourceTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/ClassPathResourceTest.java rename to support/general/src/test/java/org/wamblee/io/ClassPathResourceTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java b/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java rename to support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java b/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java rename to support/general/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/FileResourceTest.java b/support/general/src/test/java/org/wamblee/io/FileResourceTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/FileResourceTest.java rename to support/general/src/test/java/org/wamblee/io/FileResourceTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java b/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java rename to support/general/src/test/java/org/wamblee/io/FileSystemUtils.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/StreamResourceTest.java b/support/general/src/test/java/org/wamblee/io/StreamResourceTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/StreamResourceTest.java rename to support/general/src/test/java/org/wamblee/io/StreamResourceTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/TestData.java b/support/general/src/test/java/org/wamblee/io/TestData.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/TestData.java rename to support/general/src/test/java/org/wamblee/io/TestData.java diff --git a/trunk/support/general/src/test/java/org/wamblee/io/TestResource.java b/support/general/src/test/java/org/wamblee/io/TestResource.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/io/TestResource.java rename to support/general/src/test/java/org/wamblee/io/TestResource.java diff --git a/trunk/support/general/src/test/java/org/wamblee/observer/ObservableTest.java b/support/general/src/test/java/org/wamblee/observer/ObservableTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/observer/ObservableTest.java rename to support/general/src/test/java/org/wamblee/observer/ObservableTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/test/AssertionUtils.java b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/test/AssertionUtils.java rename to support/general/src/test/java/org/wamblee/test/AssertionUtils.java diff --git a/trunk/support/general/src/test/java/org/wamblee/test/EventTracker.java b/support/general/src/test/java/org/wamblee/test/EventTracker.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/test/EventTracker.java rename to support/general/src/test/java/org/wamblee/test/EventTracker.java diff --git a/trunk/support/general/src/test/java/org/wamblee/test/TimingUtils.java b/support/general/src/test/java/org/wamblee/test/TimingUtils.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/test/TimingUtils.java rename to support/general/src/test/java/org/wamblee/test/TimingUtils.java diff --git a/trunk/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java b/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java rename to support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java diff --git a/trunk/support/general/src/test/java/org/wamblee/xml/XmlUtils.java b/support/general/src/test/java/org/wamblee/xml/XmlUtils.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/xml/XmlUtils.java rename to support/general/src/test/java/org/wamblee/xml/XmlUtils.java diff --git a/trunk/support/general/src/test/java/org/wamblee/xml/XslTransformerTest.java b/support/general/src/test/java/org/wamblee/xml/XslTransformerTest.java similarity index 100% rename from trunk/support/general/src/test/java/org/wamblee/xml/XslTransformerTest.java rename to support/general/src/test/java/org/wamblee/xml/XslTransformerTest.java diff --git a/trunk/support/general/src/test/resources/org/wamblee/cache/ehcache.xml b/support/general/src/test/resources/org/wamblee/cache/ehcache.xml similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/cache/ehcache.xml rename to support/general/src/test/resources/org/wamblee/cache/ehcache.xml diff --git a/trunk/support/general/src/test/resources/org/wamblee/general/beanRefContext.xml b/support/general/src/test/resources/org/wamblee/general/beanRefContext.xml similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/general/beanRefContext.xml rename to support/general/src/test/resources/org/wamblee/general/beanRefContext.xml diff --git a/trunk/support/general/src/test/resources/org/wamblee/general/beankernel-wrong.properties b/support/general/src/test/resources/org/wamblee/general/beankernel-wrong.properties similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/general/beankernel-wrong.properties rename to support/general/src/test/resources/org/wamblee/general/beankernel-wrong.properties diff --git a/trunk/support/general/src/test/resources/org/wamblee/general/beankernel.properties b/support/general/src/test/resources/org/wamblee/general/beankernel.properties similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/general/beankernel.properties rename to support/general/src/test/resources/org/wamblee/general/beankernel.properties diff --git a/trunk/support/general/src/test/resources/org/wamblee/general/spring1.xml b/support/general/src/test/resources/org/wamblee/general/spring1.xml similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/general/spring1.xml rename to support/general/src/test/resources/org/wamblee/general/spring1.xml diff --git a/trunk/support/general/src/test/resources/org/wamblee/io/myresource.txt b/support/general/src/test/resources/org/wamblee/io/myresource.txt similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/io/myresource.txt rename to support/general/src/test/resources/org/wamblee/io/myresource.txt diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml b/support/general/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml rename to support/general/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/report.xml b/support/general/src/test/resources/org/wamblee/xml/report.xml similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/report.xml rename to support/general/src/test/resources/org/wamblee/xml/report.xml diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml.xsl similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml.xsl rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml.xsl diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml2.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml2.xsl similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/reportToHtml2.xsl rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml2.xsl diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/reportToText.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToText.xsl similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/reportToText.xsl rename to support/general/src/test/resources/org/wamblee/xml/reportToText.xsl diff --git a/trunk/support/general/src/test/resources/org/wamblee/xml/utilities.xsl b/support/general/src/test/resources/org/wamblee/xml/utilities.xsl similarity index 100% rename from trunk/support/general/src/test/resources/org/wamblee/xml/utilities.xsl rename to support/general/src/test/resources/org/wamblee/xml/utilities.xsl diff --git a/trunk/support/pom.xml b/support/pom.xml similarity index 100% rename from trunk/support/pom.xml rename to support/pom.xml diff --git a/trunk/support/spring/pom.xml b/support/spring/pom.xml similarity index 100% rename from trunk/support/spring/pom.xml rename to support/spring/pom.xml diff --git a/trunk/support/spring/src/main/java/org/wamblee/concurrency/spring/LockAdvice.java b/support/spring/src/main/java/org/wamblee/concurrency/spring/LockAdvice.java similarity index 100% rename from trunk/support/spring/src/main/java/org/wamblee/concurrency/spring/LockAdvice.java rename to support/spring/src/main/java/org/wamblee/concurrency/spring/LockAdvice.java diff --git a/trunk/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java b/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java similarity index 100% rename from trunk/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java rename to support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java diff --git a/trunk/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java b/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java similarity index 100% rename from trunk/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java rename to support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java diff --git a/trunk/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java b/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java similarity index 100% rename from trunk/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java rename to support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java diff --git a/trunk/support/spring/src/main/java/org/wamblee/persistence/hibernate/package.html b/support/spring/src/main/java/org/wamblee/persistence/hibernate/package.html similarity index 100% rename from trunk/support/spring/src/main/java/org/wamblee/persistence/hibernate/package.html rename to support/spring/src/main/java/org/wamblee/persistence/hibernate/package.html diff --git a/trunk/support/spring/src/test/java/org/wamblee/concurrency/spring/LockAdviceTest.java b/support/spring/src/test/java/org/wamblee/concurrency/spring/LockAdviceTest.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/concurrency/spring/LockAdviceTest.java rename to support/spring/src/test/java/org/wamblee/concurrency/spring/LockAdviceTest.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java b/support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java rename to support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/general/spring/TestBeanFactory.java b/support/spring/src/test/java/org/wamblee/general/spring/TestBeanFactory.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/general/spring/TestBeanFactory.java rename to support/spring/src/test/java/org/wamblee/general/spring/TestBeanFactory.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/test/spring/HibernateExporter.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateExporter.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/test/spring/HibernateExporter.java rename to support/spring/src/test/java/org/wamblee/test/spring/HibernateExporter.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/test/spring/HibernateUpdater.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUpdater.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/test/spring/HibernateUpdater.java rename to support/spring/src/test/java/org/wamblee/test/spring/HibernateUpdater.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java rename to support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java b/support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java rename to support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallback.java b/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallback.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallback.java rename to support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallback.java diff --git a/trunk/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallbackWithoutResult.java b/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallbackWithoutResult.java similarity index 100% rename from trunk/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallbackWithoutResult.java rename to support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallbackWithoutResult.java diff --git a/trunk/system/TODO.txt b/system/TODO.txt similarity index 100% rename from trunk/system/TODO.txt rename to system/TODO.txt diff --git a/trunk/system/general/pom.xml b/system/general/pom.xml similarity index 100% rename from trunk/system/general/pom.xml rename to system/general/pom.xml diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassAdapter.java b/system/general/src/main/java/org/wamblee/system/adapters/ClassAdapter.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassAdapter.java rename to system/general/src/main/java/org/wamblee/system/adapters/ClassAdapter.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java b/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java rename to system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ConstructorConfiguration.java b/system/general/src/main/java/org/wamblee/system/adapters/ConstructorConfiguration.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/ConstructorConfiguration.java rename to system/general/src/main/java/org/wamblee/system/adapters/ConstructorConfiguration.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/DefaultContainer.java b/system/general/src/main/java/org/wamblee/system/adapters/DefaultContainer.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/DefaultContainer.java rename to system/general/src/main/java/org/wamblee/system/adapters/DefaultContainer.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/FixedValueProvider.java b/system/general/src/main/java/org/wamblee/system/adapters/FixedValueProvider.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/FixedValueProvider.java rename to system/general/src/main/java/org/wamblee/system/adapters/FixedValueProvider.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ObjectAdapter.java b/system/general/src/main/java/org/wamblee/system/adapters/ObjectAdapter.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/ObjectAdapter.java rename to system/general/src/main/java/org/wamblee/system/adapters/ObjectAdapter.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ObjectConfiguration.java b/system/general/src/main/java/org/wamblee/system/adapters/ObjectConfiguration.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/ObjectConfiguration.java rename to system/general/src/main/java/org/wamblee/system/adapters/ObjectConfiguration.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ParameterValues.java b/system/general/src/main/java/org/wamblee/system/adapters/ParameterValues.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/ParameterValues.java rename to system/general/src/main/java/org/wamblee/system/adapters/ParameterValues.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/RequiredInterfaceProvider.java b/system/general/src/main/java/org/wamblee/system/adapters/RequiredInterfaceProvider.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/RequiredInterfaceProvider.java rename to system/general/src/main/java/org/wamblee/system/adapters/RequiredInterfaceProvider.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java b/system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java rename to system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ValueProvider.java b/system/general/src/main/java/org/wamblee/system/adapters/ValueProvider.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/adapters/ValueProvider.java rename to system/general/src/main/java/org/wamblee/system/adapters/ValueProvider.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/components/ORMappingConfig.java b/system/general/src/main/java/org/wamblee/system/components/ORMappingConfig.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/components/ORMappingConfig.java rename to system/general/src/main/java/org/wamblee/system/components/ORMappingConfig.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/components/PropertyComponent.java b/system/general/src/main/java/org/wamblee/system/components/PropertyComponent.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/components/PropertyComponent.java rename to system/general/src/main/java/org/wamblee/system/components/PropertyComponent.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/container/Container.java b/system/general/src/main/java/org/wamblee/system/container/Container.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/container/Container.java rename to system/general/src/main/java/org/wamblee/system/container/Container.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java rename to system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/Component.java b/system/general/src/main/java/org/wamblee/system/core/Component.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/Component.java rename to system/general/src/main/java/org/wamblee/system/core/Component.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java b/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java rename to system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java b/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java rename to system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java b/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java rename to system/general/src/main/java/org/wamblee/system/core/DefaultScope.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/NamedInterface.java b/system/general/src/main/java/org/wamblee/system/core/NamedInterface.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/NamedInterface.java rename to system/general/src/main/java/org/wamblee/system/core/NamedInterface.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/ProvidedInterface.java b/system/general/src/main/java/org/wamblee/system/core/ProvidedInterface.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/ProvidedInterface.java rename to system/general/src/main/java/org/wamblee/system/core/ProvidedInterface.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/ProvidedInterfaceImplementation.java b/system/general/src/main/java/org/wamblee/system/core/ProvidedInterfaceImplementation.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/ProvidedInterfaceImplementation.java rename to system/general/src/main/java/org/wamblee/system/core/ProvidedInterfaceImplementation.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/RequiredInterface.java b/system/general/src/main/java/org/wamblee/system/core/RequiredInterface.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/RequiredInterface.java rename to system/general/src/main/java/org/wamblee/system/core/RequiredInterface.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/Scope.java b/system/general/src/main/java/org/wamblee/system/core/Scope.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/Scope.java rename to system/general/src/main/java/org/wamblee/system/core/Scope.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/SystemAssemblyException.java b/system/general/src/main/java/org/wamblee/system/core/SystemAssemblyException.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/core/SystemAssemblyException.java rename to system/general/src/main/java/org/wamblee/system/core/SystemAssemblyException.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/CompositeEdgeFilter.java b/system/general/src/main/java/org/wamblee/system/graph/CompositeEdgeFilter.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/CompositeEdgeFilter.java rename to system/general/src/main/java/org/wamblee/system/graph/CompositeEdgeFilter.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/DefaultEdge.java b/system/general/src/main/java/org/wamblee/system/graph/DefaultEdge.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/DefaultEdge.java rename to system/general/src/main/java/org/wamblee/system/graph/DefaultEdge.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/DefaultNode.java b/system/general/src/main/java/org/wamblee/system/graph/DefaultNode.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/DefaultNode.java rename to system/general/src/main/java/org/wamblee/system/graph/DefaultNode.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/Edge.java b/system/general/src/main/java/org/wamblee/system/graph/Edge.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/Edge.java rename to system/general/src/main/java/org/wamblee/system/graph/Edge.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/EdgeFactory.java b/system/general/src/main/java/org/wamblee/system/graph/EdgeFactory.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/EdgeFactory.java rename to system/general/src/main/java/org/wamblee/system/graph/EdgeFactory.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/EdgeFilter.java b/system/general/src/main/java/org/wamblee/system/graph/EdgeFilter.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/EdgeFilter.java rename to system/general/src/main/java/org/wamblee/system/graph/EdgeFilter.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/EdgeSelector.java b/system/general/src/main/java/org/wamblee/system/graph/EdgeSelector.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/EdgeSelector.java rename to system/general/src/main/java/org/wamblee/system/graph/EdgeSelector.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/Graph.java b/system/general/src/main/java/org/wamblee/system/graph/Graph.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/Graph.java rename to system/general/src/main/java/org/wamblee/system/graph/Graph.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/Node.java b/system/general/src/main/java/org/wamblee/system/graph/Node.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/Node.java rename to system/general/src/main/java/org/wamblee/system/graph/Node.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/Visitor.java b/system/general/src/main/java/org/wamblee/system/graph/Visitor.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/Visitor.java rename to system/general/src/main/java/org/wamblee/system/graph/Visitor.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyProvidedVisitor.java b/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyProvidedVisitor.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyProvidedVisitor.java rename to system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyProvidedVisitor.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java b/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java rename to system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckRequiredProvidedMultiplicityVisitor.java b/system/general/src/main/java/org/wamblee/system/graph/component/CheckRequiredProvidedMultiplicityVisitor.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckRequiredProvidedMultiplicityVisitor.java rename to system/general/src/main/java/org/wamblee/system/graph/component/CheckRequiredProvidedMultiplicityVisitor.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckStartupDependenciesVisitor.java b/system/general/src/main/java/org/wamblee/system/graph/component/CheckStartupDependenciesVisitor.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/CheckStartupDependenciesVisitor.java rename to system/general/src/main/java/org/wamblee/system/graph/component/CheckStartupDependenciesVisitor.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ComponentGraph.java b/system/general/src/main/java/org/wamblee/system/graph/component/ComponentGraph.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ComponentGraph.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ComponentGraph.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ComponentNode.java b/system/general/src/main/java/org/wamblee/system/graph/component/ComponentNode.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ComponentNode.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ComponentNode.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ExternalProvidedInterfaceNode.java b/system/general/src/main/java/org/wamblee/system/graph/component/ExternalProvidedInterfaceNode.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ExternalProvidedInterfaceNode.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ExternalProvidedInterfaceNode.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ExternalRequiredInterfaceNode.java b/system/general/src/main/java/org/wamblee/system/graph/component/ExternalRequiredInterfaceNode.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ExternalRequiredInterfaceNode.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ExternalRequiredInterfaceNode.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/LinkVisitor.java b/system/general/src/main/java/org/wamblee/system/graph/component/LinkVisitor.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/LinkVisitor.java rename to system/general/src/main/java/org/wamblee/system/graph/component/LinkVisitor.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/ProvidedInterfaceNode.java b/system/general/src/main/java/org/wamblee/system/graph/component/ProvidedInterfaceNode.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/ProvidedInterfaceNode.java rename to system/general/src/main/java/org/wamblee/system/graph/component/ProvidedInterfaceNode.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/RequiredInterfaceNode.java b/system/general/src/main/java/org/wamblee/system/graph/component/RequiredInterfaceNode.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/RequiredInterfaceNode.java rename to system/general/src/main/java/org/wamblee/system/graph/component/RequiredInterfaceNode.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/RequiredProvidedEdgeFactory.java b/system/general/src/main/java/org/wamblee/system/graph/component/RequiredProvidedEdgeFactory.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/RequiredProvidedEdgeFactory.java rename to system/general/src/main/java/org/wamblee/system/graph/component/RequiredProvidedEdgeFactory.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/component/package-info.java b/system/general/src/main/java/org/wamblee/system/graph/component/package-info.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/component/package-info.java rename to system/general/src/main/java/org/wamblee/system/graph/component/package-info.java diff --git a/trunk/system/general/src/main/java/org/wamblee/system/graph/package-info.java b/system/general/src/main/java/org/wamblee/system/graph/package-info.java similarity index 100% rename from trunk/system/general/src/main/java/org/wamblee/system/graph/package-info.java rename to system/general/src/main/java/org/wamblee/system/graph/package-info.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/AdapterTestCase.java b/system/general/src/test/java/org/wamblee/system/adapters/AdapterTestCase.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/AdapterTestCase.java rename to system/general/src/test/java/org/wamblee/system/adapters/AdapterTestCase.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java rename to system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java rename to system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java rename to system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/DefaultContainerTest.java b/system/general/src/test/java/org/wamblee/system/adapters/DefaultContainerTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/DefaultContainerTest.java rename to system/general/src/test/java/org/wamblee/system/adapters/DefaultContainerTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java rename to system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java b/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java rename to system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X1.java b/system/general/src/test/java/org/wamblee/system/adapters/X1.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X1.java rename to system/general/src/test/java/org/wamblee/system/adapters/X1.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X10.java b/system/general/src/test/java/org/wamblee/system/adapters/X10.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X10.java rename to system/general/src/test/java/org/wamblee/system/adapters/X10.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X11.java b/system/general/src/test/java/org/wamblee/system/adapters/X11.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X11.java rename to system/general/src/test/java/org/wamblee/system/adapters/X11.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X2.java b/system/general/src/test/java/org/wamblee/system/adapters/X2.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X2.java rename to system/general/src/test/java/org/wamblee/system/adapters/X2.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X3.java b/system/general/src/test/java/org/wamblee/system/adapters/X3.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X3.java rename to system/general/src/test/java/org/wamblee/system/adapters/X3.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X4.java b/system/general/src/test/java/org/wamblee/system/adapters/X4.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X4.java rename to system/general/src/test/java/org/wamblee/system/adapters/X4.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X5.java b/system/general/src/test/java/org/wamblee/system/adapters/X5.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X5.java rename to system/general/src/test/java/org/wamblee/system/adapters/X5.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X6.java b/system/general/src/test/java/org/wamblee/system/adapters/X6.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X6.java rename to system/general/src/test/java/org/wamblee/system/adapters/X6.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X7.java b/system/general/src/test/java/org/wamblee/system/adapters/X7.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X7.java rename to system/general/src/test/java/org/wamblee/system/adapters/X7.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X8.java b/system/general/src/test/java/org/wamblee/system/adapters/X8.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X8.java rename to system/general/src/test/java/org/wamblee/system/adapters/X8.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/X9.java b/system/general/src/test/java/org/wamblee/system/adapters/X9.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/adapters/X9.java rename to system/general/src/test/java/org/wamblee/system/adapters/X9.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java rename to system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java rename to system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/container/Application.java b/system/general/src/test/java/org/wamblee/system/container/Application.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/container/Application.java rename to system/general/src/test/java/org/wamblee/system/container/Application.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java b/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java rename to system/general/src/test/java/org/wamblee/system/container/ContainerTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/AbstractComponentTest.java b/system/general/src/test/java/org/wamblee/system/core/AbstractComponentTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/AbstractComponentTest.java rename to system/general/src/test/java/org/wamblee/system/core/AbstractComponentTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/DefaultInterfaceDescriptorTest.java b/system/general/src/test/java/org/wamblee/system/core/DefaultInterfaceDescriptorTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/DefaultInterfaceDescriptorTest.java rename to system/general/src/test/java/org/wamblee/system/core/DefaultInterfaceDescriptorTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java b/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java rename to system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java b/system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java rename to system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/Environment.java b/system/general/src/test/java/org/wamblee/system/core/Environment.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/Environment.java rename to system/general/src/test/java/org/wamblee/system/core/Environment.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/IntegerComponent.java b/system/general/src/test/java/org/wamblee/system/core/IntegerComponent.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/IntegerComponent.java rename to system/general/src/test/java/org/wamblee/system/core/IntegerComponent.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/RequiredInterfaceComparator.java b/system/general/src/test/java/org/wamblee/system/core/RequiredInterfaceComparator.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/RequiredInterfaceComparator.java rename to system/general/src/test/java/org/wamblee/system/core/RequiredInterfaceComparator.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/core/StringComponent.java b/system/general/src/test/java/org/wamblee/system/core/StringComponent.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/core/StringComponent.java rename to system/general/src/test/java/org/wamblee/system/core/StringComponent.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java rename to system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/graph/GraphTest.java b/system/general/src/test/java/org/wamblee/system/graph/GraphTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/graph/GraphTest.java rename to system/general/src/test/java/org/wamblee/system/graph/GraphTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/graph/MyEdgeFactory.java b/system/general/src/test/java/org/wamblee/system/graph/MyEdgeFactory.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/graph/MyEdgeFactory.java rename to system/general/src/test/java/org/wamblee/system/graph/MyEdgeFactory.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/graph/MyNode.java b/system/general/src/test/java/org/wamblee/system/graph/MyNode.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/graph/MyNode.java rename to system/general/src/test/java/org/wamblee/system/graph/MyNode.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java rename to system/general/src/test/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedEdgeFilterTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java rename to system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java diff --git a/trunk/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java similarity index 100% rename from trunk/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java rename to system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java diff --git a/trunk/system/pom.xml b/system/pom.xml similarity index 100% rename from trunk/system/pom.xml rename to system/pom.xml diff --git a/trunk/system/spring/pom.xml b/system/spring/pom.xml similarity index 100% rename from trunk/system/spring/pom.xml rename to system/spring/pom.xml diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/ConfiguredProperties.java b/system/spring/src/main/java/org/wamblee/system/spring/ConfiguredProperties.java similarity index 100% rename from trunk/system/spring/src/main/java/org/wamblee/system/spring/ConfiguredProperties.java rename to system/spring/src/main/java/org/wamblee/system/spring/ConfiguredProperties.java diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/PropertySetter.java b/system/spring/src/main/java/org/wamblee/system/spring/PropertySetter.java similarity index 100% rename from trunk/system/spring/src/main/java/org/wamblee/system/spring/PropertySetter.java rename to system/spring/src/main/java/org/wamblee/system/spring/PropertySetter.java diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java b/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java similarity index 100% rename from trunk/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java rename to system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java b/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java similarity index 100% rename from trunk/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java rename to system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/StringResource.java b/system/spring/src/main/java/org/wamblee/system/spring/StringResource.java similarity index 100% rename from trunk/system/spring/src/main/java/org/wamblee/system/spring/StringResource.java rename to system/spring/src/main/java/org/wamblee/system/spring/StringResource.java diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java b/system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java similarity index 100% rename from trunk/system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java rename to system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java diff --git a/trunk/system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java b/system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java similarity index 100% rename from trunk/system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java rename to system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java diff --git a/trunk/system/spring/src/main/resources/properties/org.wamblee.system.spring.component.hibernate.properties b/system/spring/src/main/resources/properties/org.wamblee.system.spring.component.hibernate.properties similarity index 100% rename from trunk/system/spring/src/main/resources/properties/org.wamblee.system.spring.component.hibernate.properties rename to system/spring/src/main/resources/properties/org.wamblee.system.spring.component.hibernate.properties diff --git a/trunk/system/spring/src/main/resources/spring/org.wamblee.system.spring.component.hibernate.xml b/system/spring/src/main/resources/spring/org.wamblee.system.spring.component.hibernate.xml similarity index 100% rename from trunk/system/spring/src/main/resources/spring/org.wamblee.system.spring.component.hibernate.xml rename to system/spring/src/main/resources/spring/org.wamblee.system.spring.component.hibernate.xml diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/BlaService.java b/system/spring/src/test/java/org/wamblee/system/spring/BlaService.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/BlaService.java rename to system/spring/src/test/java/org/wamblee/system/spring/BlaService.java diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/ConfiguredPropertiesTest.java b/system/spring/src/test/java/org/wamblee/system/spring/ConfiguredPropertiesTest.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/ConfiguredPropertiesTest.java rename to system/spring/src/test/java/org/wamblee/system/spring/ConfiguredPropertiesTest.java diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/HelloService.java b/system/spring/src/test/java/org/wamblee/system/spring/HelloService.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/HelloService.java rename to system/spring/src/test/java/org/wamblee/system/spring/HelloService.java diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/HelloService2.java b/system/spring/src/test/java/org/wamblee/system/spring/HelloService2.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/HelloService2.java rename to system/spring/src/test/java/org/wamblee/system/spring/HelloService2.java diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java b/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java rename to system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java b/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java rename to system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent2.java b/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent2.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent2.java rename to system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent2.java diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/component/DatabaseTesterComponent.java b/system/spring/src/test/java/org/wamblee/system/spring/component/DatabaseTesterComponent.java similarity index 100% rename from trunk/system/spring/src/test/java/org/wamblee/system/spring/component/DatabaseTesterComponent.java rename to system/spring/src/test/java/org/wamblee/system/spring/component/DatabaseTesterComponent.java diff --git a/trunk/system/spring/src/test/resources/test.org.wamblee.system.spring.properties b/system/spring/src/test/resources/test.org.wamblee.system.spring.properties similarity index 100% rename from trunk/system/spring/src/test/resources/test.org.wamblee.system.spring.properties rename to system/spring/src/test/resources/test.org.wamblee.system.spring.properties diff --git a/trunk/system/spring/src/test/resources/test.org.wamblee.system.spring.xml b/system/spring/src/test/resources/test.org.wamblee.system.spring.xml similarity index 100% rename from trunk/system/spring/src/test/resources/test.org.wamblee.system.spring.xml rename to system/spring/src/test/resources/test.org.wamblee.system.spring.xml diff --git a/trunk/system/spring/src/test/resources/test.org.wamblee.system.springWithProperties.xml b/system/spring/src/test/resources/test.org.wamblee.system.springWithProperties.xml similarity index 100% rename from trunk/system/spring/src/test/resources/test.org.wamblee.system.springWithProperties.xml rename to system/spring/src/test/resources/test.org.wamblee.system.springWithProperties.xml diff --git a/trunk/system/spring/src/test/resources/test.org.wamblee.system.springWithProperties2.xml b/system/spring/src/test/resources/test.org.wamblee.system.springWithProperties2.xml similarity index 100% rename from trunk/system/spring/src/test/resources/test.org.wamblee.system.springWithProperties2.xml rename to system/spring/src/test/resources/test.org.wamblee.system.springWithProperties2.xml diff --git a/trunk/system/spring/src/test/resources/test.org.wamblee.system.springWithRequirements.xml b/system/spring/src/test/resources/test.org.wamblee.system.springWithRequirements.xml similarity index 100% rename from trunk/system/spring/src/test/resources/test.org.wamblee.system.springWithRequirements.xml rename to system/spring/src/test/resources/test.org.wamblee.system.springWithRequirements.xml diff --git a/trunk/test/eclipselink/pom.xml b/test/eclipselink/pom.xml similarity index 100% rename from trunk/test/eclipselink/pom.xml rename to test/eclipselink/pom.xml diff --git a/trunk/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java b/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java similarity index 100% rename from trunk/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java rename to test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java diff --git a/trunk/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java b/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java similarity index 100% rename from trunk/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java rename to test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java diff --git a/trunk/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/JndiSessionCustomizer.java b/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/JndiSessionCustomizer.java similarity index 100% rename from trunk/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/JndiSessionCustomizer.java rename to test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/JndiSessionCustomizer.java diff --git a/trunk/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer similarity index 100% rename from trunk/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer rename to test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer diff --git a/trunk/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java b/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java similarity index 100% rename from trunk/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java rename to test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java diff --git a/trunk/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java b/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java similarity index 100% rename from trunk/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java rename to test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java diff --git a/trunk/test/enterprise/pom.xml b/test/enterprise/pom.xml similarity index 100% rename from trunk/test/enterprise/pom.xml rename to test/enterprise/pom.xml diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java b/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java rename to test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java b/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java rename to test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabaseProvider.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabaseProvider.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaCustomizer.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaCustomizer.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaCustomizer.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaCustomizer.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaTables.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaTables.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaTables.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaTables.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/Database.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/Database.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/Database.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/Database.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseDescription.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseDescription.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseDescription.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseDescription.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseProvider.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseProvider.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseStarter.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseStarter.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseStarter.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseStarter.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabaseProvider.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabaseProvider.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabase.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabase.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabase.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabase.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabaseProvider.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabaseProvider.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaBuilder.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaBuilder.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaBuilder.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/JpaBuilder.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizer.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizer.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizer.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizer.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizerBuilder.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizerBuilder.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizerBuilder.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizerBuilder.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaTester.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaTester.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaTester.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/JpaTester.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/PersistenceUnitDescription.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/PersistenceUnitDescription.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/PersistenceUnitDescription.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/PersistenceUnitDescription.java diff --git a/trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/package-info.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/package-info.java similarity index 100% rename from trunk/test/enterprise/src/main/java/org/wamblee/support/persistence/package-info.java rename to test/enterprise/src/main/java/org/wamblee/support/persistence/package-info.java diff --git a/trunk/test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider b/test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider similarity index 100% rename from trunk/test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider rename to test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/jndi/StubInitiaContextFactoryTest.java b/test/enterprise/src/test/java/org/wamblee/support/jndi/StubInitiaContextFactoryTest.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/jndi/StubInitiaContextFactoryTest.java rename to test/enterprise/src/test/java/org/wamblee/support/jndi/StubInitiaContextFactoryTest.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseBuilderTest.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseBuilderTest.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseBuilderTest.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseBuilderTest.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/DerbyDatabaseTest.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/DerbyDatabaseTest.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/DerbyDatabaseTest.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/DerbyDatabaseTest.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/ExternalDatabaseTest.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/ExternalDatabaseTest.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/ExternalDatabaseTest.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/ExternalDatabaseTest.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntity.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntity.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntity.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntity.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntityExampleTestBase.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntityExampleTestBase.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntityExampleTestBase.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntityExampleTestBase.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyPersistenceUnit.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/MyPersistenceUnit.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyPersistenceUnit.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/MyPersistenceUnit.java diff --git a/trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyTables.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/MyTables.java similarity index 100% rename from trunk/test/enterprise/src/test/java/org/wamblee/support/persistence/MyTables.java rename to test/enterprise/src/test/java/org/wamblee/support/persistence/MyTables.java diff --git a/trunk/test/enterprise/src/test/resources/META-INF/persistence.xml b/test/enterprise/src/test/resources/META-INF/persistence.xml similarity index 100% rename from trunk/test/enterprise/src/test/resources/META-INF/persistence.xml rename to test/enterprise/src/test/resources/META-INF/persistence.xml diff --git a/trunk/test/hibernate/pom.xml b/test/hibernate/pom.xml similarity index 100% rename from trunk/test/hibernate/pom.xml rename to test/hibernate/pom.xml diff --git a/trunk/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java b/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java similarity index 100% rename from trunk/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java rename to test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java diff --git a/trunk/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java b/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java similarity index 100% rename from trunk/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java rename to test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java diff --git a/trunk/test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer similarity index 100% rename from trunk/test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer rename to test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer diff --git a/trunk/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java b/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java similarity index 100% rename from trunk/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java rename to test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java diff --git a/trunk/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java b/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java similarity index 100% rename from trunk/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java rename to test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java diff --git a/trunk/test/pom.xml b/test/pom.xml similarity index 100% rename from trunk/test/pom.xml rename to test/pom.xml diff --git a/trunk/test/toplink-essentials/pom.xml b/test/toplink-essentials/pom.xml similarity index 100% rename from trunk/test/toplink-essentials/pom.xml rename to test/toplink-essentials/pom.xml diff --git a/trunk/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/JndiSessionCustomizer.java b/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/JndiSessionCustomizer.java similarity index 100% rename from trunk/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/JndiSessionCustomizer.java rename to test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/JndiSessionCustomizer.java diff --git a/trunk/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java b/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java similarity index 100% rename from trunk/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java rename to test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java diff --git a/trunk/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java b/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java similarity index 100% rename from trunk/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java rename to test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java diff --git a/trunk/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer similarity index 100% rename from trunk/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer rename to test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer diff --git a/trunk/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java b/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java similarity index 100% rename from trunk/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java rename to test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java diff --git a/trunk/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java b/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java similarity index 100% rename from trunk/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java rename to test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java