[jboss-cvs] JBossAS SVN: r90660 - in trunk: build and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jun 26 18:07:20 EDT 2009


Author: pgier
Date: 2009-06-26 18:07:20 -0400 (Fri, 26 Jun 2009)
New Revision: 90660

Added:
   trunk/varia/src/assembly/httpha-invoker-sar.xml
   trunk/varia/src/assembly/snmp-adaptor-sar.xml
Removed:
   trunk/varia/build-sars.xml
   trunk/varia/build.xml
   trunk/varia/src/assembly/httpa-invoker-sar.xml
Modified:
   trunk/build/build.xml
   trunk/pom.xml
   trunk/varia/pom.xml
   trunk/varia/src/assembly/deployment-service-sar.xml
   trunk/varia/src/assembly/http-invoker-sar.xml
Log:
[JBBUILD-514] Remove extra ant file for sar generation in varia module.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/build/build.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -254,9 +254,6 @@
     <copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
           file="${project.root}/cluster/target/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
 
-    <unjar src="${project.root}/varia/target/http-invoker.sar"
-      dest="${install.default}/deploy/http-invoker.sar"/>
-
     <!-- Build server/minimal manually -->
     <mkdir dir="${install.minimal.deploy}"/>
     <mkdir dir="${install.minimal.deployers}"/>
@@ -1360,13 +1357,12 @@
     </copy>
 
     <mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
-    <unjar src="${varia.module.output}/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
+    <unjar src="${varia.module.output}/jboss-as-varia-persistent-service-sar.jar" dest="${install.examples}/jmx/persistent-service.sar"/>
 
     <mkdir dir="${install.examples.varia}/deployment-service"/>
+    <copy file="${varia.module.output}/jboss-as-varia-deployment-service-sar.jar"
+          tofile="${install.examples.varia}/deployment-service/deployment-service.sar"/>
     <copy todir="${install.examples.varia}/deployment-service">
-      <fileset dir="${varia.module.output}/">
-        <include name="deployment-service.sar"/>
-      </fileset>
       <fileset dir="${varia.module.output}/resources/services/deployment">
         <exclude name="META-INF/**"/>
       </fileset>
@@ -1374,7 +1370,7 @@
 
     <!-- MBean Configurator sar for setting mbean attributes when registered -->
     <mkdir dir="${install.examples}/jmx/mbean-configurator.sar"/>
-    <unjar src="${varia.module.output}/mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
+    <unjar src="${varia.module.output}/jboss-as-varia-mbean-configurator-sar.jar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
 
     <!-- Client jars -->
     <mkdir dir="${install.client}"/>
@@ -1404,7 +1400,7 @@
 
     <!-- copy snmp-adaptor.sar unpacked to deploy -->
     <mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
-    <unjar src="${varia.module.output}/snmp-adaptor.sar" 
+    <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor-sar.jar" 
     	     dest="${install.server}/all/deploy/snmp-adaptor.sar">
       <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
     </unjar>
@@ -1416,7 +1412,7 @@
 
     <!-- Include the HTTP invoker service unpacked -->
     <mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
-    <unjar src="${varia.module.output}/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
+    <unjar src="${varia.module.output}/jboss-as-varia-httpha-invoker-sar.jar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
 
     <!-- copy the ant jmx client -->
     <mkdir dir="${install.client}"/>
@@ -1490,6 +1486,9 @@
       </fileset>
     </copy>
 
+    <unjar src="${project.root}/varia/target/jboss-as-varia-http-invoker-sar.jar"
+      dest="${install.default}/deploy/http-invoker.sar"/>
+
   </target>
 
   <target name="module-varia-all" depends="module-varia">

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/pom.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -36,6 +36,11 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
             <source>1.5</source>

