upgrade module, align with convention

- upgrade to seam-parent 6 and seam-bom 3.0.0.b05 - upgrade to Seam Solder - use latest conventions - rename implementation artifact to seam-jms-impl - formatting - ASL license
seam · Jan 8, 2011 · 6bdfc2e · 6bdfc2e
1 parent 48488d6
commit 6bdfc2e
Show file tree

Hide file tree

Showing 13 changed files with 399 additions and 662 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -10,9 +10,12 @@
    </parent>
 
    <artifactId>seam-jms-api</artifactId>
+   <packaging>jar</packaging>
+
    <name>Seam JMS API</name>
    <description>Client View of the Seam JMS Module</description>
-   <packaging>jar</packaging>
+   <!-- url required for JAR Manifest -->
+   <url>${project.parent.url}</url>
 
    <dependencies>
       <dependency>
@@ -22,8 +25,8 @@
       </dependency>
 
       <dependency>
-         <groupId>javax.jms</groupId>
-         <artifactId>jms</artifactId>
+         <groupId>org.jboss.spec.javax.jms</groupId>
+         <artifactId>jboss-jms-api_1.1_spec</artifactId>
          <scope>provided</scope>
       </dependency>
    </dependencies>

diff --git a/dist/distribution.txt b/dist/distribution.txt
@@ -1,5 +1,5 @@
 To create the Seam JMS distribution, run the following Maven command:
 
-mvn clean package -Ddist
+mvn clean package -Drelease
 
 Release binaries will be produced in: dist/target
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -1,86 +1,86 @@
-<?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>
-
-   <parent>
-      <groupId>org.jboss.seam.jms</groupId>
-      <artifactId>seam-jms-parent</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>
-   </parent>
-
-   <artifactId>seam-jms-distribution</artifactId>
-   <name>Seam JMS Distribution</name>
-   <description>Builds a proper Seam JMS release distribution</description>
-   <packaging>pom</packaging>
-
-   <properties>
-      <maven.deploy.skip>true</maven.deploy.skip>
-   </properties>
-
-   <dependencies>
-      <dependency>
-         <groupId>org.jboss.seam.jms</groupId>
-         <artifactId>seam-jms-api</artifactId>
-         <optional>true</optional>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.seam.jms</groupId>
-         <artifactId>seam-jms-api</artifactId>
-         <version>${project.version}</version>
-         <classifier>sources</classifier>
-         <optional>true</optional>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.seam.jms</groupId>
-         <artifactId>seam-jms-api</artifactId>
-         <version>${project.version}</version>
-         <classifier>javadoc</classifier>
-         <optional>true</optional>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.seam.jms</groupId>
-         <artifactId>seam-jms</artifactId>
-         <optional>true</optional>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.seam.jms</groupId>
-         <artifactId>seam-jms</artifactId>
-         <version>${project.version}</version>
-         <classifier>sources</classifier>
-         <optional>true</optional>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.seam.jms</groupId>
-         <artifactId>seam-jms</artifactId>
-         <version>${project.version}</version>
-         <classifier>javadoc</classifier>
-         <optional>true</optional>
-      </dependency>
-
+<?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>
+
+   <parent>
+      <groupId>org.jboss.seam.jms</groupId>
+      <artifactId>seam-jms-parent</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+      <relativePath>../pom.xml</relativePath>
+   </parent>
+
+   <artifactId>seam-jms-distribution</artifactId>
+   <name>Seam JMS Distribution</name>
+   <description>Builds a Seam JMS release distribution</description>
+   <packaging>pom</packaging>
+
+   <properties>
+      <maven.deploy.skip>true</maven.deploy.skip>
+   </properties>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.seam.jms</groupId>
+         <artifactId>seam-jms-api</artifactId>
+         <optional>true</optional>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.jms</groupId>
+         <artifactId>seam-jms-api</artifactId>
+         <version>${project.version}</version>
+         <classifier>sources</classifier>
+         <optional>true</optional>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.jms</groupId>
+         <artifactId>seam-jms-api</artifactId>
+         <version>${project.version}</version>
+         <classifier>javadoc</classifier>
+         <optional>true</optional>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.jms</groupId>
+         <artifactId>seam-jms-impl</artifactId>
+         <optional>true</optional>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.jms</groupId>
+         <artifactId>seam-jms-impl</artifactId>
+         <version>${project.version}</version>
+         <classifier>sources</classifier>
+         <optional>true</optional>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.jms</groupId>
+         <artifactId>seam-jms-impl</artifactId>
+         <version>${project.version}</version>
+         <classifier>javadoc</classifier>
+         <optional>true</optional>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.seam.jms</groupId>
          <artifactId>seam-jms-reference-guide</artifactId>
-         <version>${project.version}</version>
-         <type>war</type>
+         <version>${project.version}</version>
+         <type>war</type>
          <optional>true</optional>
-      </dependency>
-
-   </dependencies>
-
-   <build>
-      <finalName>seam-jms</finalName>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-         </plugin>
-      </plugins>
-   </build>
-</project>
+      </dependency>
+
+   </dependencies>
+
+   <build>
+      <finalName>seam-jms</finalName>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+         </plugin>
+      </plugins>
+   </build>
+</project>
diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
@@ -29,7 +29,7 @@
          <useProjectArtifact>false</useProjectArtifact>
          <includes>
             <include>org.jboss.seam.jms:seam-jms-api</include>
-            <include>org.jboss.seam.jms:seam-jms</include>
+            <include>org.jboss.seam.jms:seam-jms-impl</include>
          </includes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>