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/04 01:20:31 UTC
svn commit: r399488 - in /incubator/tuscany/sandbox/jboynes/sca:
common/src/main/java/org/apache/tuscany/common/
common/src/main/java/org/apache/tuscany/common/io/
core/src/main/java/org/apache/tuscany/core/builder/impl/
core/src/main/java/org/apache/t...
Author: jboynes
Date: Wed May 3 16:20:27 2006
New Revision: 399488
URL: http://svn.apache.org/viewcvs?rev=399488&view=rev
Log:
move ObjectFactory into common
Added:
incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectCreationException.java (with props)
incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectFactory.java (with props)
Removed:
incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/io/
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/ObjectFactory.java
Modified:
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/context/impl/ExternalServiceContextImpl.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/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/PojoObjectFactory.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/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/SystemAtomicContext.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/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/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/sandbox/jboynes/sca/model/pom.xml
incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/PropertyValue.java
incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java
Added: incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectCreationException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectCreationException.java?rev=399488&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectCreationException.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectCreationException.java Wed May 3 16:20:27 2006
@@ -0,0 +1,28 @@
+package org.apache.tuscany.common;
+
+/**
+ * Denotes an error creating a new object instance
+ *
+ * @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
+ */
+public class ObjectCreationException extends TuscanyRuntimeException {
+ private static final long serialVersionUID = -6423113430265944499L;
+
+ public ObjectCreationException() {
+ super();
+ }
+
+ public ObjectCreationException(String message) {
+ super(message);
+ }
+
+ public ObjectCreationException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public ObjectCreationException(Throwable cause) {
+ super(cause);
+ }
+
+}
+
Propchange: incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectCreationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectCreationException.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added: incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectFactory.java?rev=399488&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectFactory.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectFactory.java Wed May 3 16:20:27 2006
@@ -0,0 +1,17 @@
+package org.apache.tuscany.common;
+
+/**
+ * Implementations create new instances of a particular type
+ *
+ * @version $Rev: 380903 $ $Date: 2006-02-25 00:53:26 -0800 (Sat, 25 Feb 2006) $
+ */
+public interface ObjectFactory<T> {
+
+ /**
+ * Return a instance of the type that this factory creates.
+ *
+ * @return a instance from this factory
+ */
+ T getInstance() throws ObjectCreationException;
+
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/common/src/main/java/org/apache/tuscany/common/ObjectFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ArrayMultiplicityObjectFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -13,8 +13,8 @@
*/
package org.apache.tuscany.core.builder.impl;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -15,7 +15,7 @@
import org.apache.tuscany.core.builder.ContextCreationException;
import org.apache.tuscany.core.builder.ContextFactory;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ListMultiplicityObjectFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -13,8 +13,8 @@
*/
package org.apache.tuscany.core.builder.impl;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ProxyObjectFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -13,8 +13,8 @@
*/
package org.apache.tuscany.core.builder.impl;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.common.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/context/impl/ExternalServiceContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java?rev=399488&r1=399487&r2=399488&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java Wed May 3 16:20:27 2006
@@ -13,7 +13,7 @@
*/
package org.apache.tuscany.core.context.impl;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.context.TargetException;
import org.apache.tuscany.core.context.CoreRuntimeException;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/context/impl/POJOInstanceContextFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.core.context.impl;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/ContextObjectFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.core.context.CompositeContext;
/**
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -1,12 +1,12 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.common.ObjectCreationException;
import java.lang.reflect.Field;
/**
- * Injects a value created by an {@link ObjectFactory} on a given field
+ * Injects a value created by an {@link org.apache.tuscany.common.ObjectFactory} on a given field
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/Injector.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/InterCompositeReferenceFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -14,11 +14,11 @@
package org.apache.tuscany.core.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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.spi.ObjectCreationException;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -19,8 +19,8 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/NonProxiedTargetFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -14,9 +14,9 @@
package org.apache.tuscany.core.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectCreationException;
import org.apache.tuscany.model.assembly.ConfiguredService;
/**
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java?rev=399488&r1=399487&r2=399488&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java Wed May 3 16:20:27 2006
@@ -1,7 +1,7 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectFactory;
+import org.apache.tuscany.common.ObjectCreationException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -1,6 +1,6 @@
package org.apache.tuscany.core.injection;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/JNDIPropertyFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -23,7 +23,7 @@
import javax.naming.NamingException;
import org.apache.tuscany.core.loader.StAXPropertyFactory;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StringParserPropertyFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.core.loader.impl;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/system/builder/SystemContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -20,9 +20,9 @@
import java.util.Set;
import org.apache.tuscany.common.monitor.MonitorFactory;
+import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.annotation.Monitor;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -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.spi.ObjectFactory} to create an
+ * For composite types, this factory delegates to an {@link org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 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.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -19,7 +19,7 @@
import org.apache.tuscany.core.builder.ContextCreationException;
import org.apache.tuscany.core.builder.ContextFactory;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/SystemAtomicContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java?rev=399488&r1=399487&r2=399488&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicContext.java Wed May 3 16:20:27 2006
@@ -16,10 +16,10 @@
*/
package org.apache.tuscany.core.system.context;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.ObjectFactory;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.ObjectCallbackException;
-import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectCreationException;
import org.apache.tuscany.core.context.AtomicContext;
import org.apache.tuscany.core.context.impl.AbstractContext;
import org.apache.tuscany.spi.context.TargetException;
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemExternalServiceContext.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -13,7 +13,7 @@
*/
package org.apache.tuscany.core.system.context;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -14,11 +14,11 @@
package org.apache.tuscany.core.system.injection;
import org.apache.tuscany.core.builder.ContextResolver;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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.spi.ObjectCreationException;
+import org.apache.tuscany.common.ObjectCreationException;
/**
* Returns an instance by resolving against an AutowireContext.
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -33,7 +33,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -17,7 +17,7 @@
package org.apache.tuscany.core.loader;
import junit.framework.TestCase;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -20,7 +20,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.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/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?rev=399488&r1=399487&r2=399488&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 Wed May 3 16:20:27 2006
@@ -115,7 +115,7 @@
// create the configured property definition
ConfiguredProperty configuredProperty = factory.createConfiguredProperty();
configuredProperty.setName(name);
- configuredProperty.setValue(value);
+ configuredProperty.setValueFactory(value);
configuredProperty.setOverrideOption(override);
configuredProperties.add(configuredProperty);
break;
Modified: incubator/tuscany/sandbox/jboynes/sca/model/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/model/pom.xml?rev=399488&r1=399487&r2=399488&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/model/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/model/pom.xml Wed May 3 16:20:27 2006
@@ -28,6 +28,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-common</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.5.2</version>
Modified: incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/PropertyValue.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/PropertyValue.java?rev=399488&r1=399487&r2=399488&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/PropertyValue.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/model/src/main/java/org/apache/tuscany/model/PropertyValue.java Wed May 3 16:20:27 2006
@@ -16,12 +16,14 @@
*/
package org.apache.tuscany.model;
+import org.apache.tuscany.common.ObjectFactory;
+
/**
* @version $Rev$ $Date$
*/
public class PropertyValue<T> extends ModelObject {
private String name;
- private T value;
+ private ObjectFactory<T> valueFactory;
public String getName() {
return name;
@@ -31,11 +33,11 @@
this.name = name;
}
- public T getValue() {
- return value;
+ public ObjectFactory<T> getValueFactory() {
+ return valueFactory;
}
- public void setValue(T value) {
- this.value = value;
+ public void setValueFactory(ObjectFactory<T> valueFactory) {
+ this.valueFactory = valueFactory;
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml?rev=399488&r1=399487&r2=399488&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml Wed May 3 16:20:27 2006
@@ -35,12 +35,6 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-common</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-model</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java?rev=399488&r1=399487&r2=399488&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java Wed May 3 16:20:27 2006
@@ -20,7 +20,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.model.Property;
-import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.common.ObjectFactory;
/**
* A factory that will create an ObjectFactory for a property by parsing a StAX XMLStreamReader.