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 2006/05/15 20:39:28 UTC
svn commit: r406705 - in /incubator/tuscany/sandbox/jboynes/sca:
core/src/main/resources/ core2/src/main/java/org/apache/tuscany/core/builder/
core2/src/main/java/org/apache/tuscany/core/loader/
core2/src/main/java/org/apache/tuscany/core/system/loader...
Author: jboynes
Date: Mon May 15 11:39:26 2006
New Revision: 406705
URL: http://svn.apache.org/viewcvs?rev=406705&view=rev
Log:
start to plug component type loading
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java (contents, props changed)
- copied, changed from r406679, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java (with props)
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java (with props)
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module?rev=406705&r1=406704&r2=406705&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/system.module Mon May 15 11:39:26 2006
@@ -23,8 +23,8 @@
<system:implementation.system class="org.apache.tuscany.core.services.wsdl.WSDLDefinitionRegistryImpl"/>
</component>
- <component name="org.apache.tuscany.core.loader.ComponentTypeLoader">
- <system:implementation.system class="org.apache.tuscany.core.loader.ComponentTypeLoader"/>
+ <component name="org.apache.tuscany.core.loader.ComponentTypeElementLoader">
+ <system:implementation.system class="org.apache.tuscany.core.loader.ComponentTypeElementLoader"/>
</component>
<!--
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?rev=406705&r1=406704&r2=406705&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Mon May 15 11:39:26 2006
@@ -76,26 +76,11 @@
}
public <I extends Implementation<?>> void register(ComponentBuilder<I> builder) {
- //Class<I> implClass = (Class<I>) recurseInterfaces(builder.getClass());
Class<I> implClass = JavaIntrospectionHelper.introspectGeneric(builder.getClass(),0);
if (implClass == null){
throw new IllegalArgumentException("builder is not generified");
}
register(implClass, builder);
-// Type[] interfaces = builder.getClass().getGenericInterfaces();
-// for (Type type : interfaces) {
-// if (! (type instanceof ParameterizedType)) {
-// continue;
-// }
-// ParameterizedType interfaceType = (ParameterizedType) type;
-// if (!ComponentBuilder.class.equals(interfaceType.getRawType())) {
-// continue;
-// }
-// Class<I> implClass = (Class<I>) interfaceType.getActualTypeArguments()[0];
-// register(implClass, builder);
-// return;
-// }
-// throw new IllegalArgumentException("builder is not generified");
}
public <I extends Implementation<?>> void register(Class<I> implClass, ComponentBuilder<I> builder) {
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java (from r406679, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java&r1=406679&r2=406705&rev=406705&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java Mon May 15 11:39:26 2006
@@ -34,7 +34,7 @@
/**
* @version $Rev$ $Date$
*/
-public class ComponentTypeLoader extends LoaderExtension {
+public class ComponentTypeElementLoader extends LoaderExtension {
public QName getXMLType() {
return AssemblyConstants.COMPONENT_TYPE;
}
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?rev=406705&r1=406704&r2=406705&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Mon May 15 11:39:26 2006
@@ -23,19 +23,24 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.model.ModelObject;
+import org.apache.tuscany.model.Implementation;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.StAXElementLoader;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.UnrecognizedElementException;
+import org.apache.tuscany.spi.loader.ComponentTypeLoader;
/**
* @version $Rev$ $Date$
*/
public class LoaderRegistryImpl implements LoaderRegistry {
- private final Map<QName, StAXElementLoader<? extends ModelObject>> loaders = new HashMap<QName, StAXElementLoader<? extends ModelObject>>();
-
private Monitor monitor;
+ private final Map<QName, StAXElementLoader<? extends ModelObject>> loaders =
+ new HashMap<QName, StAXElementLoader<? extends ModelObject>>();
+ private final Map<Class<? extends Implementation<?>>, ComponentTypeLoader<? extends Implementation<?>>> componentTypeLoaders =
+ new HashMap<Class<? extends Implementation<?>>, ComponentTypeLoader<? extends Implementation<?>>>();
+
@org.apache.tuscany.spi.annotation.Monitor
public void setMonitor(Monitor monitor) {
@@ -58,11 +63,18 @@
StAXElementLoader<? extends ModelObject> loader = loaders.get(name);
if (loader == null) {
throw new UnrecognizedElementException(name);
- } else {
- return loader.load(reader, loaderContext);
}
+ return loader.load(reader, loaderContext);
}
+ public <I extends Implementation> void loadComponentType(I implementation) {
+ Class<I> key = (Class<I>) implementation.getClass();
+ ComponentTypeLoader<I> loader = (ComponentTypeLoader<I>) componentTypeLoaders.get(key);
+ if (loader == null) {
+ throw new UnsupportedOperationException();
+ }
+ loader.load(implementation);
+ }
public static interface Monitor {
/**
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java?rev=406705&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java Mon May 15 11:39:26 2006
@@ -0,0 +1,45 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.core.system.loader;
+
+import java.net.URL;
+
+import org.apache.tuscany.spi.loader.ComponentTypeLoader;
+import org.apache.tuscany.core.system.model.SystemImplementation;
+import org.apache.tuscany.core.util.JavaIntrospectionHelper;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SystemComponentTypeLoader implements ComponentTypeLoader<SystemImplementation> {
+ public void load(SystemImplementation implementation) {
+ Class<?> implClass = implementation.getImplementationClass();
+ URL resource = implClass.getResource(JavaIntrospectionHelper.getBaseName(implClass) + ".componentType");
+ if (resource == null) {
+ loadByIntrospection(implementation);
+ } else {
+ loadFromSidefile(implementation, resource);
+ }
+ }
+
+ protected void loadByIntrospection(SystemImplementation implementation) {
+ }
+
+ protected void loadFromSidefile(SystemImplementation implementation, URL sidefile) {
+ throw new UnsupportedOperationException();
+ }
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java?rev=406705&r1=406704&r2=406705&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java Mon May 15 11:39:26 2006
@@ -42,10 +42,7 @@
String implClass = reader.getAttributeValue(null, "class");
Class<?> implementationClass = StAXUtil.loadClass(implClass, loaderContext.getClassLoader());
implementation.setImplementationClass(implementationClass);
-
- // todo we should allow componentType sidefiles for system implementations
-// implementation.setComponentType(introspector.introspect(implementationClass));
-
+ registry.loadComponentType(implementation);
StAXUtil.skipToEndElement(reader);
return implementation;
}
Added: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java?rev=406705&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java Mon May 15 11:39:26 2006
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.loader;
+
+import org.apache.tuscany.model.Implementation;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface ComponentTypeLoader<I extends Implementation> {
+ /**
+ * Load the component type information for the supplied implementation.
+ *
+ * @param implementation the implementation whose component type information should be loaded
+ */
+ void load(I implementation);
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java?rev=406705&r1=406704&r2=406705&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java Mon May 15 11:39:26 2006
@@ -21,6 +21,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.model.ModelObject;
+import org.apache.tuscany.model.Implementation;
/**
* Registry for XML loaders that can parse a StAX input stream and return model objects.
@@ -68,4 +69,6 @@
* @throws XMLStreamException if there was a problem reading the stream
*/
ModelObject load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, LoaderException;
+
+ <I extends Implementation> void loadComponentType(I implementation);
}