[jboss-cvs] JBossAS SVN: r95863 - in branches/Branch_5_x/varia: src/assembly and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2009-10-30 14:54:56 -0400 (Fri, 30 Oct 2009)
New Revision: 95863

Added:
   branches/Branch_5_x/varia/src/assembly/httpha-invoker-sar.xml
   branches/Branch_5_x/varia/src/assembly/snmp-adaptor-sar.xml
Removed:
   branches/Branch_5_x/varia/src/assembly/httpa-invoker-sar.xml
Modified:
   branches/Branch_5_x/varia/pom.xml
Log:
[JBAS-7416] Add snmp-adaptor sar, and a couple of assembly config improvements.

Modified: branches/Branch_5_x/varia/pom.xml
===================================================================
--- branches/Branch_5_x/varia/pom.xml	2009-10-30 18:20:02 UTC (rev 95862)
+++ branches/Branch_5_x/varia/pom.xml	2009-10-30 18:54:56 UTC (rev 95863)
@@ -13,6 +13,7 @@
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (varia module)</description>
   <build>
+    <finalName>${artifactId}</finalName>
     <sourceDirectory>src/main</sourceDirectory>
     <resources>
       <resource>
@@ -31,11 +32,51 @@
               <goal>single</goal>
             </goals>
             <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>src/assembly/autonumber-plugin.xml</descriptor>
+                <descriptor>src/assembly/counter-plugin.xml</descriptor>
+                <descriptor>src/assembly/deployment-service.xml</descriptor>
+                <!--<descriptor>src/assembly/deployment-service-sar.xml</descriptor>-->
+                <descriptor>src/assembly/derby-plugin.xml</descriptor>
+                <!--<descriptor>src/assembly/foe-deployer-3.2-sar.xml</descriptor>-->
+                <descriptor>src/assembly/hsqldb-plugin.xml</descriptor>
+                <descriptor>src/assembly/hsqldb.xml</descriptor>
+                <descriptor>src/assembly/http-invoker-sar.xml</descriptor>
+                <descriptor>src/assembly/httpha-invoker-sar.xml</descriptor>
+                <descriptor>src/assembly/jboss-bean-deployer.xml</descriptor>
+                <descriptor>src/assembly/jboss-bindingservice.xml</descriptor>
+                <descriptor>src/assembly/jboss-monitoring.xml</descriptor>
+                <descriptor>src/assembly/jboss-samlsso.xml</descriptor>
+                <descriptor>src/assembly/jboss-srp-client.xml</descriptor>
+                <descriptor>src/assembly/jboss-srp.xml</descriptor>
+                <descriptor>src/assembly/jbossjmx-ant.xml</descriptor>
+                <descriptor>src/assembly/jmx-console.xml</descriptor>
+                <descriptor>src/assembly/logging-monitor.xml</descriptor>
+                <descriptor>src/assembly/mail-plugin.xml</descriptor>
+                <descriptor>src/assembly/mbean-configurator-sar.xml</descriptor>
+                <descriptor>src/assembly/netboot.xml</descriptor>
+                <descriptor>src/assembly/persistent-service-sar.xml</descriptor>
+                <descriptor>src/assembly/process-plugin.xml</descriptor>
+                <descriptor>src/assembly/properties-plugin.xml</descriptor>
+                <descriptor>src/assembly/scheduler-plugin-example.xml</descriptor>
+                <descriptor>src/assembly/scheduler-plugin.xml</descriptor>
+                <descriptor>src/assembly/snmp-adaptor.xml</descriptor>
+                <descriptor>src/assembly/snmp-adaptor-sar.xml</descriptor>
+                <descriptor>src/assembly/statscollector.xml</descriptor>
+                <descriptor>src/assembly/threaddump.xml</descriptor>
+                <descriptor>src/assembly/xmlentitymgr.xml</descriptor>
+              </descriptors>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
-        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>jboss-packaging-maven-plugin</artifactId>
+            <version>2.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
       
     </plugins>

Deleted: branches/Branch_5_x/varia/src/assembly/httpa-invoker-sar.xml
===================================================================
--- branches/Branch_5_x/varia/src/assembly/httpa-invoker-sar.xml	2009-10-30 18:20:02 UTC (rev 95862)
+++ branches/Branch_5_x/varia/src/assembly/httpa-invoker-sar.xml	2009-10-30 18:54:56 UTC (rev 95863)
@@ -1,31 +0,0 @@
-<assembly>
-  <id>httpa-invoker-sar</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>target/classes</directory>
-      <outputDirectory>/invoker.war/WEB-INF/classes</outputDirectory>
-      <includes>
-        <include>org/jboss/invocation/http/**</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/resources/services/invoker/httpa</directory>
-      <outputDirectory>/invoker.war/WEB-INF</outputDirectory>
-      <includes>
-        <include>jboss-web.xml</include>
-        <include>-web.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/resources/services/invoker/httpa</directory>
-      <outputDirectory>/META-INF</outputDirectory>
-      <includes>
-        <include>jboss-service.xml</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
\ No newline at end of file

Copied: branches/Branch_5_x/varia/src/assembly/httpha-invoker-sar.xml (from rev 95764, branches/Branch_5_x/varia/src/assembly/httpa-invoker-sar.xml)
===================================================================
--- branches/Branch_5_x/varia/src/assembly/httpha-invoker-sar.xml	                        (rev 0)
+++ branches/Branch_5_x/varia/src/assembly/httpha-invoker-sar.xml	2009-10-30 18:54:56 UTC (rev 95863)
@@ -0,0 +1,31 @@
+<assembly>
+  <id>httpa-invoker-sar</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/invoker.war/WEB-INF/classes</outputDirectory>
+      <includes>
+        <include>org/jboss/invocation/http/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/resources/services/invoker/httpa</directory>
+      <outputDirectory>/invoker.war/WEB-INF</outputDirectory>
+      <includes>
+        <include>jboss-web.xml</include>
+        <include>-web.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/resources/services/invoker/httpa</directory>
+      <outputDirectory>/META-INF</outputDirectory>
+      <includes>
+        <include>jboss-service.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Added: branches/Branch_5_x/varia/src/assembly/snmp-adaptor-sar.xml
===================================================================
--- branches/Branch_5_x/varia/src/assembly/snmp-adaptor-sar.xml	                        (rev 0)
+++ branches/Branch_5_x/varia/src/assembly/snmp-adaptor-sar.xml	2009-10-30 18:54:56 UTC (rev 95863)
@@ -0,0 +1,20 @@
+<assembly>
+  <id>snmp-adaptor</id>
+  <formats>
+    <format>sar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>jboss-as-varia-snmp-adaptor.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/resources/services/snmp/deploy</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file


Property changes on: branches/Branch_5_x/varia/src/assembly/snmp-adaptor-sar.xml
___________________________________________________________________
Name: svn:keywords
   + "Author Date Id Revision"
Name: svn:eol-style
   + native