[jboss-cvs] JBossAS SVN: r90484 - in projects/spring-int/trunk: build and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 19 18:28:17 EDT 2009
Author: marius.bogoevici
Date: 2009-06-19 18:28:17 -0400 (Fri, 19 Jun 2009)
New Revision: 90484
Added:
projects/spring-int/trunk/build/src/assembly/deployer.xml
projects/spring-int/trunk/build/src/assembly/libs-with-deps.xml
projects/spring-int/trunk/build/src/assembly/libs.xml
projects/spring-int/trunk/build/src/main/
projects/spring-int/trunk/build/src/main/resources/
projects/spring-int/trunk/build/src/main/resources/spring-deployers-jboss-beans.xml
Removed:
projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml
projects/spring-int/trunk/build/src/assembly/dist.xml
projects/spring-int/trunk/deployers/src/assembly/
projects/spring-int/trunk/deployers/src/main/resources/
Modified:
projects/spring-int/trunk/build/pom.xml
projects/spring-int/trunk/build/src/assembly/src.xml
projects/spring-int/trunk/deployers/pom.xml
projects/spring-int/trunk/pom.xml
Log:
Reorganizing the build in final form.
Modified: projects/spring-int/trunk/build/pom.xml
===================================================================
--- projects/spring-int/trunk/build/pom.xml 2009-06-19 21:27:42 UTC (rev 90483)
+++ projects/spring-int/trunk/build/pom.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -13,6 +13,10 @@
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Spring Integration Distribution</description>
+ <properties>
+ <deployer.version>3.2</deployer.version>
+ </properties>
+
<profiles>
<profile>
<id>dist</id>
@@ -29,7 +33,7 @@
<version>2.2-beta-3</version>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>make-libs</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -37,12 +41,26 @@
<configuration>
<finalName>jboss-spring-int-${project.version}</finalName>
<descriptors>
- <descriptor>${basedir}/src/assembly/dist.xml</descriptor>
- <descriptor>${basedir}/src/assembly/dist-with-deps.xml</descriptor>
+ <descriptor>${basedir}/src/assembly/libs.xml</descriptor>
+ <descriptor>${basedir}/src/assembly/libs-with-deps.xml</descriptor>
<descriptor>${basedir}/src/assembly/src.xml</descriptor>
</descriptors>
</configuration>
</execution>
+ <execution>
+ <id>make-deployer</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>jboss-spring-${deployer.version}.deployer</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${basedir}/src/assembly/deployer.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Added: projects/spring-int/trunk/build/src/assembly/deployer.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/deployer.xml (rev 0)
+++ projects/spring-int/trunk/build/src/assembly/deployer.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -0,0 +1,21 @@
+<assembly>
+ <id>deployer</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/src/main/resources</directory>
+ <outputDirectory>META-INF</outputDirectory>
+ <includes>
+ <include>spring-deployers-jboss-beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Deleted: projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml 2009-06-19 21:27:42 UTC (rev 90483)
+++ projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -1,21 +0,0 @@
-<assembly>
- <id>with-deps</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../deployers/target/</directory>
- <outputDirectory>/deployer</outputDirectory>
- <includes>
- <include>*.zip</include>
- </includes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</assembly>
Deleted: projects/spring-int/trunk/build/src/assembly/dist.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/dist.xml 2009-06-19 21:27:42 UTC (rev 90483)
+++ projects/spring-int/trunk/build/src/assembly/dist.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -1,20 +0,0 @@
-<assembly>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../deployers/target/</directory>
- <outputDirectory>/deployer</outputDirectory>
- <includes>
- <include>*.zip</include>
- </includes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</assembly>
Copied: projects/spring-int/trunk/build/src/assembly/libs-with-deps.xml (from rev 90274, projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml)
===================================================================
--- projects/spring-int/trunk/build/src/assembly/libs-with-deps.xml (rev 0)
+++ projects/spring-int/trunk/build/src/assembly/libs-with-deps.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -0,0 +1,12 @@
+<assembly>
+ <id>libs-with-deps</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Copied: projects/spring-int/trunk/build/src/assembly/libs.xml (from rev 90274, projects/spring-int/trunk/build/src/assembly/dist.xml)
===================================================================
--- projects/spring-int/trunk/build/src/assembly/libs.xml (rev 0)
+++ projects/spring-int/trunk/build/src/assembly/libs.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -0,0 +1,12 @@
+<assembly>
+ <id>lib</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: projects/spring-int/trunk/build/src/assembly/src.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/src.xml 2009-06-19 21:27:42 UTC (rev 90483)
+++ projects/spring-int/trunk/build/src/assembly/src.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -6,9 +6,9 @@
<fileSets>
<fileSet>
<directory>..</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>/</outputDirectory>
<excludes>
- <exclude>**/target/</exclude>
+ <exclude>**/target/**</exclude>
</excludes>
</fileSet>
</fileSets>
Copied: projects/spring-int/trunk/build/src/main/resources/spring-deployers-jboss-beans.xml (from rev 90446, projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-jboss-beans.xml)
===================================================================
--- projects/spring-int/trunk/build/src/main/resources/spring-deployers-jboss-beans.xml (rev 0)
+++ projects/spring-int/trunk/build/src/main/resources/spring-deployers-jboss-beans.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Spring deployer beans.
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="SpringParserDeployer" class="org.jboss.spring.deployers.SpringParserDeployer"/>
+
+ <bean name="ApplicationContextDeployer" class="org.jboss.spring.deployers.ApplicationContextDeployer"/>
+
+ <!--
+ Uncomment this if you want to use only BeanFactory not the full ApplicationContext.
+ And comment the ApplicationContextDeployer, else both will pick-up the SpringMetaData.
+ -->
+ <!--
+ <bean name="BeanFactoryDeployer" class="org.jboss.spring.deployers.BeanFactoryDeployer"/>
+ -->
+
+</deployment>
Modified: projects/spring-int/trunk/deployers/pom.xml
===================================================================
--- projects/spring-int/trunk/deployers/pom.xml 2009-06-19 21:27:42 UTC (rev 90483)
+++ projects/spring-int/trunk/deployers/pom.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -21,29 +21,6 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
-
- </goals>
- <configuration>
- <finalName>jboss-spring.deployer</finalName>
- <descriptors>
- <descriptor>${basedir}/src/assembly/deployer.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: projects/spring-int/trunk/pom.xml
===================================================================
--- projects/spring-int/trunk/pom.xml 2009-06-19 21:27:42 UTC (rev 90483)
+++ projects/spring-int/trunk/pom.xml 2009-06-19 22:28:17 UTC (rev 90484)
@@ -84,12 +84,19 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>make-libs</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
</execution>
+ <execution>
+ <id>make-deployer</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
More information about the jboss-cvs-commits
mailing list