(no commit message)

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/cache/Cache.java b/branches/TO_MAVEN/support/src/main/java/wamblee/cache/Cache.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/cache/Cache.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/cache/Cache.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/cache/CachedObject.java b/branches/TO_MAVEN/support/src/main/java/wamblee/cache/CachedObject.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/cache/CachedObject.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/cache/CachedObject.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/cache/EhCache.java b/branches/TO_MAVEN/support/src/main/java/wamblee/cache/EhCache.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/cache/EhCache.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/cache/EhCache.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/cache/ForeverCache.java b/branches/TO_MAVEN/support/src/main/java/wamblee/cache/ForeverCache.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/cache/ForeverCache.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/cache/ForeverCache.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/cache/ZeroCache.java b/branches/TO_MAVEN/support/src/main/java/wamblee/cache/ZeroCache.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/cache/ZeroCache.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/cache/ZeroCache.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/cache/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/cache/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/cache/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/cache/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/concurrency/JvmLock.java b/branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/JvmLock.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/concurrency/JvmLock.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/JvmLock.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/concurrency/Lock.java b/branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/Lock.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/concurrency/Lock.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/Lock.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/concurrency/LockAdvice.java b/branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/LockAdvice.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/concurrency/LockAdvice.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/LockAdvice.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/concurrency/ReadWriteLock.java b/branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/ReadWriteLock.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/concurrency/ReadWriteLock.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/ReadWriteLock.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/concurrency/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/concurrency/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/concurrency/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/conditions/AndCondition.java b/branches/TO_MAVEN/support/src/main/java/wamblee/conditions/AndCondition.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/conditions/AndCondition.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/conditions/AndCondition.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/conditions/Condition.java b/branches/TO_MAVEN/support/src/main/java/wamblee/conditions/Condition.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/conditions/Condition.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/conditions/Condition.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/conditions/FixedCondition.java b/branches/TO_MAVEN/support/src/main/java/wamblee/conditions/FixedCondition.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/conditions/FixedCondition.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/conditions/FixedCondition.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/conditions/OrCondition.java b/branches/TO_MAVEN/support/src/main/java/wamblee/conditions/OrCondition.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/conditions/OrCondition.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/conditions/OrCondition.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/conditions/PropertyRegexCondition.java b/branches/TO_MAVEN/support/src/main/java/wamblee/conditions/PropertyRegexCondition.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/conditions/PropertyRegexCondition.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/conditions/PropertyRegexCondition.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/conditions/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/conditions/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/conditions/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/conditions/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/general/BeanFactory.java b/branches/TO_MAVEN/support/src/main/java/wamblee/general/BeanFactory.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/general/BeanFactory.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/general/BeanFactory.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/general/BeanFactoryException.java b/branches/TO_MAVEN/support/src/main/java/wamblee/general/BeanFactoryException.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/general/BeanFactoryException.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/general/BeanFactoryException.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/general/BeanKernel.java b/branches/TO_MAVEN/support/src/main/java/wamblee/general/BeanKernel.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/general/BeanKernel.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/general/BeanKernel.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/general/Pair.java b/branches/TO_MAVEN/support/src/main/java/wamblee/general/Pair.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/general/Pair.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/general/Pair.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/general/SpringBeanFactory.java b/branches/TO_MAVEN/support/src/main/java/wamblee/general/SpringBeanFactory.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/general/SpringBeanFactory.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/general/SpringBeanFactory.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/general/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/general/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/general/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/general/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/io/ClassPathResource.java b/branches/TO_MAVEN/support/src/main/java/wamblee/io/ClassPathResource.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/io/ClassPathResource.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/io/ClassPathResource.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/io/FileResource.java b/branches/TO_MAVEN/support/src/main/java/wamblee/io/FileResource.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/io/FileResource.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/io/FileResource.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/io/InputResource.java b/branches/TO_MAVEN/support/src/main/java/wamblee/io/InputResource.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/io/InputResource.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/io/InputResource.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/io/StreamResource.java b/branches/TO_MAVEN/support/src/main/java/wamblee/io/StreamResource.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/io/StreamResource.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/io/StreamResource.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/io/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/io/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/io/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/io/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/observer/DefaultObserverNotifier.java b/branches/TO_MAVEN/support/src/main/java/wamblee/observer/DefaultObserverNotifier.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/observer/DefaultObserverNotifier.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/observer/DefaultObserverNotifier.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/observer/Observable.java b/branches/TO_MAVEN/support/src/main/java/wamblee/observer/Observable.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/observer/Observable.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/observer/Observable.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/observer/Observer.java b/branches/TO_MAVEN/support/src/main/java/wamblee/observer/Observer.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/observer/Observer.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/observer/Observer.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/observer/ObserverNotifier.java b/branches/TO_MAVEN/support/src/main/java/wamblee/observer/ObserverNotifier.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/observer/ObserverNotifier.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/observer/ObserverNotifier.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/observer/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/observer/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/observer/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/observer/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/persistence/AbstractPersistent.java b/branches/TO_MAVEN/support/src/main/java/wamblee/persistence/AbstractPersistent.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/persistence/AbstractPersistent.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/persistence/AbstractPersistent.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/persistence/Persistent.java b/branches/TO_MAVEN/support/src/main/java/wamblee/persistence/Persistent.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/persistence/Persistent.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/persistence/Persistent.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/persistence/hibernate/HibernateMappingFiles.java b/branches/TO_MAVEN/support/src/main/java/wamblee/persistence/hibernate/HibernateMappingFiles.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/persistence/hibernate/HibernateMappingFiles.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/persistence/hibernate/HibernateMappingFiles.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/persistence/hibernate/HibernateSupport.java b/branches/TO_MAVEN/support/src/main/java/wamblee/persistence/hibernate/HibernateSupport.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/persistence/hibernate/HibernateSupport.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/persistence/hibernate/HibernateSupport.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/persistence/hibernate/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/persistence/hibernate/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/persistence/hibernate/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/persistence/hibernate/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/persistence/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/persistence/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/persistence/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/persistence/package.html

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/xml/ClasspathUriResolver.java b/branches/TO_MAVEN/support/src/main/java/wamblee/xml/ClasspathUriResolver.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/xml/ClasspathUriResolver.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/xml/ClasspathUriResolver.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/xml/DomUtils.java b/branches/TO_MAVEN/support/src/main/java/wamblee/xml/DomUtils.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/xml/DomUtils.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/xml/DomUtils.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/xml/XMLException.java b/branches/TO_MAVEN/support/src/main/java/wamblee/xml/XMLException.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/xml/XMLException.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/xml/XMLException.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/xml/XslTransformer.java b/branches/TO_MAVEN/support/src/main/java/wamblee/xml/XslTransformer.java
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/xml/XslTransformer.java
rename to branches/TO_MAVEN/support/src/main/java/wamblee/xml/XslTransformer.java

