[seam-commits] Seam SVN: r12975 - in modules/jms/trunk: api and 4 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Jun 2 14:23:39 EDT 2010
Author: pete.muir at jboss.org
Date: 2010-06-02 14:23:39 -0400 (Wed, 02 Jun 2010)
New Revision: 12975
Modified:
modules/jms/trunk/api/pom.xml
modules/jms/trunk/dist/pom.xml
modules/jms/trunk/docs/reference/pom.xml
modules/jms/trunk/impl/pom.xml
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java
modules/jms/trunk/pom.xml
Log:
new build
Modified: modules/jms/trunk/api/pom.xml
===================================================================
--- modules/jms/trunk/api/pom.xml 2010-06-02 18:20:14 UTC (rev 12974)
+++ modules/jms/trunk/api/pom.xml 2010-06-02 18:23:39 UTC (rev 12975)
@@ -13,24 +13,6 @@
<name>Seam JMS API</name>
<description>Client View of the Seam JMS Module</description>
<packaging>jar</packaging>
-
- <!-- TODO Remove -->
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<dependencies>
<dependency>
@@ -42,7 +24,6 @@
<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
- <version>1.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: modules/jms/trunk/dist/pom.xml
===================================================================
--- modules/jms/trunk/dist/pom.xml 2010-06-02 18:20:14 UTC (rev 12974)
+++ modules/jms/trunk/dist/pom.xml 2010-06-02 18:23:39 UTC (rev 12975)
@@ -14,24 +14,6 @@
<name>Seam JMS Distribution</name>
<description>Builds a proper Seam JMS release distribution</description>
<packaging>pom</packaging>
-
- <!-- TODO Remove -->
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
@@ -41,10 +23,9 @@
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms-api</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms-api</artifactId>
@@ -52,7 +33,7 @@
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms-api</artifactId>
@@ -64,10 +45,9 @@
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms</artifactId>
@@ -75,7 +55,7 @@
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms</artifactId>
Modified: modules/jms/trunk/docs/reference/pom.xml
===================================================================
--- modules/jms/trunk/docs/reference/pom.xml 2010-06-02 18:20:14 UTC (rev 12974)
+++ modules/jms/trunk/docs/reference/pom.xml 2010-06-02 18:23:39 UTC (rev 12975)
@@ -24,12 +24,6 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <configuration>
- <sourceDirectory>src/main/docbook</sourceDirectory>
- <imageResource>
- <directory>${pom.basedir}/src/main/docbook/en-US</directory>
- </imageResource>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: modules/jms/trunk/impl/pom.xml
===================================================================
--- modules/jms/trunk/impl/pom.xml 2010-06-02 18:20:14 UTC (rev 12974)
+++ modules/jms/trunk/impl/pom.xml 2010-06-02 18:23:39 UTC (rev 12975)
@@ -13,24 +13,6 @@
<name>Seam JMS Implementation</name>
<description>Implementation of the Seam JMS Module</description>
<packaging>jar</packaging>
-
- <!-- TODO Remove -->
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<dependencies>
<dependency>
@@ -60,21 +42,18 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
- <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-jbossas-remote-60</artifactId>
- <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
Modified: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java 2010-06-02 18:20:14 UTC (rev 12974)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java 2010-06-02 18:23:39 UTC (rev 12975)
@@ -29,7 +29,7 @@
import org.jboss.seam.jms.impl.inject.ConnectionProducer;
import org.jboss.seam.jms.impl.wrapper.JmsAnnotatedTypeWrapper;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
@@ -38,7 +38,7 @@
public static JavaArchive createDeployment(Class<?> c)
{
- JavaArchive archive = Archives.create("test.jar", JavaArchive.class);
+ JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class);
archive.addPackage(Util.class.getPackage());
archive.addPackage(Seam3JmsExtension.class.getPackage());
archive.addPackage(JmsSession.class.getPackage());
Modified: modules/jms/trunk/pom.xml
===================================================================
--- modules/jms/trunk/pom.xml 2010-06-02 18:20:14 UTC (rev 12974)
+++ modules/jms/trunk/pom.xml 2010-06-02 18:23:39 UTC (rev 12975)
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>11-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-parent</artifactId>
+ <version>1</version>
+ </parent>
- <groupId>org.jboss.seam.jms</groupId>
- <artifactId>seam-jms-parent</artifactId>
- <packaging>pom</packaging>
- <name>Seam JMS Parent</name>
- <version>3.0.0-SNAPSHOT</version>
+ <groupId>org.jboss.seam.jms</groupId>
+ <artifactId>seam-jms-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Seam JMS Parent</name>
+ <version>3.0.0-SNAPSHOT</version>
- <url>http://sfwk.org/Seam3/JMSModule</url>
-
+ <url>http://sfwk.org/Seam3/JMSModule</url>
+
<!-- TODO Remove -->
<!-- Snapshots repo to get parent -->
<repositories>
@@ -34,136 +35,165 @@
</repository>
</repositories>
- <properties>
- <weld.api.version>1.0-SP1</weld.api.version>
- <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version>
- <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version>
- <jboss.maven.plugin.version>1.4</jboss.maven.plugin.version>
- <cargo.maven2.plugin.version>1.0-beta-2</cargo.maven2.plugin.version>
- <arquillian.version>1.0.0.Alpha1</arquillian.version>
- </properties>
+ <properties>
+ <seam.version>3.0.0.b01</seam.version>
+ </properties>
- <modules>
- <module>api</module>
- <module>impl</module>
- <!--
- <module>examples</module>
- -->
- </modules>
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ </modules>
- <!-- Only build the distribution if requested explicitly -->
- <profiles>
- <profile>
- <id>distribution</id>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam</artifactId>
+ <version>${seam.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- Override the dependencyManagement of org.jboss.seam:seam for modules from this project -->
+ <dependency>
+ <groupId>org.jboss.seam.jms</groupId>
+ <artifactId>seam-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.jms</groupId>
+ <artifactId>seam-jms-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Only build the distribution if requested explicitly -->
+ <profiles>
+ <profile>
+ <id>distribution</id>
<activation>
<property>
<name>dist</name>
</property>
</activation>
- <modules>
- <module>dist</module>
+ <modules>
+ <module>dist</module>
<module>docs/reference</module>
- </modules>
- </profile>
- <profile>
- <id>code-coverage</id>
- <build>
- <pluginManagement>
- <plugins>
+ </modules>
+ </profile>
+ <profile>
+ <id>code-coverage</id>
+ <build>
+ <pluginManagement>
+ <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>${cargo.maven2.plugin.version}</version>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>${cargo.maven2.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
- <configuration>
- <wait>false</wait>
- <container>
- <containerId>jboss5x</containerId>
- <home>${env.JBOSS_HOME}</home>
- <timeout>300000</timeout> <!-- 5 minutes -->
- </container>
- <configuration>
- <type>existing</type>
- <home>${env.JBOSS_HOME}/server/default</home>
- <properties>
- <cargo.jboss.configuration>default</cargo.jboss.configuration>
- <cargo.rmi.port>1099</cargo.rmi.port>
- </properties>
- </configuration>
- </configuration>
- </plugin>
+ <configuration>
+ <wait>false</wait>
+ <container>
+ <containerId>jboss5x</containerId>
+ <home>${env.JBOSS_HOME}</home>
+ <timeout>300000</timeout> <!-- 5 minutes -->
+ </container>
+ <configuration>
+ <type>existing</type>
+ <home>${env.JBOSS_HOME}/server/default</home>
+ <properties>
+ <cargo.jboss.configuration>default
+ </cargo.jboss.configuration>
+ <cargo.rmi.port>1099</cargo.rmi.port>
+ </properties>
+ </configuration>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-emma-jar</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo message="Deploying emma jar to server lib directory" />
- <copy file="${emma.jar.file}" todir="${env.JBOSS_HOME}/server/default/lib" overwrite="true" />
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>retrieve-coverage-file</id>
- <phase>test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo message="Moving coverage.ec file to current modele from parent module" />
- <property name="coverage.file" value="${basedir}/../coverage.ec" />
- <waitfor maxwait="30" maxwaitunit="second">
- <available file="${coverage.file}" />
- </waitfor>
- <move file="${coverage.file}" todir="${basedir}" failonerror="false" />
- <delete file="${basedir}/transaction.log" failonerror="false" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-emma-jar</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo
+ message="Deploying emma jar to server lib directory" />
+ <copy file="${emma.jar.file}"
+ todir="${env.JBOSS_HOME}/server/default/lib"
+ overwrite="true" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>retrieve-coverage-file</id>
+ <phase>test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo
+ message="Moving coverage.ec file to current modele from parent module" />
+ <property name="coverage.file"
+ value="${basedir}/../coverage.ec" />
+ <waitfor maxwait="30"
+ maxwaitunit="second">
+ <available file="${coverage.file}" />
+ </waitfor>
+ <move file="${coverage.file}"
+ todir="${basedir}" failonerror="false" />
+ <delete file="${basedir}/transaction.log"
+ failonerror="false" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
- <developers>
- <developer>
- <name>Jordan Ganoff</name>
- <email>jganoff at gmail.com</email>
- <timezone>EST</timezone>
- <roles>
- <role>Project Lead</role>
- </roles>
+ <developers>
+ <developer>
+ <name>Jordan Ganoff</name>
+ <email>jganoff at gmail.com</email>
+ <timezone>EST</timezone>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
<url>http://community.jboss.org/people/jganoff</url>
- </developer>
+ </developer>
<developer>
<name>Dan Allen</name>
<organization>JBoss, by Red Hat</organization>
@@ -174,41 +204,13 @@
<role>Contributor</role>
</roles>
</developer>
- </developers>
+ </developers>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-bom</artifactId>
- <version>${weld.api.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
- <version>1.0.0.Alpha1</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/jms/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/jms/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Seam/modules/jms/trunk</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/jms/trunk
+ </connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/jms/trunk
+ </developerConnection>
+ <url>http://fisheye.jboss.org/browse/Seam/modules/jms/trunk</url>
+ </scm>
</project>
More information about the seam-commits
mailing list