tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r567587 - in /incubator/tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ binding-feed/src/main/resources/META-INF/services/ binding-jms/src/main/resources/META-INF/services/ binding-sca-xml/src/main/...
Date Mon, 20 Aug 2007 08:12:36 GMT
Author: jsdelfino
Date: Mon Aug 20 01:12:28 2007
New Revision: 567587

URL: http://svn.apache.org/viewvc?rev=567587&view=rev
Log:
Renamed type to qname in StAXArtifactProcessor declaration files. Renamed CRUD test case package as it conflicts with the sample CRUD extension package.

Added:
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUD.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUD.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/backend/
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java
      - copied, changed from r567542, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/module/
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java
      - copied, changed from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java
Removed:
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUD.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java
Modified:
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
    incubator/tuscany/java/sca/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
    incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
    incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/implementation-data/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java Mon Aug 20 01:12:28 2007
@@ -21,10 +21,7 @@
 
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,43 +45,69 @@
 public class DefaultBeanModelProcessor extends BaseArtifactProcessor implements StAXArtifactProcessor {
 
     private QName artifactType;
-    private Class<Implementation> beanModelType;
-    private BeanInfo beanInfo;
-    private Map<String, PropertyDescriptor> propertyDescriptors = new HashMap<String, PropertyDescriptor>();
+    private Class<Implementation> modelClass;
+    private Object modelFactory;
+    private Method factoryMethod;
+    private Map<String, Method> setterMethods = new HashMap<String, Method>();
+    private Map<String, Method> getterMethods = new HashMap<String, Method>();
 
     public DefaultBeanModelProcessor(AssemblyFactory assemblyFactory,
                                        PolicyFactory policyFactory,
                                        QName artifactType,
-                                       Class<Implementation> beanModelType) {
+                                       Class<Implementation> modelClass,
+                                       Object modelFactory) {
         super(assemblyFactory, policyFactory, null);
         this.artifactType = artifactType;
-        this.beanModelType = beanModelType;
+        this.modelClass = modelClass;
+        this.modelFactory = modelFactory;
         
-        // Introspect the bean model class
-        try {
-            beanInfo = Introspector.getBeanInfo(beanModelType);
+        // Introspect the factory class and bean model class
+        if (modelFactory != null) {
             
-            // Index the bean's property descriptors
-            PropertyDescriptor[] pd = beanInfo.getPropertyDescriptors();
-            for (int i =0; i < pd.length; i++) {
-                if (pd[i].getWriteMethod() == null) {
-                    continue;
+            // Find the model create method
+            for (Method method: modelFactory.getClass().getMethods()) {
+                if (method.getName().startsWith("create") && method.getReturnType() == modelClass) {
+                    factoryMethod = method;
+                    break;
                 }
+            }
+        }
+        
+        // Index the bean's setter methods
+        for (Method method: modelClass.getMethods()) {
+            Method getter;
+            String name = method.getName();
+            if (name.startsWith("set") && name.length() > 3) {
                 
-                // Map an uppercase property name to a lowercase attribute name 
-                String name = pd[i].getName();
-                if (name.toUpperCase().equals(name)) {
-                    name = name.toLowerCase();
+                // Get the corresponding getter method
+                try {
+                    getter = modelClass.getMethod("get" + name.substring(3));
+                } catch (Exception e) {
+                    getter = null;
                 }
                 
-                // Trim trailing _ from property names
-                if (name.endsWith("_")) {
-                    name = name.substring(0, name.length()-1);
+                // Get the property name
+                name = name.substring(3);
+                if (name.length() > 1) {
+                    if (!name.toUpperCase().equals(name)) {
+                        name = name.substring(0, 1).toLowerCase() + name.substring(1);
+                    }
                 }
-                propertyDescriptors.put(name, pd[i]);
+            } else {
+                continue;
             }
-        } catch (IntrospectionException e) {
-            throw new IllegalArgumentException(e);
+            
+            // Map an uppercase property name to a lowercase attribute name 
+            if (name.toUpperCase().equals(name)) {
+                name = name.toLowerCase();
+            }
+            
+            // Trim trailing _ from property names
+            if (name.endsWith("_")) {
+                name = name.substring(0, name.length()-1);
+            }
+            setterMethods.put(name, method);
+            getterMethods.put(name, getter);
         }
     }
 
@@ -93,31 +116,40 @@
         try {
 
             // Read an element
-            Object bean = beanModelType.newInstance();
+            
+            // Create a new instance of the model
+            Object model;
+            if (modelFactory != null) {
+                // Invoke the factory create method
+                model = factoryMethod.invoke(modelFactory);
+            } else {
+                // Invoke the model bean class default constructor
+                model = modelClass.newInstance();
+            }
 
             // Initialize the bean properties with the attributes found in the
             // XML element
             for (int i = 0, n = reader.getAttributeCount(); i < n; i++) {
                 String attributeName = reader.getAttributeLocalName(i);
-                PropertyDescriptor pd = propertyDescriptors.get(attributeName);
-                if (pd != null) {
+                Method setter = setterMethods.get(attributeName);
+                if (setter != null) {
                     String value = reader.getAttributeValue(i);
-                    pd.getWriteMethod().invoke(bean, value);
+                    setter.invoke(model, value);
                 }
             }
 
             // Read policies
-            if (bean instanceof PolicySetAttachPoint) {
-                readPolicies((PolicySetAttachPoint)bean, reader);
-            } else if (bean instanceof IntentAttachPoint) {
-                readIntents((IntentAttachPoint)bean, reader);
+            if (model instanceof PolicySetAttachPoint) {
+                readPolicies((PolicySetAttachPoint)model, reader);
+            } else if (model instanceof IntentAttachPoint) {
+                readIntents((IntentAttachPoint)model, reader);
             }
 
             // TODO read extension elements
             
             // By default mark the model object unresolved
-            if (bean instanceof Base) {
-                ((Base)bean).setUnresolved(true);
+            if (model instanceof Base) {
+                ((Base)model).setUnresolved(true);
             }
             
             // Skip to end element
@@ -126,7 +158,7 @@
                     break;
                 }
             }
-            return bean;
+            return model;
 
         } catch (Exception e) {
             throw new ContributionReadException(e);
@@ -139,10 +171,10 @@
             writer.writeStartElement(artifactType.getNamespaceURI(), artifactType.getLocalPart());
 
             // Write the bean properties as attributes
-            for (PropertyDescriptor pd: propertyDescriptors.values()) {
-                if (pd.getPropertyType() == String.class) {
-                    String value = (String)pd.getReadMethod().invoke(bean);
-                    writer.writeAttribute(pd.getName(), value);
+            for (Map.Entry<String, Method> entry: getterMethods.entrySet()) {
+                if (entry.getValue().getReturnType() == String.class) {
+                    String value = (String)entry.getValue().invoke(bean);
+                    writer.writeAttribute(entry.getKey(), value);
                 }
             }
             
@@ -208,7 +240,7 @@
     }
 
     public Class<?> getModelType() {
-        return beanModelType;
+        return modelClass;
     }
 
 }

Modified: incubator/tuscany/java/sca/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;type=http://www.osoa.org/xmlns/sca/1.0#binding.atom,model=org.apache.tuscany.sca.binding.feed.AtomBinding
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;type=http://www.osoa.org/xmlns/sca/1.0#binding.rss,model=org.apache.tuscany.sca.binding.feed.RSSBinding
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.atom,model=org.apache.tuscany.sca.binding.feed.AtomBinding
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.rss,model=org.apache.tuscany.sca.binding.feed.RSSBinding

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.jms.JMSBindingProcessor;type=http://www.osoa.org/xmlns/sca/1.0#binding.jms,model=org.apache.tuscany.sca.binding.jms.JMSBinding
+org.apache.tuscany.sca.binding.jms.JMSBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.jms,model=org.apache.tuscany.sca.binding.jms.JMSBinding

Modified: incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;type=http://www.osoa.org/xmlns/sca/1.0#binding.sca,model=org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl
+org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.sca,model=org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl

Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;type=http://www.osoa.org/xmlns/sca/1.0#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
+org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding

Modified: incubator/tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License. 
 
-org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;type=http://www.osoa.org/xmlns/sca/1.0#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
-org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;type=http://www.osoa.org/xmlns/sca/1.0#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport
+org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
+org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport

Modified: incubator/tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License. 
 
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportProcessor;type=http://www.osoa.org/xmlns/sca/1.0#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;type=http://www.osoa.org/xmlns/sca/1.0#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java Mon Aug 20 01:12:28 2007
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.sca.contribution;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Set;
@@ -93,7 +94,17 @@
                     Set<String> classNames = TempServiceDeclarationUtil.getServiceClassNames(classLoader, factoryInterface.getName());
                     if (!classNames.isEmpty()) {
                         Class<?> factoryClass = Class.forName(classNames.iterator().next(), true, classLoader);
-                        factory = factoryClass.newInstance();
+                        
+                        try {
+                            // Default empty constructor
+                            Constructor<?> constructor = factoryClass.getConstructor();
+                            factory = constructor.newInstance();
+                        } catch (NoSuchMethodException e) {
+                            
+                            // Constructor taking the model factory extension point
+                            Constructor<?> constructor = factoryClass.getConstructor(ModelFactoryExtensionPoint.class);
+                            factory = constructor.newInstance(this);
+                        }
                         
                         // Cache the loaded factory
                         addFactory(factory);

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java Mon Aug 20 01:12:28 2007
@@ -96,17 +96,23 @@
             String className = attributes.get("class");
             
             // Load a StAX artifact processor
+            
+            // Get the model qname
             QName artifactType = null;
-            String qname = attributes.get("type");
+            String qname = attributes.get("qname");
             if (qname != null) {
                 int h = qname.indexOf('#');
                 artifactType = new QName(qname.substring(0, h), qname.substring(h+1));
             }
             
+            // Get the model class name
             String modelTypeName = attributes.get("model");
             
+            // Get the model factory class name 
+            String factoryName = attributes.get("factory");
+            
             // Create a processor wrapper and register it
-            StAXArtifactProcessor processor = new LazyStAXArtifactProcessor(modelFactories, artifactType, modelTypeName, className);
+            StAXArtifactProcessor processor = new LazyStAXArtifactProcessor(modelFactories, artifactType, modelTypeName, factoryName, className);
             addArtifactProcessor(processor);
         }
         
@@ -122,14 +128,16 @@
         private ModelFactoryExtensionPoint modelFactories;
         private QName artifactType;
         private String modelTypeName;
+        private String factoryName;
         private String className;
         private StAXArtifactProcessor processor;
         private Class modelType;
         
-        LazyStAXArtifactProcessor(ModelFactoryExtensionPoint modelFactories, QName artifactType, String modelTypeName, String className) {
+        LazyStAXArtifactProcessor(ModelFactoryExtensionPoint modelFactories, QName artifactType, String modelTypeName, String factoryName, String className) {
             this.modelFactories = modelFactories;
             this.artifactType = artifactType;
             this.modelTypeName = modelTypeName;
+            this.factoryName = factoryName;
             this.className = className;
         }
 
@@ -149,8 +157,15 @@
                     try {
                         ClassLoader classLoader = URLArtifactProcessor.class.getClassLoader();
                         Class<StAXArtifactProcessor> processorClass = (Class<StAXArtifactProcessor>)Class.forName(className, true, classLoader);
-                        Constructor<StAXArtifactProcessor> constructor = processorClass.getConstructor(AssemblyFactory.class, PolicyFactory.class, QName.class, Class.class);
-                        processor = constructor.newInstance(assemblyFactory, policyFactory, artifactType, getModelType());
+                        Object modelFactory;
+                        if (factoryName != null) {
+                            Class<?> factoryClass = (Class<?>)Class.forName(factoryName, true, classLoader);
+                            modelFactory = modelFactories.getFactory(factoryClass);
+                        } else {
+                            modelFactory = null;
+                        }
+                        Constructor<StAXArtifactProcessor> constructor = processorClass.getConstructor(AssemblyFactory.class, PolicyFactory.class, QName.class, Class.class, Object.class);
+                        processor = constructor.newInstance(assemblyFactory, policyFactory, artifactType, getModelType(), modelFactory);
                     } catch (Exception e) {
                         throw new IllegalStateException(e);
                     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License. 
 
-org.apache.tuscany.sca.databinding.sdo.ImportSDOProcessor;type=http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0#import.sdo,model=org.apache.tuscany.sca.databinding.sdo.ImportSDO
+org.apache.tuscany.sca.databinding.sdo.ImportSDOProcessor;qname=http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0#import.sdo,model=org.apache.tuscany.sca.databinding.sdo.ImportSDO

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java Mon Aug 20 01:12:28 2007
@@ -23,7 +23,8 @@
 
 import org.osoa.sca.ServiceReference;
 
-import crud.CRUD;
+import test.crud.CRUD;
+
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java Mon Aug 20 01:12:28 2007
@@ -23,7 +23,8 @@
 
 import org.osoa.sca.ServiceReference;
 
-import crud.CRUD;
+import test.crud.CRUD;
+
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java Mon Aug 20 01:12:28 2007
@@ -21,8 +21,9 @@
 
 import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
 
+import test.crud.CRUD;
+
 import junit.framework.TestCase;
-import crud.CRUD;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java Mon Aug 20 01:12:28 2007
@@ -32,7 +32,8 @@
 import org.apache.tuscany.sca.host.embedded.management.ComponentListener;
 import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
 
-import crud.CRUD;
+import test.crud.CRUD;
+
 
 /**
  * @version $Rev$ $Date$

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUD.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUD.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUD.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUD.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUD.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUD.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUD.java Mon Aug 20 01:12:28 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package crud;
+package test.crud;
 
 /**
  * The service interface of the single CRUD service provided by CRUD components.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementation.java Mon Aug 20 01:12:28 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package crud;
+package test.crud;
 
 import org.apache.tuscany.sca.assembly.Implementation;
 

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/CRUDImplementationFactory.java Mon Aug 20 01:12:28 2007
@@ -17,7 +17,9 @@
  * under the License.    
  */
 
-package crud;
+package test.crud;
+
+import test.crud.CRUDImplementation;
 
 /**
  * A factory for the sample CRUD implementation model.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/DefaultCRUDImplementationFactory.java Mon Aug 20 01:12:28 2007
@@ -17,12 +17,15 @@
  * under the License.    
  */
 
-package crud;
+package test.crud;
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 
-import crud.impl.CRUDImplementationImpl;
+import test.crud.impl.CRUDImplementationImpl;
+
+import test.crud.CRUDImplementation;
+import test.crud.CRUDImplementationFactory;
 
 /**
  * A default factory for the CRUD implementation model.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/backend/ResourceManager.java Mon Aug 20 01:12:28 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package crud.backend;
+package test.crud.backend;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java (from r567542, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java&r1=567542&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationImpl.java Mon Aug 20 01:12:28 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package crud.impl;
+package test.crud.impl;
 
 import java.util.Collections;
 import java.util.List;
@@ -30,8 +30,9 @@
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import crud.CRUD;
-import crud.CRUDImplementation;
+
+import test.crud.CRUD;
+import test.crud.CRUDImplementation;
 
 /**
  * The model representing a sample CRUD implementation in an SCA assembly model.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/impl/CRUDImplementationProcessor.java Mon Aug 20 01:12:28 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package crud.impl;
+package test.crud.impl;
 
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 
@@ -31,8 +31,9 @@
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
 
-import crud.CRUDImplementation;
-import crud.CRUDImplementationFactory;
+import test.crud.CRUDImplementation;
+import test.crud.CRUDImplementationFactory;
+
 
 /**
  * Implements a STAX artifact processor for CRUD implementations.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/module/CRUDModuleActivator.java Mon Aug 20 01:12:28 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package crud.module;
+package test.crud.module;
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
@@ -28,10 +28,11 @@
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
 
-import crud.CRUDImplementationFactory;
-import crud.DefaultCRUDImplementationFactory;
-import crud.impl.CRUDImplementationProcessor;
-import crud.provider.CRUDImplementationProviderFactory;
+import test.crud.CRUDImplementationFactory;
+import test.crud.DefaultCRUDImplementationFactory;
+import test.crud.impl.CRUDImplementationProcessor;
+import test.crud.provider.CRUDImplementationProviderFactory;
+
 
 /**
  * Implements a module activator for the CRUD implementation extension module.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProvider.java Mon Aug 20 01:12:28 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package crud.provider;
+package test.crud.provider;
 
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
@@ -24,8 +24,9 @@
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 
-import crud.CRUDImplementation;
-import crud.backend.ResourceManager;
+import test.crud.CRUDImplementation;
+import test.crud.backend.ResourceManager;
+
 
 /**
  * The model representing a sample CRUD implementation in an SCA assembly model.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDImplementationProviderFactory.java Mon Aug 20 01:12:28 2007
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package crud.provider;
+package test.crud.provider;
 
 import org.apache.tuscany.sca.provider.ImplementationProvider;
 import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 
-import crud.CRUDImplementation;
+import test.crud.CRUDImplementation;
+
 
 /**
  * The model representing a sample CRUD implementation in an SCA assembly model.

Copied: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java (from r567515, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java?p2=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java&p1=incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java&r1=567515&r2=567587&rev=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/test/crud/provider/CRUDInvoker.java Mon Aug 20 01:12:28 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package crud.provider;
+package test.crud.provider;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -25,7 +25,8 @@
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 
-import crud.backend.ResourceManager;
+import test.crud.backend.ResourceManager;
+
 
 /**
  * Implements a target invoker for CRUD component implementations.

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator Mon Aug 20 01:12:28 2007
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 # Implementation class for the ExtensionActivator
-crud.module.CRUDModuleActivator
+test.crud.module.CRUDModuleActivator

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.bpel.impl.BPELArtifactProcessor;type=http://www.osoa.org/xmlns/sca/1.0#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
+org.apache.tuscany.sca.implementation.bpel.impl.BPELArtifactProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation

Modified: incubator/tuscany/java/sca/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.das.DASArtifactProcessor;type=http://www.osoa.org/xmlns/sca/1.0#implementation.das,model=org.apache.tuscany.sca.implementation.das.DASImplementation
+org.apache.tuscany.sca.implementation.das.DASArtifactProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.das,model=org.apache.tuscany.sca.implementation.das.DASImplementation

Modified: incubator/tuscany/java/sca/modules/implementation-data/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-data/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.data.DATAArtifactProcessor;type=http://www.osoa.org/xmlns/sca/1.0#implementation.data,model=org.apache.tuscany.sca.implementation.data.DATAImplementation
+org.apache.tuscany.sca.implementation.data.DATAArtifactProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.data,model=org.apache.tuscany.sca.implementation.data.DATAImplementation

Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;type=http://www.osoa.org/xmlns/sca/1.0#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation
+org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation

Modified: incubator/tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementationProcessor;type=http://www.osoa.org/xmlns/sca/1.0#implementation.osgi,model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface
+org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.osgi,model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface

Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;type=http://www.osoa.org/xmlns/sca/1.0#binding.resource,model=org.apache.tuscany.sca.binding.resource.HTTPResourceBinding
-org.apache.tuscany.sca.implementation.resource.ResourceImplementationProcessor;type=http://www.osoa.org/xmlns/sca/1.0#implementation.resource,model=org.apache.tuscany.sca.implementation.resource.ResourceImplementation
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.resource,model=org.apache.tuscany.sca.binding.resource.HTTPResourceBinding
+org.apache.tuscany.sca.implementation.resource.ResourceImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.resource,model=org.apache.tuscany.sca.implementation.resource.ResourceImplementation

Modified: incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.spring.SpringArtifactProcessor;type=http://www.osoa.org/xmlns/sca/1.0#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation
+org.apache.tuscany.sca.implementation.spring.SpringArtifactProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;type=http://www.osoa.org/xmlns/sca/1.0#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
+org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=567587&r1=567586&r2=567587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Mon Aug 20 01:12:28 2007
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;type=http://www.osoa.org/xmlns/sca/1.0#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
+org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message