diff --git a/branches/TO_MAVEN/support/src/org/wamblee/xml/package.html b/branches/TO_MAVEN/support/src/main/java/wamblee/xml/package.html
similarity index 100%
rename from branches/TO_MAVEN/support/src/org/wamblee/xml/package.html
rename to branches/TO_MAVEN/support/src/main/java/wamblee/xml/package.html

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/cache/CachedObjectTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/cache/CachedObjectTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/cache/CachedObjectTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/cache/CachedObjectTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/concurrency/AbstractLockTestCase.java b/branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/AbstractLockTestCase.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/concurrency/AbstractLockTestCase.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/AbstractLockTestCase.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/concurrency/JvmLockTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/JvmLockTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/concurrency/JvmLockTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/JvmLockTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/concurrency/LockAdviceTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/LockAdviceTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/concurrency/LockAdviceTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/LockAdviceTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/concurrency/ReadWriteLockTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/ReadWriteLockTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/concurrency/ReadWriteLockTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/concurrency/ReadWriteLockTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/conditions/AndConditionTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/conditions/AndConditionTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/conditions/AndConditionTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/conditions/AndConditionTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/conditions/GreaterThanCondition.java b/branches/TO_MAVEN/support/src/test/java/wamblee/conditions/GreaterThanCondition.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/conditions/GreaterThanCondition.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/conditions/GreaterThanCondition.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/conditions/LessThanCondition.java b/branches/TO_MAVEN/support/src/test/java/wamblee/conditions/LessThanCondition.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/conditions/LessThanCondition.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/conditions/LessThanCondition.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/conditions/OrConditionTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/conditions/OrConditionTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/conditions/OrConditionTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/conditions/OrConditionTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/conditions/PropertyRegexConditionTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/conditions/PropertyRegexConditionTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/conditions/PropertyRegexConditionTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/conditions/PropertyRegexConditionTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/conditions/TestBean.java b/branches/TO_MAVEN/support/src/test/java/wamblee/conditions/TestBean.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/conditions/TestBean.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/conditions/TestBean.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/general/BeanKernelTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/general/BeanKernelTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/general/BeanKernelTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/general/BeanKernelTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/general/PairTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/general/PairTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/general/PairTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/general/PairTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/general/SpringBeanFactoryTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/general/SpringBeanFactoryTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/general/SpringBeanFactoryTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/general/SpringBeanFactoryTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/general/TestBeanFactory.java b/branches/TO_MAVEN/support/src/test/java/wamblee/general/TestBeanFactory.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/general/TestBeanFactory.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/general/TestBeanFactory.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/io/ClassPathResourceTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/io/ClassPathResourceTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/io/ClassPathResourceTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/io/ClassPathResourceTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/io/FileResourceTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/io/FileResourceTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/io/FileResourceTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/io/FileResourceTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/io/FileSystemUtils.java b/branches/TO_MAVEN/support/src/test/java/wamblee/io/FileSystemUtils.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/io/FileSystemUtils.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/io/FileSystemUtils.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/io/StreamResourceTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/io/StreamResourceTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/io/StreamResourceTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/io/StreamResourceTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/io/TestResource.java b/branches/TO_MAVEN/support/src/test/java/wamblee/io/TestResource.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/io/TestResource.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/io/TestResource.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/observer/ObservableTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/observer/ObservableTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/observer/ObservableTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/observer/ObservableTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/AssertionUtils.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/AssertionUtils.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/AssertionUtils.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/AssertionUtils.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/EventTracker.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/EventTracker.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/EventTracker.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/EventTracker.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/HibernateExporter.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/HibernateExporter.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/HibernateExporter.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/HibernateExporter.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/HibernateUpdater.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/HibernateUpdater.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/HibernateUpdater.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/HibernateUpdater.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/HibernateUtils.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/HibernateUtils.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/HibernateUtils.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/HibernateUtils.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/SpringConfigFiles.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/SpringConfigFiles.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/SpringConfigFiles.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/SpringConfigFiles.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/SpringTestCase.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/SpringTestCase.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/SpringTestCase.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/SpringTestCase.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/TestSpringBeanFactory.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/TestSpringBeanFactory.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/TestSpringBeanFactory.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/TestSpringBeanFactory.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/TestSupport.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/TestSupport.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/TestSupport.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/TestSupport.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/TestTransactionCallback.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/TestTransactionCallback.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/TestTransactionCallback.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/TestTransactionCallback.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/TestTransactionCallbackWithoutResult.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/TestTransactionCallbackWithoutResult.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/TestTransactionCallbackWithoutResult.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/TestTransactionCallbackWithoutResult.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/test/TimingUtils.java b/branches/TO_MAVEN/support/src/test/java/wamblee/test/TimingUtils.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/test/TimingUtils.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/test/TimingUtils.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/xml/ClasspathUriResolverTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/xml/ClasspathUriResolverTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/xml/ClasspathUriResolverTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/xml/ClasspathUriResolverTest.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/xml/XmlUtils.java b/branches/TO_MAVEN/support/src/test/java/wamblee/xml/XmlUtils.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/xml/XmlUtils.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/xml/XmlUtils.java

