You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/25 11:29:22 UTC
svn commit: r522186 [3/3] - in
/incubator/tuscany/sandbox/sebastien/java/sca/modules: ./
assembly/src/main/java/org/apache/tuscany/assembly/model/
assembly/src/main/java/org/apache/tuscany/assembly/model/impl/
assembly/src/main/java/org/apache/tuscany/...
Modified: incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ComponentTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ComponentTypeHandler.java?view=diff&rev=522186&r1=522185&r2=522186
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ComponentTypeHandler.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ComponentTypeHandler.java Sun Mar 25 02:29:19 2007
@@ -71,14 +71,13 @@
} else if (Constants.SERVICE.equals(name)) {
service = factory.createService();
contract = service;
- componentType.getServices().add(service);
service.setName(getString(attr, Constants.NAME));
+ componentType.getServices().add(service);
return;
} else if (Constants.REFERENCE.equals(name)) {
reference = factory.createReference();
contract = reference;
- componentType.getReferences().add(reference);
reference.setName(getString(attr, Constants.NAME));
//TODO support multivalued attribute
@@ -86,11 +85,14 @@
target.setUnresolved(true);
target.setName(getString(attr, Constants.TARGET));
reference.getTargets().add(target);
+
+ componentType.getReferences().add(reference);
return;
} else if (Constants.PROPERTY.equals(name)) {
property = factory.createProperty();
readProperty(property, attr);
+ componentType.getProperties().add(property);
return;
} else if (Constants.CALLBACK.equals(name)) {
Modified: incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/CompositeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/CompositeHandler.java?view=diff&rev=522186&r1=522185&r2=522186
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/CompositeHandler.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/CompositeHandler.java Sun Mar 25 02:29:19 2007
@@ -91,18 +91,19 @@
if (component != null) {
componentService = factory.createComponentService();
contract = componentService;
- component.getServices().add(componentService);
componentService.setName(getString(attr, Constants.NAME));
+ component.getServices().add(componentService);
} else {
compositeService = factory.createCompositeService();
contract = compositeService;
- composite.getServices().add(compositeService);
compositeService.setName(getString(attr, Constants.NAME));
ComponentService promoted = factory.createComponentService();
promoted.setUnresolved(true);
promoted.setName(getString(attr, Constants.PROMOTE));
compositeService.setPromotedService(promoted);
+
+ composite.getServices().add(compositeService);
}
return;
@@ -110,7 +111,6 @@
if (component != null) {
componentReference = factory.createComponentReference();
contract = componentReference;
- component.getReferences().add(componentReference);
componentReference.setName(getString(attr, Constants.NAME));
//TODO support multivalued attribute
@@ -119,10 +119,10 @@
target.setName(getString(attr, Constants.TARGET));
componentReference.getTargets().add(target);
+ component.getReferences().add(componentReference);
} else {
compositeReference = factory.createCompositeReference();
contract = compositeReference;
- composite.getReferences().add(compositeReference);
compositeReference.setName(getString(attr, Constants.NAME));
//TODO support multivalued attribute
@@ -130,6 +130,8 @@
promoted.setUnresolved(true);
promoted.setName(getString(attr, Constants.PROMOTE));
compositeReference.getPromotedReferences().add(promoted);
+
+ composite.getReferences().add(compositeReference);
}
return;
@@ -137,26 +139,24 @@
if (component != null) {
componentProperty = factory.createComponentProperty();
property = componentProperty;
- component.getProperties().add(componentProperty);
readProperty(componentProperty, attr);
+ component.getProperties().add(componentProperty);
} else {
property = factory.createProperty();
- composite.getProperties().add(property);
readProperty(property, attr);
+ composite.getProperties().add(property);
}
return;
} else if (Constants.COMPONENT.equals(name)) {
component = factory.createComponent();
- composite.getComponents().add(component);
component.setName(getString(attr, Constants.NAME));
component.setConstrainingType(getConstrainingType(attr));
+ composite.getComponents().add(component);
return;
} else if (Constants.WIRE.equals(name)) {
wire = factory.createWire();
- composite.getWires().add(wire);
-
ComponentReference source = factory.createComponentReference();
source.setUnresolved(true);
source.setName(getString(attr, Constants.SOURCE));
@@ -166,6 +166,8 @@
target.setUnresolved(true);
target.setName(getString(attr, Constants.TARGET));
wire.setTarget(target);
+
+ composite.getWires().add(wire);
return;
} else if (Constants.CALLBACK.equals(name)) {
Modified: incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ConstrainingTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ConstrainingTypeHandler.java?view=diff&rev=522186&r1=522185&r2=522186
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ConstrainingTypeHandler.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/main/java/org/apache/tuscany/scdl/impl/ConstrainingTypeHandler.java Sun Mar 25 02:29:19 2007
@@ -68,21 +68,21 @@
} else if (Constants.SERVICE.equals(name)) {
abstractService = factory.createAbstractService();
abstractContract = abstractService;
- constrainingType.getServices().add(abstractService);
abstractService.setName(getString(attr, Constants.NAME));
+ constrainingType.getServices().add(abstractService);
return;
} else if (Constants.REFERENCE.equals(name)) {
abstractReference = factory.createAbstractReference();
abstractContract = abstractReference;
- constrainingType.getReferences().add(abstractReference);
abstractReference.setName(getString(attr, Constants.NAME));
+ constrainingType.getReferences().add(abstractReference);
return;
} else if (Constants.PROPERTY.equals(name)) {
abstractProperty = factory.createAbstractProperty();
- constrainingType.getProperties().add(abstractProperty);
readAbstractProperty(abstractProperty, attr);
+ constrainingType.getProperties().add(abstractProperty);
return;
}
}
Modified: incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/ReadTestCase.java?view=diff&rev=522186&r1=522185&r2=522186
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/ReadTestCase.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/ReadTestCase.java Sun Mar 25 02:29:19 2007
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.impl.AssemblyFactoryImpl;
+import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
import org.apache.tuscany.assembly.util.PrintUtil;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.scdl.impl.ComponentTypeHandler;
@@ -49,7 +49,7 @@
reader.setFeature("http://xml.org/sax/features/namespaces", true);
reader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
- assemblyFactory = new AssemblyFactoryImpl();
+ assemblyFactory = new DefaultAssemblyFactory();
}
public void tearDown() throws Exception {
Modified: incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java?view=diff&rev=522186&r1=522185&r2=522186
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/modules/scdl/src/test/java/org/apache/tuscany/scdl/WriteTestCase.java Sun Mar 25 02:29:19 2007
@@ -29,7 +29,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.impl.AssemblyFactoryImpl;
+import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
import org.apache.tuscany.scdl.impl.ComponentTypeHandler;
import org.apache.tuscany.scdl.impl.ComponentTypeWriter;
import org.apache.tuscany.scdl.impl.CompositeHandler;
@@ -52,7 +52,7 @@
Transformer transformer;
public void setUp() throws Exception {
- factory = new AssemblyFactoryImpl();
+ factory = new DefaultAssemblyFactory();
reader = XMLReaderFactory.createXMLReader();
reader.setFeature("http://xml.org/sax/features/namespaces", true);
Modified: incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl-scdl/src/test/java/org/apache/tuscany/scdl/wsdl/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl-scdl/src/test/java/org/apache/tuscany/scdl/wsdl/ReadTestCase.java?view=diff&rev=522186&r1=522185&r2=522186
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl-scdl/src/test/java/org/apache/tuscany/scdl/wsdl/ReadTestCase.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl-scdl/src/test/java/org/apache/tuscany/scdl/wsdl/ReadTestCase.java Sun Mar 25 02:29:19 2007
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.impl.AssemblyFactoryImpl;
+import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.assembly.util.PrintUtil;
import org.apache.tuscany.scdl.Constants;
@@ -33,7 +33,7 @@
import org.apache.tuscany.scdl.impl.ConstrainingTypeHandler;
import org.apache.tuscany.scdl.impl.InterfaceHandlerRegistry;
import org.apache.tuscany.wsdl.model.WSDLInterface;
-import org.apache.tuscany.wsdl.model.impl.WSDLFactoryImpl;
+import org.apache.tuscany.wsdl.model.impl.DefaultWSDLFactory;
import org.apache.tuscany.wsdl.scdl.WSDLConstants;
import org.apache.tuscany.wsdl.scdl.WSDLHandler;
import org.xml.sax.InputSource;
@@ -57,9 +57,9 @@
reader.setFeature("http://xml.org/sax/features/namespaces", true);
reader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
- assemblyFactory = new AssemblyFactoryImpl();
+ assemblyFactory = new DefaultAssemblyFactory();
- WSDLHandler wsdlHandler = new WSDLHandler(new WSDLFactoryImpl());
+ WSDLHandler wsdlHandler = new WSDLHandler(new DefaultWSDLFactory());
interfaceHandlers = new InterfaceHandlerRegistry();
interfaceHandlers.addHandler(Constants.SCA10_NS, WSDLConstants.INTERFACE_WSDL, wsdlHandler);
}
Added: incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl/src/main/java/org/apache/tuscany/wsdl/model/impl/DefaultWSDLFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl/src/main/java/org/apache/tuscany/wsdl/model/impl/DefaultWSDLFactory.java?view=auto&rev=522186
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl/src/main/java/org/apache/tuscany/wsdl/model/impl/DefaultWSDLFactory.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl/src/main/java/org/apache/tuscany/wsdl/model/impl/DefaultWSDLFactory.java Sun Mar 25 02:29:19 2007
@@ -0,0 +1,35 @@
+/*
+ * 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.wsdl.model.impl;
+
+import org.apache.tuscany.wsdl.model.WSDLFactory;
+import org.apache.tuscany.wsdl.model.WSDLInterface;
+
+/**
+ * A factory for the WSDL model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefaultWSDLFactory implements WSDLFactory {
+
+ public WSDLInterface createWSDLInterface() {
+ return new WSDLInterfaceImpl();
+ }
+
+}
Propchange: incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl/src/main/java/org/apache/tuscany/wsdl/model/impl/DefaultWSDLFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/sebastien/java/sca/modules/wsdl/src/main/java/org/apache/tuscany/wsdl/model/impl/DefaultWSDLFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org