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/04/04 00:25:48 UTC
svn commit: r525309 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/
assembly/src/main/java/org/apache/tuscany/assembly/
assembly/src/main/java/org/apache/tuscany/assembly/impl/ assembly/src/tes...
Author: jsdelfino
Date: Tue Apr 3 15:25:43 2007
New Revision: 525309
URL: http://svn.apache.org/viewvc?view=rev&rev=525309
Log:
Fixed compile errors after refactoring
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/DefaultAssemblyFactory.java
incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java
incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java
incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java
incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/Intent.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/PolicySet.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/IntentImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/PolicySetImpl.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java Tue Apr 3 15:25:43 2007
@@ -42,12 +42,12 @@
import org.apache.tuscany.assembly.Multiplicity;
import org.apache.tuscany.assembly.Property;
import org.apache.tuscany.assembly.xml.Constants;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.IntentAttachPoint;
import org.apache.tuscany.policy.PolicyFactory;
import org.apache.tuscany.policy.PolicySet;
import org.apache.tuscany.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.idl.Operation;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java Tue Apr 3 15:25:43 2007
@@ -38,9 +38,9 @@
import org.apache.tuscany.assembly.xml.Constants;
import org.apache.tuscany.assembly.xml.Loader;
import org.apache.tuscany.assembly.xml.LoaderRegistry;
+import org.apache.tuscany.idl.Interface;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.policy.PolicyFactory;
-import org.apache.tuscany.sca.idl.Interface;
-import org.apache.tuscany.sca.idl.Operation;
/**
* A componentType loader.
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java Tue Apr 3 15:25:43 2007
@@ -43,9 +43,9 @@
import org.apache.tuscany.assembly.Wire;
import org.apache.tuscany.assembly.xml.Loader;
import org.apache.tuscany.assembly.xml.LoaderRegistry;
+import org.apache.tuscany.idl.Interface;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.policy.PolicyFactory;
-import org.apache.tuscany.sca.idl.Interface;
-import org.apache.tuscany.sca.idl.Operation;
/**
* A composite content handler.
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java Tue Apr 3 15:25:43 2007
@@ -35,9 +35,9 @@
import org.apache.tuscany.assembly.xml.Constants;
import org.apache.tuscany.assembly.xml.Loader;
import org.apache.tuscany.assembly.xml.LoaderRegistry;
+import org.apache.tuscany.idl.Interface;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.policy.PolicyFactory;
-import org.apache.tuscany.sca.idl.Interface;
-import org.apache.tuscany.sca.idl.Operation;
/**
* A contrainingType content handler.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java Tue Apr 3 15:25:43 2007
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.assembly;
+import org.apache.tuscany.idl.Interface;
import org.apache.tuscany.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.idl.Interface;
/**
* Interface contracts define one or more business functions. These business
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java Tue Apr 3 15:25:43 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.assembly;
-import org.apache.tuscany.sca.idl.Operation;
+import org.apache.tuscany.idl.Operation;
/**
* A factory for the assembly model
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java Tue Apr 3 15:25:43 2007
@@ -22,8 +22,8 @@
import java.util.List;
import org.apache.tuscany.assembly.AbstractContract;
+import org.apache.tuscany.idl.Interface;
import org.apache.tuscany.policy.Intent;
-import org.apache.tuscany.sca.idl.Interface;
public class ContractImpl extends BaseImpl implements AbstractContract {
private Interface callbackInterface;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/DefaultAssemblyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/DefaultAssemblyFactory.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/DefaultAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/DefaultAssemblyFactory.java Tue Apr 3 15:25:43 2007
@@ -38,8 +38,8 @@
import org.apache.tuscany.assembly.SCABinding;
import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.assembly.Wire;
-import org.apache.tuscany.sca.idl.Operation;
-import org.apache.tuscany.sca.idl.impl.OperationImpl;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
/**
* A factory for the assembly model.
Modified: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java Tue Apr 3 15:25:43 2007
@@ -22,25 +22,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.assembly.AbstractProperty;
-import org.apache.tuscany.assembly.AbstractReference;
-import org.apache.tuscany.assembly.AbstractService;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentProperty;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.ComponentType;
-import org.apache.tuscany.assembly.Composite;
-import org.apache.tuscany.assembly.CompositeReference;
-import org.apache.tuscany.assembly.CompositeService;
-import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.assembly.Implementation;
-import org.apache.tuscany.assembly.Multiplicity;
-import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.assembly.Reference;
-import org.apache.tuscany.assembly.Service;
-import org.apache.tuscany.assembly.Wire;
import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
/**
Modified: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java Tue Apr 3 15:25:43 2007
@@ -20,12 +20,6 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.Implementation;
-import org.apache.tuscany.assembly.Multiplicity;
-import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.assembly.Reference;
-import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.assembly.impl.ComponentTypeImpl;
/**
Modified: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java Tue Apr 3 15:25:43 2007
@@ -18,10 +18,9 @@
*/
package org.apache.tuscany.assembly;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.idl.Interface;
-import org.apache.tuscany.sca.idl.Operation;
-import org.apache.tuscany.sca.idl.impl.InterfaceImpl;
+import org.apache.tuscany.idl.Interface;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.InterfaceImpl;
/**
* A test interface model.
Modified: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java Tue Apr 3 15:25:43 2007
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.assembly;
-import org.apache.tuscany.sca.idl.Operation;
-import org.apache.tuscany.sca.idl.impl.OperationImpl;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
/**
* A test operation model.
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/Intent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/Intent.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/Intent.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/Intent.java Tue Apr 3 15:25:43 2007
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.idl.Operation;
+import org.apache.tuscany.idl.Operation;
/**
* Represents a policy intent. See the Policy Framework specification for a
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/PolicySet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/PolicySet.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/PolicySet.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/PolicySet.java Tue Apr 3 15:25:43 2007
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.idl.Operation;
+import org.apache.tuscany.idl.Operation;
/**
* Represents a policy set. See the Policy Framework specification for a
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/IntentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/IntentImpl.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/IntentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/IntentImpl.java Tue Apr 3 15:25:43 2007
@@ -23,8 +23,8 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.policy.Intent;
-import org.apache.tuscany.sca.idl.Operation;
/**
* Represents a policy intent.
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/PolicySetImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/PolicySetImpl.java?view=diff&rev=525309&r1=525308&r2=525309
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/PolicySetImpl.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/policy/impl/PolicySetImpl.java Tue Apr 3 15:25:43 2007
@@ -23,9 +23,9 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.Operation;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
-import org.apache.tuscany.sca.idl.Operation;
/**
* Represents a policy set.
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org