svn commit: r527749 [2/4] - in /incubator/tuscany/java/sca/modules/implementation-java-runtime/src: main/java/org/apache/tuscany/core/ main/java/org/apache/tuscany/implementation/ main/java/org/apache/tuscany/implementation/java/ main/java/org/apache/t...

[js...@apache.org]

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InjectionRuntimeException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InjectionRuntimeException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import org.apache.tuscany.spi.TuscanyRuntimeException;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/Injector.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/Injector.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/Injector.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/Injector.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/Injector.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/Injector.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/Injector.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import org.apache.tuscany.spi.ObjectCreationException;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InvalidAccessorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidAccessorException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 /**
  * @version $$Rev$$ $$Date$$

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InvalidResourceTypeException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InvalidResourceTypeException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/InvalidResourceTypeException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/InvalidResourceTypeException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import org.apache.tuscany.spi.ObjectCreationException;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/JNDIObjectFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/JNDIObjectFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/JNDIObjectFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/JNDIObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/JNDIObjectFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import javax.naming.Context;
 import javax.naming.NamingException;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ListMultiplicityObjectFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ListMultiplicityObjectFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ListMultiplicityObjectFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ListMultiplicityObjectFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodEventInvoker.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodEventInvoker.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodEventInvoker.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/MethodEventInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodEventInvoker.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/MethodInjector.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/MethodInjector.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoAccessorException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/NoAccessorException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoAccessorException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/NoAccessorException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoAccessorException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/NoAccessorException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoAccessorException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 /**
  * @version $$Rev$$ $$Date$$

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/NoMultiplicityTypeException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/NoMultiplicityTypeException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/NoMultiplicityTypeException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/NoMultiplicityTypeException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 /**
  * @version $Rev$ $Date$

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ObjectCallbackException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ObjectCallbackException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 /**
  * Denotes an error when invoking on an object

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/PojoObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/PojoObjectFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -29,7 +29,7 @@
  * Creates new instances of a Java class
  *
  * @version $Rev$ $Date$
- * @see org.apache.tuscany.core.injection.Injector
+ * @see org.apache.tuscany.implementation.java.injection.Injector
  */
 public class PojoObjectFactory<T> implements ObjectFactory<T> {
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/RequestContextObjectFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/RequestContextObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/RequestContextObjectFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/RequestContextObjectFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/RequestContextObjectFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/RequestContextObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/RequestContextObjectFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import org.apache.tuscany.core.implementation.composite.RequestContextImpl;
 import org.apache.tuscany.spi.ObjectCreationException;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ResourceNotFoundException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceNotFoundException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import org.apache.tuscany.spi.ObjectCreationException;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/ResourceObjectFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/SingletonObjectFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/SingletonObjectFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/SingletonObjectFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/injection/SingletonObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/injection/SingletonObjectFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.injection;
+package org.apache.tuscany.implementation.java.injection;
 
 import org.apache.tuscany.spi.ObjectFactory;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/implementation/java/bootstrap/RuntimeJavaModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Wed Apr 11 18:59:43 2007
@@ -17,14 +17,13 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.implementation.java.bootstrap;
+package org.apache.tuscany.implementation.java.module;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.tuscany.core.implementation.java.JavaComponentBuilder;
-import org.apache.tuscany.core.wire.jdk.JDKProxyService;
 import org.apache.tuscany.implementation.java.JavaImplementation;
+import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
 import org.apache.tuscany.implementation.java.introspect.BaseJavaClassIntrospectorExtension;
 import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospector;
 import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospectorExtension;
@@ -42,6 +41,7 @@
 import org.apache.tuscany.implementation.java.introspect.impl.ResourceProcessor;
 import org.apache.tuscany.implementation.java.introspect.impl.ScopeProcessor;
 import org.apache.tuscany.implementation.java.introspect.impl.ServiceProcessor;
+import org.apache.tuscany.implementation.java.proxy.JDKProxyService;
 import org.apache.tuscany.implementation.java.xml.JavaImplementationProcessor;
 import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
 import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
@@ -56,7 +56,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class RuntimeJavaModuleActivator implements ModuleActivator {
+public class JavaRuntimeModuleActivator implements ModuleActivator {
 
     public Map<Class, Object> getExtensionPoints() {
         Map<Class, Object> map = new HashMap<Class, Object>();

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/DefaultExceptionFormatter.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/DefaultExceptionFormatter.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.monitor;
+package org.apache.tuscany.implementation.java.monitor;
 
 import java.io.PrintWriter;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/InvalidLevelException.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/InvalidLevelException.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/InvalidLevelException.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/InvalidLevelException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/InvalidLevelException.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.monitor;
+package org.apache.tuscany.implementation.java.monitor;
 
 /**
  * Exception indicating an invalid log level has been passed.

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/JavaLoggingMonitorFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/JavaLoggingMonitorFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/JavaLoggingMonitorFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/JavaLoggingMonitorFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.monitor;
+package org.apache.tuscany.implementation.java.monitor;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/MonitorFactoryUtil.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/MonitorFactoryUtil.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/MonitorFactoryUtil.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/MonitorFactoryUtil.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.monitor;
+package org.apache.tuscany.implementation.java.monitor;
 
 import org.apache.tuscany.host.MonitorFactory;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/NullMonitorFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/NullMonitorFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/NullMonitorFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/NullMonitorFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.monitor;
+package org.apache.tuscany.implementation.java.monitor;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/ProxyMonitorFactory.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/ProxyMonitorFactory.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/ProxyMonitorFactory.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/monitor/ProxyMonitorFactory.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.monitor;
+package org.apache.tuscany.implementation.java.monitor;
 
 import java.util.Map;
 import java.util.Properties;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandler.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandler.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandler.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKCallbackInvocationHandler.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.wire.jdk;
+package org.apache.tuscany.implementation.java.proxy;
 
 import java.io.Externalizable;
 import java.io.IOException;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKInvocationHandler.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.wire.jdk;
+package org.apache.tuscany.implementation.java.proxy;
 
 import java.io.Externalizable;
 import java.io.IOException;
@@ -31,9 +31,9 @@
 import java.util.UUID;
 
 import org.apache.tuscany.assembly.Contract;
-import org.apache.tuscany.core.implementation.PojoWorkContextTunnel;
 import org.apache.tuscany.core.wire.NoMethodForOperationException;
 import org.apache.tuscany.core.wire.WireUtils;
+import org.apache.tuscany.implementation.java.context.PojoWorkContextTunnel;
 import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.ReactivationException;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKProxyService.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKProxyService.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKProxyService.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/core/wire/jdk/JDKProxyService.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/proxy/JDKProxyService.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.wire.jdk;
+package org.apache.tuscany.implementation.java.proxy;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator?view=diff&rev=527749&r1=527748&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator Wed Apr 11 18:59:43 2007
@@ -1,2 +1,2 @@
-# Implementation class for the ExtensionActivator
-org.apache.tuscany.core.implementation.java.bootstrap.RuntimeJavaModuleActivator
+# Implementation class for the ModuleActivator
+org.apache.tuscany.implementation.java.module.RuntimeJavaModuleActivator

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/InstanceWrapperBaseTestCase.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/InstanceWrapperBaseTestCase.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestCase.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/InstanceWrapperBaseTestCase.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/InstanceWrapperBaseTestCase.java Wed Apr 11 18:59:43 2007
@@ -16,9 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.component.scope;
+package org.apache.tuscany.implementation.java.context;
 
 import junit.framework.TestCase;
+
+import org.apache.tuscany.core.component.scope.InstanceWrapperBase;
 
 /**
  * @version $Rev$ $Date$

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentMetadataInjectionTestCase.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentMetadataInjectionTestCase.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentMetadataInjectionTestCase.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentMetadataInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentMetadataInjectionTestCase.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import junit.framework.TestCase;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentNegativeMetadataTestCase.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentNegativeMetadataTestCase.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentNegativeMetadataTestCase.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponentNegativeMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponentNegativeMetadataTestCase.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import junit.framework.TestCase;
 

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCaseFIXME.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import java.net.URI;
 
@@ -26,6 +26,7 @@
 import org.apache.tuscany.assembly.ComponentProperty;
 import org.apache.tuscany.assembly.Property;
 import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
 import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
 import org.apache.tuscany.implementation.java.impl.JavaElement;
 import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCaseFIXME.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import java.lang.reflect.Field;
 import java.net.URI;
@@ -26,6 +26,8 @@
 import org.apache.tuscany.assembly.Component;
 import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
 import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.implementation.java.context.JavaAtomicComponent;
+import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
 import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
 import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
 import org.apache.tuscany.spi.Scope;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCaseFIXME.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderMetadataTestCaseFIXME.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import java.lang.reflect.Constructor;
 import java.net.URI;
@@ -27,13 +27,15 @@
 import org.apache.tuscany.assembly.ComponentReference;
 import org.apache.tuscany.assembly.ComponentService;
 import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
-import org.apache.tuscany.core.mock.component.Source;
-import org.apache.tuscany.core.mock.component.SourceImpl;
-import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.implementation.java.context.JavaAtomicComponent;
+import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
 import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
 import org.apache.tuscany.implementation.java.impl.JavaElement;
 import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
 import org.apache.tuscany.implementation.java.impl.Scope;
+import org.apache.tuscany.implementation.java.mock.Source;
+import org.apache.tuscany.implementation.java.mock.SourceImpl;
+import org.apache.tuscany.implementation.java.mock.Target;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.ScopeContainer;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCaseFIXME.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import java.net.URI;
 
@@ -24,6 +24,8 @@
 
 import org.apache.tuscany.assembly.Component;
 import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.implementation.java.context.JavaAtomicComponent;
+import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
 import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
 import org.apache.tuscany.implementation.java.impl.JavaElement;
 import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaInvokerInterceptorBasicTestCase.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaInvokerInterceptorBasicTestCase.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaInvokerInterceptorBasicTestCase.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaInvokerInterceptorBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaInvokerInterceptorBasicTestCase.java Wed Apr 11 18:59:43 2007
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.implementation.java.context.JavaInvokerInterceptor;
 import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.InstanceWrapper;

Added: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaReferenceWireTestCase.java.FIXME
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaReferenceWireTestCase.java.FIXME?view=auto&rev=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaReferenceWireTestCase.java.FIXME (added)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaReferenceWireTestCase.java.FIXME Wed Apr 11 18:59:43 2007
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.implementation.java.context;
+
+import java.lang.reflect.Constructor;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.implementation.PojoConfiguration;
+import org.apache.tuscany.core.injection.PojoObjectFactory;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.spi.Scope;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetException;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.ProxyService;
+import org.apache.tuscany.spi.wire.Wire;
+import org.easymock.EasyMock;
+import org.easymock.IAnswer;
+
+/**
+ * Validates wiring from a Java atomic context
+ *
+ * @version $$Rev: 526852 $$ $$Date: 2007-04-09 10:47:45 -0700 (Mon, 09 Apr 2007) $$
+ */
+public class JavaReferenceWireTestCase extends TestCase {
+
+    @SuppressWarnings({"unchecked"})
+    public void testReferenceSet() throws Exception {
+        ScopeContainer scope = createMock();
+        scope.start();
+        final Target target = new TargetImpl();
+        PojoConfiguration configuration = new PojoConfiguration();
+        configuration.addReferenceSite("target", SourceImpl.class.getMethod("setTarget", Target.class));
+        Constructor<SourceImpl> ctr = SourceImpl.class.getConstructor();
+        configuration.setInstanceFactory(new PojoObjectFactory<SourceImpl>(ctr));
+        Wire wire = EasyMock.createMock(Wire.class);
+        wire.getInvocationChains();
+        EasyMock.expectLastCall().andReturn(new HashMap<Operation, InvocationChain>()).atLeastOnce();
+        URI uri = URI.create("#target");
+        EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
+        EasyMock.expect(wire.isOptimizable()).andReturn(false);
+        EasyMock.replay(wire);
+        ProxyService service = EasyMock.createMock(ProxyService.class);
+        EasyMock.expect(service.createProxy(EasyMock.eq(Target.class), EasyMock.eq(wire), EasyMock.isA(Map.class)))
+            .andAnswer(new IAnswer<Target>() {
+                public Target answer() throws Throwable {
+                    Wire wire = (Wire) EasyMock.getCurrentArguments()[1];
+                    wire.getInvocationChains();
+                    return target;
+                }
+
+            }).atLeastOnce();
+        EasyMock.replay(service);
+        configuration.setProxyService(service);
+        configuration.setName(new URI("source"));
+        configuration.setGroupId(URI.create("composite"));
+        JavaAtomicComponent component = new JavaAtomicComponent(configuration);
+        component.setScopeContainer(scope);
+        component.attachWire(wire);
+        component.start();
+        Source source = (Source) component.getTargetInstance();
+        assertSame(target, source.getTarget());
+        scope.stop();
+        EasyMock.verify(wire);
+        EasyMock.verify(scope);
+        EasyMock.verify(service);
+    }
+
+    private ScopeContainer createMock() throws TargetException {
+        ScopeContainer scope = EasyMock.createMock(ScopeContainer.class);
+        scope.start();
+        scope.stop();
+        scope.register(EasyMock.isA(AtomicComponent.class), EasyMock.eq(URI.create("composite")));
+        EasyMock.expectLastCall().atLeastOnce();
+        EasyMock.expect(scope.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
+        scope.getWrapper(EasyMock.isA(AtomicComponent.class), EasyMock.eq(URI.create("composite")));
+        EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
+            private Map<AtomicComponent, InstanceWrapper> cache = new HashMap<AtomicComponent, InstanceWrapper>();
+
+            public Object answer() throws Throwable {
+                AtomicComponent component = (AtomicComponent) EasyMock.getCurrentArguments()[0];
+                InstanceWrapper instance = cache.get(component);
+                if (instance == null) {
+                    instance = component.createInstanceWrapper();
+                    cache.put(component, instance);
+                }
+                return instance;
+            }
+        }).anyTimes();
+        EasyMock.replay(scope);
+        return scope;
+    }
+
+    private interface Source {
+        Target getTarget();
+    }
+
+    private static class SourceImpl implements Source {
+        private Target target;
+
+        public SourceImpl() {
+        }
+
+        public Target getTarget() {
+            return target;
+        }
+
+        public void setTarget(Target target) {
+            this.target = target;
+        }
+    }
+
+    private interface Target {
+
+        String getString();
+
+        void setString(String val);
+    }
+
+    private static class TargetImpl implements Target {
+        private String string;
+
+        public TargetImpl() {
+        }
+
+        public String getString() {
+            return string;
+        }
+
+        public void setString(String string) {
+            this.string = string;
+        }
+
+    }
+}

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerBasicInvocationTestCaseFIXME.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerBasicInvocationTestCaseFIXME.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCaseFIXME.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerBasicInvocationTestCaseFIXME.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerBasicInvocationTestCaseFIXME.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
 
@@ -25,6 +25,8 @@
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.implementation.java.context.JavaAtomicComponent;
+import org.apache.tuscany.implementation.java.context.JavaTargetInvoker;
 import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.component.InstanceWrapper;
 import org.apache.tuscany.spi.component.ScopeContainer;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerSequenceTestCaseFIXME.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerSequenceTestCaseFIXME.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCaseFIXME.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerSequenceTestCaseFIXME.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerSequenceTestCaseFIXME.java Wed Apr 11 18:59:43 2007
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.implementation.java.context.JavaAtomicComponent;
+import org.apache.tuscany.implementation.java.context.JavaTargetInvoker;
 import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.component.InstanceWrapper;
 import org.apache.tuscany.spi.component.ScopeContainer;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerStatelessDestroyTestCaseFIXME.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCaseFIXME.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerStatelessDestroyTestCaseFIXME.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCaseFIXME.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerStatelessDestroyTestCaseFIXME.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaTargetInvokerStatelessDestroyTestCaseFIXME.java Wed Apr 11 18:59:43 2007
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.implementation.java.context.JavaAtomicComponent;
+import org.apache.tuscany.implementation.java.context.JavaTargetInvoker;
 import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.component.InstanceWrapper;
 import org.apache.tuscany.spi.component.ScopeContainer;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/ModelHelper.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ModelHelper.java Wed Apr 11 18:59:43 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import org.apache.tuscany.assembly.AssemblyFactory;
 import org.apache.tuscany.assembly.ComponentService;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/MultiplicityTestCase.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/MultiplicityTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/MultiplicityTestCase.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/MultiplicityTestCase.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/MultiplicityTestCase.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/java/MultiplicityTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/MultiplicityTestCase.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.implementation.java.context;
 
 import junit.framework.TestCase;
 

Added: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponentTestCase.java.FIXME
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponentTestCase.java.FIXME?view=auto&rev=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponentTestCase.java.FIXME (added)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponentTestCase.java.FIXME Wed Apr 11 18:59:43 2007
@@ -0,0 +1,177 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.implementation;
+
+import java.net.URI;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.injection.EventInvoker;
+import org.apache.tuscany.core.injection.PojoObjectFactory;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.introspection.impl.IntrospectionRegistryImpl;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.Scope;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetInvokerCreationException;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Wire;
+import org.easymock.EasyMock;
+
+/**
+ * @version $Rev: 526976 $ $Date: 2007-04-09 17:38:35 -0700 (Mon, 09 Apr 2007) $
+ */
+public class PojoAtomicComponentTestCase extends TestCase {
+    private PojoConfiguration config;
+    private URI groupId;
+
+    @SuppressWarnings({"unchecked"})
+    public void testNoCallbackWires() throws Exception {
+        AtomicComponent component = new TestAtomicComponent(config);
+        ScopeContainer container = EasyMock.createMock(ScopeContainer.class);
+        EasyMock.expect(container.getScope()).andReturn(Scope.CONVERSATION);
+        container.register(component, groupId);
+        EasyMock.replay(container);
+        config.addCallbackSite("callback", Foo.class.getMethod("setCallback", Object.class));
+        component.setScopeContainer(container);
+        component.start();
+        EasyMock.verify(container);
+    }
+
+    public void testOptimizable() throws Exception {
+        TestAtomicComponent component = new TestAtomicComponent(config);
+        assertTrue(component.isOptimizable());
+    }
+
+    @SuppressWarnings({"unchecked"})
+    public void testDestroyableButOptimizable() throws Exception {
+        EventInvoker<Object> invoker = EasyMock.createMock(EventInvoker.class);
+        invoker.invokeEvent(EasyMock.notNull());
+        EasyMock.replay(invoker);
+        config.setDestroyInvoker(invoker);
+        TestAtomicComponent component = new TestAtomicComponent(config);
+        assertTrue(component.isOptimizable());
+    }
+
+    @SuppressWarnings({"unchecked"})
+    public void testStatelessOptimizable() throws Exception {
+        TestAtomicComponent component = new TestAtomicComponent(config, Scope.STATELESS);
+        assertTrue(component.isOptimizable());
+    }
+
+    @SuppressWarnings({"unchecked"})
+    public void testNotOptimizable() throws Exception {
+        EventInvoker<Object> invoker = EasyMock.createMock(EventInvoker.class);
+        invoker.invokeEvent(EasyMock.notNull());
+        EasyMock.replay(invoker);
+        config.setDestroyInvoker(invoker);
+        TestAtomicComponent component = new TestAtomicComponent(config, Scope.STATELESS);
+        assertFalse(component.isOptimizable());
+    }
+
+    public void testPropertyAccess() {
+        String value = "Foo!";
+        ObjectFactory objectFactory = EasyMock.createMock(ObjectFactory.class);
+        EasyMock.expect(objectFactory.getInstance()).andReturn(value);
+        EasyMock.replay(objectFactory);
+
+        TestAtomicComponent component = new TestAtomicComponent(config);
+        component.addPropertyFactory("foo", objectFactory);
+        assertSame(value, component.getProperty(String.class, "foo"));
+    }
+
+    public void testServiceLookup() {
+        URI uri = URI.create("#service");
+        FooService foo = EasyMock.createMock(FooService.class);
+        Wire wire = EasyMock.createMock(Wire.class);
+        EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
+        EasyMock.replay(wire);
+        ObjectFactory factory = EasyMock.createMock(ObjectFactory.class);
+        EasyMock.expect(factory.getInstance()).andReturn(foo);
+        EasyMock.replay(factory);
+        TestAtomicComponent component = new TestAtomicComponent(config, Scope.COMPOSITE, factory);
+        component.attachWire(wire);
+        assertSame(foo, component.getService(FooService.class, "service"));
+        EasyMock.verify(wire);
+        EasyMock.verify(factory);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        
+        JavaImplementationDefinition definition = new JavaImplementationDefinition();
+        definition.setName("foo");
+        
+        PojoObjectFactory<Foo> factory = new PojoObjectFactory<Foo>(Foo.class.getConstructor());
+
+        config = new PojoConfiguration(definition);
+        groupId = URI.create("parent");
+        config.setGroupId(groupId);
+    }
+
+    private class TestAtomicComponent extends PojoAtomicComponent {
+        private final ObjectFactory factory;
+        private final Scope scope;
+
+        public TestAtomicComponent(PojoConfiguration configuration) {
+            this(configuration, Scope.COMPOSITE, null);
+        }
+
+        public TestAtomicComponent(PojoConfiguration configuration, Scope scope) {
+            this(configuration, scope, null);
+        }
+
+        public TestAtomicComponent(PojoConfiguration configuration, Scope scope, ObjectFactory factory) {
+            super(configuration);
+            this.scope = scope;
+            this.factory = factory;
+        }
+
+        public Scope getScope() {
+            return scope;
+        }
+
+        @SuppressWarnings({"unchecked"})
+        protected <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire) {
+            return factory;
+        }
+
+        public TargetInvoker createTargetInvoker(String targetName, Operation operation, boolean isCallback)
+            throws TargetInvokerCreationException {
+            return null;
+        }
+    }
+
+    private static class Foo {
+        public Foo() {
+        }
+
+        public void setCallback(Object callback) {
+
+        }
+    }
+
+    public static interface FooService {
+    }
+
+}
+
+

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoComponentTestCase.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoComponentTestCase.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoComponentTestCase.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/PojoComponentTestCase.java Wed Apr 11 18:59:43 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.implementation;
+package org.apache.tuscany.implementation.java.context;
 
 import java.net.URI;
 import java.util.Collections;
@@ -29,8 +29,9 @@
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.verify;
 
-import org.apache.tuscany.core.component.InstanceFactory;
-import org.apache.tuscany.core.component.InstanceFactoryProvider;
+import org.apache.tuscany.implementation.java.context.InstanceFactory;
+import org.apache.tuscany.implementation.java.context.InstanceFactoryProvider;
+import org.apache.tuscany.implementation.java.context.PojoComponent;
 import org.apache.tuscany.spi.component.InstanceWrapper;
 import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.wire.Wire;

Copied: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceWrapperTestCase.java (from r527613, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/scope/ReflectiveInstanceWrapperTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceWrapperTestCase.java?view=diff&rev=527749&p1=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/scope/ReflectiveInstanceWrapperTestCase.java&r1=527613&p2=incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceWrapperTestCase.java&r2=527749
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/core/component/scope/ReflectiveInstanceWrapperTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/ReflectiveInstanceWrapperTestCase.java Wed Apr 11 18:59:43 2007
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.component.scope;
+package org.apache.tuscany.implementation.java.context;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.createMock;
 import org.easymock.EasyMock;
 
-import org.apache.tuscany.core.injection.EventInvoker;
+import org.apache.tuscany.implementation.java.context.ReflectiveInstanceWrapper;
+import org.apache.tuscany.implementation.java.injection.EventInvoker;
 import org.apache.tuscany.spi.component.TargetDestructionException;
 import org.apache.tuscany.spi.component.TargetInitializationException;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org