Author: jboynes
Date: Sun Oct  1 15:33:04 2006
New Revision: 451830

URL: http://svn.apache.org/viewvc?view=rev&rev=451830
Log:
move sdo samples and distro under sdo root

Added:
    incubator/tuscany/java/sdo/distribution/
      - copied from r451818, incubator/tuscany/java/distribution/sdo/
    incubator/tuscany/java/sdo/distribution/sdo-distribution.iml
    incubator/tuscany/java/sdo/sample/
      - copied from r451818, incubator/tuscany/java/samples/sdo/
Removed:
    incubator/tuscany/java/distribution/sdo/
    incubator/tuscany/java/samples/sdo/
Modified:
    incubator/tuscany/java/distribution/pom.xml
    incubator/tuscany/java/samples/pom.xml
    incubator/tuscany/java/sdo/distribution/pom.xml
    incubator/tuscany/java/sdo/pom.xml
    incubator/tuscany/java/sdo/sample/pom.xml

Modified: incubator/tuscany/java/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/pom.xml?view=diff&rev=451830&r1=451829&r2=451830
==============================================================================
--- incubator/tuscany/java/distribution/pom.xml (original)
+++ incubator/tuscany/java/distribution/pom.xml Sun Oct  1 15:33:04 2006
@@ -76,7 +76,6 @@
     </pluginRepositories>
 
     <modules>
-        <module>sdo</module>
         <module>das</module>
         <module>das-samples</module>
         <module>sca</module>

Modified: incubator/tuscany/java/samples/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/pom.xml?view=diff&rev=451830&r1=451829&r2=451830
==============================================================================
--- incubator/tuscany/java/samples/pom.xml (original)
+++ incubator/tuscany/java/samples/pom.xml Sun Oct  1 15:33:04 2006
@@ -57,7 +57,6 @@
     </repositories>
 
     <modules>
-        <module>sdo</module>
         <module>das</module>
         <module>sca</module>
     </modules>

Modified: incubator/tuscany/java/sdo/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/pom.xml?view=diff&rev=451830&r1=451818&r2=451830
==============================================================================
--- incubator/tuscany/java/sdo/distribution/pom.xml (original)
+++ incubator/tuscany/java/sdo/distribution/pom.xml Sun Oct  1 15:33:04 2006
@@ -20,41 +20,14 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.distribution</groupId>
-        <artifactId>parent</artifactId>
+        <groupId>org.apache.tuscany.sdo</groupId>
+        <artifactId>tuscany-sdo</artifactId>
         <version>1.0-incubator-M2-SNAPSHOT</version>
     </parent>
     <artifactId>sdo</artifactId>
-    <version>1.0-incubator-M2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Tuscany SDO Distribution</name>
     <description>Tuscany Distribution for SDO.</description>
-
-    <!-- definition of repositories where the parent pom can be found -->
-    <repositories>
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>apache.incubator</id>
-            <name>Apache Incubator Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 
     <dependencies>
         <dependency>

Added: incubator/tuscany/java/sdo/distribution/sdo-distribution.iml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/sdo-distribution.iml?view=auto&rev=451830
==============================================================================
--- incubator/tuscany/java/sdo/distribution/sdo-distribution.iml (added)
+++ incubator/tuscany/java/sdo/distribution/sdo-distribution.iml Sun Oct  1 
15:33:04 2006
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: incubator/tuscany/java/sdo/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?view=diff&rev=451830&r1=451829&r2=451830
==============================================================================
--- incubator/tuscany/java/sdo/pom.xml (original)
+++ incubator/tuscany/java/sdo/pom.xml Sun Oct  1 15:33:04 2006
@@ -71,6 +71,8 @@
         <module>impl</module>
         <module>tools</module>
         <module>plugin</module>
+        <module>sample</module>
+        <module>distribution</module>
     </modules>
 
     <build>

Modified: incubator/tuscany/java/sdo/sample/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/pom.xml?view=diff&rev=451830&r1=451818&r2=451830
==============================================================================
--- incubator/tuscany/java/sdo/sample/pom.xml (original)
+++ incubator/tuscany/java/sdo/sample/pom.xml Sun Oct  1 15:33:04 2006
@@ -22,29 +22,25 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
     <parent>
-        <groupId>org.apache.tuscany.samples</groupId>
-        <artifactId>parent</artifactId>
+        <groupId>org.apache.tuscany.sdo</groupId>
+        <artifactId>tuscany-sdo</artifactId>
         <version>1.0-incubator-M2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.samples.sdo</groupId>
     <artifactId>sample-sdo</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubator-M2-SNAPSHOT</version>
     <name>Tuscany SDO Sample</name>
     <dependencies>
         <dependency>
             <groupId>commonj</groupId>
-            <artifactId>sdo-api-r2.0.1</artifactId>
-            <version>1.0-incubator-M2-SNAPSHOT</version>
-            <scope>compile</scope>
+            <artifactId>sdo-api-r${specVersion}</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.0-incubator-M2-SNAPSHOT</version>
+            <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to