[jboss-cvs] JBossAS SVN: r81510 - in trunk/varia: src/assembly and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 24 15:58:57 EST 2008
Author: pgier
Date: 2008-11-24 15:58:57 -0500 (Mon, 24 Nov 2008)
New Revision: 81510
Added:
trunk/varia/src/assembly/jboss-bean-deployer.xml
trunk/varia/src/assembly/jboss-samlsso.xml
trunk/varia/src/assembly/jboss-srp-client.xml
trunk/varia/src/assembly/jboss-srp.xml
trunk/varia/src/assembly/logging-monitor.xml
trunk/varia/src/assembly/scheduler-plugin-example.xml
trunk/varia/src/assembly/snmp-adaptor.xml
trunk/varia/src/assembly/threaddump.xml
trunk/varia/src/assembly/xmlentitymgr.xml
Removed:
trunk/varia/src/assembly/bsh-deployer.xml
Modified:
trunk/varia/build.xml
trunk/varia/pom.xml
trunk/varia/src/assembly/jbossjmx-ant.xml
trunk/varia/src/assembly/jmx-console.xml
trunk/varia/src/assembly/mail-plugin.xml
trunk/varia/src/assembly/netboot.xml
trunk/varia/src/assembly/scheduler-plugin.xml
Log:
[JBBUILD-456] Update maven assemblies of varia to match ant output.
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/build.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -515,10 +515,6 @@
<include name="org/jboss/jmx/adaptor/rmi/RMIAdaptorService.class"/>
<include name="org/jboss/jmx/connector/**"/>
</fileset>
- <fileset dir="${jboss.jmx.root}/classes">
- <include name="javax/management/*.class"/>
- <include name="org/jboss/mx/util/Serialization.class"/>
- </fileset>
</jar>
<!-- Build netboot.war -->
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/pom.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -178,6 +178,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</dependency>
Deleted: trunk/varia/src/assembly/bsh-deployer.xml
===================================================================
--- trunk/varia/src/assembly/bsh-deployer.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/src/assembly/bsh-deployer.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -1,19 +0,0 @@
-<assembly>
- <id>bsh-deployer</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/varia/deployment/BeanShell**</include>
- <include>org/jboss/varia/deployment/Script**</include>
- <include>org/jboss/varia/deployment/Test**</include>
- <include>org/jboss/varia/deployment/Legacy**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Added: trunk/varia/src/assembly/jboss-bean-deployer.xml
===================================================================
--- trunk/varia/src/assembly/jboss-bean-deployer.xml (rev 0)
+++ trunk/varia/src/assembly/jboss-bean-deployer.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jboss-bean-deployer</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/kernel/deployment/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/jboss-bean-deployer.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/varia/src/assembly/jboss-samlsso.xml
===================================================================
--- trunk/varia/src/assembly/jboss-samlsso.xml (rev 0)
+++ trunk/varia/src/assembly/jboss-samlsso.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jboss-samlsso</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/security/identity/sso/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/jboss-samlsso.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/varia/src/assembly/jboss-srp-client.xml
===================================================================
--- trunk/varia/src/assembly/jboss-srp-client.xml (rev 0)
+++ trunk/varia/src/assembly/jboss-srp-client.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,29 @@
+<assembly>
+ <id>jboss-srp-client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/security/srp/PkgCategory.class</include>
+ <include>org/jboss/security/srp/TracePriority.class</include>
+ <include>org/jboss/security/srp/SRPClientSession.class</include>
+ <include>org/jboss/security/srp/SRPServerInterface*.class</include>
+ <include>org/jboss/security/srp/SRPServerProxy.class</include>
+ <include>org/jboss/security/srp/SRPParameters.class</include>
+ <include>org/jboss/security/srp/SRPPermission.class</include>
+ <include>org/jboss/security/srp/SRPConf*.class</include>
+ <include>org/jboss/security/srp/SRPRemoteServer_Stub.class</include>
+ <include>org/jboss/security/srp/SRPRemoteServerInterface.class</include>
+ <include>org/jboss/security/srp/SRPVerifierStore.class</include>
+ <include>org/jboss/security/srp/SRPVerifierStore$*.class</include>
+ <include>org/jboss/security/srp/jaas/SRPLoginModule.class</include>
+ <include>org/jboss/security/srp/jaas/SRPPrincipal.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/jboss-srp-client.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/varia/src/assembly/jboss-srp.xml
===================================================================
--- trunk/varia/src/assembly/jboss-srp.xml (rev 0)
+++ trunk/varia/src/assembly/jboss-srp.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jboss-srp</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/security/srp/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/jboss-srp.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/varia/src/assembly/jbossjmx-ant.xml
===================================================================
--- trunk/varia/src/assembly/jbossjmx-ant.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/src/assembly/jbossjmx-ant.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -12,23 +12,27 @@
<include>org/jboss/ant/**</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../server/target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
<includes>
- <include>org/jboss/jmx/adaptor/rmi/RMIAdaptor.class</include>
- <include>org/jboss/jmx/adaptor/rmi/RMIAdaptorImpl_Stub.class</include>
- <include>org/jboss/jmx/adaptor/rmi/RMIAdaptorService.class</include>
- <include>org/jboss/jmx/connector/**</include>
+ <include>org.jboss.naming:jnpserver</include>
</includes>
- </fileSet>
- <fileSet>
- <directory>../jmx/target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
<includes>
- <include>javax/management/*.class</include>
- <include>org/jboss/mx/util/Serialization.class</include>
+ <include>org.jboss.jbossas:jboss-as-server</include>
</includes>
- </fileSet>
- </fileSets>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/jmx/adaptor/rmi/RMIAdaptor.class</include>
+ <include>org/jboss/jmx/adaptor/rmi/RMIAdaptorImpl_Stub.class</include>
+ <include>org/jboss/jmx/adaptor/rmi/RMIAdaptorService.class</include>
+ <include>org/jboss/jmx/connector/**</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
Modified: trunk/varia/src/assembly/jmx-console.xml
===================================================================
--- trunk/varia/src/assembly/jmx-console.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/src/assembly/jmx-console.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -4,10 +4,21 @@
<format>war</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>src/resources/jmx/jmx-console-web.xml</source>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ <destName>web.xml</destName>
+ </file>
+ </files>
<fileSets>
<fileSet>
+ <directory>src/resources/jmx/web-inf</directory>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>/WEB-INF/classes</outputDirectory>
<includes>
<include>org/jboss/jmx/adaptor/**</include>
</includes>
@@ -17,19 +28,8 @@
</fileSet>
<fileSet>
<directory>src/resources/jmx/</directory>
- <outputDirectory>/WEB-INF</outputDirectory>
+ <outputDirectory>/WEB-INF/classes</outputDirectory>
<includes>
- <include>jmx-console-web.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/resources/jmx/web-inf</directory>
- <outputDirectory>/WEB-INF</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/resources/jmx/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
<include>*.properties</include>
</includes>
</fileSet>
@@ -38,13 +38,4 @@
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
- <includes>
- <include>commons-collections:commons-collections</include>
- <include>apache-velocity:velocity</include>
- </includes>
- </dependencySet>
- </dependencySets>
</assembly>
\ No newline at end of file
Added: trunk/varia/src/assembly/logging-monitor.xml
===================================================================
--- trunk/varia/src/assembly/logging-monitor.xml (rev 0)
+++ trunk/varia/src/assembly/logging-monitor.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>logging-monitor</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/services/loggingmonitor/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/logging-monitor.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/varia/src/assembly/mail-plugin.xml
===================================================================
--- trunk/varia/src/assembly/mail-plugin.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/src/assembly/mail-plugin.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -9,7 +9,7 @@
<directory>target/classes</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>org/jboss/mail/MailService*.class</include>
+ <include>org/jboss/mail/*</include>
</includes>
</fileSet>
</fileSets>
Modified: trunk/varia/src/assembly/netboot.xml
===================================================================
--- trunk/varia/src/assembly/netboot.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/src/assembly/netboot.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -4,10 +4,16 @@
<format>war</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>src/resources/netboot/WEB-INF/web.xml</source>
+ <outputDirectory>WEB-INF</outputDirectory>
+ </file>
+ </files>
<fileSets>
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>/WEB-INF/classes</outputDirectory>
<includes>
<include>org/jboss/netboot/**</include>
</includes>
@@ -15,6 +21,9 @@
<fileSet>
<directory>src/resources/netboot</directory>
<outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>WEB-INF/web.xml</exclude>
+ </excludes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Added: trunk/varia/src/assembly/scheduler-plugin-example.xml
===================================================================
--- trunk/varia/src/assembly/scheduler-plugin-example.xml (rev 0)
+++ trunk/varia/src/assembly/scheduler-plugin-example.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>scheduler-plugin-example</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/varia/scheduler/example/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/scheduler-plugin-example.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/varia/src/assembly/scheduler-plugin.xml
===================================================================
--- trunk/varia/src/assembly/scheduler-plugin.xml 2008-11-24 20:04:29 UTC (rev 81509)
+++ trunk/varia/src/assembly/scheduler-plugin.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -9,7 +9,7 @@
<directory>target/classes</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>org/jboss/varia/scheduler/example/**</include>
+ <include>org/jboss/varia/scheduler/**</include>
</includes>
</fileSet>
</fileSets>
Added: trunk/varia/src/assembly/snmp-adaptor.xml
===================================================================
--- trunk/varia/src/assembly/snmp-adaptor.xml (rev 0)
+++ trunk/varia/src/assembly/snmp-adaptor.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>snmp-adaptor</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/jmx/adaptor/snmp/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/snmp-adaptor.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/varia/src/assembly/threaddump.xml
===================================================================
--- trunk/varia/src/assembly/threaddump.xml (rev 0)
+++ trunk/varia/src/assembly/threaddump.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,29 @@
+<assembly>
+ <id>threaddump</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>src/resources/varia/threaddump/web.xml</source>
+ <outputDirectory>WEB-INF</outputDirectory>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/varia/threaddump</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>WEB-INF/web.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>org/jboss/varia/threaddump/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: trunk/varia/src/assembly/threaddump.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/varia/src/assembly/xmlentitymgr.xml
===================================================================
--- trunk/varia/src/assembly/xmlentitymgr.xml (rev 0)
+++ trunk/varia/src/assembly/xmlentitymgr.xml 2008-11-24 20:58:57 UTC (rev 81510)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>xmlentitymgr</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/services/xml/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/varia/src/assembly/xmlentitymgr.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list