Deleted: trunk/varia/build-sars.xml
===================================================================
--- trunk/varia/build-sars.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/varia/build-sars.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-   <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
-]>
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!--  JBoss, The Home of Professional Open Source                           -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-
-<!-- $Id$ -->
-
-<project default="build-sars" name="JBoss/Varia">
-
-  <target name="init">
-    <property name="project.thirdparty" location="../thirdparty"/>
-    &libraries;
-  </target>
-
-  <target name="build-sars" description="create sar files" depends="init">
-    
-    <property name="build.lib" location="target"/>
-    <property name="build.classes" location="target/classes"/>
-    <property name="build.etc" location="target/etc"/>
-    <property name="build.resources" location="target/resources"/>
-    
-    <!-- deployment-service.sar -->
-    <jar jarfile="${build.lib}/deployment-service.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.resources}/services/deployment">
-        <include name="META-INF/**"/>
-      </fileset>
-      <fileset dir="${build.lib}">
-        <include name="deployment-service.jar"/>
-      </fileset>
-      <fileset dir="${apache.collections.lib}">
-        <include name="commons-collections.jar"/>
-      </fileset>
-      <fileset dir="${apache.velocity.lib}">
-        <include name="velocity.jar"/>
-      </fileset>
-    </jar>
-
-    <!-- foe-deployer.sar -->
-    <jar jarfile="${build.lib}/foe-deployer-3.2.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/deployment/Foe**"/>
-        <include name="org/jboss/varia/deployment/convertor/**"/>
-      </fileset>
-      <fileset dir="${build.resources}/deployment">
-        <include name="META-INF/**"/>
-        <include name="resources/6.1/**"/>
-      </fileset>
-      <fileset dir="${build.etc}">
-        <include name="foe-deployer-service.xml"/>
-      </fileset>
-    </jar>
-
-    <!-- persistent-service.sar -->
-    <!-- demo service for docs/examples -->
-    <jar jarfile="${build.lib}/persistent-service.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/jmx/examples/persistence/**"/>
-      </fileset>
-      <fileset dir="${build.resources}/jmx/examples/persistent-service"/>
-    </jar>
-
-    <!-- mbean-configurator-service.sar -->
-    <!-- demo service for docs/examples -->
-    <!-- shows how to set attributes on registered mbean from file -->
-    <jar jarfile="${build.lib}/mbean-configurator.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/jmx/examples/configuration/**"/>
-      </fileset>
-      <fileset dir="${build.resources}/jmx/examples/mbean-configurator-service"/>
-    </jar>
-
-     <!-- http-invoker.sar + war -->
-     <zip destfile="${build.lib}/http-invoker.sar">
-        <zipfileset dir="${build.resources}/services/invoker/http"
-         prefix="invoker.war/WEB-INF">
-           <include name="jboss-web.xml" />
-           <include name="web.xml" />
-         </zipfileset>
-        <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
-         <include name="org/jboss/invocation/http/**"/>
-       </zipfileset>
-        <zipfileset dir="${build.resources}/services/invoker/http"
-           prefix="META-INF">
-           <include name="jboss-service.xml" />
-        </zipfileset>
-     </zip>
-     
-     <!-- httpha-invoker.sar + war -->
-     <zip destfile="${build.lib}/httpha-invoker.sar">
-        <zipfileset dir="${build.resources}/services/invoker/httpha"
-         prefix="invoker.war/WEB-INF">
-           <include name="jboss-web.xml" />
-           <include name="jboss-scanning.xml" />
-           <include name="web.xml" />
-         </zipfileset>
-        <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
-         <include name="org/jboss/invocation/http/**"/>
-       </zipfileset>
-        <zipfileset dir="${build.resources}/services/invoker/httpha"
-           prefix="META-INF">
-           <include name="jboss-service.xml" />
-           <include name="jboss-scanning.xml" />
-        </zipfileset>
-     </zip>
-
-    <!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
-    <jar jarfile="${build.lib}/snmp-adaptor.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.resources}/services/snmp/deploy"/>
-      <fileset dir="${build.lib}">
-        <include name="jboss-as-varia-snmp-adaptor.jar"/>
-      </fileset>
-    </jar>
-
-    <!-- build deployers -->
-
-    <property name="build.deployers" location="target/deployers"/>
-    <property name="source.resources" location="src/resources"/>
-    
-    <mkdir dir="${build.deployers}/bsh.deployer"/>
-    <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
-
-    <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/deployment/BeanShell**"/>
-        <include name="org/jboss/varia/deployment/Script**"/>
-        <include name="org/jboss/varia/deployment/Test**"/>
-        <include name="org/jboss/varia/deployment/Legacy**"/>
-      </fileset>
-    </jar>
-
-    <copy todir="${build.deployers}/bsh.deployer/META-INF">
-       <fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
-    </copy>
-
-    <!-- seam.deployer -->
-    <mkdir dir="${build.deployers}/seam.deployer"/>
-    <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
-
-    <copy todir="${build.deployers}/seam.deployer/META-INF">
-       <fileset dir="${source.resources}/seam">
-         <include name="*.xml"/>
-       </fileset>
-    </copy>
-
-    <copy todir="${build.deployers}/seam.deployer">
-      <fileset dir="${org.jboss.seam.integration.lib}">
-         <include name="jboss-seam-int-microcontainer.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- jboss-bean.deployer -->
-    <mkdir dir="${build.lib}/kernel/jboss-bean.deployer"/>
-    <copy todir="${build.lib}/kernel/jboss-bean.deployer" filtering="no">
-      <fileset file="${build.lib}/jboss-bean-deployer.jar"/>
-      <fileset dir="${jboss.microcontainer.lib}">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.microcontainer.lib}">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.microcontainer.lib}">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${build.resources}/kernel">
-         <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-</project>

