You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/05/21 18:30:58 UTC
svn commit: r408183 [1/2] - in /incubator/tuscany/sandbox/jboynes/sca: ./
common/
containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/
containers/container.java/src/main/java/org/apache/tuscany/container/java/context/
cont...
Author: jboynes
Date: Sun May 21 09:30:53 2006
New Revision: 408183
URL: http://svn.apache.org/viewvc?rev=408183&view=rev
Log:
SPI is tightly coupled to the model so merge the two modules together
Added:
incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/
incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/
incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/
incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/
incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/
incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/
incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/TestMessages.properties (with props)
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java (with props)
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java (with props)
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java (with props)
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/impl/
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java (with props)
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/impl/
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/common/
- copied from r408181, incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/model/
- copied from r408181, incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java (with props)
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/ObjectFactory.java (with props)
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java (with props)
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/MonitorFactory.java (with props)
Removed:
incubator/tuscany/sandbox/jboynes/sca/common/
incubator/tuscany/sandbox/jboynes/sca/model/
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/common/ObjectCreationException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/common/ObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/common/TuscanyException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/common/TuscanyRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/common/monitor/
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/resources/
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/Injector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContextImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/MockContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/pom.xml
incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/model/PropertyValue.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ScopeRegistry.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireException.java
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaComponentBuilder.java Sun May 21 09:30:53 2006
@@ -4,7 +4,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.container.java.context.JavaAtomicContext;
import org.apache.tuscany.container.java.model.JavaImplementation;
import org.apache.tuscany.core.injection.ContextInjector;
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaAtomicContext.java Sun May 21 09:30:53 2006
@@ -21,7 +21,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.container.java.invocation.JavaTargetInvoker;
import org.apache.tuscany.core.context.PojoAtomicContext;
import org.apache.tuscany.core.injection.EventInvoker;
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java Sun May 21 09:30:53 2006
@@ -8,7 +8,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.container.java.context.JavaAtomicContext;
import org.apache.tuscany.container.java.invocation.JavaTargetInvoker;
import org.apache.tuscany.core.injection.EventInvoker;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java Sun May 21 09:30:53 2006
@@ -13,8 +13,8 @@
*/
package org.apache.tuscany.core.builder.impl;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
import java.lang.reflect.Array;
import java.util.List;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java Sun May 21 09:30:53 2006
@@ -15,7 +15,7 @@
import org.apache.tuscany.core.builder.ContextCreationException;
import org.apache.tuscany.core.builder.ContextFactory;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.ExternalServiceContext;
import org.apache.tuscany.core.context.impl.ExternalServiceContextImpl;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java Sun May 21 09:30:53 2006
@@ -13,8 +13,8 @@
*/
package org.apache.tuscany.core.builder.impl;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java Sun May 21 09:30:53 2006
@@ -13,8 +13,8 @@
*/
package org.apache.tuscany.core.builder.impl;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.wire.ProxyCreationException;
import org.apache.tuscany.spi.wire.WireFactory;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java Sun May 21 09:30:53 2006
@@ -20,7 +20,7 @@
import java.util.List;
import javax.xml.stream.XMLInputFactory;
-import org.apache.tuscany.common.monitor.MonitorFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java Sun May 21 09:30:53 2006
@@ -20,9 +20,9 @@
import org.osoa.sca.SCA;
import org.osoa.sca.ServiceRuntimeException;
-import org.apache.tuscany.common.monitor.LogLevel;
-import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.spi.monitor.LogLevel;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.core.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
import org.apache.tuscany.core.config.ConfigurationException;
@@ -61,7 +61,7 @@
* @param name the name of the module component
* @param uri the URI to assign to the module component
* @throws ConfigurationException if there was a problem loading the SCA configuration
- * @see TuscanyRuntime#TuscanyRuntime(String, String, org.apache.tuscany.common.monitor.MonitorFactory)
+ * @see TuscanyRuntime#TuscanyRuntime(String, String, org.apache.tuscany.spi.monitor.MonitorFactory)
*/
public TuscanyRuntime(String name, String uri) throws ConfigurationException {
this(name, uri, new NullMonitorFactory());
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/config/ConfigurationException.java Sun May 21 09:30:53 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.core.config;
-import org.apache.tuscany.common.TuscanyException;
+import org.apache.tuscany.spi.TuscanyException;
/**
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/CoreRuntimeException.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.context;
-import org.apache.tuscany.common.TuscanyRuntimeException;
+import org.apache.tuscany.spi.TuscanyRuntimeException;
/**
* The root exception for the runtime package. Exceptions occurring in the runtime are generally non-recoverable
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java Sun May 21 09:30:53 2006
@@ -27,6 +27,7 @@
import org.apache.tuscany.core.context.EventContext;
import org.apache.tuscany.core.context.EventException;
import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.TuscanyRuntimeException;
import org.apache.tuscany.spi.wire.WireFactory;
import org.apache.tuscany.core.context.ScopeAwareContext;
import org.apache.tuscany.core.context.ScopeContext;
@@ -63,7 +64,6 @@
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
-import org.apache.tuscany.common.TuscanyRuntimeException;
import java.util.ArrayList;
import java.util.Collections;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java Sun May 21 09:30:53 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.core.context.impl;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.CoreRuntimeException;
import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.InstanceContextFactory;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.CompositeContext;
/**
@@ -10,7 +10,7 @@
* @version $Rev: 380903 $ $Date: 2006-02-25 00:53:26 -0800 (Sat, 25 Feb 2006) $
*/
public class ContextObjectFactory implements ObjectFactory<CompositeContext> {
-
+
private final ContextResolver resolver;
public ContextObjectFactory(ContextResolver resolver) {
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java Sun May 21 09:30:53 2006
@@ -1,12 +1,12 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
import java.lang.reflect.Field;
/**
- * Injects a value created by an {@link org.apache.tuscany.common.ObjectFactory} on a given field
+ * Injects a value created by an {@link org.apache.tuscany.spi.ObjectFactory} on a given field
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.TuscanyRuntimeException;
+import org.apache.tuscany.spi.TuscanyRuntimeException;
/**
* Root unchecked exception for the injection package
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* Implementations inject a pre-configured value on an instance
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java Sun May 21 09:30:53 2006
@@ -14,11 +14,11 @@
package org.apache.tuscany.core.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.context.TargetException;
/**
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java Sun May 21 09:30:53 2006
@@ -19,8 +19,8 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* An implementation of ObjectFactory that creates instances
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java Sun May 21 09:30:53 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java Sun May 21 09:30:53 2006
@@ -14,9 +14,9 @@
package org.apache.tuscany.core.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.model.assembly.ConfiguredService;
/**
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
/**
* Implementation of ObjectFactory that returns a single instance, typically an immutable type.
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java Sun May 21 09:30:53 2006
@@ -23,7 +23,7 @@
import javax.naming.NamingException;
import org.apache.tuscany.core.loader.StAXPropertyFactory;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.injection.JNDIObjectFactory;
import org.apache.tuscany.model.assembly.Property;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java Sun May 21 09:30:53 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.core.loader.impl;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.core.loader.StAXPropertyFactory;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java Sun May 21 09:30:53 2006
@@ -13,7 +13,7 @@
*/
package org.apache.tuscany.core.runtime;
-import org.apache.tuscany.common.monitor.MonitorFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.HierarchicalWireBuilder;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeMonitor.java Sun May 21 09:30:53 2006
@@ -13,8 +13,8 @@
*/
package org.apache.tuscany.core.runtime;
-import org.apache.tuscany.common.TuscanyException;
-import org.apache.tuscany.common.TuscanyRuntimeException;
+import org.apache.tuscany.spi.TuscanyException;
+import org.apache.tuscany.spi.TuscanyRuntimeException;
/**
@@ -27,6 +27,6 @@
public void log(TuscanyRuntimeException e);
public void log(TuscanyException e);
-
+
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java Sun May 21 09:30:53 2006
@@ -19,8 +19,8 @@
import java.util.List;
import java.util.Set;
-import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.annotation.Autowire;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.system.config;
-import org.apache.tuscany.common.TuscanyRuntimeException;
+import org.apache.tuscany.spi.TuscanyRuntimeException;
import org.apache.tuscany.core.builder.ContextCreationException;
import org.apache.tuscany.core.builder.ContextFactory;
import org.apache.tuscany.core.builder.ContextResolver;
@@ -24,7 +24,7 @@
* A <code>ContextFactory</code> that handles system component implementation types, which may be either simple, leaf
* types or an composites.
* <p>
- * For composite types, this factory delegates to an {@link org.apache.tuscany.common.ObjectFactory} to create an
+ * For composite types, this factory delegates to an {@link org.apache.tuscany.spi.ObjectFactory} to create an
* instance of the composite implementation and perform injection of configuration and references. Once an composite
* instance is created, the factory will register the composite's children. This process may be done recursively in a
* lazy fashion, descending down an composite hierarchy as a child composite is instantiated.
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java Sun May 21 09:30:53 2006
@@ -16,7 +16,7 @@
import org.apache.tuscany.core.builder.ContextCreationException;
import org.apache.tuscany.core.builder.ContextFactory;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.ExternalServiceContext;
import org.apache.tuscany.core.injection.InterCompositeReferenceFactory;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java Sun May 21 09:30:53 2006
@@ -19,7 +19,7 @@
import org.apache.tuscany.core.builder.ContextCreationException;
import org.apache.tuscany.core.builder.ContextFactory;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.Context;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java Sun May 21 09:30:53 2006
@@ -13,7 +13,7 @@
*/
package org.apache.tuscany.core.system.context;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.impl.AbstractContext;
import org.apache.tuscany.core.context.ExternalServiceContext;
import org.apache.tuscany.spi.QualifiedName;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java Sun May 21 09:30:53 2006
@@ -14,11 +14,11 @@
package org.apache.tuscany.core.system.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.AutowireContext;
import org.apache.tuscany.core.injection.FactoryInitException;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* Returns an instance by resolving against an AutowireContext.
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java Sun May 21 09:30:53 2006
@@ -16,8 +16,8 @@
*/
package org.apache.tuscany.core.webapp;
-import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.core.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
import org.apache.tuscany.core.client.BootstrapHelper;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java Sun May 21 09:30:53 2006
@@ -33,7 +33,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.impl.JNDIPropertyFactory;
import org.apache.tuscany.model.assembly.AssemblyFactory;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java Sun May 21 09:30:53 2006
@@ -17,7 +17,7 @@
package org.apache.tuscany.core.loader;
import junit.framework.TestCase;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.impl.StringParserPropertyFactory;
import org.apache.tuscany.model.assembly.AssemblyFactory;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java Sun May 21 09:30:53 2006
@@ -20,7 +20,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.config.ComponentTypeIntrospector;
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.config.ConfigurationLoadException;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java Sun May 21 09:30:53 2006
@@ -49,7 +49,7 @@
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.impl.AssemblyContextImpl;
import org.apache.tuscany.model.types.java.JavaServiceContract;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.core.monitor.impl.NullMonitorFactory;
/**
* Generates test components, modules, and runtime artifacts
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java Sun May 21 09:30:53 2006
@@ -16,7 +16,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.core.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
import org.apache.tuscany.core.client.BootstrapHelper;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java Sun May 21 09:30:53 2006
@@ -17,8 +17,8 @@
import junit.framework.TestCase;
import org.osoa.sca.ServiceUnavailableException;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
-import org.apache.tuscany.common.monitor.MonitorFactory;
+import org.apache.tuscany.core.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.client.BootstrapHelper;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java Sun May 21 09:30:53 2006
@@ -16,7 +16,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.core.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.client.BootstrapHelper;
import org.apache.tuscany.core.context.AutowireContext;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java Sun May 21 09:30:53 2006
@@ -19,7 +19,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.common.monitor.MonitorFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
import org.apache.tuscany.core.builder.ContextFactory;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.Context;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java Sun May 21 09:30:53 2006
@@ -27,8 +27,8 @@
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
import org.apache.tuscany.core.client.BootstrapHelper;
-import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.core.monitor.impl.NullMonitorFactory;
/**
* @version $Rev$ $Date$
Added: incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/TestMessages.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/TestMessages.properties?rev=408183&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/TestMessages.properties (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/TestMessages.properties Sun May 21 09:30:53 2006
@@ -0,0 +1,16 @@
+# Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Rev$ $Date$
+#
Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/TestMessages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core/src/test/resources/resources/org/apache/tuscany/core/monitor/TestMessages.properties
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java Sun May 21 09:30:53 2006
@@ -8,8 +8,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.common.ObjectCreationException;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.injection.ArrayMultiplicityObjectFactory;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.FieldInjector;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/HttpSessionScopeObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.context.scope;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* @version $$Rev$$ $$Date$$
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ModuleScopeObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.context.scope;
-import org.apache.tuscany.common.ObjectCreationException;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
/**
* @version $$Rev$$ $$Date$$
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.context.scope;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* @version $$Rev$$ $$Date$$
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/ScopeRegistryImpl.java Sun May 21 09:30:53 2006
@@ -3,7 +3,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.model.Scope;
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.ScopeContext;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/StatelessScopeObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.context.scope;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* @version $$Rev$$ $$Date$$
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java Sun May 21 09:30:53 2006
@@ -3,8 +3,8 @@
import java.util.List;
import java.lang.reflect.Array;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* Resolves targets configured in a multiplicity by delegating to object factories and returning an
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* Implementations inject a pre-configured context type (interface) on an instance.
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java Sun May 21 09:30:53 2006
@@ -2,11 +2,11 @@
import java.lang.reflect.Field;
-import org.apache.tuscany.common.ObjectFactory;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
- * Injects a value created by an {@link org.apache.tuscany.common.ObjectFactory} on a given field
+ * Injects a value created by an {@link org.apache.tuscany.spi.ObjectFactory} on a given field
*
* @version $Rev: 399488 $ $Date: 2006-05-03 16:20:27 -0700 (Wed, 03 May 2006) $
*/
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.TuscanyRuntimeException;
+import org.apache.tuscany.spi.TuscanyRuntimeException;
/**
* Root unchecked exception for the injection package
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/Injector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/Injector.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/Injector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/Injector.java Sun May 21 09:30:53 2006
@@ -13,7 +13,7 @@
*/
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectCreationException;
/**
* Implementations inject a pre-configured value on an instance
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java Sun May 21 09:30:53 2006
@@ -3,8 +3,8 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.tuscany.common.ObjectCreationException;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
/**
* Resolves targets configured in a multiplicity by delegating to object factories and returning an
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java Sun May 21 09:30:53 2006
@@ -3,11 +3,11 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
-import org.apache.tuscany.common.ObjectCreationException;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
/**
- * Injects a value created by an {@link org.apache.tuscany.common.ObjectFactory} using a given method
+ * Injects a value created by an {@link org.apache.tuscany.spi.ObjectFactory} using a given method
* @version $Rev: 399488 $ $Date: 2006-05-03 16:20:27 -0700 (Wed, 03 May 2006) $
*/
public class MethodInjector<T> implements Injector<T> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java Sun May 21 09:30:53 2006
@@ -17,8 +17,8 @@
import java.lang.reflect.InvocationTargetException;
import java.util.List;
-import org.apache.tuscany.common.ObjectCreationException;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
/**
* Creates new instances of a Java class, calling a given set of injectors to configure the instance
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
/**
* Implementation of ObjectFactory that returns a single instance, typically an immutable type.
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java Sun May 21 09:30:53 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.common.ObjectCreationException;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.wire.SourceWire;
/**
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?rev=408183&r1=408182&r2=408183&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Sun May 21 09:30:53 2006
@@ -24,7 +24,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.model.Component;
import org.apache.tuscany.model.ComponentType;
import org.apache.tuscany.model.Implementation;
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java?rev=408183&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java Sun May 21 09:30:53 2006
@@ -0,0 +1,60 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tuscany.core.monitor;
+
+/**
+ * Exception indicating an invalid log level has been passed.
+ *
+ * @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
+ */
+public class InvalidLevelException extends IllegalArgumentException {
+ private static final long serialVersionUID = 7767234706427841915L;
+ private final String method;
+ private final String level;
+
+ /**
+ * Constructor specifying the method name and the level affected.
+ *
+ * @param method the name of the method being monitored
+ * @param level the invalid log level value
+ */
+ public InvalidLevelException(String method, String level) {
+ super();
+ this.method = method;
+ this.level = level;
+ }
+
+ /**
+ * Returns the name of the method being monitored.
+ * @return the name of the method being monitored
+ */
+ public String getMethod() {
+ return method;
+ }
+
+ /**
+ * Returns the invalid log level specified.
+ * @return the invalid log level that was specified
+ */
+ public String getLevel() {
+ return level;
+ }
+
+ public String getMessage() {
+ return "Invalid level for method " + method + " : " + level;
+ }
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org