Author: jmarino
Date: Fri Jan 5 02:34:32 2007
New Revision: 492964
URL: http://svn.apache.org/viewvc?view=rev&rev=492964
Log:
more changeover to @EagerInit
Removed:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/CompositeScopeEagerInitDestroyComponent.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/LoaderExceptionFormatterTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderExceptionFormatter.java
Fri Jan 5 02:34:32 2007
@@ -4,6 +4,7 @@
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -16,24 +17,17 @@
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class LoaderExceptionFormatter implements ExceptionFormatter {
private FormatterRegistry factory;
- public LoaderExceptionFormatter() {
+ public LoaderExceptionFormatter(@Autowire FormatterRegistry factory) {
+ this.factory = factory;
+ factory.register(this);
}
public boolean canFormat(Class<?> type) {
return LoaderException.class.isAssignableFrom(type);
- }
-
- @Autowire
- public void setRegistry(FormatterRegistry factory) {
- this.factory = factory;
- }
-
- @Init(eager = true)
- public void init() {
- factory.register(this);
}
@Destroy
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
Fri Jan 5 02:34:32 2007
@@ -29,7 +29,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -38,8 +38,8 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.StAXElementLoader;
-import org.apache.tuscany.spi.loader.UnrecognizedElementException;
import org.apache.tuscany.spi.loader.UnrecognizedComponentTypeException;
+import org.apache.tuscany.spi.loader.UnrecognizedElementException;
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.model.ModelObject;
@@ -48,6 +48,7 @@
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class LoaderRegistryImpl implements LoaderRegistry {
private Monitor monitor;
private final Map<QName, StAXElementLoader<? extends ModelObject>> loaders
=
@@ -56,22 +57,8 @@
ComponentTypeLoader<? extends Implementation<?>>> componentTypeLoaders
=
new HashMap<Class<? extends Implementation<?>>, ComponentTypeLoader<?
extends Implementation<?>>>();
-
- public LoaderRegistryImpl() {
- }
-
- public LoaderRegistryImpl(Monitor monitor) {
+ public LoaderRegistryImpl(@org.apache.tuscany.api.annotation.Monitor
Monitor monitor) {
this.monitor = monitor;
- }
-
- @org.apache.tuscany.api.annotation.Monitor
- public void setMonitor(Monitor monitor) {
- this.monitor = monitor;
- }
-
- @Init(eager = true)
- public void init() {
-
}
public <T extends ModelObject> void registerLoader(QName element,
StAXElementLoader<T> loader) {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java
Fri Jan 5 02:34:32 2007
@@ -23,7 +23,7 @@
import java.lang.reflect.Proxy;
import java.util.Map;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.host.MonitorFactory;
@@ -32,6 +32,7 @@
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class NullMonitorFactory implements MonitorFactory {
/**
* Singleton wire hander that does nothing.
@@ -41,10 +42,6 @@
return null;
}
};
-
- @Init(eager = true)
- public void init() {
- }
public void initialize(Map<String, Object> configProperties) {
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
Fri Jan 5 02:34:32 2007
@@ -25,6 +25,7 @@
import java.util.concurrent.TimeUnit;
import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Scope;
@@ -44,6 +45,7 @@
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
[EMAIL PROTECTED]
public class MemoryStore implements Store {
private Map<SCAObject, Map<String, Record>> store;
// TODO integrate with a core threading scheme
@@ -87,7 +89,7 @@
return reaperInterval;
}
- @Init(eager = true)
+ @Init
public void init() {
scheduler.scheduleWithFixedDelay(new Reaper(), reaperInterval,
reaperInterval, TimeUnit.MILLISECONDS);
monitor.start("In-memory store started");
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatter.java
Fri Jan 5 02:34:32 2007
@@ -21,7 +21,7 @@
import java.io.PrintWriter;
import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.model.Operation;
@@ -36,24 +36,17 @@
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class IncompatibleServiceContractExceptionFormatter implements
ExceptionFormatter {
private FormatterRegistry factory;
- public IncompatibleServiceContractExceptionFormatter() {
+ public IncompatibleServiceContractExceptionFormatter(@Autowire
FormatterRegistry factory) {
+ this.factory = factory;
+ factory.register(this);
}
public boolean canFormat(Class<?> type) {
return
IncompatibleServiceContractException.class.isAssignableFrom(type);
- }
-
- @Autowire(required = false)
- public void setRegistry(FormatterRegistry factory) {
- this.factory = factory;
- }
-
- @Init(eager = true)
- public void init() {
- factory.register(this);
}
@Destroy
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
Fri Jan 5 02:34:32 2007
@@ -18,22 +18,22 @@
*/
package org.apache.tuscany.core.wire.jdk;
-import java.lang.reflect.Proxy;
import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.util.Map;
import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundChainHolder;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.ProxyCreationException;
import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.spi.wire.WireInvocationHandler;
-import org.apache.tuscany.spi.wire.OutboundChainHolder;
import org.apache.tuscany.core.wire.WireServiceExtension;
@@ -42,6 +42,7 @@
*
* @version $$Rev$$ $$Date$$
*/
[EMAIL PROTECTED]
public class JDKWireService extends WireServiceExtension {
public JDKWireService() {
@@ -51,10 +52,6 @@
@Constructor
public JDKWireService(@Autowire WorkContext context, @Autowire
PolicyBuilderRegistry policyRegistry) {
super(context, policyRegistry);
- }
-
- @Init(eager = true)
- public void init() {
}
public <T> T createProxy(Class<T> interfaze, Wire wire) throws
ProxyCreationException {
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/LoaderExceptionFormatterTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/LoaderExceptionFormatterTestCase.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/LoaderExceptionFormatterTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/LoaderExceptionFormatterTestCase.java
Fri Jan 5 02:34:32 2007
@@ -24,6 +24,8 @@
import org.apache.tuscany.spi.loader.LoaderException;
import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import org.apache.tuscany.host.monitor.FormatterRegistry;
/**
* @version $Rev$ $Date$
@@ -31,7 +33,8 @@
public class LoaderExceptionFormatterTestCase extends TestCase {
public void testLog() {
- LoaderExceptionFormatter formatter = new LoaderExceptionFormatter();
+ FormatterRegistry registry =
EasyMock.createNiceMock(FormatterRegistry.class);
+ LoaderExceptionFormatter formatter = new
LoaderExceptionFormatter(registry);
LoaderException e = new LoaderException("test");
StringWriter writer = new StringWriter();
PrintWriter pw = new PrintWriter(writer);
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
Fri Jan 5 02:34:32 2007
@@ -119,9 +119,8 @@
super.setUp();
name = new QName("http://mock";, "test");
deploymentContext = new RootDeploymentContext(null, null, null, null);
- registry = new LoaderRegistryImpl();
mockMonitor = EasyMock.createMock(LoaderRegistryImpl.Monitor.class);
- registry.setMonitor(mockMonitor);
+ registry = new LoaderRegistryImpl(mockMonitor);
mockLoader = EasyMock.createMock(StAXElementLoader.class);
mockReader = EasyMock.createMock(XMLStreamReader.class);
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java
Fri Jan 5 02:34:32 2007
@@ -21,15 +21,17 @@
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.EagerInit;
@Scope("COMPOSITE")
[EMAIL PROTECTED]
public class OrderedEagerInitPojo {
private static final Object LOCK = new Object();
private static int numberInstantied;
private int initOrder;
- @Init(eager = true)
+ @Init
public void init() {
synchronized (LOCK) {
++numberInstantied;
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java?view=diff&rev=492964&r1=492963&r2=492964
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java
Fri Jan 5 02:34:32 2007
@@ -26,12 +26,15 @@
import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
import junit.framework.TestCase;
+import org.apache.tuscany.host.monitor.FormatterRegistry;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
public class IncompatibleServiceContractExceptionFormatterTestCase extends
TestCase {
- IncompatibleServiceContractExceptionFormatter formatter = new
IncompatibleServiceContractExceptionFormatter();
+ FormatterRegistry registry =
EasyMock.createNiceMock(FormatterRegistry.class);
+ IncompatibleServiceContractExceptionFormatter formatter = new
IncompatibleServiceContractExceptionFormatter(registry);
public void testFormat() throws Exception {
ServiceContract<Object> source = new ServiceContract<Object>() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