Deleted: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/varia/build.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -1,751 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-   <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
-   <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
-   <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
-]>
-
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!--  JBoss, The Home of Professional Open Source                           -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-
-<!-- $Id$ -->
-
-<project default="main" name="JBoss/Varia">
-
-  <!-- ================================================================== -->
-  <!-- Setup                                                              -->
-  <!-- ================================================================== -->
-
-  <!--
-     | Include the common Buildmagic elements.
-     |
-     | This defines several different targets, properties and paths.
-     | It also sets up the basic extention tasks amoung other things.
-   -->
-
-  &buildmagic;
-
-
-  <!-- ================================================================== -->
-  <!-- Initialization                                                     -->
-  <!-- ================================================================== -->
-
-  <!--
-     | Initialize the build system.  Must depend on '_buildmagic:init'.
-     | Other targets should depend on 'init' or things will mysteriously fail.
-   -->
-
-  <target name="init" unless="init.disable" depends="_buildmagic:init">
-  </target>
-
-
-  <!-- ================================================================== -->
-  <!-- Configuration                                                      -->
-  <!-- ================================================================== -->
-
-  <!--
-     | Configure the build system.
-     |
-     | This target is invoked by the Buildmagic initialization logic and
-     | should contain module specific configuration elements.
-   -->
-
-  <target name="configure" unless="configure.disable">
-
-    <!-- =================== -->
-    <!-- Basic Configuration -->
-    <!-- =================== -->
-
-    <!-- Module name(s) & version -->
-    <property name="module.name" value="varia"/>
-    <property name="module.Name" value="Various"/>
-
-    <!-- ========= -->
-    <!-- Libraries -->
-    <!-- ========= -->
-
-    &libraries;
-    
-    <!-- The combined library classpath -->
-    <path id="library.classpath">
-      <path refid="sun.jaf.classpath"/>
-      <path refid="sun.javamail.classpath"/>
-      <path refid="sun.jaxb.classpath"/>
-      <path refid="jboss.web.classpath"/>
-      <path refid="apache.bsf.classpath"/>
-      <path refid="apache.commons.classpath"/>
-      <path refid="apache.log4j.classpath"/>
-      <path refid="apache.xerces.classpath"/>
-      <path refid="apache.velocity.classpath"/>      
-      <path refid="junit.junit.classpath"/>
-      <path refid="hsqldb.hsqldb.classpath"/>
-      <path refid="apache.ant.classpath"/>
-      <path refid="beanshell.beanshell.classpath"/>
-      <path refid="opennms.joesnmp.classpath"/>
-      <path refid="opensaml.opensaml.classpath"/>
-      <path refid="oswego.concurrent.classpath"/>
-      <path refid="juddi.juddi.classpath"/>
-      <path refid="jboss.metadata.classpath"/>
-      <path refid="jboss.jboss.deployers.classpath"/>      
-      <path refid="jboss.jboss.man.classpath"/>      
-      <path refid="jboss.microcontainer.classpath"/>
-      <path refid="org.jboss.ws.native.classpath"/>
-      <path refid="jboss.jbossxb.classpath"/>
-      <path refid="jboss.integration.classpath"/>
-      <path refid="org.jboss.cluster.classpath"/>
-      <path refid="jboss.jboss.vfs.classpath"/>
-    </path>
-
-    <!-- ======= -->
-    <!-- Modules -->
-    <!-- ======= -->
-
-    &modules;
-    <!-- The combined dependent module classpath -->
-    <path id="dependentmodule.classpath">
-      <path refid="jboss.jboss.javaee.classpath"/>
-      <path refid="jboss.common.core.classpath"/>
-      <path refid="jboss.common.logging.spi.classpath"/>
-      <path refid="jboss.common.logging.log4j.classpath"/>
-      <path refid="jboss.common.logging.jdk.classpath"/>
-      <path refid="jboss.cluster.classpath"/>
-      <path refid="jboss.jboss.bootstrap.classpath"/>
-      <path refid="jboss.system.classpath"/>
-      <path refid="jboss.systemjmx.classpath"/>
-      <path refid="jboss.mx.classpath"/>
-      <path refid="jboss.jnpserver.classpath"/>
-      <path refid="jboss.server.classpath"/>
-      <path refid="jboss.jbosssx.classpath"/>
-    </path>
-
-    <!-- ===== -->
-    <!-- Tasks -->
-    <!-- ===== -->
-
-    <!-- Where source files live -->
-    <property name="source.java" value="${module.source}/main"/>
-    <property name="source.etc" value="${module.source}/etc"/>
-    <property name="source.resources" value="${module.source}/resources"/>
-
-    <!-- Where build generated files will go -->
-    <property name="build.classes" value="${module.output}/classes"/>
-    <property name="build.lib" value="${module.output}/lib"/>
-    <property name="build.api" value="${module.output}/api"/>
-    <property name="build.etc" value="${module.output}/etc"/>
-    <property name="build.resources" value="${module.output}/resources"/>
-    <property name="build.reports" value="${module.output}/reports"/>
-    <property name="build.deployers" value="${module.output}/deployers"/>
-
-    <!-- Install/Release structure -->
-    <property name="install.id" value="${module.name}-${module.version}"/>
-    <property name="release.id" value="${install.id}"/>
-    <property name="install.root" value="${module.output}/${install.id}"/>
-
-    <!-- The combined thirdparty classpath -->
-    <path id="thirdparty.classpath">
-      <path refid="library.classpath"/>
-      <path refid="dependentmodule.classpath"/>
-    </path>
-
-    <!-- RMIC should generate stubs compatible with Java 1.2+ -->
-    <property name="rmic.stubVersion" value="1.2"/>
-
-    <!-- classpath and local.classpath must have a value using with a path -->
-    <property name="classpath" value=""/>
-    <property name="local.classpath" value=""/>
-
-    <!-- The classpath required to build classes. -->
-    <path id="javac.classpath">
-      <pathelement path="${classpath}"/>
-      <pathelement path="${local.classpath}"/>
-      <path refid="thirdparty.classpath"/>
-    </path>
-
-    <!-- The classpath required to build javadocs. -->
-    <path id="javadoc.classpath">
-      <path refid="javac.classpath"/>
-    </path>
-
-    <!-- Packages to include when generating api documentation -->
-    <property name="javadoc.packages" value="org.jboss.*"/>
-
-  </target>
-
-
-  <!-- ================================================================== -->
-  <!-- Compile                                                            -->
-  <!-- ================================================================== -->
-
-  <!--
-     |  Compile everything.
-     |
-     |  This target should depend on other compile-* targets for each
-     |  different type of compile that needs to be performed, short of
-     |  documentation compiles.
-    -->
-  <target name="compile"
-    depends="compile-classes, compile-etc, compile-resources"
-    description="Compile all source files."/>
-
-  <!-- Compile all class files -->
-  <target name="compile-classes" depends="compile-classes-jdk5, compile-classes-jdk6"/>
-  <target name="compile-classes-jdk5" depends="init" unless="HAVE_JDK_1.6">
-    <mkdir dir="${build.classes}"/>
-    <javac destdir="${build.classes}"
-      optimize="${javac.optimize}"
-      target="${javac.target}"
-      source="${javac.source}"
-      debug="${javac.debug}"
-      depend="${javac.depend}"
-      verbose="${javac.verbose}"
-      deprecation="${javac.deprecation}"
-      includeAntRuntime="${javac.include.ant.runtime}"
-      includeJavaRuntime="${javac.include.java.runtime}"
-      includes="${javac.includes}"
-      excludes="${javac.excludes}"
-      failonerror="${javac.fail.onerror}">
-      <src path="${source.java}"/>
-      <classpath refid="javac.classpath"/>
-      <exclude name="org/jboss/varia/stats/*JDK6.java"/>
-      <exclude name="org/jboss/tm/plugins/tyrex/*.java"/>
-      <exclude name="org/jboss/jdo/castor/*.java"/>
-    </javac>
-  </target>
-  <target name="compile-classes-jdk6" depends="init" if="HAVE_JDK_1.6">
-    <mkdir dir="${build.classes}"/>
-    <javac destdir="${build.classes}"
-      optimize="${javac.optimize}"
-      target="${javac.target}"
-      source="${javac.source}"
-      debug="${javac.debug}"
-      depend="${javac.depend}"
-      verbose="${javac.verbose}"
-      deprecation="${javac.deprecation}"
-      includeAntRuntime="${javac.include.ant.runtime}"
-      includeJavaRuntime="${javac.include.java.runtime}"
-      includes="${javac.includes}"
-      excludes="${javac.excludes}"
-      failonerror="${javac.fail.onerror}">
-      <src path="${source.java}"/>
-      <classpath refid="javac.classpath"/>
-      <exclude name="org/jboss/varia/stats/*JDK5.java"/>
-      <exclude name="org/jboss/tm/plugins/tyrex/*.java"/>
-      <exclude name="org/jboss/jdo/castor/*.java"/>
-    </javac>
-  </target>
-
-  <!-- Compile manifests -->
-  <target name="compile-etc" depends="init">
-    <mkdir dir="${build.etc}"/>
-    <copy todir="${build.etc}" filtering="yes">
-      <fileset dir="${source.etc}">
-        <include name="**"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- Compile resource files -->
-  <target name="compile-resources" depends="init">
-    <mkdir dir="${build.resources}"/>
-    <copy todir="${build.resources}" filtering="yes">
-      <fileset dir="${source.resources}">
-        <include name="**/*"/>
-        <exclude name="jmx/html/images/**"/>
-      </fileset>
-    </copy>
-    <copy todir="${build.resources}" filtering="no">
-      <fileset dir="${source.resources}">
-        <include name="jmx/html/images/**"/>
-      </fileset>
-    </copy>
-  </target>
-
-
-  <!-- ================================================================== -->
-  <!-- Archives                                                           -->
-  <!-- ================================================================== -->
-
-  <!--
-     |  Build all jar files.
-    -->
-  <target name="jars" description="Builds all jar files."
-    depends="_buildmagic:build-bypass-check"
-    unless="build-bypass.on">
-
-    <call target="compile"/>
-
-    <mkdir dir="${build.lib}"/>
-
-    <!-- autonumber-plugin.jar -->
-    <jar jarfile="${build.lib}/autonumber-plugin.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/autonumber/**"/>
-      </fileset>
-    </jar>
-
-    <!-- counter-plugin.jar -->
-    <jar jarfile="${build.lib}/counter-plugin.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/counter/**"/>
-      </fileset>
-    </jar>
-
-    <!-- deployment-service.jar/sar -->
-    <jar jarfile="${build.lib}/deployment-service.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/services/deployment/**"/>
-        <include name="org/jboss/varia/deployment/**"/>
-      </fileset>
-    </jar>
-    <jar jarfile="${build.lib}/deployment-service.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.resources}/services/deployment">
-        <include name="META-INF/**"/>
-      </fileset>
-      <fileset dir="${build.lib}">
-        <include name="deployment-service.jar"/>
-      </fileset>
-      <fileset dir="${apache.collections.lib}">
-        <include name="commons-collections.jar"/>
-      </fileset>
-      <fileset dir="${apache.velocity.lib}">
-        <include name="velocity.jar"/>
-      </fileset>
-    </jar>
-    
-    <!-- scheduler-plugin.jar -->
-    <jar jarfile="${build.lib}/scheduler-plugin.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/scheduler/**"/>
-      </fileset>
-    </jar>
-
-    <!-- scheduler-plugin-example.jar -->
-    <jar jarfile="${build.lib}/scheduler-plugin-example.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/scheduler/example/**"/>
-      </fileset>
-    </jar>
-
-    <!-- mail-plugin.jar -->
-    <jar jarfile="${build.lib}/mail-plugin.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/mail/*"/>
-      </fileset>
-    </jar>
-
-    <!-- patched hsqldb.jar -->
-    <jar jarfile="${build.lib}/hsqldb.jar"
-      manifest="${build.etc}/default.mf">
-      <zipfileset src="${hsqldb.hsqldb.lib}/hsqldb.jar">
-        <include name="**"/>
-        <exclude name="org/hsqldb/Embedded**"/>
-        <exclude name="**/MANIFEST.MF"/>
-      </zipfileset>
-      <fileset dir="${build.classes}">
-        <include name="org/hsqldb/Embedded**"/>
-      </fileset>
-    </jar>
-
-    <!-- hsqldb-plugin.jar -->
-    <jar jarfile="${build.lib}/hsqldb-plugin.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/jdbc/Hypersonic**"/>
-      </fileset>
-    </jar>
-
-    <!-- derby-plugin.jar -->
-    <jar jarfile="${build.lib}/derby-plugin.jar" manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/jdbc/Derby**"/>
-      </fileset>
-    </jar>
-
-    <!-- properties-plugin.jar -->
-    <jar jarfile="${build.lib}/properties-plugin.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/property/**"/>
-      </fileset>
-    </jar>
-
-    <!-- process-plugin.jar -->
-    <jar jarfile="${build.lib}/process-plugin.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/process/**"/>
-      </fileset>
-    </jar>
-
-    <!-- foe-deployer.sar -->
-    <jar jarfile="${build.lib}/foe-deployer-3.2.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/deployment/Foe**"/>
-        <include name="org/jboss/varia/deployment/convertor/**"/>
-      </fileset>
-      <fileset dir="${build.resources}/deployment">
-        <include name="META-INF/**"/>
-        <include name="resources/6.1/**"/>
-      </fileset>
-      <fileset dir="${build.etc}">
-        <include name="foe-deployer-service.xml"/>
-      </fileset>
-    </jar>
-
-    <!-- statscollector.jar -->
-    <jar jarfile="${build.lib}/statscollector.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/stats/**"/>
-      </fileset>
-    </jar>
-
-    <!-- jmx-console.war -->
-    <war warfile="${build.lib}/jmx-console.war"
-      webxml="${source.resources}/jmx/jmx-console-web.xml">
-      <webinf dir="${source.resources}/jmx/web-inf"/>
-      <include name="jboss-scanning.xml" />
-      <classes dir="${build.classes}">
-        <include name="org/jboss/jmx/adaptor/**"/>
-        <exclude name="org/jboss/jmx/adaptor/snmp/**"/>
-      </classes>
-      <classes dir="${source.resources}/jmx">
-        <include name="*.properties"/>
-      </classes>
-      <fileset dir="${source.resources}/jmx/html"/>
-    </war>
-
-    <!-- persistent-service.sar -->
-    <!-- demo service for docs/examples -->
-    <jar jarfile="${build.lib}/persistent-service.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/jmx/examples/persistence/**"/>
-      </fileset>
-      <fileset dir="${build.resources}/jmx/examples/persistent-service"/>
-    </jar>
-
-    <!-- mbean-configurator-service.sar -->
-    <!-- demo service for docs/examples -->
-    <!-- shows how to set attributes on registered mbean from file -->
-    <jar jarfile="${build.lib}/mbean-configurator.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/jmx/examples/configuration/**"/>
-      </fileset>
-      <fileset dir="${build.resources}/jmx/examples/mbean-configurator-service"/>
-    </jar>
-
-    <!-- jboss-monitoring.jar -->
-    <jar jarfile="${build.lib}/jboss-monitoring.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/monitor/**"/>
-      </fileset>
-    </jar>
-
-     <!-- http-invoker.sar + war -->
-     <zip destfile="${build.lib}/http-invoker.sar">
-        <zipfileset dir="${build.resources}/services/invoker/http"
-         prefix="invoker.war/WEB-INF">
-           <include name="jboss-web.xml" />
-           <include name="web.xml" />
-         </zipfileset>
-        <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
-         <include name="org/jboss/invocation/http/**"/>
-       </zipfileset>
-        <zipfileset dir="${build.resources}/services/invoker/http"
-           prefix="META-INF">
-           <include name="jboss-service.xml" />
-        </zipfileset>
-     </zip>
-     
-     <!-- httpha-invoker.sar + war -->
-     <zip destfile="${build.lib}/httpha-invoker.sar">
-        <zipfileset dir="${build.resources}/services/invoker/httpha"
-         prefix="invoker.war/WEB-INF">
-           <include name="jboss-web.xml" />
-           <include name="jboss-scanning.xml" />
-           <include name="web.xml" />
-         </zipfileset>
-        <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
-         <include name="org/jboss/invocation/http/**"/>
-       </zipfileset>
-        <zipfileset dir="${build.resources}/services/invoker/httpha"
-           prefix="META-INF">
-           <include name="jboss-service.xml" />
-           <include name="jboss-scanning.xml" />
-        </zipfileset>
-     </zip>
-
-    <!-- Build jbossjmx-ant.jar -->
-    <jar jarfile="${build.lib}/jbossjmx-ant.jar" manifest="${build.etc}/default.mf">
-    	<zipfileset fullpath="META-INF/MANIFEST.MF" dir="${build.etc}">
-    		<include name="default.mf" />
-    	</zipfileset>
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/ant/**"/>
-      </fileset>
-      <zipfileset src="${jboss.jnpserver.lib}/jnpserver.jar">
-      </zipfileset>
-      <fileset dir="${jboss.server.root}/classes">
-        <include name="org/jboss/jmx/adaptor/rmi/RMIAdaptor.class"/>
-        <include name="org/jboss/jmx/adaptor/rmi/RMIAdaptorImpl_Stub.class"/>
-        <include name="org/jboss/jmx/adaptor/rmi/RMIAdaptorService.class"/>
-        <include name="org/jboss/jmx/connector/**"/>
-      </fileset>
-    </jar>
-
-    <!-- Build netboot.war -->
-    <war warfile="${build.lib}/netboot.war" webxml="${build.resources}/netboot/WEB-INF/web.xml">
-      <fileset dir="${build.resources}/netboot" excludes="WEB-INF/web.xml"/>
-      <classes dir="${build.classes}">
-        <include name="org/jboss/netboot/**"/>
-      </classes>
-    </war>
-
-    <!-- bsh-deployer.jar -->
-
-    <mkdir dir="${build.deployers}/bsh.deployer"/>
-    <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
-
-    <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/varia/deployment/BeanShell**"/>
-        <include name="org/jboss/varia/deployment/Script**"/>
-        <include name="org/jboss/varia/deployment/Test**"/>
-        <include name="org/jboss/varia/deployment/Legacy**"/>
-      </fileset>
-    </jar>
-
-    <copy todir="${build.deployers}/bsh.deployer/META-INF">
-       <fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
-    </copy>
-
-    <!-- seam.deployer -->
-
-    <mkdir dir="${build.deployers}/seam.deployer"/>
-    <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
-
-    <copy todir="${build.deployers}/seam.deployer/META-INF">
-       <fileset dir="${source.resources}/seam">
-         <include name="*.xml"/>
-       </fileset>
-    </copy>
-
-    <copy todir="${build.deployers}/seam.deployer">
-      <fileset dir="${org.jboss.seam.integration.lib}">
-         <include name="jboss-seam-int-microcontainer.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
-    <jar jarfile="${build.lib}/snmp-adaptor.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/jmx/adaptor/snmp/**"/>
-      </fileset>
-    </jar>
-    <jar jarfile="${build.lib}/snmp-adaptor.sar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.resources}/services/snmp/deploy"/>
-      <fileset dir="${build.lib}">
-        <include name="snmp-adaptor.jar"/>
-      </fileset>
-    </jar>
-
-    <!-- Generate the (.deployer) to be used for bean deployment -->
-    <jar jarfile="${build.lib}/jboss-bean-deployer.jar"
-         manifest="${build.etc}/default.mf">
-       <fileset dir="${build.classes}">
-          <include name="org/jboss/kernel/deployment/**"/>
-       </fileset>
-    </jar>
-    <mkdir dir="${build.lib}/kernel/jboss-bean.deployer"/>
-    <copy todir="${build.lib}/kernel/jboss-bean.deployer" filtering="no">
-      <fileset file="${build.lib}/jboss-bean-deployer.jar"/>
-      <fileset dir="${jboss.microcontainer.lib}">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.microcontainer.lib}">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${jboss.microcontainer.lib}">
-         <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${build.resources}/kernel">
-         <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- logging-monitor.jar -->
-    <jar jarfile="${build.lib}/logging-monitor.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/services/loggingmonitor/**"/>
-      </fileset>
-    </jar>
-
-     <!-- xmlentitymgr.jar -->
-     <jar jarfile="${build.lib}/xmlentitymgr.jar"
-       manifest="${build.etc}/default.mf">
-       <fileset dir="${build.classes}">
-         <include name="org/jboss/services/xml/**"/>
-       </fileset>
-     </jar>
-
-    <!--jboss-samlsso jar-->
-    <jar jarfile="${build.lib}/jboss-samlsso.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/security/identity/sso/**"/>
-      </fileset>
-    </jar>
-
-     <!-- SRP jars -->
-     <jar jarfile="${build.lib}/jboss-srp.jar">
-       <fileset dir="${build.classes}">
-         <include name="org/jboss/security/srp/**"/>
-       </fileset>
-     </jar>
-     <!-- Build jboss-srp-client.jar -->
-     <jar jarfile="${build.lib}/jboss-srp-client.jar">
-       <fileset dir="${build.classes}">
-          <include name="org/jboss/security/srp/PkgCategory.class"/>
-          <include name="org/jboss/security/srp/TracePriority.class"/>
-          <include name="org/jboss/security/srp/SRPClientSession.class"/>
-          <include name="org/jboss/security/srp/SRPServerInterface*.class"/>
-          <include name="org/jboss/security/srp/SRPServerProxy.class"/>
-          <include name="org/jboss/security/srp/SRPParameters.class"/>
-          <include name="org/jboss/security/srp/SRPPermission.class"/>
-          <include name="org/jboss/security/srp/SRPConf*.class"/>
-          <include name="org/jboss/security/srp/SRPRemoteServer_Stub.class"/>
-          <include name="org/jboss/security/srp/SRPRemoteServerInterface.class"/>
-          <include name="org/jboss/security/srp/SRPVerifierStore.class"/>
-          <include name="org/jboss/security/srp/SRPVerifierStore$*.class"/>
-          <include name="org/jboss/security/srp/jaas/SRPLoginModule.class"/>
-          <include name="org/jboss/security/srp/jaas/SRPPrincipal.class"/>
-       </fileset>
-     </jar>
-
-    <!-- Build threaddump.war -->
-    <war warfile="${build.lib}/threaddump.war" webxml="${build.resources}/varia/threaddump/web.xml">
-      <fileset dir="${build.resources}/varia/threaddump" excludes="web.xml"/>
-      <classes dir="${build.classes}">
-        <include name="org/jboss/varia/threaddump/**"/>
-      </classes>
-    </war>
-    
-    <!-- Update the build marker to allow bypassing -->
-    <touch file="${build-bypass.marker}"/>
-
-  </target>
-
-   <target name="validateHeaders" depends="compile"
-      description="Validate the source tree headers">
-      <java classname="org.jboss.tools.license.ValidateLicenseHeaders"
-         fork="true">
-         <arg value="-addheader"/>
-         <arg value="${project.root}"/>
-         <classpath>
-            <pathelement location="${build.classes}" />
-         </classpath>
-      </java>
-   </target>
-
-   <!-- Use ant -Djboss.dist=/release/jboss-x.y.z to create a serialuid.ser for the x.y.z dist -->
-   <target name="buildSerialVersionUIDDB" depends="compile"
-      description="Create a serialVersionUID db for a jboss.dist">
-      <fail unless="jboss.dist" message="The jboss.dist variable must be defined" />
-      <java classname="org.jboss.tools.SerialVersionUID"
-         fork="true">
-         <jvmarg value="-XX:MaxPermSize=256m"/>
-         <jvmarg value="-Xms256m"/>
-         <jvmarg value="-Xmx256m"/>
-         <arg value="${jboss.dist}" />
-         <classpath>
-            <pathelement location="${build.classes}" />
-         </classpath>
-      </java>
-   </target>
-
-  <!-- ================================================================== -->
-  <!-- Install & Release                                                  -->
-  <!-- ================================================================== -->
-
-  <target name="install"
-    description="Install the structure for a release."
-    depends="all, _buildmagic:install:default"/>
-
-  <target name="release" depends="install"/>
-
-  <target name="release-zip"
-    description="Builds a ZIP distribution."
-    depends="release, _buildmagic:release:zip"/>
-
-  <target name="release-tar"
-    description="Builds a TAR distribution."
-    depends="release, _buildmagic:release:tar"/>
-
-  <target name="release-tgz"
-    description="Builds a TAR-GZ distribution."
-    depends="release, _buildmagic:release:tgz"/>
-
-  <target name="release-all"
-    description="Builds a distribution for each archive type."
-    depends="release-zip, release-tgz"/>
-
-
-  <!-- ================================================================== -->
-  <!-- Cleaning                                                           -->
-  <!-- ================================================================== -->
-
-  <!-- Clean up all build output -->
-  <target name="clean"
-    description="Cleans up most generated files."
-    depends="_buildmagic:clean">
-  </target>
-
-  <!-- Clean up all generated files -->
-  <target name="clobber"
-    description="Cleans up all generated files."
-    depends="_buildmagic:clobber, clean">
-  </target>
-
-
-  <!-- ================================================================== -->
-  <!-- Misc.                                                              -->
-  <!-- ================================================================== -->
-
-  <target name="main"
-    description="Executes the default target (most)."
-    depends="most"/>
-
-  <target name="all"
-    description="Builds everything."
-    depends="jars, docs"/>
-
-  <target name="most"
-    description="Builds almost everything."
-    depends="jars"/>
-
-  <target name="help"
-    description="Show this help message."
-    depends="_buildmagic:help:standard"/>
-
-</project>

Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/varia/pom.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -22,7 +22,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
         <executions>
           <execution>
             <id>assembly</id>
@@ -107,67 +106,54 @@
                     <include name="jmx/html/images/**"/>
                   </fileset>
                 </copy>
+                                
+                <!-- build deployers -->
+            
+                <property name="build.deployers" location="target/deployers"/>
+                <property name="source.resources" location="src/resources"/>
                 
-                <!-- Copy jars -->
-                <!--<property name="output.lib" location="${basedir}/output/lib"/>
-                <mkdir dir="${output.lib}"/>
-                <copy file="target/${artifactId}-${version}-autonumber-plugin.jar"
-                      tofile="${output.lib}/autonumber-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-counter-plugin.jar"
-                      tofile="${output.lib}/counter-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-deployment-service.jar"
-                      tofile="${output.lib}/deployment-service.jar"/>
-                <copy file="target/${artifactId}-${version}-derby-plugin.jar"
-                      tofile="${output.lib}/derby-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-hsqldb.jar"
-                      tofile="${output.lib}/hsqldb.jar"/>
-                <copy file="target/${artifactId}-${version}-hsqldb-plugin.jar"
-                      tofile="${output.lib}/hsqldb-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss-bean-deployer.jar"
-                      tofile="${output.lib}/jboss-bean-deployer.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss-bindingservice.jar"
-                      tofile="${output.lib}/jboss-bindingservice.jar"/>
-                <copy file="target/${artifactId}-${version}-jbossjmx-ant.jar"
-                      tofile="${output.lib}/jbossjmx-ant.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss-monitoring.jar"
-                      tofile="${output.lib}/jboss-monitoring.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss-samlsso.jar"
-                      tofile="${output.lib}/jboss-samlsso.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss-srp.jar"
-                      tofile="${output.lib}/jboss-srp.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss-srp-client.jar"
-                      tofile="${output.lib}/jboss-srp-client.jar"/>
-                <copy file="target/${artifactId}-${version}-logging-monitor.jar"
-                      tofile="${output.lib}/logging-monitor.jar"/>
-                <copy file="target/${artifactId}-${version}-mail-plugin.jar"
-                      tofile="${output.lib}/mail-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-process-plugin.jar"
-                      tofile="${output.lib}/process-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-properties-plugin.jar"
-                      tofile="${output.lib}/properties-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-scheduler-plugin.jar"
-                      tofile="${output.lib}/scheduler-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-scheduler-plugin-example.jar"
-                      tofile="${output.lib}/scheduler-plugin-example.jar"/>
-                <copy file="target/${artifactId}-${version}-snmp-adaptor.jar"
-                      tofile="${output.lib}/snmp-adaptor.jar"/>
-                <copy file="target/${artifactId}-${version}-statscollector.jar"
-                      tofile="${output.lib}/statscollector.jar"/>
-                <copy file="target/${artifactId}-${version}-xmlentitymgr.jar"
-                      tofile="${output.lib}/xmlentitymgr.jar"/>
-                  -->
+                <mkdir dir="${build.deployers}/bsh.deployer"/>
+                <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
+            
+                <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
+                  <fileset dir="${project.build.outputDirectory}">
+                    <include name="org/jboss/varia/deployment/BeanShell**"/>
+                    <include name="org/jboss/varia/deployment/Script**"/>
+                    <include name="org/jboss/varia/deployment/Test**"/>
+                    <include name="org/jboss/varia/deployment/Legacy**"/>
+                  </fileset>
+                </jar>
+            
+                <copy todir="${build.deployers}/bsh.deployer/META-INF">
+                   <fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
+                </copy>
+            
+                <!-- seam.deployer -->
+                <mkdir dir="${build.deployers}/seam.deployer"/>
+                <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
+            
+                <copy todir="${build.deployers}/seam.deployer/META-INF">
+                   <fileset dir="${source.resources}/seam">
+                     <include name="*.xml"/>
+                   </fileset>
+                </copy>
+            
+                <copy todir="${build.deployers}/seam.deployer">
+                  <fileset file="${maven.dependency.org.jboss.seam.integration.jboss-seam-int-microcontainer.jar.path}"/>
+                </copy>
+            
+                <!-- jboss-bean.deployer -->
+                <mkdir dir="target/kernel/jboss-bean.deployer"/>
+                <copy todir="target/kernel/jboss-bean.deployer" filtering="no">
+                  <fileset file="target/jboss-bean-deployer.jar"/>
+                  <fileset file="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/>
+                  <fileset file="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+                  <fileset file="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+                  <fileset dir="target/resources/kernel">
+                     <include name="**/*.xml"/>
+                  </fileset>
+                </copy>
 