diff --git a/branches/TO_MAVEN/support/test/org/wamblee/xml/XslTransformerTest.java b/branches/TO_MAVEN/support/src/test/java/wamblee/xml/XslTransformerTest.java
similarity index 100%
rename from branches/TO_MAVEN/support/test/org/wamblee/xml/XslTransformerTest.java
rename to branches/TO_MAVEN/support/src/test/java/wamblee/xml/XslTransformerTest.java

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/cache/ehcache.xml b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/cache/ehcache.xml
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/cache/ehcache.xml
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/cache/ehcache.xml

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/general/beanRefContext.xml b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/beanRefContext.xml
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/general/beanRefContext.xml
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/beanRefContext.xml

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/general/beankernel-wrong.properties b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/beankernel-wrong.properties
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/general/beankernel-wrong.properties
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/beankernel-wrong.properties

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/general/beankernel.properties b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/beankernel.properties
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/general/beankernel.properties
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/beankernel.properties

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/general/spring1.xml b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/spring1.xml
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/general/spring1.xml
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/general/spring1.xml

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/io/myresource.txt b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/io/myresource.txt
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/io/myresource.txt
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/io/myresource.txt

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/output-reportToHtml-report.xml b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/output-reportToHtml-report.xml
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/report.xml b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/report.xml
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/report.xml
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/report.xml

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml-invalid.xsl b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml-invalid.xsl
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml-nonwellformed.xsl b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml-nonwellformed.xsl
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml.xsl b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml.xsl
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml.xsl
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml.xsl

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml2.xsl b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml2.xsl
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToHtml2.xsl
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToHtml2.xsl

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToText.xsl b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToText.xsl
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/reportToText.xsl
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/reportToText.xsl

diff --git a/branches/TO_MAVEN/support/resources/test/org/wamblee/xml/utilities.xsl b/branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/utilities.xsl
similarity index 100%
rename from branches/TO_MAVEN/support/resources/test/org/wamblee/xml/utilities.xsl
rename to branches/TO_MAVEN/support/src/test/resources/org/wamblee/xml/utilities.xsl