[jboss-cvs] JBossAS SVN: r103348 - in projects/snowdrop/branches/1_0: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 31 12:34:12 EDT 2010
Author: marius.bogoevici
Date: 2010-03-31 12:34:11 -0400 (Wed, 31 Mar 2010)
New Revision: 103348
Added:
projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer-no-deps.xml
Modified:
projects/snowdrop/branches/1_0/build/pom.xml
projects/snowdrop/branches/1_0/deployer-assembly/pom.xml
projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml
projects/snowdrop/branches/1_0/documentation/user-guide/src/main/docbook/user-guide.xml
projects/snowdrop/branches/1_0/pom.xml
Log:
creating nodeps assembly
Modified: projects/snowdrop/branches/1_0/build/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/build/pom.xml 2010-03-31 15:43:08 UTC (rev 103347)
+++ projects/snowdrop/branches/1_0/build/pom.xml 2010-03-31 16:34:11 UTC (rev 103348)
@@ -36,12 +36,24 @@
<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-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>
Modified: projects/snowdrop/branches/1_0/deployer-assembly/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/pom.xml 2010-03-31 15:43:08 UTC (rev 103347)
+++ projects/snowdrop/branches/1_0/deployer-assembly/pom.xml 2010-03-31 16:34:11 UTC (rev 103348)
@@ -1,70 +1,96 @@
-<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>
+<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>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>
+ <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.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${version.spring}</version>
- </dependency>
- </dependencies>
+ <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-${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>
Copied: projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer-no-deps.xml (from rev 103333, projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml)
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer-no-deps.xml (rev 0)
+++ projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer-no-deps.xml 2010-03-31 16:34:11 UTC (rev 103348)
@@ -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
Modified: projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml 2010-03-31 15:43:08 UTC (rev 103347)
+++ projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml 2010-03-31 16:34:11 UTC (rev 103348)
@@ -3,6 +3,7 @@
<formats>
<format>zip</format>
</formats>
+ <baseDirectory>spring.deployer</baseDirectory>
<fileSets>
<fileSet>
<directory>${basedir}/src/main/resources</directory>
@@ -18,7 +19,6 @@
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useTransitiveDependencies>true</useTransitiveDependencies>
<excludes>
- <exclude>*:aopalliance:*</exclude>
<exclude>*:commons-logging:*</exclude>
</excludes>
</dependencySet>
@@ -27,7 +27,7 @@
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
- <include>org.springframework:spring</include>
+ <include>*:org.springframework:*</include>
</includes>
</dependencySet>
</dependencySets>
Modified: projects/snowdrop/branches/1_0/documentation/user-guide/src/main/docbook/user-guide.xml
===================================================================
--- projects/snowdrop/branches/1_0/documentation/user-guide/src/main/docbook/user-guide.xml 2010-03-31 15:43:08 UTC (rev 103347)
+++ projects/snowdrop/branches/1_0/documentation/user-guide/src/main/docbook/user-guide.xml 2010-03-31 16:34:11 UTC (rev 103348)
@@ -11,7 +11,6 @@
<xi:include href="author-group.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-
</bookinfo>
<preface>
@@ -45,7 +44,7 @@
</listitem>
<listitem>
- <para>Spring 2.5.x</para>
+ <para>Spring 2.5.x and 3.0.x</para>
</listitem>
</itemizedlist>
</preface>
@@ -101,7 +100,7 @@
package.</para>
<section>
- <title>The VFS-supporting application contexts</title>
+ <title>The VFS-supporting application contexts (Spring 2.5 only)</title>
<para>For using this functionality, the snowdrop-vfs.jar file needs to
be added to the application.</para>
@@ -153,6 +152,7 @@
sample below:</para>
<?dbfo-need height="5in" ?>
+
<informalexample>
<programlisting language="XML"><context-param>
<param-name>contextConfigLocation</param-name>
@@ -191,7 +191,9 @@
<para>Both configurations can be seen at work in the web-scanning
sample.</para>
- <?dbfo-need height="5in" ?>
+
+ <?dbfo-need height="5in" ?>
+
<note>
<para>In general, it is a good idea to pay attention to this error. If
encountered while the application is starting, you definitely need to
@@ -204,6 +206,10 @@
.doFindPathMatchingJarResources(PathMatchingResourcePatternResolver.java:448)</programlisting>
(the listing has been wrapped for formatting purposes).</para>
</note>
+
+ <note>
+ <para>This feature is necessary</para>
+ </note>
</section>
<section>
@@ -307,6 +313,7 @@
description element of the Spring XML.</para>
<?dbfo-need height="5in" ?>
+
<programlisting language="XML"><beans>
<description>BeanFactory=(MyApp)</description>
...
Modified: projects/snowdrop/branches/1_0/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/pom.xml 2010-03-31 15:43:08 UTC (rev 103347)
+++ projects/snowdrop/branches/1_0/pom.xml 2010-03-31 16:34:11 UTC (rev 103348)
@@ -54,14 +54,12 @@
</properties>
<build>
- <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
- <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -94,6 +92,13 @@
<goal>single</goal>
</goals>
</execution>
+ <execution>
+ <id>make-assembly-no-deps</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
More information about the jboss-cvs-commits
mailing list