[jboss-cvs] JBossAS SVN: r81373 - in trunk: connector/src/assembly and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 20 15:07:26 EST 2008
Author: pgier
Date: 2008-11-20 15:07:26 -0500 (Thu, 20 Nov 2008)
New Revision: 81373
Added:
trunk/connector/src/assembly/jboss-common-jdbc-wrapper.xml
trunk/connector/src/assembly/jboss-local-jdbc.xml
trunk/connector/src/assembly/jboss-ra.xml
trunk/connector/src/assembly/jboss-xa-jdbc.xml
trunk/connector/src/assembly/jbosscx-client.xml
trunk/connector/src/assembly/mail-ra.xml
trunk/connector/src/assembly/quartz-ra.xml
Modified:
trunk/connector/pom.xml
trunk/connector/src/assembly/jboss-jca.xml
trunk/console/pom.xml
trunk/console/src/assembly/applet.xml
trunk/console/src/assembly/console-client.xml
trunk/deployment/pom.xml
trunk/hibernate-int/pom.xml
Log:
[JBBUILD-498] Update assemblies to match ant output.
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2008-11-20 18:37:51 UTC (rev 81372)
+++ trunk/connector/pom.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -14,11 +14,6 @@
<description>JBoss Application Server (connector module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Added: trunk/connector/src/assembly/jboss-common-jdbc-wrapper.xml
===================================================================
--- trunk/connector/src/assembly/jboss-common-jdbc-wrapper.xml (rev 0)
+++ trunk/connector/src/assembly/jboss-common-jdbc-wrapper.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -0,0 +1,36 @@
+<assembly>
+ <id>jboss-common-jdbc-wrapper</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/adapter/jdbc/JBossWrapper.class</include>
+ <include>org/jboss/resource/adapter/jdbc/WrapperConnectionFactory.class</include>
+ <include>org/jboss/resource/adapter/jdbc/ExceptionSorter.class</include>
+ <include>org/jboss/resource/adapter/jdbc/CheckValidConnectionSQL.class</include>
+ <include>org/jboss/resource/adapter/jdbc/ValidConnectionChecker.class</include>
+ <include>org/jboss/resource/adapter/jdbc/StaleConnectionChecker.class</include>
+ <include>org/jboss/resource/adapter/jdbc/StaleConnectionException.class</include>
+ <include>org/jboss/resource/adapter/jdbc/vendor/*.class</include>
+ <include>org/jboss/resource/adapter/jdbc/Null*.class</include>
+ <include>org/jboss/resource/adapter/jdbc/Wrap*.class</include>
+ <include>org/jboss/resource/adapter/jdbc/BaseWrap*.class</include>
+ <include>org/jboss/resource/adapter/jdbc/CachedCallableStatement.class</include>
+ <include>org/jboss/resource/adapter/jdbc/CachedPreparedStatement.class</include>
+ <include>org/jboss/resource/adapter/jdbc/PreparedStatementCache*.class</include>
+ <include>org/jboss/resource/adapter/jdbc/StatementAccess.class</include>
+ <include>org/jboss/resource/adapter/jdbc/jdk5/*.class</include>
+ <include>org/jboss/resource/adapter/jdbc/jdk6/*.class</include>
+ <include>org/jboss/resource/adapter/jdbc/URLSelectorStrategy.class</include>
+ <include>org/jboss/resource/adapter/jdbc/remote/*</include>
+ <!-- JBAS-2250 hack -->
+ <include>org/jboss/ejb/plugins/cmp/jdbc/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jboss-common-jdbc-wrapper.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/connector/src/assembly/jboss-jca.xml
===================================================================
--- trunk/connector/src/assembly/jboss-jca.xml 2008-11-20 18:37:51 UTC (rev 81372)
+++ trunk/connector/src/assembly/jboss-jca.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -10,6 +10,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/adapter/**</exclude>
+ <exclude>org/jboss/resource/deployers/**</exclude>
</excludes>
</fileSet>
<fileSet>
Added: trunk/connector/src/assembly/jboss-local-jdbc.xml
===================================================================
--- trunk/connector/src/assembly/jboss-local-jdbc.xml (rev 0)
+++ trunk/connector/src/assembly/jboss-local-jdbc.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jboss-local-jdbc</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/adapter/jdbc/local/Local*.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jboss-local-jdbc.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/jboss-ra.xml
===================================================================
--- trunk/connector/src/assembly/jboss-ra.xml (rev 0)
+++ trunk/connector/src/assembly/jboss-ra.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jms-ra</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/adapter/jms/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jboss-ra.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/jboss-xa-jdbc.xml
===================================================================
--- trunk/connector/src/assembly/jboss-xa-jdbc.xml (rev 0)
+++ trunk/connector/src/assembly/jboss-xa-jdbc.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jboss-xa-jdbc</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/adapter/jdbc/xa/**/*.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jboss-xa-jdbc.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/jbosscx-client.xml
===================================================================
--- trunk/connector/src/assembly/jbosscx-client.xml (rev 0)
+++ trunk/connector/src/assembly/jbosscx-client.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -0,0 +1,19 @@
+<assembly>
+ <id>jbosscx-client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/JBossResourceException.class</include>
+ <include>org/jboss/resource/adapter/jdbc/remote/*</include>
+ <include>org/jboss/resource/connectionmanager/JBossLocalXAException.class</include>
+ <include>org/jboss/resource/adapter/jdbc/JBossWrapper.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jbosscx-client.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/mail-ra.xml
===================================================================
--- trunk/connector/src/assembly/mail-ra.xml (rev 0)
+++ trunk/connector/src/assembly/mail-ra.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>mail-ra</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/adapter/mail/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/mail-ra.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/quartz-ra.xml
===================================================================
--- trunk/connector/src/assembly/quartz-ra.xml (rev 0)
+++ trunk/connector/src/assembly/quartz-ra.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>quartz-ra</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/adapter/quartz/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/quartz-ra.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2008-11-20 18:37:51 UTC (rev 81372)
+++ trunk/console/pom.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -14,15 +14,11 @@
<description>JBoss Application Server (console module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <!--<version>2.2-beta-3-SNAPSHOT</version>-->
<executions>
<execution>
<id>assembly</id>
@@ -85,6 +81,11 @@
<artifactId>jboss-as-system</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -114,6 +115,11 @@
<artifactId>jboss-as-server</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
Modified: trunk/console/src/assembly/applet.xml
===================================================================
--- trunk/console/src/assembly/applet.xml 2008-11-20 18:37:51 UTC (rev 81372)
+++ trunk/console/src/assembly/applet.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -9,16 +9,110 @@
<directory>target/classes</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>**</include>
+ <include>org/jboss/console/manager/**</include>
+ <include>org/jboss/console/plugins/**</include>
+ <include>org/jboss/console/navtree/**</include>
+ <include>org/jboss/console/remote/**</include>
+ <include>org/jboss/console/manager/navtree/**</include>
+ <include>org/jboss/console/manager/**MBean.*</include>
</includes>
</fileSet>
</fileSets>
- <!--<dependencySets>
+ <dependencySets>
<dependencySet>
<unpack>true</unpack>
<includes>
- <include>urbanophile:java-getopt</include>
+ <include>jfree:jfreechart</include>
+ <include>jfree:jcommon</include>
</includes>
</dependencySet>
- </dependencySets>-->
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.jbossas:jboss-as-server:jar:client</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/invocation/*</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.logging:jboss-logging-spi</include>
+ <include>org.jboss.logging:jboss-logging-log4j</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>org/jboss/logging/**</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss:jboss-common-core</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/INDEX.LIST</exclude>
+ <exclude>org/jboss/util/property/**</exclude>
+ <exclude>org/jboss/util/propertyeditor/**</exclude>
+ <exclude>org/jboss/util/state/**</exclude>
+ <exclude>org/jboss/util/xml/**</exclude>
+ <exclude>org/jboss/util/collection/**</exclude>
+ <exclude>org/jboss/util/file/**</exclude>
+ <exclude>org/jboss/util/platform/**</exclude>
+ <exclude>org/jboss/util/stream/**</exclude>
+ <exclude>org/jboss/util/timeout/**</exclude>
+ <exclude>org/jboss/util/coerce/**</exclude>
+ <exclude>org/jboss/util/net/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.jbossas:jboss-as-system:jar:client</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/INDEX.LIST</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.naming:jnp-client</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/INDEX.LIST</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.jbossas:jboss-as-jmx</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/INDEX.LIST</exclude>
+ <exclude>org/jboss/mx/server/**</exclude>
+ <exclude>org/jboss/mx/remote/**</exclude>
+ <exclude>org/jboss/mx/persistence/**</exclude>
+ <exclude>org/jboss/mx/modelmbean/**</exclude>
+ <exclude>org/jboss/mx/metadata/**</exclude>
+ <exclude>org/jboss/mx/loading/**</exclude>
+ <exclude>org/jboss/mx/logging/**</exclude>
+ <exclude>org/jboss/mx/interceptor/**</exclude>
+ <exclude>javax/management/loading/**</exclude>
+ <exclude>javax/management/modelmbean/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
Modified: trunk/console/src/assembly/console-client.xml
===================================================================
--- trunk/console/src/assembly/console-client.xml 2008-11-20 18:37:51 UTC (rev 81372)
+++ trunk/console/src/assembly/console-client.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -1,5 +1,5 @@
<assembly>
- <id>client</id>
+ <id>console-client</id>
<formats>
<format>jar</format>
</formats>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2008-11-20 18:37:51 UTC (rev 81372)
+++ trunk/deployment/pom.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -23,6 +23,22 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/jboss/deployment/spi/**</include>
+ </includes>
+ <archive>
+ <manifestEntries>
+ <J2EE-DeploymentFactory-Implementation-Class>
+ org.jboss.deployment.spi.factories.DeploymentFactoryImpl
+ </J2EE-DeploymentFactory-Implementation-Class>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2008-11-20 18:37:51 UTC (rev 81372)
+++ trunk/hibernate-int/pom.xml 2008-11-20 20:07:26 UTC (rev 81373)
@@ -14,11 +14,6 @@
<description>JBoss Application Server (hibernate-int module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
</build>
<dependencies>
<!-- Compile (global dependencies) -->
More information about the jboss-cvs-commits
mailing list