You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/01/13 10:28:41 UTC
svn commit: r495858 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/system/component/
main/java/org/apache/tuscany/core/wire/
test/java/org/apache/tuscany/core/implementation/system/component/
test/jav...
Author: jmarino
Date: Sat Jan 13 01:28:40 2007
New Revision: 495858
URL: http://svn.apache.org/viewvc?view=rev&rev=495858
Log:
class rename and package move; additional testcase
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactory.java (contents, props changed)
- copied, changed from r495848, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java (contents, props changed)
- copied, changed from r495848, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java?view=diff&rev=495858&r1=495857&r2=495858
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java Sat Jan 13 01:28:40 2007
@@ -27,6 +27,7 @@
import org.apache.tuscany.core.implementation.PojoAtomicComponent;
import org.apache.tuscany.core.implementation.PojoConfiguration;
+import org.apache.tuscany.core.wire.OptimizedWireObjectFactory;
/**
* Default implementation of a system atomic context
@@ -49,6 +50,6 @@
}
protected ObjectFactory<?> createWireFactory(Class<?> interfaze, OutboundWire wire) {
- return new WireObjectFactory(wire);
+ return new OptimizedWireObjectFactory(wire);
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactory.java (from r495848, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactory.java?view=diff&rev=495858&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactory.java&r1=495848&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactory.java&r2=495858
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactory.java Sat Jan 13 01:28:40 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.system.component;
+package org.apache.tuscany.core.wire;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
@@ -24,15 +24,15 @@
import org.apache.tuscany.spi.wire.OutboundWire;
/**
- * Returns a target instance from a wire
+ * Returns a target instance directly from a wire
*
* @version $Rev$ $Date$
*/
-public class WireObjectFactory implements ObjectFactory {
+public class OptimizedWireObjectFactory implements ObjectFactory {
private OutboundWire wire;
- public WireObjectFactory(OutboundWire factory) {
+ public OptimizedWireObjectFactory(OutboundWire factory) {
this.wire = factory;
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java?view=diff&rev=495858&r1=495857&r2=495858
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponentTestCase.java Sat Jan 13 01:28:40 2007
@@ -18,6 +18,9 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import java.util.List;
+import java.util.ArrayList;
+
import org.apache.tuscany.spi.component.TargetException;
import junit.framework.TestCase;
@@ -34,11 +37,25 @@
assertEquals(foo, component.getTargetInstance());
}
+ public void testGetInstanceMultipleServices() throws TargetException {
+ FooImpl foo = new FooImpl();
+ List<Class<?>> services = new ArrayList<Class<?>>();
+ services.add(Foo.class);
+ services.add(Bar.class);
+ SystemSingletonAtomicComponent<Foo, FooImpl> component =
+ new SystemSingletonAtomicComponent<Foo, FooImpl>("foo", null, services, foo);
+ assertEquals(foo, component.getTargetInstance());
+ }
+
private interface Foo {
}
- private class FooImpl implements Foo {
+ private interface Bar {
+
+ }
+
+ private class FooImpl implements Foo, Bar {
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java (from r495848, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java?view=diff&rev=495858&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java&r1=495848&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java&r2=495858
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/WireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java Sat Jan 13 01:28:40 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.system.component;
+package org.apache.tuscany.core.wire;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -26,14 +26,14 @@
/**
* @version $Rev$ $Date$
*/
-public class WireObjectFactoryTestCase extends TestCase {
+public class OptimizedWireObjectFactoryTestCase extends TestCase {
public void testGetInstance() throws Exception {
Foo foo = new Foo();
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getTargetService()).andReturn(foo);
EasyMock.replay(wire);
- WireObjectFactory factory = new WireObjectFactory(wire);
+ OptimizedWireObjectFactory factory = new OptimizedWireObjectFactory(wire);
assertEquals(foo, factory.getInstance());
EasyMock.verify(wire);
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org