You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/10/06 19:39:15 UTC

svn commit: r453702 - in /incubator/tuscany/sandbox/jboynes/sdo: LICENSE.txt NOTICE.txt RELEASE_NOTES.txt STATUS distribution/ pom.xml sample/distribution/ sample/pom.xml sdo.xml

Author: jboynes
Date: Fri Oct  6 10:39:14 2006
New Revision: 453702

URL: http://svn.apache.org/viewvc?view=rev&rev=453702
Log:
strawman of sdo distribution with assembly in the parent project

Added:
    incubator/tuscany/sandbox/jboynes/sdo/LICENSE.txt
      - copied unchanged from r453654, incubator/tuscany/sandbox/jboynes/sdo/distribution/LICENSE.txt
    incubator/tuscany/sandbox/jboynes/sdo/NOTICE.txt
      - copied unchanged from r453654, incubator/tuscany/sandbox/jboynes/sdo/distribution/NOTICE.txt
    incubator/tuscany/sandbox/jboynes/sdo/RELEASE_NOTES.txt
      - copied unchanged from r453654, incubator/tuscany/sandbox/jboynes/sdo/distribution/RELEASE_NOTES.txt
    incubator/tuscany/sandbox/jboynes/sdo/sdo.xml
      - copied, changed from r453654, incubator/tuscany/sandbox/jboynes/sdo/distribution/src/main/assembly/sdo.xml
Removed:
    incubator/tuscany/sandbox/jboynes/sdo/STATUS
    incubator/tuscany/sandbox/jboynes/sdo/distribution/
    incubator/tuscany/sandbox/jboynes/sdo/sample/distribution/
Modified:
    incubator/tuscany/sandbox/jboynes/sdo/pom.xml
    incubator/tuscany/sandbox/jboynes/sdo/sample/pom.xml

Modified: incubator/tuscany/sandbox/jboynes/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sdo/pom.xml?view=diff&rev=453702&r1=453701&r2=453702
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sdo/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sdo/pom.xml Fri Oct  6 10:39:14 2006
@@ -72,12 +72,9 @@
         <module>tools</module>
         <module>plugin</module>
         <module>sample</module>
-        <module>distribution</module>
     </modules>
 
     <build>
-        <defaultGoal>install</defaultGoal>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -96,7 +93,31 @@
                     </includes>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>sdo.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <aggregate>true</aggregate>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
     </build>
 
     <dependencyManagement>

Modified: incubator/tuscany/sandbox/jboynes/sdo/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sdo/sample/pom.xml?view=diff&rev=453702&r1=453701&r2=453702
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sdo/sample/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sdo/sample/pom.xml Fri Oct  6 10:39:14 2006
@@ -58,6 +58,18 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                          <mainClass>org.apache.tuscany.samples.sdo.ExecuteSamples</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+<!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <overview>${basedir}/src/main/java/org/apache/tuscany/samples/sdo/overview.html</overview> 
@@ -72,17 +84,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                          <mainClass>org.apache.tuscany.samples.sdo.ExecuteSamples</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
+-->
 <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Copied: incubator/tuscany/sandbox/jboynes/sdo/sdo.xml (from r453654, incubator/tuscany/sandbox/jboynes/sdo/distribution/src/main/assembly/sdo.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sdo/sdo.xml?view=diff&rev=453702&p1=incubator/tuscany/sandbox/jboynes/sdo/distribution/src/main/assembly/sdo.xml&r1=453654&p2=incubator/tuscany/sandbox/jboynes/sdo/sdo.xml&r2=453702
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sdo/distribution/src/main/assembly/sdo.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sdo/sdo.xml Fri Oct  6 10:39:14 2006
@@ -35,17 +35,31 @@
                 <include>CHANGES.txt</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>javadoc</outputDirectory>
+        </fileSet>
     </fileSets>
 
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
+    <moduleSets>
+        <moduleSet>
             <includes>
                 <include>org.apache.tuscany.sdo:tuscany-sdo-impl</include>
-                <include>org.apache.tuscany.sdo:tuscany-sdo-tools</include> 
+                <include>org.apache.tuscany.sdo:tuscany-sdo-tools</include>
             </includes>
-            <fileMode>644</fileMode>
-        </dependencySet>
-    </dependencySets>
+            <binaries>
+                <outputDirectory>lib</outputDirectory>
+                <unpack>false</unpack>
+                <includeDependencies>true</includeDependencies>
+            </binaries>
+        </moduleSet>
+        <moduleSet>
+            <includes>
+                <include>org.apache.tuscany.sdo:sample-sdo</include>
+            </includes>
+            <sources>
+            </sources>
+        </moduleSet>
+    </moduleSets>
 </assembly>
 



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