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/14 06:23:02 UTC
svn commit: r518025 - in
/incubator/tuscany/branches/sca-java-integration/sca/scdl/src:
main/java/org/apache/tuscany/spi/loader/
test/java/org/apache/tuscany/assembly/reader/ test/resources/
Author: jsdelfino
Date: Tue Mar 13 22:23:01 2007
New Revision: 518025
URL: http://svn.apache.org/viewvc?view=rev&rev=518025
Log:
Commented out dependencies on DeploymentContext for now to test the test cases in n Maven build.
Modified:
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/Loader.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ReferenceMultiplicityViolationException.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/NamespaceStack.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/Calculator.composite
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/CalculatorComponent.constrainingType
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java Tue Mar 13 22:23:01 2007
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.spi.loader;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
+//FIXME need to find a way to remove dependencies on DeploymentContext
+//import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.Implementation;
/**
@@ -38,5 +39,6 @@
* @param context the current deployment context
* @throws LoaderException if there was a problem loading the configuration type
*/
- void load(I implementation, DeploymentContext context) throws LoaderException;
+ //FIXME need to find a way to remove dependencies on DeploymentContext
+ //void load(I implementation, DeploymentContext context) throws LoaderException;
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/Loader.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/Loader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/Loader.java Tue Mar 13 22:23:01 2007
@@ -22,7 +22,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
+//FIXME need to find a way to remove dependencies on DeploymentContext
+//import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.model.ModelObject;
@@ -48,8 +49,9 @@
* @throws LoaderException if there was a problem loading the document
* @throws XMLStreamException if there was a problem reading the stream
*/
- ModelObject load(ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
- throws XMLStreamException, LoaderException;
+//FIXME need to find a way to remove dependencies on DeploymentContext
+// ModelObject load(ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
+// throws XMLStreamException, LoaderException;
/**
* Load a model object from a specified location.
@@ -62,8 +64,9 @@
* @return the model ojbect loaded from the document
* @throws LoaderException if there was a problem loading the document
*/
- <MO extends ModelObject> MO load(ModelObject object, URL url, Class<MO> type, DeploymentContext context)
- throws LoaderException;
+//FIXME need to find a way to remove dependencies on DeploymentContext
+// <MO extends ModelObject> MO load(ModelObject object, URL url, Class<MO> type, DeploymentContext context)
+// throws LoaderException;
/**
* Load the component type definition for a given implementation. How the component type information is located is
@@ -75,6 +78,7 @@
* @param context the current deployment context
* @throws LoaderException if there was a problem loading the component type definition
*/
- <I extends Implementation<?>> void loadComponentType(I implementation, DeploymentContext context)
- throws LoaderException;
+//FIXME need to find a way to remove dependencies on DeploymentContext
+// <I extends Implementation<?>> void loadComponentType(I implementation, DeploymentContext context)
+// throws LoaderException;
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ReferenceMultiplicityViolationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ReferenceMultiplicityViolationException.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ReferenceMultiplicityViolationException.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/ReferenceMultiplicityViolationException.java Tue Mar 13 22:23:01 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.spi.loader;
-import org.apache.tuscany.spi.model.Multiplicity;
+import org.apache.tuscany.assembly.model.Multiplicity;
/**
* Denote the violation of multiplicity declaration for a reference
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/main/java/org/apache/tuscany/spi/loader/StAXElementLoader.java Tue Mar 13 22:23:01 2007
@@ -21,7 +21,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
+//FIXME need to find a way to remove dependencies on DeploymentContext
+//import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.ModelObject;
/**
@@ -41,6 +42,7 @@
* @param context the context for the load operation
* @return the model object for that element
*/
- T load(ModelObject object, XMLStreamReader reader, DeploymentContext context)
- throws XMLStreamException, LoaderException;
+//FIXME need to find a way to remove dependencies on DeploymentContext
+// T load(ModelObject object, XMLStreamReader reader, DeploymentContext context)
+// throws XMLStreamException, LoaderException;
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java Tue Mar 13 22:23:01 2007
@@ -85,4 +85,8 @@
}
}
+ public ComponentType getComponentType() {
+ return componentType;
+ }
+
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java Tue Mar 13 22:23:01 2007
@@ -139,4 +139,8 @@
}
}
+ public Composite getComposite() {
+ return composite;
+ }
+
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java Tue Mar 13 22:23:01 2007
@@ -85,4 +85,8 @@
}
}
+ public ConstrainingType getConstrainingType() {
+ return constrainingType;
+ }
+
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/NamespaceStack.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/NamespaceStack.java?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/NamespaceStack.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/NamespaceStack.java Tue Mar 13 22:23:01 2007
@@ -78,7 +78,7 @@
* <p>
* Unlike <code>Stack</code>, <code>ArrayStack</code> accepts null entries.
*/
- public static class FastStack<T> extends ArrayList<T> {
+ private static class FastStack<T> extends ArrayList<T> {
/** Ensure serialization compatibility */
private static final long serialVersionUID = 2130079159931574599L;
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/Calculator.composite?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/Calculator.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/Calculator.composite Tue Mar 13 22:23:01 2007
@@ -18,7 +18,8 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="Calculator">
+ xmlns:calc="http://sample.calculator"
+ name="calc:Calculator">
<service name="CalculatorService">
<interface.java interface="calculator.CalculatorService"/>
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/CalculatorComponent.constrainingType
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/CalculatorComponent.constrainingType?view=diff&rev=518025&r1=518024&r2=518025
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/CalculatorComponent.constrainingType (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/resources/CalculatorComponent.constrainingType Tue Mar 13 22:23:01 2007
@@ -18,7 +18,8 @@
* under the License.
-->
<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="CalculatorComponent">
+ xmlns:calc="http://sample.calculator"
+ name="calc:CalculatorComponent">
<service name="CalculatorService">
<interface.java class="calculator.CalculatorService" />
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org