Author: gerdogdu
Date: Sat Feb 27 22:52:32 2010
New Revision: 917068
URL: http://svn.apache.org/viewvc?rev=917068&view=rev
Log:
Commit distribution update
Modified:
openwebbeans/trunk/distribution/pom.xml
openwebbeans/trunk/distribution/src/assembly/dist-binary.xml
Modified: openwebbeans/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/pom.xml?rev=917068&r1=917067&r2=917068&view=diff
==============================================================================
--- openwebbeans/trunk/distribution/pom.xml (original)
+++ openwebbeans/trunk/distribution/pom.xml Sat Feb 27 22:52:32 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>1.0.0-incubating-M3</version>
+ <version>1.0.0-M4</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -77,7 +77,7 @@
</plugins>
</build>
<properties>
- <siteId>/OWB/1.0.0-incubating-M3-rc2/distribution</siteId>
+ <siteId>/OWB/1.0.0-M4/distribution</siteId>
</properties>
<!--
The assemblies work off of dependency sets since the stuff to be
@@ -86,38 +86,14 @@
-->
<dependencies>
<dependency>
- <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>org.apache.openwebbeans.samples</groupId>
- <artifactId>ejb-sample</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans.samples</groupId>
- <artifactId>jms-sample</artifactId>
- <version>${project.version}</version>
- <type>war</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0-beta</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>openwebbeans-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>atinject-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>1.0-beta</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -141,12 +117,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openwebbeans-geronimo</artifactId>
+ <artifactId>openwebbeans-resource</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openwebbeans-resource</artifactId>
+ <artifactId>openwebbeans-spi</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Modified: openwebbeans/trunk/distribution/src/assembly/dist-binary.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml?rev=917068&r1=917067&r2=917068&view=diff
==============================================================================
--- openwebbeans/trunk/distribution/src/assembly/dist-binary.xml (original)
+++ openwebbeans/trunk/distribution/src/assembly/dist-binary.xml Sat Feb 27
22:52:32 2010
@@ -37,7 +37,7 @@
</file>
<file>
- <source>../readme/README_M3.txt</source>
+ <source>../readme/README_M4.txt</source>
</file>
<file>
@@ -101,6 +101,81 @@
<exclude>**/.gitignore</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../samples/ejb-telephone</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>samples/ejb-telephone</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
+ <exclude>**/.metadata/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/conversation-sample</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>samples/conversation-sample</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
+ <exclude>**/.metadata/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jms-sample</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>samples/jms-sample</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
+ <exclude>**/.metadata/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jsf2sample</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>samples/jsf2sample</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
+ <exclude>**/.metadata/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/standalone-sample</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>samples/standalone-sample</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
+ <exclude>**/.metadata/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
<dependencySets>
@@ -108,35 +183,45 @@
<dependencySet>
<outputDirectory></outputDirectory>
<includes>
- <include>org.apache.openwebbeans:atinject-api</include>
- <include>org.apache.openwebbeans:openwebbeans-api</include>
<include>org.apache.openwebbeans:openwebbeans-impl</include>
+ </includes>
+ <excludes>
+
<exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude>
+ </excludes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>api</outputDirectory>
+ <includes>
+
<include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar:1.0-beta</include>
+
<include>org.apache.geronimo.specs:geronimo-jcdi_1.0_spec:jar:1.0-beta</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>plugins</outputDirectory>
+ <includes>
<include>org.apache.openwebbeans:openwebbeans-ejb</include>
+
<include>org.apache.openwebbeans:openwebbeans-resource</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>
-
<include>org.apache.openwebbeans:openwebbeans-resource</include>
</includes>
<excludes>
-
<exclude>org.apache.openwebbeans:atinject-api:jar:sources</exclude>
-
<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-resource: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>
-
<exclude>org.apache.openwebbeans:openwebbeans-resources:jar:sources</exclude>
- </excludes>
+ </excludes>
</dependencySet>
-
<dependencySet>
- <outputDirectory>samples</outputDirectory>
+ <outputDirectory>spi</outputDirectory>
<includes>
-
<include>org.apache.openwebbeans.samples:jms-sample:war</include>
+ <include>org.apache.openwebbeans:openwebbeans-spi</include>
</includes>
+ <excludes>
+
<exclude>org.apache.openwebbeans:openwebbeans-spi:jar:sources</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
