From 4845c677310814de4c98e22aad483e49b9dfc594 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Wed, 9 Apr 2008 18:29:10 +0000 Subject: [PATCH] Package rename org.wamblee.system to org.wamblee.system.core --- .../wamblee/system/{ => core}/AbstractComponent.java | 2 +- .../java/org/wamblee/system/{ => core}/Component.java | 2 +- .../java/org/wamblee/system/{ => core}/Container.java | 2 +- .../system/{ => core}/DefaultProvidedInterface.java | 2 +- .../system/{ => core}/DefaultRequiredInterface.java | 2 +- .../wamblee/system/{ => core}/ProvidedInterface.java | 2 +- .../wamblee/system/{ => core}/RequiredInterface.java | 2 +- .../system/{ => core}/SystemAssemblyException.java | 2 +- .../org/wamblee/system/{ => core}/Application.java | 6 +++++- .../org/wamblee/system/{ => core}/ContainerTest.java | 11 +++++++++-- .../{ => core}/DefaultInterfaceDescriptorTest.java | 7 ++++++- .../{ => core}/DefaultRequiredInterfaceTest.java | 5 ++++- .../org/wamblee/system/{ => core}/Environment.java | 6 +++++- .../wamblee/system/spring/RequiredServiceBean.java | 6 +++--- .../org/wamblee/system/spring/SpringComponent.java | 8 ++++---- .../wamblee/system/spring/SpringComponentTest.java | 10 +++++----- 16 files changed, 49 insertions(+), 26 deletions(-) rename system/general/src/main/java/org/wamblee/system/{ => core}/AbstractComponent.java (99%) rename system/general/src/main/java/org/wamblee/system/{ => core}/Component.java (98%) rename system/general/src/main/java/org/wamblee/system/{ => core}/Container.java (99%) rename system/general/src/main/java/org/wamblee/system/{ => core}/DefaultProvidedInterface.java (98%) rename system/general/src/main/java/org/wamblee/system/{ => core}/DefaultRequiredInterface.java (98%) rename system/general/src/main/java/org/wamblee/system/{ => core}/ProvidedInterface.java (97%) rename system/general/src/main/java/org/wamblee/system/{ => core}/RequiredInterface.java (97%) rename system/general/src/main/java/org/wamblee/system/{ => core}/SystemAssemblyException.java (97%) rename system/general/src/test/java/org/wamblee/system/{ => core}/Application.java (85%) rename system/general/src/test/java/org/wamblee/system/{ => core}/ContainerTest.java (95%) rename system/general/src/test/java/org/wamblee/system/{ => core}/DefaultInterfaceDescriptorTest.java (92%) rename system/general/src/test/java/org/wamblee/system/{ => core}/DefaultRequiredInterfaceTest.java (91%) rename system/general/src/test/java/org/wamblee/system/{ => core}/Environment.java (86%) 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 8b6109f2..5d89e4a4 100644 --- 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 e0653266..b9b5dad4 100644 --- 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 65d10f06..b6f0a4ce 100644 --- 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 fea5ec04..b751a671 100644 --- 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 b0227ee0..32276a25 100644 --- 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 1ccdf64c..349197d0 100644 --- 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 033c5d7e..0fea7360 100644 --- 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 4733ad14..a8a0ac16 100644 --- 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 cb177f20..938f2bd1 100644 --- 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 775e8006..9bb53a6a 100644 --- 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 6786e164..c455395b 100644 --- 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 5a9f7811..a7abee5d 100644 --- 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 07a2814d..2fa1c4cf 100644 --- 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 95e2e786..88ebed1f 100644 --- 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 0e54deae..36b50e78 100644 --- 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 72912fe9..bbbda999 100644 --- 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 { -- 2.31.1