update distribution

seam · Feb 26, 2011 · 0b9c958 · 0b9c958
1 parent cd59c90
commit 0b9c958
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 54 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -21,14 +21,7 @@
    <dependencies>
       <dependency>
          <groupId>org.jboss.seam.rest</groupId>
-         <artifactId>seam-rest-api</artifactId>
-         <optional>true</optional>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.seam.rest</groupId>
-         <artifactId>seam-rest-impl</artifactId>
-         <optional>true</optional>
+         <artifactId>seam-rest</artifactId>
       </dependency>
 
       <dependency>

diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
@@ -12,8 +12,9 @@
    <!-- Add distribution files -->
    <fileSets>
       <fileSet>
-         <directory>${basedir}/..</directory>
+         <directory>src/main/assembly</directory>
          <outputDirectory>.</outputDirectory>
+         <filtered>true</filtered>
          <includes>
             <include>readme.txt</include>
             <include>license.txt</include>
@@ -28,11 +29,15 @@
          <outputDirectory>artifacts</outputDirectory>
          <useProjectArtifact>false</useProjectArtifact>
          <includes>
-            <include>org.jboss.seam.rest:seam-rest-api</include>
-            <include>org.jboss.seam.rest:seam-rest-impl</include>
+            <include>org.jboss.seam.rest:seam-rest</include>
          </includes>
+         <excludes>
+            <exclude>org.jboss.seam.rest:*:*:javadoc</exclude>
+            <exclude>org.jboss.seam.rest:*:*:sources</exclude>
+         </excludes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>
+
       <!-- Add necessary dependencies -->
       <dependencySet>
          <outputDirectory>lib</outputDirectory>
@@ -43,15 +48,17 @@
          </excludes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>
+
       <!-- Pull in javadoc for api -->
       <dependencySet>
-         <outputDirectory>doc/apidocs</outputDirectory>
+         <outputDirectory>doc/api</outputDirectory>
          <unpack>true</unpack>
          <useProjectArtifact>false</useProjectArtifact>
          <includes>
             <include>org.jboss.seam.rest:seam-rest-api:jar:javadoc</include>
          </includes>
       </dependencySet>
+
       <!-- Pull in the example projects -->
       <dependencySet>
          <outputDirectory>examples</outputDirectory>
@@ -77,6 +84,7 @@
             <include>org.jboss.seam.rest:seam-jaxrs-exceptions-example</include>
          </includes>
       </dependencySet>
+
       <!-- Pull in docbook artifacts -->
       <dependencySet>
          <outputDirectory>doc/reference</outputDirectory>
@@ -91,5 +99,21 @@
             </excludes>
          </unpackOptions>
       </dependencySet>
+
+      <!-- Add the source -->
+      <dependencySet>
+         <outputDirectory>source</outputDirectory>
+         <unpack>true</unpack>
+         <useProjectArtifact>false</useProjectArtifact>
+         <includes>
+            <include>org.jboss.seam.rest:seam-rest-api:*:sources</include>
+            <include>org.jboss.seam.rest:seam-rest-impl:*:sources</include>            
+         </includes>
+         <unpackOptions>
+            <excludes>
+               <exclude>META-INF/</exclude>
+            </excludes>
+         </unpackOptions>
+      </dependencySet>      
    </dependencySets>
 </assembly>
diff --git a/dist/src/main/assembly/readme.txt b/dist/src/main/assembly/readme.txt
@@ -8,17 +8,25 @@ Seam REST ${project.version}
 Contents of distribution
 ========================
 
-doc/
+ artifacts/
+
+  Seam Catch libraries
+
+ doc/
 
   API Docs and reference guide.
 
-examples/
+ examples/
 
   Seam REST Examples
 
-lib/
+ lib/
 
-  Seam REST Jar files
+  Seam REST dependencies
+
+ source/
+
+  Source code for this module
 
 Licensing
 =========

diff --git a/examples/jaxrs-exceptions/pom.xml b/examples/jaxrs-exceptions/pom.xml
@@ -52,24 +52,9 @@
 
 		<dependency>
 			<groupId>org.jboss.seam.catch</groupId>
-			<artifactId>seam-catch-api</artifactId>
+			<artifactId>seam-catch</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.jboss.seam.catch</groupId>
-			<artifactId>seam-catch-impl</artifactId>
-			<!-- Because we use the combined jar -->
-			<exclusions>
-				<exclusion>
-					<groupId>org.jboss.seam.solder</groupId>
-					<artifactId>seam-solder-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.jboss.seam.solder</groupId>
-					<artifactId>seam-solder-impl</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -93,24 +78,8 @@
 				<!-- Exclude catch from GF for now -->
 				<dependency>
 					<groupId>org.jboss.seam.catch</groupId>
-					<artifactId>seam-catch-api</artifactId>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>org.jboss.seam.catch</groupId>
-					<artifactId>seam-catch-impl</artifactId>
+					<artifactId>seam-catch</artifactId>
 					<scope>provided</scope>
-					<!-- Because we use the combined jar -->
-					<exclusions>
-						<exclusion>
-							<groupId>org.jboss.seam.solder</groupId>
-							<artifactId>seam-solder-api</artifactId>
-						</exclusion>
-						<exclusion>
-							<groupId>org.jboss.seam.solder</groupId>
-							<artifactId>seam-solder-impl</artifactId>
-						</exclusion>
-					</exclusions>
 				</dependency>
 			</dependencies>
 

diff --git a/examples/tasks/pom.xml b/examples/tasks/pom.xml
@@ -141,11 +141,7 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.jboss.seam.catch</groupId>
-					<artifactId>seam-catch-api</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>org.jboss.seam.catch</groupId>
-					<artifactId>seam-catch-impl</artifactId>
+					<artifactId>seam-catch</artifactId>
 				</dependency>
 			</dependencies>
 		</profile>