-                <!-- copy wars -->
-                <!--<copy file="target/${artifactId}-${version}-jmx-console.war"
-                      tofile="${output.lib}/jmx-console.war"/>
-                <copy file="target/${artifactId}-${version}-netboot.war"
-                      tofile="${output.lib}/netboot.war"/>
-                <copy file="target/${artifactId}-${version}-threaddump.war"
-                      tofile="${output.lib}/threaddump.war"/>-->
-                
-                <!-- build sars and deployers -->
-                <ant antfile="build-sars.xml" target="build-sars"/>
-
               </tasks>
             </configuration>
           </execution>
@@ -370,6 +356,11 @@
       <artifactId>hsqldb</artifactId>
     </dependency>
     
+    <dependency>
+      <groupId>org.jboss.seam.integration</groupId>
+      <artifactId>jboss-seam-int-microcontainer</artifactId>
+    </dependency>
+
   </dependencies>
   
   <profiles>

Modified: trunk/varia/src/assembly/deployment-service-sar.xml
===================================================================
--- trunk/varia/src/assembly/deployment-service-sar.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/varia/src/assembly/deployment-service-sar.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -22,7 +22,7 @@
   </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
+      <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
       <includes>
         <include>commons-collections:commons-collections</include>
         <include>apache-velocity:velocity</include>

