Package rename org.wamblee.system to org.wamblee.system.core

diff --git a/system/general/src/main/java/org/wamblee/system/AbstractComponent.java b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
similarity index 99%
rename from system/general/src/main/java/org/wamblee/system/AbstractComponent.java
rename to system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
index 8b6109f233a951cf72edae3a6eb5765abc320e2a..5d89e4a46f839078c7adc5876bae684a3d2cdb8f 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
+++ b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/system/general/src/main/java/org/wamblee/system/Component.java b/system/general/src/main/java/org/wamblee/system/core/Component.java
similarity index 98%
rename from system/general/src/main/java/org/wamblee/system/Component.java
rename to system/general/src/main/java/org/wamblee/system/core/Component.java
index e06532669ce5a49c179fc5d54c0214c9b5e20d45..b9b5dad4e5d9cd7ebcf461126ec379b447987693 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/Component.java
+++ b/system/general/src/main/java/org/wamblee/system/core/Component.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 /**
  * A component represents a part of a system that requires a 

diff --git a/system/general/src/main/java/org/wamblee/system/Container.java b/system/general/src/main/java/org/wamblee/system/core/Container.java
similarity index 99%
rename from system/general/src/main/java/org/wamblee/system/Container.java
rename to system/general/src/main/java/org/wamblee/system/core/Container.java
index 65d10f06e2960d74eff34b5ed63cd560d6fa1337..b6f0a4ce318b361a9f375c6a7f94842921dbf07f 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/core/Container.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/system/general/src/main/java/org/wamblee/system/DefaultProvidedInterface.java b/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java
similarity index 98%
rename from system/general/src/main/java/org/wamblee/system/DefaultProvidedInterface.java
rename to system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java
index fea5ec048caae53c7d5f45a0b3bc7bbcabc4b03b..b751a67144d00542804ea39354a5eafa88e83af3 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/DefaultProvidedInterface.java
+++ b/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import java.util.Arrays;
 

diff --git a/system/general/src/main/java/org/wamblee/system/DefaultRequiredInterface.java b/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java
similarity index 98%
rename from system/general/src/main/java/org/wamblee/system/DefaultRequiredInterface.java
rename to system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java
index b0227ee006ad8d843ab595e782ee3a329d382be1..32276a25cc26d7237e479f379b5b94309773e3ae 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/DefaultRequiredInterface.java
+++ b/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import java.util.Arrays;
 

diff --git a/system/general/src/main/java/org/wamblee/system/ProvidedInterface.java b/system/general/src/main/java/org/wamblee/system/core/ProvidedInterface.java
similarity index 97%
rename from system/general/src/main/java/org/wamblee/system/ProvidedInterface.java
rename to system/general/src/main/java/org/wamblee/system/core/ProvidedInterface.java
index 1ccdf64c98d49f9baa2c29848b00655c8e8febb0..349197d0f2b8a450ee39ea5e21a6c4dfc10f2ffa 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/ProvidedInterface.java
+++ b/system/general/src/main/java/org/wamblee/system/core/ProvidedInterface.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import java.util.Collection;
 

diff --git a/system/general/src/main/java/org/wamblee/system/RequiredInterface.java b/system/general/src/main/java/org/wamblee/system/core/RequiredInterface.java
similarity index 97%
rename from system/general/src/main/java/org/wamblee/system/RequiredInterface.java
rename to system/general/src/main/java/org/wamblee/system/core/RequiredInterface.java
index 033c5d7e55fb483f719d3fbef8f9031ad9754c25..0fea736057bbc32849ef977004a91520b7a3f2ff 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/RequiredInterface.java
+++ b/system/general/src/main/java/org/wamblee/system/core/RequiredInterface.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 public interface RequiredInterface {
 

diff --git a/system/general/src/main/java/org/wamblee/system/SystemAssemblyException.java b/system/general/src/main/java/org/wamblee/system/core/SystemAssemblyException.java
similarity index 97%
rename from system/general/src/main/java/org/wamblee/system/SystemAssemblyException.java
rename to system/general/src/main/java/org/wamblee/system/core/SystemAssemblyException.java
index 4733ad14eb7d3b71ea18560b72c0fe1e4483580f..a8a0ac16ae694534490c4206ffb3bdcbb3d9d4f6 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/SystemAssemblyException.java
+++ b/system/general/src/main/java/org/wamblee/system/core/SystemAssemblyException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 /**
  * Exception thrown when an error occurs in assembling the systems.

diff --git a/system/general/src/test/java/org/wamblee/system/Application.java b/system/general/src/test/java/org/wamblee/system/core/Application.java
similarity index 85%
rename from system/general/src/test/java/org/wamblee/system/Application.java
rename to system/general/src/test/java/org/wamblee/system/core/Application.java
index cb177f20259de7de21512c6576d4e30ce4f37540..938f2bd1d50e7e969d46e71d97b778f81a3573ee 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/Application.java
+++ b/system/general/src/test/java/org/wamblee/system/core/Application.java
@@ -13,10 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import javax.sql.DataSource;
 
+import org.wamblee.system.core.AbstractComponent;
+import org.wamblee.system.core.DefaultRequiredInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.test.EventTracker;
 
 public class Application extends AbstractComponent {

diff --git a/system/general/src/test/java/org/wamblee/system/ContainerTest.java b/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
similarity index 95%
rename from system/general/src/test/java/org/wamblee/system/ContainerTest.java
rename to system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
index 775e80064af58f5e797d4e45c0285efb166964a8..9bb53a6a6c1a615c7bd4c0218e90a4bc78921679 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/ContainerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
@@ -13,13 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.wamblee.system.Component.Status;
+import org.wamblee.system.core.Component;
+import org.wamblee.system.core.Container;
+import org.wamblee.system.core.DefaultProvidedInterface;
+import org.wamblee.system.core.DefaultRequiredInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.SystemAssemblyException;
+import org.wamblee.system.core.Component.Status;
 import org.wamblee.test.AssertionUtils;
 import org.wamblee.test.EventTracker;
 

diff --git a/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java b/system/general/src/test/java/org/wamblee/system/core/DefaultInterfaceDescriptorTest.java
similarity index 92%
rename from system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java
rename to system/general/src/test/java/org/wamblee/system/core/DefaultInterfaceDescriptorTest.java
index 6786e1642f1c0b7bf6e6707b98433e40426802b5..c455395b24bd2912788b784a4ed590a59ef69f40 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java
+++ b/system/general/src/test/java/org/wamblee/system/core/DefaultInterfaceDescriptorTest.java
@@ -13,10 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import java.io.Serializable;
 
+import org.wamblee.system.core.DefaultProvidedInterface;
+import org.wamblee.system.core.DefaultRequiredInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+
 import junit.framework.TestCase;
 
 public class DefaultInterfaceDescriptorTest extends TestCase {

diff --git a/system/general/src/test/java/org/wamblee/system/DefaultRequiredInterfaceTest.java b/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java
similarity index 91%
rename from system/general/src/test/java/org/wamblee/system/DefaultRequiredInterfaceTest.java
rename to system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java
index 5a9f7811f36888182c179e25f5203a17f51215f5..a7abee5df9639cfb7163fb2de3cb6b6fca9590a9 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/DefaultRequiredInterfaceTest.java
+++ b/system/general/src/test/java/org/wamblee/system/core/DefaultRequiredInterfaceTest.java
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
+
+import org.wamblee.system.core.DefaultRequiredInterface;
+import org.wamblee.system.core.RequiredInterface;
 
 import junit.framework.TestCase;
 

diff --git a/system/general/src/test/java/org/wamblee/system/Environment.java b/system/general/src/test/java/org/wamblee/system/core/Environment.java
similarity index 86%
rename from system/general/src/test/java/org/wamblee/system/Environment.java
rename to system/general/src/test/java/org/wamblee/system/core/Environment.java
index 07a2814d49327314607ec2f8e957926b725d58b5..2fa1c4cf374471412837905cfa76ffe30bf676d9 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/core/Environment.java
@@ -13,10 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system;
+package org.wamblee.system.core;
 
 import javax.sql.DataSource;
 
+import org.wamblee.system.core.AbstractComponent;
+import org.wamblee.system.core.DefaultProvidedInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.test.EventTracker;
 
 

diff --git a/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java b/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
index 95e2e786628d6b6638ef98524053ca6668501268..88ebed1f39b600fd38be8790b6aefe068de0c8ba 100644 (file)
--- a/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
+++ b/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
@@ -16,9 +16,9 @@
 package org.wamblee.system.spring;
 
 import org.springframework.beans.factory.FactoryBean;
-import org.wamblee.system.ProvidedInterface;
-import org.wamblee.system.RequiredInterface;
-import org.wamblee.system.SystemAssemblyException;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.SystemAssemblyException;
 
 /**
  * Bean which adds a service required by the spring component to 

diff --git a/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java b/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
index 0e54deaec72ff12b194348704632f9bb8fdf7c4e..36b50e78f38db31b22993386daf00e9024a91f81 100644 (file)
--- a/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
+++ b/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
@@ -25,10 +25,10 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
-import org.wamblee.system.AbstractComponent;
-import org.wamblee.system.ProvidedInterface;
-import org.wamblee.system.RequiredInterface;
-import org.wamblee.system.SystemAssemblyException;
+import org.wamblee.system.core.AbstractComponent;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.SystemAssemblyException;
 
 /**
  * Represents a system configured based on spring. The spring config files that

diff --git a/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java b/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java
index 72912fe9fa32e9b68a1244e70341f2a6cada7933..bbbda99925d5ea48c42c2d7cc11082da198b0e6b 100644 (file)
--- a/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java
+++ b/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java
@@ -23,11 +23,11 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.wamblee.io.ClassPathResource;
-import org.wamblee.system.DefaultProvidedInterface;
-import org.wamblee.system.DefaultRequiredInterface;
-import org.wamblee.system.ProvidedInterface;
-import org.wamblee.system.RequiredInterface;
-import org.wamblee.system.SystemAssemblyException;
+import org.wamblee.system.core.DefaultProvidedInterface;
+import org.wamblee.system.core.DefaultRequiredInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.SystemAssemblyException;
 
 public class SpringComponentTest extends TestCase {