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/02/25 02:14:56 UTC
svn commit: r511394 - in
/incubator/tuscany/java/sca/services/persistence/datasource/src:
main/java/org/apache/tuscany/persistence/datasource/
test/java/org/apache/tuscany/persistence/datasource/
Author: jmarino
Date: Sat Feb 24 17:14:55 2007
New Revision: 511394
URL: http://svn.apache.org/viewvc?view=rev&rev=511394
Log:
remove CompositeComponent references and replace with Component references
Modified:
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceBuilder.java
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java
incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java?view=diff&rev=511394&r1=511393&r2=511394
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java Sat Feb 24 17:14:55 2007
@@ -24,7 +24,7 @@
import javax.sql.DataSource;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
@@ -57,7 +57,7 @@
return DataSourceImplementation.class;
}
- public void load(CompositeComponent parent, DataSourceImplementation implementation, DeploymentContext ctx)
+ public void load(Component parent, DataSourceImplementation implementation, DeploymentContext ctx)
throws LoaderException {
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> componentType =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceBuilder.java?view=diff&rev=511394&r1=511393&r2=511394
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceBuilder.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceBuilder.java Sat Feb 24 17:14:55 2007
@@ -25,7 +25,6 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
@@ -43,7 +42,7 @@
return DataSourceImplementation.class;
}
- public Component build(CompositeComponent parent,
+ public Component build(Component parent,
ComponentDefinition<DataSourceImplementation> definition,
DeploymentContext deploymentContext) throws BuilderConfigException {
try {
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java?view=diff&rev=511394&r1=511393&r2=511394
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java Sat Feb 24 17:14:55 2007
@@ -23,7 +23,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -68,7 +68,7 @@
return DATASOURCE;
}
- public ModelObject load(CompositeComponent parent,
+ public ModelObject load(Component parent,
ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java?view=diff&rev=511394&r1=511393&r2=511394
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/test/java/org/apache/tuscany/persistence/datasource/DataSourceBuilderTestCase.java Sat Feb 24 17:14:55 2007
@@ -21,7 +21,7 @@
import java.net.URI;
import javax.sql.DataSource;
-import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
@@ -40,7 +40,7 @@
public class DataSourceBuilderTestCase extends TestCase {
public void testBuild() throws Exception {
- CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
+ Component parent = EasyMock.createMock(Component.class);
EasyMock.replay(parent);
ScopeContainer scope = EasyMock.createMock(ScopeContainer.class);
EasyMock.replay(scope);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org