[jboss-cvs] JBossAS SVN: r90228 - in projects/spring-int/trunk: build and 9 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jun 15 23:05:52 EDT 2009


Author: marius.bogoevici
Date: 2009-06-15 23:05:52 -0400 (Mon, 15 Jun 2009)
New Revision: 90228

Added:
   projects/spring-int/trunk/deployers/src/assembly/
   projects/spring-int/trunk/deployers/src/assembly/deployer.xml
   projects/spring-int/trunk/deployers/src/main/resources/
   projects/spring-int/trunk/deployers/src/main/resources/META-INF/
   projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml
Removed:
   projects/spring-int/trunk/build/src/assembly/deployer.xml
   projects/spring-int/trunk/build/src/resources/
Modified:
   projects/spring-int/trunk/build/pom.xml
   projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml
   projects/spring-int/trunk/build/src/assembly/dist.xml
   projects/spring-int/trunk/build/src/assembly/src.xml
   projects/spring-int/trunk/deployers/pom.xml
   projects/spring-int/trunk/pom.xml
   projects/spring-int/trunk/vfs/pom.xml
Log:
Moved deployer assembly configuration insided the deployers module. Reorganizing the dist/dist-with-deps/src descriptors.

Modified: projects/spring-int/trunk/build/pom.xml
===================================================================
--- projects/spring-int/trunk/build/pom.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/build/pom.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -16,6 +16,11 @@
   <profiles>
     <profile>
       <id>dist</id>
+      <activation>
+        <property>
+          <name>!nojars</name>
+        </property>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -43,41 +48,7 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>deployer</id>
-      <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-${project.version}.deployer</finalName>
-                  <descriptors>
-                    <descriptor>${basedir}/src/assembly/deployer.xml</descriptor>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
   </profiles>
-
   <dependencies>
     <dependency>
       <groupId>org.jboss.spring-int</groupId>
@@ -90,7 +61,7 @@
     <dependency>
       <groupId>org.jboss.spring-int</groupId>
       <artifactId>jboss-spring-int-weaving</artifactId>
-    </dependency>
+    </dependency> 
   </dependencies>
 
 </project>
\ No newline at end of file

Deleted: projects/spring-int/trunk/build/src/assembly/deployer.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/deployer.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/build/src/assembly/deployer.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -1,20 +0,0 @@
-<assembly>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}/src/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>META-INF/spring-deployers-beans.xml</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-    </dependencySet>
-  </dependencySets>
-</assembly>

Modified: projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/build/src/assembly/dist-with-deps.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -3,9 +3,22 @@
   <formats>
     <format>zip</format>
   </formats>
+  <fileSets>
+    <fileSet>
+      <directory>../deployers/target/</directory>
+      <outputDirectory>/dist/deployer</outputDirectory>
+      <includes>
+        <include>*.zip</include>
+      </includes>
+    </fileSet>
+  </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory>/dist/lib</outputDirectory>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <excludes>
+        <exclude>org.jboss.spring-int:jboss-spring-int-deployers:*</exclude>
+      </excludes>
     </dependencySet>
   </dependencySets>
 </assembly>

Modified: projects/spring-int/trunk/build/src/assembly/dist.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/dist.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/build/src/assembly/dist.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -2,10 +2,22 @@
   <formats>
     <format>zip</format>
   </formats>
+  <fileSets>
+    <fileSet>
+      <directory>../deployers/target/</directory>
+      <outputDirectory>/dist/deployer</outputDirectory>
+      <includes>
+        <include>*.zip</include>
+      </includes>
+    </fileSet>
+  </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory>/dist/lib</outputDirectory>
       <useTransitiveDependencies>false</useTransitiveDependencies>
+      <excludes>
+        <exclude>org.jboss.spring-int:jboss-spring-int-deployers:*</exclude>
+      </excludes>
     </dependencySet>
   </dependencySets>
 </assembly>

Modified: projects/spring-int/trunk/build/src/assembly/src.xml
===================================================================
--- projects/spring-int/trunk/build/src/assembly/src.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/build/src/assembly/src.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -8,7 +8,7 @@
       <directory>..</directory>
       <outputDirectory></outputDirectory>
       <excludes>
-        <exclude>*/target/</exclude>
+        <exclude>**/target/</exclude>
       </excludes>
     </fileSet>
   </fileSets>

Modified: projects/spring-int/trunk/deployers/pom.xml
===================================================================
--- projects/spring-int/trunk/deployers/pom.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/deployers/pom.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -12,11 +12,48 @@
   <url>http://www.jboss.org/jbossmc</url>
   <description>JBoss Spring Integration - Deployers</description>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>META-INF/spring-deployers-beans.xml</exclude>
+        </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>
     <dependency>
       <groupId>org.jboss.spring-int</groupId>
       <artifactId>jboss-spring-int-vfs</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.spring-int</groupId>
+      <artifactId>jboss-spring-int-weaving</artifactId>
+    </dependency>
     <!-- Compile (global dependencies) -->
     <dependency>
       <groupId>org.jboss.deployers</groupId>

Added: projects/spring-int/trunk/deployers/src/assembly/deployer.xml
===================================================================
--- projects/spring-int/trunk/deployers/src/assembly/deployer.xml	                        (rev 0)
+++ projects/spring-int/trunk/deployers/src/assembly/deployer.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -0,0 +1,20 @@
+<assembly>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>META-INF/spring-deployers-beans.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file

Added: projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml
===================================================================
--- projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml	                        (rev 0)
+++ projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -0,0 +1,18 @@
+<!--
+   Spring deployer beans.
+-->
+<deployment>
+  <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>
\ No newline at end of file

Modified: projects/spring-int/trunk/pom.xml
===================================================================
--- projects/spring-int/trunk/pom.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/pom.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -382,6 +382,12 @@
         <version>${version.jboss.pojocache}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <scope>provided</scope>
+        <version>2.3</version>
+      </dependency>
       <!-- test dependencies -->
       <dependency>
         <groupId>org.jboss</groupId>

Modified: projects/spring-int/trunk/vfs/pom.xml
===================================================================
--- projects/spring-int/trunk/vfs/pom.xml	2009-06-16 02:25:52 UTC (rev 90227)
+++ projects/spring-int/trunk/vfs/pom.xml	2009-06-16 03:05:52 UTC (rev 90228)
@@ -38,6 +38,10 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
   </dependencies>
   
 </project>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list