[jboss-cvs] JBossAS SVN: r101601 - in projects/snowdrop/branches/1_0: build and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 26 19:59:27 EST 2010
Author: marius.bogoevici
Date: 2010-02-26 19:59:26 -0500 (Fri, 26 Feb 2010)
New Revision: 101601
Added:
projects/snowdrop/branches/1_0/deployer-assembly/
projects/snowdrop/branches/1_0/deployer-assembly/pom.xml
projects/snowdrop/branches/1_0/deployer-assembly/src/
projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/
projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml
projects/snowdrop/branches/1_0/deployer-assembly/src/main/
projects/snowdrop/branches/1_0/deployer-assembly/src/main/resources/
projects/snowdrop/branches/1_0/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml
Removed:
projects/snowdrop/branches/1_0/build/src/assembly/deployer.xml
projects/snowdrop/branches/1_0/build/src/main/
Modified:
projects/snowdrop/branches/1_0/build/pom.xml
projects/snowdrop/branches/1_0/pom.xml
Log:
create a separate assembly module for deployer
Modified: projects/snowdrop/branches/1_0/build/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/build/pom.xml 2010-02-27 00:49:50 UTC (rev 101600)
+++ projects/snowdrop/branches/1_0/build/pom.xml 2010-02-27 00:59:26 UTC (rev 101601)
@@ -8,14 +8,10 @@
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop</artifactId>
<packaging>pom</packaging>
- <name>Snowdrop Distribution</name>
+ <name>Snowdrop - Distribution</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>Snowdrop Distribution</description>
- <properties>
- <deployer.version>3.2.1-SNAPSHOT</deployer.version>
- </properties>
-
<profiles>
<profile>
<id>dist</id>
@@ -32,7 +28,7 @@
<version>2.2-beta-3</version>
<executions>
<execution>
- <id>make-libs</id>
+ <id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -46,19 +42,6 @@
</descriptors>
</configuration>
</execution>
- <execution>
- <id>make-deployer</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>jboss-spring-${deployer.version}.deployer</finalName>
- <descriptors>
- <descriptor>${basedir}/src/assembly/deployer.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Deleted: projects/snowdrop/branches/1_0/build/src/assembly/deployer.xml
===================================================================
--- projects/snowdrop/branches/1_0/build/src/assembly/deployer.xml 2010-02-27 00:49:50 UTC (rev 101600)
+++ projects/snowdrop/branches/1_0/build/src/assembly/deployer.xml 2010-02-27 00:59:26 UTC (rev 101601)
@@ -1,25 +0,0 @@
-<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>
- <excludes>
- <exclude>*:aopalliance:*</exclude>
- <exclude>*:commons-logging:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
Added: projects/snowdrop/branches/1_0/deployer-assembly/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/pom.xml (rev 0)
+++ projects/snowdrop/branches/1_0/deployer-assembly/pom.xml 2010-02-27 00:59:26 UTC (rev 101601)
@@ -0,0 +1,69 @@
+<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">
+ <parent>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>jboss-spring-deployer</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Spring Deployer</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>Snowdrop Distribution</description>
+
+ <properties>
+ <deployer.version>3.2.1</deployer.version>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>dist</id>
+ <activation>
+ <property>
+ <name>!nojars</name>
+ </property>
+ </activation>
+ <build>
+ <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.version}.deployer</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${basedir}/src/assembly/deployer.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-deployers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop</groupId>
+ <artifactId>snowdrop-weaving</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml (rev 0)
+++ projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml 2010-02-27 00:59:26 UTC (rev 101601)
@@ -0,0 +1,26 @@
+<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>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <excludes>
+ <exclude>*:aopalliance:*</exclude>
+ <exclude>*:commons-logging:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Copied: projects/snowdrop/branches/1_0/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml (from rev 101356, projects/snowdrop/branches/1_0/build/src/main/resources/spring-deployers-jboss-beans.xml)
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml (rev 0)
+++ projects/snowdrop/branches/1_0/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml 2010-02-27 00:59:26 UTC (rev 101601)
@@ -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/snowdrop/branches/1_0/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/pom.xml 2010-02-27 00:49:50 UTC (rev 101600)
+++ projects/snowdrop/branches/1_0/pom.xml 2010-02-27 00:59:26 UTC (rev 101601)
@@ -26,6 +26,7 @@
<module>vfs</module>
<module>weaving</module>
<module>build</module>
+ <module>deployer-assembly</module>
</modules>
<properties>
@@ -86,19 +87,12 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>make-libs</id>
+ <id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
- <execution>
- <id>make-deployer</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
More information about the jboss-cvs-commits
mailing list