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/11 08:43:32 UTC
svn commit: r527398 - in /incubator/tuscany/java/sca/modules:
contribution-impl/src/main/java/org/apache/tuscany/services/contribution/
contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/
contribution-impl/src/test/java/...
Author: jsdelfino
Date: Tue Apr 10 23:43:31 2007
New Revision: 527398
URL: http://svn.apache.org/viewvc?view=rev&rev=527398
Log:
Moved contribution model to o.a.t.contribution.
Added:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java
- copied, changed from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java
- copied, changed from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java
- copied, changed from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java
- copied, changed from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java
Removed:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ArtifactTypeDescriberImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionMetadataLoaderImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImplTestCase.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContributionLoaderTestCase.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImplTestCase.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ArtifactTypeDescriberImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ArtifactTypeDescriberImpl.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ArtifactTypeDescriberImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ArtifactTypeDescriberImpl.java Tue Apr 10 23:43:31 2007
@@ -25,8 +25,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tuscany.services.contribution.model.ContentType;
-import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.contribution.ContentType;
+import org.apache.tuscany.contribution.Contribution;
import org.apache.tuscany.services.contribution.util.FileHelper;
import org.apache.tuscany.services.spi.contribution.TypeDescriber;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionMetadataLoaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionMetadataLoaderImpl.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionMetadataLoaderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionMetadataLoaderImpl.java Tue Apr 10 23:43:31 2007
@@ -27,8 +27,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.services.contribution.model.Contribution;
-import org.apache.tuscany.services.contribution.model.ContributionImport;
+import org.apache.tuscany.contribution.Contribution;
+import org.apache.tuscany.contribution.ContributionImport;
import org.apache.tuscany.services.spi.contribution.loader.ContributionMetadataLoader;
import org.apache.tuscany.services.spi.contribution.loader.ContributionMetadataLoaderException;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java Tue Apr 10 23:43:31 2007
@@ -32,8 +32,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.services.contribution.model.Contribution;
-import org.apache.tuscany.services.contribution.model.DeployedArtifact;
+import org.apache.tuscany.contribution.Contribution;
+import org.apache.tuscany.contribution.DeployedArtifact;
import org.apache.tuscany.services.contribution.util.IOHelper;
import org.apache.tuscany.services.spi.contribution.ArtifactResolver;
import org.apache.tuscany.services.spi.contribution.ContributionException;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImpl.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImpl.java Tue Apr 10 23:43:31 2007
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tuscany.services.contribution.model.ContentType;
+import org.apache.tuscany.contribution.ContentType;
import org.apache.tuscany.services.contribution.util.FileHelper;
import org.apache.tuscany.services.spi.contribution.TypeDescriber;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/FolderContributionProcessor.java Tue Apr 10 23:43:31 2007
@@ -29,7 +29,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.services.contribution.model.ContentType;
+import org.apache.tuscany.contribution.ContentType;
import org.apache.tuscany.services.contribution.util.FileHelper;
import org.apache.tuscany.services.spi.contribution.ContributionException;
import org.apache.tuscany.services.spi.contribution.ContributionPackageProcessor;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessor.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessor.java Tue Apr 10 23:43:31 2007
@@ -29,7 +29,7 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import org.apache.tuscany.services.contribution.model.ContentType;
+import org.apache.tuscany.contribution.ContentType;
import org.apache.tuscany.services.spi.contribution.ContributionException;
import org.apache.tuscany.services.spi.contribution.ContributionPackageProcessor;
import org.apache.tuscany.services.spi.contribution.ContributionPackageProcessorRegistry;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImplTestCase.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImplTestCase.java Tue Apr 10 23:43:31 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.services.contribution.model.ContentType;
+import org.apache.tuscany.contribution.ContentType;
public class ContentTypeDescriberImplTestCase extends TestCase {
private ArtifactTypeDescriberImpl contentTypeDescriber;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContributionLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContributionLoaderTestCase.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContributionLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/ContributionLoaderTestCase.java Tue Apr 10 23:43:31 2007
@@ -26,7 +26,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.contribution.Contribution;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImplTestCase.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/services/contribution/PackageTypeDescriberImplTestCase.java Tue Apr 10 23:43:31 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.services.contribution.model.ContentType;
+import org.apache.tuscany.contribution.ContentType;
public class PackageTypeDescriberImplTestCase extends TestCase {
private PackageTypeDescriberImpl packageTypeDescriber;
Copied: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java (from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java?view=diff&rev=527398&p1=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java&r1=527365&p2=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java Tue Apr 10 23:43:31 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.services.contribution.model;
+package org.apache.tuscany.contribution;
public interface ContentType {
/**
Copied: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java (from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java?view=diff&rev=527398&p1=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java&r1=527365&p2=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java Tue Apr 10 23:43:31 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.services.contribution.model;
+package org.apache.tuscany.contribution;
import java.net.URI;
import java.net.URL;
Copied: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java (from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java?view=diff&rev=527398&p1=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java&r1=527365&p2=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java Tue Apr 10 23:43:31 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.services.contribution.model;
+package org.apache.tuscany.contribution;
import java.net.URI;
Copied: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java (from r527365, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java?view=diff&rev=527398&p1=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java&r1=527365&p2=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java Tue Apr 10 23:43:31 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.services.contribution.model;
+package org.apache.tuscany.contribution;
import java.net.URI;
import java.net.URL;
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java Tue Apr 10 23:43:31 2007
@@ -24,7 +24,7 @@
import java.net.URL;
import java.util.Map;
-import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.contribution.Contribution;
/**
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java Tue Apr 10 23:43:31 2007
@@ -22,7 +22,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.contribution.Contribution;
public interface ContributionMetadataLoader {
/**
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java?view=diff&rev=527398&r1=527397&r2=527398
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/SimpleRuntimeImpl.java Tue Apr 10 23:43:31 2007
@@ -30,6 +30,8 @@
import org.apache.tuscany.assembly.xml.CompositeDocumentProcessor;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
import org.apache.tuscany.assembly.xml.ConstrainingTypeProcessor;
+import org.apache.tuscany.contribution.Contribution;
+import org.apache.tuscany.contribution.DeployedArtifact;
import org.apache.tuscany.core.bootstrap.ExtensionPointRegistryImpl;
import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.core.runtime.AbstractRuntime;
@@ -38,8 +40,6 @@
import org.apache.tuscany.services.contribution.ContributionRepositoryImpl;
import org.apache.tuscany.services.contribution.ContributionServiceImpl;
import org.apache.tuscany.services.contribution.PackageTypeDescriberImpl;
-import org.apache.tuscany.services.contribution.model.Contribution;
-import org.apache.tuscany.services.contribution.model.DeployedArtifact;
import org.apache.tuscany.services.contribution.processor.FolderContributionProcessor;
import org.apache.tuscany.services.contribution.processor.JarContributionProcessor;
import org.apache.tuscany.services.contribution.util.FileHelper;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org