[jboss-cvs] JBossAS SVN: r104009 - in projects/snowdrop/trunk: build and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 15 13:35:29 EDT 2010
Author: marius.bogoevici
Date: 2010-04-15 13:35:28 -0400 (Thu, 15 Apr 2010)
New Revision: 104009
Added:
projects/snowdrop/trunk/deployer-assembly/
projects/snowdrop/trunk/deployer-assembly/pom.xml
projects/snowdrop/trunk/deployer-assembly/src/
projects/snowdrop/trunk/deployer-assembly/src/assembly/
projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer-no-deps.xml
projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer.xml
projects/snowdrop/trunk/deployer-assembly/src/main/
projects/snowdrop/trunk/deployer-assembly/src/main/resources/
projects/snowdrop/trunk/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml
Removed:
projects/snowdrop/trunk/build/src/assembly/deployer.xml
projects/snowdrop/trunk/build/src/main/
Modified:
projects/snowdrop/trunk/build/pom.xml
projects/snowdrop/trunk/pom.xml
Log:
Modifying deployment structure to match 1.0 and 1.1
Modified: projects/snowdrop/trunk/build/pom.xml
===================================================================
--- projects/snowdrop/trunk/build/pom.xml 2010-04-15 16:12:13 UTC (rev 104008)
+++ projects/snowdrop/trunk/build/pom.xml 2010-04-15 17:35:28 UTC (rev 104009)
@@ -12,73 +12,69 @@
<url>http://www.jboss.com/products/jbossmc</url>
<description>Snowdrop Distribution</description>
- <properties>
- <deployer.version>3.2.CR1</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-libs</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>snowdrop-${project.version}</finalName>
- <descriptors>
- <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>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <!-- dependency>
- <groupId>org.jboss.snowdrop</groupId>
- <artifactId>snowdrop-extensions</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>
+ <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>snowdrop-${project.version}</finalName>
+ <descriptors>
+ <descriptor>${basedir}/src/assembly/libs-with-deps.xml</descriptor>
+ <descriptor>${basedir}/src/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>make-assembly-no-deps</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>snowdrop-${project.version}</finalName>
+ <descriptors>
+ <descriptor>${basedir}/src/assembly/libs.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>
\ No newline at end of file
+ </project>
+
\ No newline at end of file
Deleted: projects/snowdrop/trunk/build/src/assembly/deployer.xml
===================================================================
--- projects/snowdrop/trunk/build/src/assembly/deployer.xml 2010-04-15 16:12:13 UTC (rev 104008)
+++ projects/snowdrop/trunk/build/src/assembly/deployer.xml 2010-04-15 17:35:28 UTC (rev 104009)
@@ -1,26 +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>org.springframework:spring-web:*</exclude>
- <exclude>*:aopalliance:*</exclude>
- <exclude>*:commons-logging:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
Added: projects/snowdrop/trunk/deployer-assembly/pom.xml
===================================================================
--- projects/snowdrop/trunk/deployer-assembly/pom.xml (rev 0)
+++ projects/snowdrop/trunk/deployer-assembly/pom.xml 2010-04-15 17:35:28 UTC (rev 104009)
@@ -0,0 +1,98 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>snowdrop-parent</artifactId>
+ <groupId>org.jboss.snowdrop</groupId>
+ <version>2.0.0-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 Deployer</description>
+
+ <properties>
+ <deployer.version>4.0</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-${deployer.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${basedir}/src/assembly/deployer.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>make-assembly-no-deps</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>jboss-spring-deployer-${deployer.version}-nodeps</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${basedir}/src/assembly/deployer-no-deps.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.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer-no-deps.xml
===================================================================
--- projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer-no-deps.xml (rev 0)
+++ projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer-no-deps.xml 2010-04-15 17:35:28 UTC (rev 104009)
@@ -0,0 +1,28 @@
+<assembly>
+ <id>deployer-no-deps</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>spring.deployer</baseDirectory>
+ <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>false</useTransitiveDependencies>
+ <excludes>
+ <exclude>*:aopalliance:*</exclude>
+ <exclude>*:commons-logging:*</exclude>
+ <exclude>*:spring-*:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Added: projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer.xml
===================================================================
--- projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer.xml (rev 0)
+++ projects/snowdrop/trunk/deployer-assembly/src/assembly/deployer.xml 2010-04-15 17:35:28 UTC (rev 104009)
@@ -0,0 +1,34 @@
+<assembly>
+ <id>deployer</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>spring.deployer</baseDirectory>
+ <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>*:commons-logging:*</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>*:org.springframework:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Added: projects/snowdrop/trunk/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml
===================================================================
--- projects/snowdrop/trunk/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml (rev 0)
+++ projects/snowdrop/trunk/deployer-assembly/src/main/resources/spring-deployers-jboss-beans.xml 2010-04-15 17:35:28 UTC (rev 104009)
@@ -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/trunk/pom.xml
===================================================================
--- projects/snowdrop/trunk/pom.xml 2010-04-15 16:12:13 UTC (rev 104008)
+++ projects/snowdrop/trunk/pom.xml 2010-04-15 17:35:28 UTC (rev 104009)
@@ -26,7 +26,8 @@
<module>vfs</module>
<module>weaving</module>
<module>build</module>
- <!-- module>extensions</module -->
+ <module>deployer-assembly</module>
+ <!-- module>extensions</module -->
</modules>
<properties>
@@ -86,17 +87,17 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>make-libs</id>
+ <id>make-assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
- <execution>
- <id>make-deployer</id>
+ <execution>
+ <id>make-assembly-no-deps</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
More information about the jboss-cvs-commits
mailing list