[jboss-svn-commits] JBL Code SVN: r6430 - in labs/reportingservices/trunk: dev/applications/sar dev/applications/sar/src/main dev/applications/sar/src/main/assembly dev/modules/client/api dev/modules/client/impl dev/modules/common dev/modules/server/api dev/modules/server/impl dev/modules/server/webadminconsole src/main

[jboss-svn-commits at lists.jboss.org]

Author: cyril.joui at supinfo.com
Date: 2006-09-25 18:29:10 -0400 (Mon, 25 Sep 2006)
New Revision: 6430

Added:
   labs/reportingservices/trunk/dev/applications/sar/src/main/assembly/
   labs/reportingservices/trunk/dev/applications/sar/src/main/assembly/sar.xml
Removed:
   labs/reportingservices/trunk/dev/applications/sar/src/main/assembly/sar.xml
   labs/reportingservices/trunk/src/main/assembly/
Modified:
   labs/reportingservices/trunk/dev/applications/sar/
   labs/reportingservices/trunk/dev/applications/sar/pom.xml
   labs/reportingservices/trunk/dev/modules/client/api/
   labs/reportingservices/trunk/dev/modules/client/impl/
   labs/reportingservices/trunk/dev/modules/common/
   labs/reportingservices/trunk/dev/modules/server/api/
   labs/reportingservices/trunk/dev/modules/server/impl/
   labs/reportingservices/trunk/dev/modules/server/webadminconsole/
Log:
New structure refactoring after monday morning (25/09/06)


Property changes on: labs/reportingservices/trunk/dev/applications/sar
___________________________________________________________________
Name: svn:ignore
   + 
target


Modified: labs/reportingservices/trunk/dev/applications/sar/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/applications/sar/pom.xml	2006-09-25 22:21:34 UTC (rev 6429)
+++ labs/reportingservices/trunk/dev/applications/sar/pom.xml	2006-09-25 22:29:10 UTC (rev 6430)
@@ -17,12 +17,45 @@
 
 	<dependencies>
 		<!-- internal dependencies -->
+		<dependency>
+				<groupId>jboss.reportingservices</groupId>
+				<artifactId>common</artifactId>
+				<type>jar</type>
+			</dependency>
+			
+			<dependency>
+				<groupId>jboss.reportingservices</groupId>
+				<artifactId>client-api</artifactId>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>jboss.reportingservices</groupId>
+				<artifactId>client-impl</artifactId>
+				<type>jar</type>
+			</dependency>
+
+			<dependency>
+				<groupId>jboss.reportingservices</groupId>
+				<artifactId>server-api</artifactId>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>jboss.reportingservices</groupId>
+				<artifactId>server-impl</artifactId>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>jboss.reportingservices</groupId>
+				<artifactId>webadminconsole</artifactId>
+				<type>war</type>
+			</dependency>
+
 	</dependencies>
 
 	<build>
 		<defaultGoal>package</defaultGoal>
 		<finalName>reporting-services</finalName>
-		
+
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -33,9 +66,17 @@
 						</descriptor>
 					</descriptors>
 				</configuration>
+				<executions>
+					<execution>
+						<phase>install</phase>
+						<goals>
+							<goal>assembly</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
-		
+
 	</build>
 
 </project>
\ No newline at end of file

Copied: labs/reportingservices/trunk/dev/applications/sar/src/main/assembly (from rev 6427, labs/reportingservices/trunk/src/main/assembly)

Deleted: labs/reportingservices/trunk/dev/applications/sar/src/main/assembly/sar.xml
===================================================================
--- labs/reportingservices/trunk/src/main/assembly/sar.xml	2006-09-25 22:04:53 UTC (rev 6427)
+++ labs/reportingservices/trunk/dev/applications/sar/src/main/assembly/sar.xml	2006-09-25 22:29:10 UTC (rev 6430)
@@ -1,26 +0,0 @@
-<assembly>
-	<id>sar</id>
-	<formats>
-		<format>dir</format>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<moduleSets>
-		<moduleSet>
-			<includes>
-				<include>jboss-reporting:rs-sar</include>
-			</includes>
-			<binaries>
-				<outputDirectory>${artifactId}</outputDirectory>
-				<includeDependencies>true</includeDependencies>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-	</moduleSets>
-
-    <dependencySets>
-        <dependencySet>
-        </dependencySet>
-    </dependencySets>
-</assembly>
\ No newline at end of file

Copied: labs/reportingservices/trunk/dev/applications/sar/src/main/assembly/sar.xml (from rev 6429, labs/reportingservices/trunk/src/main/assembly/sar.xml)
===================================================================
--- labs/reportingservices/trunk/src/main/assembly/sar.xml	2006-09-25 22:21:34 UTC (rev 6429)
+++ labs/reportingservices/trunk/dev/applications/sar/src/main/assembly/sar.xml	2006-09-25 22:29:10 UTC (rev 6430)
@@ -0,0 +1,26 @@
+<assembly>
+	<id>sar</id>
+	<formats>
+		<format>dir</format>
+		<format>jar</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<moduleSets>
+		<moduleSet>
+			<includes>
+				<include>jboss-reporting:sar</include>
+			</includes>
+			<binaries>
+				<outputDirectory>${artifactId}</outputDirectory>
+				<includeDependencies>true</includeDependencies>
+				<unpack>false</unpack>
+			</binaries>
+		</moduleSet>
+	</moduleSets>
+
+    <dependencySets>
+        <dependencySet>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: labs/reportingservices/trunk/dev/modules/client/api
___________________________________________________________________
Name: svn:ignore
   + 
target



Property changes on: labs/reportingservices/trunk/dev/modules/client/impl
___________________________________________________________________
Name: svn:ignore
   + 
target



Property changes on: labs/reportingservices/trunk/dev/modules/common
___________________________________________________________________
Name: svn:ignore
   + 
target



Property changes on: labs/reportingservices/trunk/dev/modules/server/api
___________________________________________________________________
Name: svn:ignore
   + 
target



Property changes on: labs/reportingservices/trunk/dev/modules/server/impl
___________________________________________________________________
Name: svn:ignore
   + 
target



Property changes on: labs/reportingservices/trunk/dev/modules/server/webadminconsole
___________________________________________________________________
Name: svn:ignore
   + 
target