You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/08/25 08:37:25 UTC

svn commit: r569629 - in /incubator/tuscany/java/sca/modules/implementation-xquery/src/main: java/org/apache/tuscany/implementation/xquery/ java/org/apache/tuscany/implementation/xquery/impl/ java/org/apache/tuscany/implementation/xquery/xml/ java/org/...

Author: rfeng
Date: Fri Aug 24 23:37:22 2007
New Revision: 569629

URL: http://svn.apache.org/viewvc?rev=569629&view=rev
Log:
Refactor the code to use o.a.t.sca as the package prefix

Added:
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
      - copied, changed from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
      - copied, changed from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
      - copied, changed from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
      - copied, changed from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
      - copied, changed from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
      - copied, changed from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryModuleActivator.java
      - copied, changed from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/
      - copied from r569426, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
      - copied, changed from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
      - copied, changed from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/
      - copied from r569426, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryArtifactProcessor.java
      - copied, changed from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
      - copied, changed from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java
Removed:
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/
Modified:
    incubator/tuscany/java/sca/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java (from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java&r1=569627&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery;
+package org.apache.tuscany.sca.implementation.xquery;
 
 import java.lang.reflect.Method;
 import java.util.Map;

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java (from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java&r1=569627&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java Fri Aug 24 23:37:22 2007
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery;
+package org.apache.tuscany.sca.implementation.xquery;
 
-import org.apache.tuscany.implementation.xquery.impl.XQueryImplementationFactoryImpl;
+import org.apache.tuscany.sca.implementation.xquery.impl.XQueryImplementationFactoryImpl;
 
 /**
  * Provides instances of XQueryImplementation classes

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java (from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java&r1=569627&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery;
+package org.apache.tuscany.sca.implementation.xquery;
 
 import java.util.HashMap;
 import java.util.List;

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java (from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java&r1=569627&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryImplementationProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery;
+package org.apache.tuscany.sca.implementation.xquery;
 
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
 import org.apache.tuscany.sca.provider.ImplementationProvider;

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java (from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java&r1=569627&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvokationException.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery;
+package org.apache.tuscany.sca.implementation.xquery;
 
 /**
  * Exception class used by the XQueryInvoker to report problems in

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java (from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java&r1=569627&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery;
+package org.apache.tuscany.sca.implementation.xquery;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryModuleActivator.java (from r569627, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryModuleActivator.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryModuleActivator.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java&r1=569627&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/XQueryModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryModuleActivator.java Fri Aug 24 23:37:22 2007
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery;
+package org.apache.tuscany.sca.implementation.xquery;
 
-import org.apache.tuscany.implementation.xquery.xml.XQueryArtifactProcessor;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
@@ -28,6 +27,7 @@
 import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
 import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
+import org.apache.tuscany.sca.implementation.xquery.xml.XQueryArtifactProcessor;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
 

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java (from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java&r1=569628&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java Fri Aug 24 23:37:22 2007
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery.impl;
+package org.apache.tuscany.sca.implementation.xquery.impl;
 
-import org.apache.tuscany.implementation.xquery.XQueryImplementation;
-import org.apache.tuscany.implementation.xquery.XQueryImplementationFactory;
+import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
+import org.apache.tuscany.sca.implementation.xquery.XQueryImplementationFactory;
 
 /**
  * Actual implementation of the XQuery implementation factory

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java (from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java&r1=569628&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/impl/XQueryImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery.impl;
+package org.apache.tuscany.sca.implementation.xquery.impl;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -24,8 +24,8 @@
 
 import net.sf.saxon.query.XQueryExpression;
 
-import org.apache.tuscany.implementation.xquery.XQueryImplementation;
 import org.apache.tuscany.sca.assembly.impl.ComponentTypeImpl;
+import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
 
 /**
  * Actual implementation of the XQuery implementation

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryArtifactProcessor.java (from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryArtifactProcessor.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryArtifactProcessor.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java&r1=569628&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryArtifactProcessor.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery.xml;
+package org.apache.tuscany.sca.implementation.xquery.xml;
 
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 
@@ -25,8 +25,6 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.implementation.xquery.XQueryImplementation;
-import org.apache.tuscany.implementation.xquery.XQueryImplementationFactory;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
@@ -34,6 +32,8 @@
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
+import org.apache.tuscany.sca.implementation.xquery.XQueryImplementationFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 
 /**

Copied: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java (from r569628, incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java?p2=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java&p1=incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java&r1=569628&r2=569629&rev=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/implementation/xquery/xml/XQueryIntrospector.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java Fri Aug 24 23:37:22 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.implementation.xquery.xml;
+package org.apache.tuscany.sca.implementation.xquery.xml;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -35,13 +35,13 @@
 import net.sf.saxon.query.XQueryExpression;
 import net.sf.saxon.trans.XPathException;
 
-import org.apache.tuscany.implementation.xquery.XQueryImplementation;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.Multiplicity;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.implementation.xquery.XQueryImplementation;
 import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;

Modified: incubator/tuscany/java/sca/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator?rev=569629&r1=569628&r2=569629&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator Fri Aug 24 23:37:22 2007
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 # Implementation class for the ExtensionActivator for Spring module
-org.apache.tuscany.implementation.xquery.XQueryModuleActivator
\ No newline at end of file
+org.apache.tuscany.sca.implementation.xquery.XQueryModuleActivator
\ No newline at end of file



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