Modified: trunk/varia/src/assembly/http-invoker-sar.xml
===================================================================
--- trunk/varia/src/assembly/http-invoker-sar.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/varia/src/assembly/http-invoker-sar.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -17,7 +17,7 @@
       <outputDirectory>/invoker.war/WEB-INF</outputDirectory>
       <includes>
         <include>jboss-web.xml</include>
-        <include>-web.xml</include>
+        <include>web.xml</include>
       </includes>
     </fileSet>
     <fileSet>

Deleted: trunk/varia/src/assembly/httpa-invoker-sar.xml
===================================================================
--- trunk/varia/src/assembly/httpa-invoker-sar.xml	2009-06-26 21:47:23 UTC (rev 90659)
+++ trunk/varia/src/assembly/httpa-invoker-sar.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -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: trunk/varia/src/assembly/httpha-invoker-sar.xml (from rev 90635, trunk/varia/src/assembly/httpa-invoker-sar.xml)
===================================================================
--- trunk/varia/src/assembly/httpha-invoker-sar.xml	                        (rev 0)
+++ trunk/varia/src/assembly/httpha-invoker-sar.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -0,0 +1,33 @@
+<assembly>
+  <id>httpha-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>target/resources/services/invoker/httpha</directory>
+      <outputDirectory>/invoker.war/WEB-INF</outputDirectory>
+      <includes>
+        <include>jboss-web.xml</include>
+        <include>jboss-scanning.xml</include>
+        <include>web.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/resources/services/invoker/httpha</directory>
+      <outputDirectory>/META-INF</outputDirectory>
+      <includes>
+        <include>jboss-service.xml</include>
+        <include>jboss-scanning.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/varia/src/assembly/httpha-invoker-sar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Added: trunk/varia/src/assembly/snmp-adaptor-sar.xml
===================================================================
--- trunk/varia/src/assembly/snmp-adaptor-sar.xml	                        (rev 0)
+++ trunk/varia/src/assembly/snmp-adaptor-sar.xml	2009-06-26 22:07:20 UTC (rev 90660)
@@ -0,0 +1,20 @@
+<assembly>
+  <id>snmp-adaptor-sar</id>
+  <formats>
+    <format>jar</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: trunk/varia/src/assembly/snmp-adaptor-sar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native




More information about the jboss-cvs-commits mailing list