You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/19 00:59:13 UTC
svn commit: r519747 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/implementation/
core/src/main/java/org/apache/tuscany/core/implementation/system/builder/
core/src/main/java/org/apache/tuscany/core/implementation/...
Author: jboynes
Date: Sun Mar 18 16:59:12 2007
New Revision: 519747
URL: http://svn.apache.org/viewvc?view=rev&rev=519747
Log:
add PojoPCD to middle of hierarchy to share defn for Java and System PCs
Added:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/POJOComponentDefinition.java (with props)
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InstanceFactoryProviderDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java?view=diff&rev=519747&r1=519746&r2=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java Sun Mar 18 16:59:12 2007
@@ -26,8 +26,11 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
+import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
import org.apache.tuscany.core.implementation.system.model.SystemPhysicalComponentDefinition;
import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
+import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderException;
+import org.apache.tuscany.core.component.InstanceFactoryProvider;
/**
* Base class for PhysicalComponentBuilders that build components based on POJOs.
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java?view=diff&rev=519747&r1=519746&r2=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java Sun Mar 18 16:59:12 2007
@@ -31,6 +31,7 @@
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilderRegistry;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
/**
* @version $Rev$ $Date$
@@ -50,8 +51,13 @@
URI componentId = definition.getComponentId();
int initLevel = definition.getInitLevel();
URI groupId = definition.getGroupId();
+
ScopeContainer<?> scopeContainer = null;
- InstanceFactoryProvider<T> provider = definition.getProvider();
- return new SystemComponent<T>(componentId, provider, scopeContainer, groupId, initLevel, -1, -1);
+
+/*
+ InstanceFactoryProviderDefinition providerDefinition = definition.getInstanceFactoryProviderDefinition();
+ InstanceFactoryProvider<T> provider = providerBuilders.build(providerDefinition, null);
+*/
+ return new SystemComponent<T>(componentId, null, scopeContainer, groupId, initLevel, -1, -1);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java?view=diff&rev=519747&r1=519746&r2=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/model/SystemPhysicalComponentDefinition.java Sun Mar 18 16:59:12 2007
@@ -20,39 +20,11 @@
import org.apache.tuscany.core.component.InstanceFactoryProvider;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
+import org.apache.tuscany.spi.model.physical.POJOComponentDefinition;
/**
* @version $Rev$ $Date$
* @param <T> the implementation class for the defined component
- * @param <GROUP> the component group id type
*/
-public class SystemPhysicalComponentDefinition<T> extends PhysicalComponentDefinition {
- private int initLevel;
- private InstanceFactoryProvider<T> provider;
-
- /**
- * Return the provider for the component's instance factory.
- *
- * @return the provider for the component's instance factory
- */
- public InstanceFactoryProvider<T> getProvider() {
- return provider;
- }
-
- /**
- * Sets the provider for the component's instance factory.
- *
- * @param provider the provider for the component's instance factory
- */
- public void setProvider(InstanceFactoryProvider<T> provider) {
- this.provider = provider;
- }
-
- public int getInitLevel() {
- return initLevel;
- }
-
- public void setInitLevel(int initLevel) {
- this.initLevel = initLevel;
- }
+public class SystemPhysicalComponentDefinition<T> extends POJOComponentDefinition<T> {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java?view=diff&rev=519747&r1=519746&r2=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/marshaller/extensions/AbstractPhysicalComponentDefinitionMarshaller.java Sun Mar 18 16:59:12 2007
@@ -70,8 +70,8 @@
writer.writeAttribute(SCOPE, modelObject.getScope().toString());
writer.writeNamespace(qname.getPrefix(), qname.getNamespaceURI());
-
- registry.marshall(modelObject.getInstanceFactoryProviderDefinition(), writer);
+// FIXME JNB
+// registry.marshall(modelObject.getInstanceFactoryProviderDefinition(), writer);
handleExtension(modelObject, writer);
@@ -100,7 +100,8 @@
if(INSTANCE_FACTORY_PROVIDER.equals(name)) {
InstanceFactoryProviderDefinition ipcd =
(InstanceFactoryProviderDefinition) registry.unmarshall(reader);
- componentDefinition.setInstanceFactoryProviderDefinition(ipcd);
+// FIXME JNB
+// componentDefinition.setInstanceFactoryProviderDefinition(ipcd);
}
handleExtension(componentDefinition, reader);
break;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java?view=diff&rev=519747&r1=519746&r2=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java Sun Mar 18 16:59:12 2007
@@ -22,6 +22,7 @@
import org.apache.tuscany.core.component.InstanceFactoryProvider;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
+import org.apache.tuscany.spi.model.physical.POJOComponentDefinition;
/**
* Represents the physical component definition for a Java implementation.
@@ -29,26 +30,5 @@
* @version $Rev$ $Date$
* @param <T> the implementation class (if known)
*/
-public class JavaPhysicalComponentDefinition<T> extends PhysicalComponentDefinition {
-
- // Class loader id
- private URI classLoaderId;
-
- /**
- * Gets the classloader id.
- *
- * @return Classloader id.
- */
- public URI getClassLoaderId() {
- return classLoaderId;
- }
-
- /**
- * Set the classloader id.
- *
- * @param classLoaderId Classloader id.
- */
- public void setClassLoaderId(URI classLoaderId) {
- this.classLoaderId = classLoaderId;
- }
+public class JavaPhysicalComponentDefinition<T> extends POJOComponentDefinition<T> {
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InstanceFactoryProviderDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InstanceFactoryProviderDefinition.java?view=diff&rev=519747&r1=519746&r2=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InstanceFactoryProviderDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InstanceFactoryProviderDefinition.java Sun Mar 18 16:59:12 2007
@@ -25,7 +25,8 @@
* Base class for instance factory provider definition.
*
* @version $Revsion$ $Date$
+ * @param
*/
-public class InstanceFactoryProviderDefinition extends ModelObject {
+public class InstanceFactoryProviderDefinition<T> extends ModelObject {
}
Added: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/POJOComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/POJOComponentDefinition.java?view=auto&rev=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/POJOComponentDefinition.java (added)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/POJOComponentDefinition.java Sun Mar 18 16:59:12 2007
@@ -0,0 +1,55 @@
+/*
+ * 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.spi.model.physical;
+
+/**
+ * Definition of a physical component based on a POJO.
+ *
+ * @version $Rev$ $Date$
+ * @param <T> the implementation class (if known)
+ */
+public abstract class POJOComponentDefinition<T> extends PhysicalComponentDefinition {
+ private InstanceFactoryProviderDefinition<T> instanceFactoryProviderDefinition;
+ private int initLevel;
+
+ /**
+ * Gets the instance factory provider definition.
+ * @return Instance factory provider definition.
+ */
+ public InstanceFactoryProviderDefinition<T> getInstanceFactoryProviderDefinition() {
+ return instanceFactoryProviderDefinition;
+ }
+
+ /**
+ * Sets the instance factory provider definition.
+ * @param instanceFactoryProviderDefinition Instance factory provider definition.
+ */
+ public void setInstanceFactoryProviderDefinition(
+ InstanceFactoryProviderDefinition<T> instanceFactoryProviderDefinition) {
+ this.instanceFactoryProviderDefinition = instanceFactoryProviderDefinition;
+ }
+
+ public int getInitLevel() {
+ return initLevel;
+ }
+
+ public void setInitLevel(int initLevel) {
+ this.initLevel = initLevel;
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/POJOComponentDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/POJOComponentDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java?view=diff&rev=519747&r1=519746&r2=519747
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java Sun Mar 18 16:59:12 2007
@@ -30,14 +30,11 @@
*/
public abstract class PhysicalComponentDefinition extends ModelObject {
- // Component Id.
private URI componentId;
+ private URI classLoaderId;
private Scope scope;
private URI groupId;
- // Instance factory provider
- private InstanceFactoryProviderDefinition instanceFactoryProviderDefinition;// Scope
-
/**
* Gets the component id.
*
@@ -57,35 +54,37 @@
}
/**
- * Returns the id of the component group this component belongs to.
- * @return the id of the component group this component belongs to
+ * Gets the classloader id.
+ *
+ * @return Classloader id.
*/
- public URI getGroupId() {
- return groupId;
+ public URI getClassLoaderId() {
+ return classLoaderId;
}
/**
- * Sets the id of the component group this component belongs to.
- * @param groupId the id of the component group this component belongs to
+ * Set the classloader id.
+ *
+ * @param classLoaderId Classloader id.
*/
- public void setGroupId(URI groupId) {
- this.groupId = groupId;
+ public void setClassLoaderId(URI classLoaderId) {
+ this.classLoaderId = classLoaderId;
}
/**
- * Gets the instance factory provider definition.
- * @return Instance factory provider definition.
+ * Returns the id of the component group this component belongs to.
+ * @return the id of the component group this component belongs to
*/
- public InstanceFactoryProviderDefinition getInstanceFactoryProviderDefinition() {
- return instanceFactoryProviderDefinition;
+ public URI getGroupId() {
+ return groupId;
}
/**
- * Sets the instance factory provider definition.
- * @param instanceFactoryProviderDefinition Instance factory provider definition.
+ * Sets the id of the component group this component belongs to.
+ * @param groupId the id of the component group this component belongs to
*/
- public void setInstanceFactoryProviderDefinition(InstanceFactoryProviderDefinition instanceFactoryProviderDefinition) {
- this.instanceFactoryProviderDefinition = instanceFactoryProviderDefinition;
+ public void setGroupId(URI groupId) {
+ this.groupId = groupId;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org