You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/12 23:22:55 UTC
svn commit: r517427 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/component/instancefactory/
main/java/org/apache/tuscany/core/component/instancefactory/impl/
main/java/org/apache/tuscany/core/marshaller/extensions...
Author: meerajk
Date: Mon Mar 12 15:22:53 2007
New Revision: 517427
URL: http://svn.apache.org/viewvc?view=rev&rev=517427
Log:
Intermediate checkin for IF provider builders.
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilder.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderException.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderRegistry.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/AbstractIFProviderBuilder.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/DefaultIFProviderBuilderRegistry.java (with props)
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractIFProviderDefinitionMarshaller.java
- copied, changed from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractInstanceFactoryProviderDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeIFProviderDefinitionMarshaller.java
- copied, changed from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeInstanceFactoryProviderDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java
- copied, changed from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveInstanceFactoryProviderDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeIFProviderDefinition.java
- copied, changed from r517310, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeInstanceFactoryProviderDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveIFProviderDefinition.java
- copied, changed from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveInstanceFactoryProviderDefinition.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractInstanceFactoryProviderDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeInstanceFactoryProviderDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveInstanceFactoryProviderDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeInstanceFactoryProviderDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveInstanceFactoryProviderDefinition.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilder.java?view=auto&rev=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilder.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilder.java Mon Mar 12 15:22:53 2007
@@ -0,0 +1,20 @@
+package org.apache.tuscany.core.component.instancefactory;
+
+import org.apache.tuscany.core.component.InstanceFactoryProvider;
+import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
+
+/**
+ * Interface for building instance factories.
+ */
+public interface IFProviderBuilder<IFP extends InstanceFactoryProvider,
+ IFPD extends InstanceFactoryProviderDefinition> {
+
+ /**
+ * Builds an instance factory provider from provider definition.
+ *
+ * @param ifpd Instance factory provider definition.
+ * @param cl Classloader to use.
+ * @return Instance factory provider.
+ */
+ IFP build(IFPD ifpd, ClassLoader cl);
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilder.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderException.java?view=auto&rev=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderException.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderException.java Mon Mar 12 15:22:53 2007
@@ -0,0 +1,13 @@
+package org.apache.tuscany.core.component.instancefactory;
+
+import org.apache.tuscany.api.TuscanyException;
+
+/**
+ * The builder exception for IF provider.
+ * @author Dell
+ *
+ */
+@SuppressWarnings("serial")
+public class IFProviderBuilderException extends TuscanyException {
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderRegistry.java?view=auto&rev=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderRegistry.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderRegistry.java Mon Mar 12 15:22:53 2007
@@ -0,0 +1,29 @@
+package org.apache.tuscany.core.component.instancefactory;
+
+import org.apache.tuscany.core.component.InstanceFactoryProvider;
+import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
+
+/**
+ * Registry for instance factory builders.
+ *
+ * @version $Revision$ $Date$
+ */
+public interface IFProviderBuilderRegistry {
+
+ /**
+ *
+ * Registers an instance factory provider builder.
+ *
+ * @param ifpdClass Instance factory provider definition class.
+ * @param builder Instance factory provider builder.
+ */
+ <IFPD extends InstanceFactoryProviderDefinition, IFP extends InstanceFactoryProvider> void register(Class<IFPD> ifpdClass,
+ IFProviderBuilder<IFP, IFPD> builder);
+
+ /**
+ * Builds an instnace factory provider from a definition.
+ * @param providerDefinition Provider definition.
+ * @return Instance factory provider.
+ */
+ InstanceFactoryProvider build(InstanceFactoryProviderDefinition providerDefinition);
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/IFProviderBuilderRegistry.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/AbstractIFProviderBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/AbstractIFProviderBuilder.java?view=auto&rev=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/AbstractIFProviderBuilder.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/AbstractIFProviderBuilder.java Mon Mar 12 15:22:53 2007
@@ -0,0 +1,30 @@
+package org.apache.tuscany.core.component.instancefactory.impl;
+
+import org.apache.tuscany.core.component.InstanceFactoryProvider;
+import org.apache.tuscany.core.component.instancefactory.IFProviderBuilder;
+import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
+import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * Abstarct implementation that supportes registration.
+ */
+public abstract class AbstractIFProviderBuilder<IFP extends InstanceFactoryProvider, IFPD extends InstanceFactoryProviderDefinition>
+ implements IFProviderBuilder<IFP, IFPD> {
+
+ /**
+ * Returns the IFPD class.
+ * @return IFPD class.
+ */
+ protected abstract Class<IFPD> getIfpdClass();
+
+ /**
+ * Injects the builder registry.
+ * @param registry The builder registry.
+ */
+ @Reference
+ public void setBuilderRegistry(IFProviderBuilderRegistry registry) {
+ registry.register(getIfpdClass(), this);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/AbstractIFProviderBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/AbstractIFProviderBuilder.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/DefaultIFProviderBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/DefaultIFProviderBuilderRegistry.java?view=auto&rev=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/DefaultIFProviderBuilderRegistry.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/DefaultIFProviderBuilderRegistry.java Mon Mar 12 15:22:53 2007
@@ -0,0 +1,42 @@
+package org.apache.tuscany.core.component.instancefactory.impl;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.tuscany.core.component.InstanceFactoryProvider;
+import org.apache.tuscany.core.component.instancefactory.IFProviderBuilder;
+import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
+import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilder;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
+
+/**
+ * Default implementation of the registry.
+ *
+ * @version $Revison$ $Date$
+ *
+ */
+public class DefaultIFProviderBuilderRegistry implements IFProviderBuilderRegistry {
+
+ // Internal cache
+ private Map<Class<?>, IFProviderBuilder<? extends InstanceFactoryProvider, ? extends InstanceFactoryProviderDefinition>> registry =
+ new ConcurrentHashMap<Class<?>, IFProviderBuilder<? extends InstanceFactoryProvider, ? extends InstanceFactoryProviderDefinition>>();
+
+ /**
+ * Builds the IF provider.
+ */
+ public InstanceFactoryProvider build(InstanceFactoryProviderDefinition providerDefinition) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * Registers the builder.
+ */
+ public <IFPD extends InstanceFactoryProviderDefinition, IFP extends InstanceFactoryProvider> void register(Class<IFPD> ifpdClass,
+ IFProviderBuilder<IFP, IFPD> builder) {
+ registry.put(ifpdClass, builder);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/DefaultIFProviderBuilderRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/DefaultIFProviderBuilderRegistry.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractIFProviderDefinitionMarshaller.java (from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractInstanceFactoryProviderDefinitionMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractIFProviderDefinitionMarshaller.java?view=diff&rev=517427&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractInstanceFactoryProviderDefinitionMarshaller.java&r1=517376&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractIFProviderDefinitionMarshaller.java&r2=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractInstanceFactoryProviderDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractIFProviderDefinitionMarshaller.java Mon Mar 12 15:22:53 2007
@@ -34,7 +34,7 @@
*
* @version $Revision$ $Date$
*/
-public abstract class AbstractInstanceFactoryProviderDefinitionMarshaller<IFPD extends InstanceFactoryProviderDefinition> extends
+public abstract class AbstractIFProviderDefinitionMarshaller<IFPD extends InstanceFactoryProviderDefinition> extends
AbstractExtensibleMarshallerExtension<IFPD> {
/**
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeIFProviderDefinitionMarshaller.java (from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeInstanceFactoryProviderDefinitionMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeIFProviderDefinitionMarshaller.java?view=diff&rev=517427&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeInstanceFactoryProviderDefinitionMarshaller.java&r1=517376&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeIFProviderDefinitionMarshaller.java&r2=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeInstanceFactoryProviderDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ByteCodeIFProviderDefinitionMarshaller.java Mon Mar 12 15:22:53 2007
@@ -25,9 +25,9 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.commons.codec.binary.Base64;
-import org.apache.tuscany.core.marshaller.extensions.AbstractInstanceFactoryProviderDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.AbstractIFProviderDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalComponentDefinitionMarshaller;
-import org.apache.tuscany.core.model.physical.instancefactory.ByteCodeInstanceFactoryProviderDefinition;
+import org.apache.tuscany.core.model.physical.instancefactory.ByteCodeIFProviderDefinition;
import org.apache.tuscany.spi.marshaller.MarshalException;
/**
@@ -35,8 +35,8 @@
*
* @version $Revision$ $Date$
*/
-public class ByteCodeInstanceFactoryProviderDefinitionMarshaller extends
- AbstractInstanceFactoryProviderDefinitionMarshaller<ByteCodeInstanceFactoryProviderDefinition> {
+public class ByteCodeIFProviderDefinitionMarshaller extends
+ AbstractIFProviderDefinitionMarshaller<ByteCodeIFProviderDefinition> {
// Byte code extension NS
public static final String BYTE_CODE_NS = "http://tuscany.apache.org/xmlns/marshaller/byteCode/1.0-SNAPSHOT";
@@ -52,12 +52,12 @@
new QName(BYTE_CODE_NS, AbstractPhysicalComponentDefinitionMarshaller.INSTANCE_FACTORY_PROVIDER, BYTE_CODE_PREFIX);
@Override
- protected ByteCodeInstanceFactoryProviderDefinition getConcreteModelObject() {
- return new ByteCodeInstanceFactoryProviderDefinition();
+ protected ByteCodeIFProviderDefinition getConcreteModelObject() {
+ return new ByteCodeIFProviderDefinition();
}
@Override
- protected void handleExtension(ByteCodeInstanceFactoryProviderDefinition modelObject, XMLStreamReader reader)
+ protected void handleExtension(ByteCodeIFProviderDefinition modelObject, XMLStreamReader reader)
throws MarshalException {
try {
@@ -74,7 +74,7 @@
}
@Override
- protected void handleExtension(ByteCodeInstanceFactoryProviderDefinition modelObject, XMLStreamWriter writer)
+ protected void handleExtension(ByteCodeIFProviderDefinition modelObject, XMLStreamWriter writer)
throws MarshalException {
try {
@@ -94,8 +94,8 @@
}
@Override
- protected Class<ByteCodeInstanceFactoryProviderDefinition> getModelObjectType() {
- return ByteCodeInstanceFactoryProviderDefinition.class;
+ protected Class<ByteCodeIFProviderDefinition> getModelObjectType() {
+ return ByteCodeIFProviderDefinition.class;
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java (from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveInstanceFactoryProviderDefinitionMarshaller.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java?view=diff&rev=517427&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveInstanceFactoryProviderDefinitionMarshaller.java&r1=517376&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java&r2=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveInstanceFactoryProviderDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/instancefactory/ReflectiveIFProviderDefinitionMarshaller.java Mon Mar 12 15:22:53 2007
@@ -27,11 +27,11 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.core.marshaller.extensions.AbstractInstanceFactoryProviderDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.AbstractIFProviderDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.AbstractPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.model.physical.instancefactory.InjectionSite;
import org.apache.tuscany.core.model.physical.instancefactory.InjectionSiteType;
-import org.apache.tuscany.core.model.physical.instancefactory.ReflectiveInstanceFactoryProviderDefinition;
+import org.apache.tuscany.core.model.physical.instancefactory.ReflectiveIFProviderDefinition;
import org.apache.tuscany.spi.marshaller.MarshalException;
/**
@@ -39,8 +39,8 @@
*
* @version $Revision$ $Date$
*/
-public class ReflectiveInstanceFactoryProviderDefinitionMarshaller extends
- AbstractInstanceFactoryProviderDefinitionMarshaller<ReflectiveInstanceFactoryProviderDefinition> {
+public class ReflectiveIFProviderDefinitionMarshaller extends
+ AbstractIFProviderDefinitionMarshaller<ReflectiveIFProviderDefinition> {
// Byte code extension NS
public static final String REFLECTIVE_NS = "http://tuscany.apache.org/xmlns/marshaller/reflect/1.0-SNAPSHOT";
@@ -80,12 +80,12 @@
new QName(REFLECTIVE_NS, AbstractPhysicalComponentDefinitionMarshaller.INSTANCE_FACTORY_PROVIDER, REFLECTIVE_PREFIX);
@Override
- protected ReflectiveInstanceFactoryProviderDefinition getConcreteModelObject() {
- return new ReflectiveInstanceFactoryProviderDefinition();
+ protected ReflectiveIFProviderDefinition getConcreteModelObject() {
+ return new ReflectiveIFProviderDefinition();
}
@Override
- protected void handleExtension(ReflectiveInstanceFactoryProviderDefinition modelObject, XMLStreamReader reader)
+ protected void handleExtension(ReflectiveIFProviderDefinition modelObject, XMLStreamReader reader)
throws MarshalException {
try {
@@ -116,7 +116,7 @@
}
@Override
- protected void handleExtension(ReflectiveInstanceFactoryProviderDefinition modelObject, XMLStreamWriter writer)
+ protected void handleExtension(ReflectiveIFProviderDefinition modelObject, XMLStreamWriter writer)
throws MarshalException {
try {
@@ -164,8 +164,8 @@
}
@Override
- protected Class<ReflectiveInstanceFactoryProviderDefinition> getModelObjectType() {
- return ReflectiveInstanceFactoryProviderDefinition.class;
+ protected Class<ReflectiveIFProviderDefinition> getModelObjectType() {
+ return ReflectiveIFProviderDefinition.class;
}
}
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeIFProviderDefinition.java (from r517310, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeInstanceFactoryProviderDefinition.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeIFProviderDefinition.java?view=diff&rev=517427&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeInstanceFactoryProviderDefinition.java&r1=517310&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeIFProviderDefinition.java&r2=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeInstanceFactoryProviderDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ByteCodeIFProviderDefinition.java Mon Mar 12 15:22:53 2007
@@ -26,7 +26,7 @@
*
* @version $Revision$ $Date$
*/
-public class ByteCodeInstanceFactoryProviderDefinition extends InstanceFactoryProviderDefinition {
+public class ByteCodeIFProviderDefinition extends InstanceFactoryProviderDefinition {
// Byte code
byte[] byteCode;
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveIFProviderDefinition.java (from r517376, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveInstanceFactoryProviderDefinition.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveIFProviderDefinition.java?view=diff&rev=517427&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveInstanceFactoryProviderDefinition.java&r1=517376&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveIFProviderDefinition.java&r2=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveInstanceFactoryProviderDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/instancefactory/ReflectiveIFProviderDefinition.java Mon Mar 12 15:22:53 2007
@@ -31,7 +31,7 @@
*
* @version $Revision$ $Date$
*/
-public class ReflectiveInstanceFactoryProviderDefinition extends InstanceFactoryProviderDefinition {
+public class ReflectiveIFProviderDefinition extends InstanceFactoryProviderDefinition {
// Implementation class
private String implementationClass;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java?view=diff&rev=517427&r1=517426&r2=517427
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java Mon Mar 12 15:22:53 2007
@@ -32,8 +32,8 @@
import junit.framework.TestCase;
-import org.apache.tuscany.core.marshaller.extensions.instancefactory.ByteCodeInstanceFactoryProviderDefinitionMarshaller;
-import org.apache.tuscany.core.marshaller.extensions.instancefactory.ReflectiveInstanceFactoryProviderDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.instancefactory.ByteCodeIFProviderDefinitionMarshaller;
+import org.apache.tuscany.core.marshaller.extensions.instancefactory.ReflectiveIFProviderDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireSourceDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireTargetDefinitionMarshaller;
@@ -70,8 +70,8 @@
marshallers[3] = new PhysicalChangeSetMarshaller();
marshallers[4] = new JavaPhysicalWireSourceDefinitionMarshaller();
marshallers[5] = new JavaPhysicalWireTargetDefinitionMarshaller();
- marshallers[6] = new ByteCodeInstanceFactoryProviderDefinitionMarshaller();
- marshallers[7] = new ReflectiveInstanceFactoryProviderDefinitionMarshaller();
+ marshallers[6] = new ByteCodeIFProviderDefinitionMarshaller();
+ marshallers[7] = new ReflectiveIFProviderDefinitionMarshaller();
for (int i = 0; i < 8; i++) {
marshallers[i].setMarshallerRegistry(registry);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org