[jboss-cvs] JBossAS SVN: r69454 - in trunk: embedded and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 29 13:02:15 EST 2008
Author: pgier
Date: 2008-01-29 13:02:15 -0500 (Tue, 29 Jan 2008)
New Revision: 69454
Added:
trunk/main/src/assembly/
trunk/main/src/assembly/log4j-boot.xml
Modified:
trunk/embedded/
trunk/jbossas/jmx-remoting/
trunk/jbossas/remoting/
trunk/jbossmq/pom.xml
trunk/main/pom.xml
trunk/messaging/pom.xml
trunk/pom.xml
trunk/security/
trunk/server/pom.xml
Log:
Property changes on: trunk/embedded
___________________________________________________________________
Name: svn:ignore
- output
+ output
target
Property changes on: trunk/jbossas/jmx-remoting
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/jbossas/remoting
___________________________________________________________________
Name: svn:ignore
- output
+ output
target
Modified: trunk/jbossmq/pom.xml
===================================================================
--- trunk/jbossmq/pom.xml 2008-01-29 17:59:56 UTC (rev 69453)
+++ trunk/jbossmq/pom.xml 2008-01-29 18:02:15 UTC (rev 69454)
@@ -24,7 +24,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>javacc</id>
Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml 2008-01-29 17:59:56 UTC (rev 69453)
+++ trunk/main/pom.xml 2008-01-29 18:02:15 UTC (rev 69454)
@@ -20,6 +20,63 @@
<directory>src/resources</directory>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <!--<execution>
+ <id>log4j-boot</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>org/apache/log4j/*</include>
+ <include>org/apache/log4j/config/*</include>
+ <include>org/apache/log4j/helpers/*</include>
+ <include>org/apache/log4j/or/*</include>
+ <include>org/apache/log4j/spi/*</include>
+ </includes>
+ </configuration>
+ </execution>-->
+ <execution>
+ <id>main-client</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>org/jboss/system/server/ServerLoader*.class</include>
+ <include>org/jboss/system/server/Server.class</include>
+ <include>org/jboss/system/server/ServerConfig.class</include>
+ <include>**/*MBean.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>assemblies</id>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/log4j-boot.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+
+ </plugins>
</build>
<dependencies>
<!-- Compile (global dependencies) -->
@@ -27,6 +84,11 @@
<groupId>urbanophile</groupId>
<artifactId>java-getopt</artifactId>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
</dependencies>
</project>
Added: trunk/main/src/assembly/log4j-boot.xml
===================================================================
--- trunk/main/src/assembly/log4j-boot.xml (rev 0)
+++ trunk/main/src/assembly/log4j-boot.xml 2008-01-29 18:02:15 UTC (rev 69454)
@@ -0,0 +1,24 @@
+<assembly>
+ <id>log4j-boot</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/apache/log4j/*</include>
+ <include>org/apache/log4j/config/*</include>
+ <include>org/apache/log4j/helpers/*</include>
+ <include>org/apache/log4j/or/*</include>
+ <include>org/apache/log4j/spi/*</include>
+ </includes>
+ </unpackOptions>
+ <includes>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/main/src/assembly/log4j-boot.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/messaging/pom.xml
===================================================================
--- trunk/messaging/pom.xml 2008-01-29 17:59:56 UTC (rev 69453)
+++ trunk/messaging/pom.xml 2008-01-29 18:02:15 UTC (rev 69454)
@@ -32,7 +32,7 @@
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>jboss.messaging</groupId>
<artifactId>jboss-messaging</artifactId>
</dependency>
<dependency>
@@ -43,6 +43,14 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi-bare</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-01-29 17:59:56 UTC (rev 69453)
+++ trunk/pom.xml 2008-01-29 18:02:15 UTC (rev 69454)
@@ -74,6 +74,11 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -294,9 +299,9 @@
<version>2.0.3.GA</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>jboss.messaging</groupId>
<artifactId>jboss-messaging</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1.Beta1</version>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Property changes on: trunk/security
___________________________________________________________________
Name: svn:ignore
- build.log
output
+ build.log
output
target
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2008-01-29 17:59:56 UTC (rev 69453)
+++ trunk/server/pom.xml 2008-01-29 18:02:15 UTC (rev 69454)
@@ -24,7 +24,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.3-jboss-1</version>
<executions>
<execution>
<id>jjtree-jbossql</id>
More information about the jboss-cvs-commits
mailing list