[jboss-cvs] JBossAS SVN: r78759 - in projects/aop/trunk: aop and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 22 16:28:02 EDT 2008
Author: pgier
Date: 2008-09-22 16:28:02 -0400 (Mon, 22 Sep 2008)
New Revision: 78759
Added:
projects/aop/trunk/asintegration/src/assembly/
projects/aop/trunk/asintegration/src/assembly/as4.xml
projects/aop/trunk/asintegration/src/assembly/jboss4-jdk50.xml
projects/aop/trunk/asintegration/src/etc/jbossorg-eula.txt
Modified:
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration/pom.xml
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/pluggable-instrumentor/pom.xml
projects/aop/trunk/pom.xml
Log:
[JBBUILD-493] Set up aspects and asintegration modules to replace the ant builds with maven. Fix a couple of minor things in other poms.
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-09-22 16:24:29 UTC (rev 78758)
+++ projects/aop/trunk/aop/pom.xml 2008-09-22 20:28:02 UTC (rev 78759)
@@ -8,13 +8,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50</artifactId>
+ <artifactId>jboss-aop</artifactId>
<packaging>jar</packaging>
<name>JBoss AOP Framework</name>
<description>JBoss AOP Framework</description>
- <url>http://labs.jboss.org/jbossaop</url>
+ <url>http://www.jboss.org/jbossaop</url>
<build>
<sourceDirectory>src/main/</sourceDirectory>
+ <!--<testSourceDirectory>src/test/</testSourceDirectory>-->
<resources>
<resource>
<directory>docs</directory>
@@ -71,8 +72,6 @@
</archive>
</configuration>
</plugin>
- <!-- When assembly plugin 2.2-beta-2 is released, we should be able to use
- - this configuration instead of the antrun config -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -198,6 +197,10 @@
<dependencies>
<dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
Modified: projects/aop/trunk/asintegration/pom.xml
===================================================================
--- projects/aop/trunk/asintegration/pom.xml 2008-09-22 16:24:29 UTC (rev 78758)
+++ projects/aop/trunk/asintegration/pom.xml 2008-09-22 20:28:02 UTC (rev 78759)
@@ -7,19 +7,22 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-asintegration</artifactId>
+ <artifactId>jboss-aop-deployer</artifactId>
<packaging>jar</packaging>
<name>JBoss AOP AS Integration</name>
<description>JBoss AOP AS Integration</description>
- <url>http://labs.jboss.com/portal/jbossaop</url>
+
<build>
<sourceDirectory>src/main/</sourceDirectory>
<testSourceDirectory>src/tests/</testSourceDirectory>
<resources>
<resource>
- <directory>src/resources</directory>
+ <directory>src/etc</directory>
+ <includes>
+ <include>jbossorg-eula.txt</include>
+ </includes>
</resource>
- </resources>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -32,6 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
<executions>
<execution>
<id>test-jar</id>
@@ -40,18 +44,117 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/aop/junit/**</exclude>
+ <exclude>org/jboss/aop/asintegration/jboss4/**</exclude>
+ </excludes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>as4</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/as4.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${pom.url}</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jboss4-jdk50</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/jboss4-jdk50.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${pom.url}</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>copy-output-jars</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${basedir}/output"/>
+ <mkdir dir="${basedir}/output/lib"/>
+ <copy todir="${basedir}/output/etc">
+ <fileset dir="${basedir}/src/etc"/>
+ </copy>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+ tofile="${basedir}/output/lib/jboss-aop-deployer-jdk50.jar"/>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-as4.jar"
+ tofile="${basedir}/output/lib/jboss-aop-as4-deployer.jar"/>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-jboss4-jdk50.jar"
+ tofile="${basedir}/output/lib/jboss-aop-jboss4-jdk50.jar"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Clean the output directory created by the antrun plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>apache-xerces</groupId>
@@ -66,6 +169,10 @@
<artifactId>jboss-aop</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
@@ -104,4 +211,5 @@
<scope>compile</scope>
</dependency>
</dependencies>
+
</project>
Added: projects/aop/trunk/asintegration/src/assembly/as4.xml
===================================================================
--- projects/aop/trunk/asintegration/src/assembly/as4.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/assembly/as4.xml 2008-09-22 20:28:02 UTC (rev 78759)
@@ -0,0 +1,30 @@
+<assembly>
+ <id>as4</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/aop/asintegration/*</include>
+ <include>org/jboss/aop/asintegration/core/*</include>
+ <include>org/jboss/aop/classpool/**</include>
+ <include>org/jboss/aop/deploy*/**</include>
+ <include>org/jboss/aop/domain/**</include>
+ </includes>
+ <excludes>
+ <exclude>org/jboss/aop/deployers/*.class</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/etc</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossorg-eula.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: projects/aop/trunk/asintegration/src/assembly/as4.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/asintegration/src/assembly/jboss4-jdk50.xml
===================================================================
--- projects/aop/trunk/asintegration/src/assembly/jboss4-jdk50.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/assembly/jboss4-jdk50.xml 2008-09-22 20:28:02 UTC (rev 78759)
@@ -0,0 +1,23 @@
+<assembly>
+ <id>jboss4-jdk50</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/aop/asintegration/jboss4/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/etc</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossorg-eula.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: projects/aop/trunk/asintegration/src/assembly/jboss4-jdk50.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/asintegration/src/etc/jbossorg-eula.txt
===================================================================
--- projects/aop/trunk/asintegration/src/etc/jbossorg-eula.txt (rev 0)
+++ projects/aop/trunk/asintegration/src/etc/jbossorg-eula.txt 2008-09-22 20:28:02 UTC (rev 78759)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
Property changes on: projects/aop/trunk/asintegration/src/etc/jbossorg-eula.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2008-09-22 16:24:29 UTC (rev 78758)
+++ projects/aop/trunk/aspects/pom.xml 2008-09-22 20:28:02 UTC (rev 78759)
@@ -9,7 +9,7 @@
<artifactId>jboss-aop-aspects</artifactId>
<name>JBoss AOP Aspects</name>
<description>JBoss AOP Aspects</description>
- <url>http://labs.jboss.com/portal/jbossaop</url>
+
<build>
<sourceDirectory>src/main/</sourceDirectory>
<!--<testSourceDirectory>src/test/</testSourceDirectory>-->
@@ -29,17 +29,18 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
- <excludes>
- <exclude>org/jboss/aop/hook/JRockit*</exclude>
- </excludes>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
@@ -47,15 +48,40 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>copy-output-jars</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${basedir}/output"/>
+ <mkdir dir="${basedir}/output/lib"/>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+ tofile="${basedir}/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
+ tofile="${basedir}/output/lib/jboss-standalone-aspect-library-sources.jar"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Clean the output directory created by the antrun plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
<configuration>
- <archive>
- <manifestEntries>
- <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/output</directory>
+ </fileset>
+ </filesets>
</configuration>
</plugin>
</plugins>
Modified: projects/aop/trunk/pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/trunk/pluggable-instrumentor/pom.xml 2008-09-22 16:24:29 UTC (rev 78758)
+++ projects/aop/trunk/pluggable-instrumentor/pom.xml 2008-09-22 20:28:02 UTC (rev 78759)
@@ -6,10 +6,8 @@
<artifactId>jboss-aop-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.aop</groupId>
<artifactId>pluggable-instrumentor</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
<name>JBoss AOP Pluggable Instrumentor</name>
<build>
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2008-09-22 16:24:29 UTC (rev 78758)
+++ projects/aop/trunk/pom.xml 2008-09-22 20:28:02 UTC (rev 78759)
@@ -264,6 +264,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloader</artifactId>
<version>${version.org.jboss.cl}</version>
@@ -404,6 +409,12 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<version>${version.org.jboss.logging}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.man</groupId>
@@ -429,6 +440,10 @@
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list