openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r775475 - in /incubator/openwebbeans/trunk/distribution: pom.xml src/assembly/dist-all.xml src/assembly/dist-binary.xml
Date Sat, 16 May 2009 14:39:24 GMT
Author: gerdogdu
Date: Sat May 16 14:39:24 2009
New Revision: 775475

URL: http://svn.apache.org/viewvc?rev=775475&view=rev
Log:
Update assembly for M2

Modified:
    incubator/openwebbeans/trunk/distribution/pom.xml
    incubator/openwebbeans/trunk/distribution/src/assembly/dist-all.xml
    incubator/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml

Modified: incubator/openwebbeans/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/distribution/pom.xml?rev=775475&r1=775474&r2=775475&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/distribution/pom.xml (original)
+++ incubator/openwebbeans/trunk/distribution/pom.xml Sat May 16 14:39:24 2009
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.openwebbeans</groupId>
         <artifactId>openwebbeans</artifactId>
-        <version>1.0.0-incubating-M1</version>
+        <version>1.0.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         </plugins>
     </build>
     <properties>
-      <siteId>/OWB/1.0.0-incubating-M1/distribution</siteId>
+      <siteId>/OWB/1.0.0-incubating-M2/distribution</siteId>
     </properties>
     <!--
         The assemblies work off of dependency sets since the stuff to be
@@ -86,12 +86,18 @@
     -->
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.openwebbeans.samples</groupId>
             <artifactId>guess</artifactId>
             <version>${project.version}</version>
     	    <type>war</type>
         </dependency>
         <dependency>
+            <groupId>org.apache.openwebbeans.samples</groupId>
+            <artifactId>reservation</artifactId>
+            <version>${project.version}</version>
+    	    <type>war</type>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openwebbeans-api</artifactId>
             <version>${project.version}</version>
@@ -101,7 +107,30 @@
             <artifactId>openwebbeans-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>openwebbeans-jsf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>openwebbeans-jms</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>openwebbeans-jpa</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>openwebbeans-ejb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>openwebbeans-geronimo</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
-
-
 </project>

Modified: incubator/openwebbeans/trunk/distribution/src/assembly/dist-all.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/distribution/src/assembly/dist-all.xml?rev=775475&r1=775474&r2=775475&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/distribution/src/assembly/dist-all.xml (original)
+++ incubator/openwebbeans/trunk/distribution/src/assembly/dist-all.xml Sat May 16 14:39:24
2009
@@ -37,7 +37,7 @@
         </file>
 
         <file>
-            <source>../README.txt</source>
+            <source>../readme/README_M2.txt</source>
         </file>
 
         <file>
@@ -53,11 +53,6 @@
             <source>../samples/guess/src/main/webapp/WEB-INF/web.xml</source>
         </file>
 
-        <file>
-            <outputDirectory>config</outputDirectory>
-            <source>../samples/guess/src/main/webapp/WEB-INF/beans.xml</source>
-        </file>
-
     </files>
 
     <dependencySets>
@@ -67,10 +62,20 @@
             <includes>
                 <include>org.apache.openwebbeans:openwebbeans-api</include>
                 <include>org.apache.openwebbeans:openwebbeans-impl</include>
+                <include>org.apache.openwebbeans:openwebbeans-ejb</include>
+                <include>org.apache.openwebbeans:openwebbeans-jsf</include>
+                <include>org.apache.openwebbeans:openwebbeans-jpa</include>
+                <include>org.apache.openwebbeans:openwebbeans-jms</include>
+                <include>org.apache.openwebbeans:openwebbeans-geronimo</include>
             </includes>
 	    <excludes>
 		<exclude>org.apache.openwebbeans:openwebbeans-api:jar:sources</exclude>
 		<exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-ejb:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-jsf:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-jpa:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-jms:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-geronimo:jar:sources</exclude>
 	    </excludes>
         </dependencySet>
 
@@ -78,7 +83,8 @@
         <dependencySet>
             <outputDirectory>samples</outputDirectory>
             <includes>
-                <include>org.apache.openwebbeans:guess:war</include>
+                <include>org.apache.openwebbeans.samples:guess:war</include>
+                <include>org.apache.openwebbeans.samples:reservation:war</include>
             </includes>
         </dependencySet>
 
@@ -104,6 +110,8 @@
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jsp_2.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jaxws_2.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
             </includes>
         </dependencySet>
 

Modified: incubator/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml?rev=775475&r1=775474&r2=775475&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml (original)
+++ incubator/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml Sat May 16 14:39:24
2009
@@ -37,7 +37,7 @@
         </file>
 
         <file>
-            <source>../README.txt</source>
+            <source>../readme/README_M2.txt</source>
         </file>
 
         <file>
@@ -53,11 +53,6 @@
             <source>../samples/guess/src/main/webapp/WEB-INF/web.xml</source>
         </file>
 
-        <file>
-            <outputDirectory>config</outputDirectory>
-            <source>../samples/guess/src/main/webapp/WEB-INF/beans.xml</source>
-        </file>
-
     </files>
 
    <fileSets>
@@ -74,10 +69,20 @@
             <includes>
                 <include>org.apache.openwebbeans:openwebbeans-api</include>
                 <include>org.apache.openwebbeans:openwebbeans-impl</include>
+                <include>org.apache.openwebbeans:openwebbeans-ejb</include>
+                <include>org.apache.openwebbeans:openwebbeans-jsf</include>
+                <include>org.apache.openwebbeans:openwebbeans-jpa</include>
+                <include>org.apache.openwebbeans:openwebbeans-jms</include>
+                <include>org.apache.openwebbeans:openwebbeans-geronimo</include>
             </includes>
 	    <excludes>
 		<exclude>org.apache.openwebbeans:openwebbeans-api:jar:sources</exclude>
 		<exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-ejb:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-jsf:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-jpa:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-jms:jar:sources</exclude>
+		<exclude>org.apache.openwebbeans:openwebbeans-geronimo:jar:sources</exclude>
 	    </excludes>
         </dependencySet>
 
@@ -85,7 +90,8 @@
         <dependencySet>
             <outputDirectory>samples</outputDirectory>
             <includes>
-                <include>org.apache.openwebbeans:guess:war</include>
+                <include>org.apache.openwebbeans.samples:guess:war</include>
+                <include>org.apache.openwebbeans.samples:reservation:war</include>
             </includes>
         </dependencySet>
 
@@ -111,6 +117,8 @@
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jsp_2.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jaxws_2.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
             </includes>
         </dependencySet>
 



Mime
View raw message