svn commit: r521820 - in /incubator/tuscany/java/sca/runtime/services/contribution: ./ src/main/java/org/apache/tuscany/services/ src/main/java/org/apache/tuscany/services/contribution/ src/main/java/org/apache/tuscany/services/contribution/resolver/ s...

[lr...@apache.org]

Author: lresende
Date: Fri Mar 23 10:28:34 2007
New Revision: 521820

URL: http://svn.apache.org/viewvc?view=rev&rev=521820
Log:
Contribution services module contents

Added:
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionLoader.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionRepositoryImpl.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/InvalidContributionMetadataException.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/resolver/
      - copied from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/resolver/
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/resolver/ComponentDefinitionArtifactResolver.java
      - copied, changed from r521625, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/resolver/ComponentDefinitionArtifactResolver.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/FileHelper.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java
    incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/IOHelper.java
      - copied, changed from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java
Modified:
    incubator/tuscany/java/sca/runtime/services/contribution/pom.xml

Modified: incubator/tuscany/java/sca/runtime/services/contribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/pom.xml?view=diff&rev=521820&r1=521819&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/pom.xml Fri Mar 23 10:28:34 2007
@@ -35,8 +35,16 @@
             <artifactId>sca-api-r${scaSpecVersion}</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.tuscany.sca.kernel</groupId>
+            <artifactId>tuscany-spi</artifactId>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>        
     </dependencies>
 </project>

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java Fri Mar 23 10:28:34 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.services.deployment;
+package org.apache.tuscany.services.contribution;
 
 import java.io.IOException;
 import java.net.URL;
@@ -30,7 +30,7 @@
 
 import org.apache.tuscany.spi.deployer.ContentTypeDescriber;
 
-import org.apache.tuscany.core.util.FileHelper;
+import org.apache.tuscany.services.contribution.util.FileHelper;
 
 /**
  * Implementation of the content describer

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java Fri Mar 23 10:28:34 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.services.deployment;
+package org.apache.tuscany.services.contribution;
 
 import java.io.File;
 import java.io.IOException;

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionLoader.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionLoader.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java Fri Mar 23 10:28:34 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.services.deployment;
+package org.apache.tuscany.services.contribution;
 
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 import static org.osoa.sca.Constants.SCA_NS;

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionProcessorRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionProcessorRegistryImpl.java Fri Mar 23 10:28:34 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.services.deployment;
+package org.apache.tuscany.services.contribution;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionRepositoryImpl.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionRepositoryImpl.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionRepositoryImpl.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionRepositoryImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionRepositoryImpl.java Fri Mar 23 10:28:34 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.services.deployment;
+package org.apache.tuscany.services.contribution;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -44,8 +44,8 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.core.util.FileHelper;
-import org.apache.tuscany.core.util.IOHelper;
+import org.apache.tuscany.services.contribution.util.FileHelper;
+import org.apache.tuscany.services.contribution.util.IOHelper;
 import org.apache.tuscany.spi.deployer.ContributionRepository;
 import org.osoa.sca.annotations.Constructor;
 import org.osoa.sca.annotations.Destroy;

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java Fri Mar 23 10:28:34 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.services.deployment;
+package org.apache.tuscany.services.contribution;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,7 +33,7 @@
 import org.apache.tuscany.spi.deployer.ContributionRepository;
 import org.apache.tuscany.spi.model.Contribution;
 
-import org.apache.tuscany.core.util.IOHelper;
+import org.apache.tuscany.services.contribution.util.IOHelper;
 import org.apache.tuscany.host.deployment.ContributionService;
 import org.apache.tuscany.host.deployment.DeploymentException;
 

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/InvalidContributionMetadataException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/InvalidContributionMetadataException.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/InvalidContributionMetadataException.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java Fri Mar 23 10:28:34 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.services.deployment;
+package org.apache.tuscany.services.contribution;
 
 import org.apache.tuscany.host.deployment.DeploymentException;
 

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/resolver/ComponentDefinitionArtifactResolver.java (from r521625, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/resolver/ComponentDefinitionArtifactResolver.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/resolver/ComponentDefinitionArtifactResolver.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/resolver/ComponentDefinitionArtifactResolver.java&r1=521625&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/resolver/ComponentDefinitionArtifactResolver.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/resolver/ComponentDefinitionArtifactResolver.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/resolver/ComponentDefinitionArtifactResolver.java Fri Mar 23 10:28:34 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.services.deployment.resolver;
+package org.apache.tuscany.services.contribution.resolver;
 
 import java.net.URI;
 import java.net.URL;

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/FileHelper.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/FileHelper.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/FileHelper.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/FileHelper.java Fri Mar 23 10:28:34 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.util;
+package org.apache.tuscany.services.contribution.util;
 
 import java.io.File;
 import java.io.FileFilter;

Copied: incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/IOHelper.java (from r520921, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/IOHelper.java?view=diff&rev=521820&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java&r1=520921&p2=incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/IOHelper.java&r2=521820
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/src/main/java/org/apache/tuscany/services/contribution/util/IOHelper.java Fri Mar 23 10:28:34 2007
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.core.util;
+package org.apache.tuscany.services.contribution.util;
 
 import java.io.IOException;
 import java.io.InputStream;



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