[jboss-cvs] JBossAS SVN: r104696 - in projects/snowdrop/branches/1_1: deployer-assembly/src/assembly and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue May 11 17:50:23 EDT 2010


Author: marius.bogoevici
Date: 2010-05-11 17:50:23 -0400 (Tue, 11 May 2010)
New Revision: 104696

Modified:
   projects/snowdrop/branches/1_1/deployer-assembly/pom.xml
   projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer-no-deps.xml
   projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer.xml
   projects/snowdrop/branches/1_1/documentation/user-guide/src/main/docbook/user-guide.xml
Log:
doc update

Modified: projects/snowdrop/branches/1_1/deployer-assembly/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/deployer-assembly/pom.xml	2010-05-11 21:48:24 UTC (rev 104695)
+++ projects/snowdrop/branches/1_1/deployer-assembly/pom.xml	2010-05-11 21:50:23 UTC (rev 104696)
@@ -29,7 +29,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2-beta-3</version>
+                        <version>2.2-brew</version>
                         <executions>
                             <execution>
                                 <id>make-assembly</id>

Modified: projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer-no-deps.xml
===================================================================
--- projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer-no-deps.xml	2010-05-11 21:48:24 UTC (rev 104695)
+++ projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer-no-deps.xml	2010-05-11 21:50:23 UTC (rev 104696)
@@ -17,12 +17,10 @@
         <dependencySet>
             <outputDirectory>/</outputDirectory>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-            <excludes>
-                <exclude>*:aopalliance:*</exclude>
-                <exclude>*:commons-logging:*</exclude>
-                <exclude>*:spring-*:*</exclude>
-            </excludes>
+            <includes>
+                <include>org.jboss.snowdrop:snowdrop-vfs:jar</include>
+                <include>org.jboss.snowdrop:snowdrop-deployers:jar</include>
+            </includes>
         </dependencySet>
     </dependencySets>
 </assembly>
\ No newline at end of file

Modified: projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer.xml
===================================================================
--- projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer.xml	2010-05-11 21:48:24 UTC (rev 104695)
+++ projects/snowdrop/branches/1_1/deployer-assembly/src/assembly/deployer.xml	2010-05-11 21:50:23 UTC (rev 104696)
@@ -1,34 +1,25 @@
 <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>
+    <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}.jar</outputFileNameMapping>
+            <excludes>
+                <exclude>*:commons-logging:*</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
 </assembly>
\ No newline at end of file

Modified: projects/snowdrop/branches/1_1/documentation/user-guide/src/main/docbook/user-guide.xml
===================================================================
--- projects/snowdrop/branches/1_1/documentation/user-guide/src/main/docbook/user-guide.xml	2010-05-11 21:48:24 UTC (rev 104695)
+++ projects/snowdrop/branches/1_1/documentation/user-guide/src/main/docbook/user-guide.xml	2010-05-11 21:50:23 UTC (rev 104696)
@@ -264,15 +264,26 @@
       <section>
         <title>Installation</title>
 
-        <para>If you are using EJB 3.0 and JDK 5 integration, copy the
-        jboss-spring-jdk5.deployer directory into the JBoss deploy/ directory.
-        If you are using JDK 1.4, then copy the jboss-spring.deployer/ into
-        the deploy directory. If you look inside these
-        <emphasis>.deployer</emphasis> deployments you will see that only a
-        partial Spring distribution is contained. If you need a full Spring
-        distribution, then copy those jars into the
-        <emphasis>.deployer</emphasis> directory or into the lib/ directory of
-        your JBoss configuration.</para>
+        <para>For installing the Snowdrop deployer, unzip the
+        jboss-spring-deployer.zip file in
+        JBOSS_HOME/server/&lt;configuration&gt;/deployers. The distribution
+        you are installing from may or may not contain the Spring jars. If the
+        archive does not contain the Spring jars, please include the following
+        files from the Spring 3.0.2.RELEASE distribution:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>org.springframework.beans-3.0.2.RELEASE.jar;</para>
+          </listitem>
+
+          <listitem>
+            <para>org.springframework.context-3.0.2.RELEASE.jar;</para>
+          </listitem>
+
+          <listitem>
+            <para>org.springframework.core-3.0.2.RELEASE.jar.</para>
+          </listitem>
+        </itemizedlist>
       </section>
 
       <section>




More information about the jboss-cvs-commits mailing list