[jboss-cvs] JBossAS SVN: r78713 - in projects/aop/trunk: aop and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 19 14:01:32 EDT 2008
Author: pgier
Date: 2008-09-19 14:01:32 -0400 (Fri, 19 Sep 2008)
New Revision: 78713
Added:
projects/aop/trunk/aop/src/assembly/
projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml
projects/aop/trunk/aop/src/assembly/jdk50-client.xml
projects/aop/trunk/aop/src/assembly/jdk50-single.xml
projects/aop/trunk/aop/src/assembly/jdk50-sources.xml
projects/aop/trunk/aop/src/assembly/jdk50.xml
projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml
projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml
Modified:
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration/build-test.xml
projects/aop/trunk/asintegration/pom.xml
projects/aop/trunk/build/build.xml
projects/aop/trunk/pom.xml
projects/aop/trunk/thirdparty/pom.xml
projects/aop/trunk/tools/lib/buildmagic-tasks.jar
Log:
[JBBUILD-491] Create maven assemblies for aop jars. Build aop module with maven instead of ant.
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-09-19 14:56:20 UTC (rev 78712)
+++ projects/aop/trunk/aop/pom.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -49,42 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!--<executions>
- <execution>
- <id>javaagent-genadvisor-tests</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>org/jboss/test/aop/**/GenAdvisorOverrideTestCase.java</include>
- </includes>
- <excludes>
- <exclude>org/jboss/test/aop/reflection/ReflectionAspectTester.java</exclude>
- <exclude>org/jboss/test/aop/basic/POJOAspectTester.java</exclude>
- </excludes>
- <argLine>-javaagent:target/jboss-aop-jdk50.jar</argLine>
- <systemProperties>
- <property>
- <name>jboss.aop.path</name>
- <value>src/resources/test/override/jboss-aop.xml</value>
- </property>
- <property>
- <name>jboss.aop.class.path</name>
- <value></value>
- </property>
- <property>
- <name>jboss.aop.instrumentor</name>
- <value>org.jboss.aop.instrument.GeneratedAdvisorInstrumentor</value>
- </property>
- <property>
- <name>jboss-junit-configuration</name>
- <value>javaagent-genadvisor-tests</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>-->
+ <version>2.4.3</version>
<configuration>
<skip>true</skip>
<forkMode>always</forkMode>
@@ -96,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<archive>
<manifestEntries>
@@ -107,11 +72,11 @@
</configuration>
</plugin>
<!-- When assembly plugin 2.2-beta-2 is released, we should be able to use
- - this configuration instead of the antrun config
+ - this configuration instead of the antrun config -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2-SNAPSHOT</version>
+ <version>2.2-beta-2</version>
<executions>
<execution>
<id>jdk50</id>
@@ -182,130 +147,75 @@
</archive>
</configuration>
</execution>
+ <execution>
+ <id>jdk50-single</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/jdk50-single.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${pom.url}</Implementation-URL>
+ <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
+ <Can-Redefine-Classes>true</Can-Redefine-Classes>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
</executions>
- </plugin>-->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<executions>
<execution>
- <!-- This execution is required until the assembly plugin can correctly
- - add custom manifest attributes to jar files.
- -->
- <id>create-jars</id>
+ <id>copy-output-jars</id>
<goals>
<goal>run</goal>
</goals>
<phase>package</phase>
<configuration>
<tasks>
- <property name="java.vm.version" value="${java.vm.version}"/>
- <!-- Build the jboss-aop-jdk50.jar -->
- <jar destfile="${project.build.directory}/jboss-aop-jdk50.jar">
- <fileset dir="${project.build.outputDirectory}">
- <exclude name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
- </fileset>
- <fileset file="${project.basedir}/docs/jboss-aop_1_0.dtd"/>
- <fileset file ="${project.basedir}/src/etc/jbossorg-eula.txt"/>
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Build-Jdk" value="${java.vm.version}"/>
- <attribute name="Specification-Title" value="${project.name}"/>
- <attribute name="Specification-Version" value="${project.version}"/>
- <attribute name="Specification-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Title" value="${project.name}"/>
- <attribute name="Implementation-URL" value="${project.url}"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
- <attribute name="Premain-Class" value="org.jboss.aop.standalone.Agent"/>
- <attribute name="Can-Redefine-Classes" value="true"/>
- </manifest>
- </jar>
- <jar destfile="${project.build.directory}/pluggable-instrumentor.jar">
- <fileset dir="${project.build.outputDirectory}">
- <!-- Include everything else -->
- <include name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
- </fileset>
- <fileset file ="${project.basedir}/src/etc/jbossorg-eula.txt"/>
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Build-Jdk" value="${java.vm.version}"/>
- <attribute name="Specification-Title" value="${project.name}"/>
- <attribute name="Specification-Version" value="${project.version}"/>
- <attribute name="Specification-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Title" value="${project.name}"/>
- <attribute name="Implementation-URL" value="${project.url}"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
- <attribute name="Premain-Class" value="org.jboss.aop.standalone.PluggableInstrumentor"/>
- <attribute name="Can-Redefine-Classes" value="true"/>
- </manifest>
- </jar>
- <!-- Build the jboss-aop-jdk50-client.jar needed for EJB 3-->
- <jar destfile="${project.build.directory}/jboss-aop-jdk50-client.jar">
- <fileset dir="${project.build.outputDirectory}">
- <!-- Include everything else -->
- <include name="org/jboss/lang/**"/>
- <include name="org/jboss/aop/Advisor.class"/>
- <include name="org/jboss/aop/AspectManager.class"/>
- <include name="org/jboss/aop/AspectManager$*.class"/>
- <include name="org/jboss/aop/ClassAdvisor.class"/>
- <include name="org/jboss/aop/ClassInstanceAdvisor.class"/>
- <include name="org/jboss/aop/InstanceAdvisorDelegate.class"/>
- <include name="org/jboss/aop/Domain.class"/>
- <include name="org/jboss/aop/InstanceAdvisor.class"/>
- <include name="org/jboss/aop/MethodInfo.class"/>
- <include name="org/jboss/aop/InterceptorChainObserver.class"/>
- <include name="org/jboss/aop/JoinPoint.class"/>
- <include name="org/jboss/aop/JoinPointInfo.class"/>
- <include name="org/jboss/aop/MethodJoinPoint.class"/>
- <include name="org/jboss/aop/*Dispatcher*.class"/>
- <include name="org/jboss/aop/*Advised.class"/>
- <include name="org/jboss/aop/advice/AspectDefinition.class"/>
- <include name="org/jboss/aop/advice/Interceptor.class"/>
- <include name="org/jboss/aop/instrument/Untransformable.class"/>
- <include name="org/jboss/aop/joinpoint/Invocation*.class"/>
- <include name="org/jboss/aop/joinpoint/Joinpoint.class"/>
- <include name="org/jboss/aop/joinpoint/MethodInvocation*.class"/>
- <include name="org/jboss/aop/joinpoint/MethodJoinpoint.class"/>
- <include name="org/jboss/aop/metadata/SimpleMetaData.class"/>
- <include name="org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.class"/>
- <include name="org/jboss/aop/metadata/MetaDataResolver.class"/>
- <include name="org/jboss/aop/metadata/ThreadMetaData.class"/>
- <include name="org/jboss/aop/proxy/MarshalledInterfaceProxy.class"/>
- <include name="org/jboss/aop/proxy/MethodMapped.class"/>
- <include name="org/jboss/aop/proxy/Proxy.class"/>
- <include name="org/jboss/aop/proxy/ProxyFactory.class"/>
- <include name="org/jboss/aop/proxy/ProxyMixin.class"/>
- <include name="org/jboss/aop/util/SecurityActions*.class"/>
- <include name="org/jboss/aop/util/Marshalled*.class"/>
- <include name="org/jboss/aop/util/MethodHashing*.class"/>
- <include name="org/jboss/aop/util/PayloadKey*.class"/>
- </fileset>
- <fileset file ="${project.basedir}/src/etc/jbossorg-eula.txt"/>
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Build-Jdk" value="${java.vm.version}"/>
- <attribute name="Specification-Title" value="${project.name}"/>
- <attribute name="Specification-Version" value="${project.version}"/>
- <attribute name="Specification-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Title" value="${project.name}"/>
- <attribute name="Implementation-URL" value="${project.url}"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
- <attribute name="Premain-Class" value="org.jboss.aop.standalone.Agent"/>
- <attribute name="Can-Redefine-Classes" value="true"/>
- </manifest>
- </jar>
+ <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}/jboss-aop-${project.version}-jdk50.jar"
+ tofile="${basedir}/output/lib/jboss-aop-jdk50.jar"/>
+ <copy file="${project.build.directory}/jboss-aop-${project.version}-jdk50-client.jar"
+ tofile="${basedir}/output/lib/jboss-aop-jdk50-client.jar"/>
+ <copy file="${project.build.directory}/jboss-aop-${project.version}-jdk50-single.jar"
+ tofile="${basedir}/output/lib/jboss-aop-jdk50-single.jar"/>
+ <copy file="${project.build.directory}/jboss-aop-${project.version}-pluggable-instrumentor.jar"
+ tofile="${basedir}/output/lib/pluggable-instrumentor.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>
@@ -369,6 +279,17 @@
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Included for assembly of jdk50-single jar -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </dependency>
+
</dependencies>
<profiles>
Added: projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -0,0 +1,64 @@
+<assembly>
+ <id>jdk50-client-sources</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/lang/**</include>
+ <include>org/jboss/aop/Advisor.java</include>
+ <include>org/jboss/aop/AspectManager.java</include>
+ <include>org/jboss/aop/AspectManager$*.java</include>
+ <include>org/jboss/aop/ClassAdvisor.java</include>
+ <include>org/jboss/aop/ClassInstanceAdvisor.java</include>
+ <include>org/jboss/aop/DynamicAOPStrategy.java</include>
+ <include>org/jboss/aop/InstanceAdvisorDelegate.java</include>
+ <include>org/jboss/aop/Domain.java</include>
+ <include>org/jboss/aop/InstanceAdvisor.java</include>
+ <include>org/jboss/aop/MethodInfo.java</include>
+ <include>org/jboss/aop/InterceptorChainObserver.java</include>
+ <include>org/jboss/aop/JoinPoint.java</include>
+ <include>org/jboss/aop/JoinPointInfo.java</include>
+ <include>org/jboss/aop/MethodJoinPoint.java</include>
+ <include>org/jboss/aop/*Dispatcher*.java</include>
+ <include>org/jboss/aop/*Advised.java</include>
+ <include>org/jboss/aop/WeavingStrategy.java</include>
+ <include>org/jboss/aop/advice/AspectDefinition.java</include>
+ <include>org/jboss/aop/advice/Interceptor.java</include>
+ <include>org/jboss/aop/instrument/Untransformable.java</include>
+ <include>org/jboss/aop/joinpoint/Invocation*.java</include>
+ <include>org/jboss/aop/joinpoint/Joinpoint.java</include>
+ <include>org/jboss/aop/joinpoint/JoinPointBean.java</include>
+ <include>org/jboss/aop/joinpoint/MethodExecution.java</include>
+ <include>org/jboss/aop/joinpoint/MethodInvocation*.java</include>
+ <include>org/jboss/aop/joinpoint/MethodJoinpoint.java</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData.java</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.java</include>
+ <include>org/jboss/aop/metadata/MetaDataResolver.java</include>
+ <include>org/jboss/aop/metadata/ThreadMetaData.java</include>
+ <include>org/jboss/aop/pointcut/PointcutStats.java</include>
+ <include>org/jboss/aop/proxy/MarshalledInterfaceProxy.java</include>
+ <include>org/jboss/aop/proxy/MethodMapped.java</include>
+ <include>org/jboss/aop/proxy/Proxy.java</include>
+ <include>org/jboss/aop/proxy/ProxyFactory.java</include>
+ <include>org/jboss/aop/proxy/ProxyMixin.java</include>
+ <include>org/jboss/aop/proxy/container/*.java</include>
+ <include>org/jboss/aop/util/SecurityActions*.java</include>
+ <include>org/jboss/aop/util/Marshalled*.java</include>
+ <include>org/jboss/aop/util/MethodHashing*.java</include>
+ <include>org/jboss/aop/util/PayloadKey*.java</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/aop/src/assembly/jdk50-client-sources.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/aop/src/assembly/jdk50-client.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-client.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/jdk50-client.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -0,0 +1,64 @@
+<assembly>
+ <id>jdk50-client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/lang/**</include>
+ <include>org/jboss/aop/Advisor.class</include>
+ <include>org/jboss/aop/AspectManager.class</include>
+ <include>org/jboss/aop/AspectManager$*.class</include>
+ <include>org/jboss/aop/ClassAdvisor.class</include>
+ <include>org/jboss/aop/ClassInstanceAdvisor.class</include>
+ <include>org/jboss/aop/DynamicAOPStrategy.class</include>
+ <include>org/jboss/aop/InstanceAdvisorDelegate.class</include>
+ <include>org/jboss/aop/Domain.class</include>
+ <include>org/jboss/aop/InstanceAdvisor.class</include>
+ <include>org/jboss/aop/MethodInfo.class</include>
+ <include>org/jboss/aop/InterceptorChainObserver.class</include>
+ <include>org/jboss/aop/JoinPoint.class</include>
+ <include>org/jboss/aop/JoinPointInfo.class</include>
+ <include>org/jboss/aop/MethodJoinPoint.class</include>
+ <include>org/jboss/aop/*Dispatcher*.class</include>
+ <include>org/jboss/aop/*Advised.class</include>
+ <include>org/jboss/aop/WeavingStrategy.class</include>
+ <include>org/jboss/aop/advice/AspectDefinition.class</include>
+ <include>org/jboss/aop/advice/Interceptor.class</include>
+ <include>org/jboss/aop/instrument/Untransformable.class</include>
+ <include>org/jboss/aop/joinpoint/Invocation*.class</include>
+ <include>org/jboss/aop/joinpoint/Joinpoint.class</include>
+ <include>org/jboss/aop/joinpoint/JoinPointBean.class</include>
+ <include>org/jboss/aop/joinpoint/MethodExecution.class</include>
+ <include>org/jboss/aop/joinpoint/MethodInvocation*.class</include>
+ <include>org/jboss/aop/joinpoint/MethodJoinpoint.class</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData.class</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.class</include>
+ <include>org/jboss/aop/metadata/MetaDataResolver.class</include>
+ <include>org/jboss/aop/metadata/ThreadMetaData.class</include>
+ <include>org/jboss/aop/pointcut/PointcutStats.class</include>
+ <include>org/jboss/aop/proxy/MarshalledInterfaceProxy.class</include>
+ <include>org/jboss/aop/proxy/MethodMapped.class</include>
+ <include>org/jboss/aop/proxy/Proxy.class</include>
+ <include>org/jboss/aop/proxy/ProxyFactory.class</include>
+ <include>org/jboss/aop/proxy/ProxyMixin.class</include>
+ <include>org/jboss/aop/proxy/container/*.class</include>
+ <include>org/jboss/aop/util/SecurityActions*.class</include>
+ <include>org/jboss/aop/util/Marshalled*.class</include>
+ <include>org/jboss/aop/util/MethodHashing*.class</include>
+ <include>org/jboss/aop/util/PayloadKey*.class</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/aop/src/assembly/jdk50-client.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/aop/src/assembly/jdk50-single.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-single.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/jdk50-single.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -0,0 +1,32 @@
+<assembly>
+ <id>jdk50-single</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.aop:jboss-aop</include>
+ <include>javassist:javassist</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss.logging:jboss-logging-log4j</include>
+ <include>org.jboss.logging:jboss-logging-spi</include>
+ <include>log4j:log4j</include>
+ <include>trove:trove</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>docs/jboss-aop_1_0.dtd</include>
+ <include>src/etc/jbossorg-eula.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: projects/aop/trunk/aop/src/assembly/jdk50-single.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/aop/src/assembly/jdk50-sources.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-sources.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/jdk50-sources.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -0,0 +1,23 @@
+<assembly>
+ <id>pluggable-instrumentor</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>org/jboss/aop/standalone/PluggableInstrumentor.java</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/aop/src/assembly/jdk50-sources.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/aop/src/assembly/jdk50.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/jdk50.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -0,0 +1,23 @@
+<assembly>
+ <id>jdk50</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>org/jboss/aop/standalone/PluggableInstrumentor.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/aop/src/assembly/jdk50.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -0,0 +1,23 @@
+<assembly>
+ <id>pluggable-instrumentor-sources</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/aop/standalone/PluggableInstrumentor.java</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/aop/src/assembly/pluggable-instrumentor-sources.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -0,0 +1,23 @@
+<assembly>
+ <id>pluggable-instrumentor</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/aop/standalone/PluggableInstrumentor.class</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/aop/src/assembly/pluggable-instrumentor.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/aop/trunk/asintegration/build-test.xml
===================================================================
--- projects/aop/trunk/asintegration/build-test.xml 2008-09-19 14:56:20 UTC (rev 78712)
+++ projects/aop/trunk/asintegration/build-test.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -81,7 +81,7 @@
<path refid="javassist.classpath"/>
<path refid="jbossas.core.libs.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
+ <path refid="org.jboss.microcontainer.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="oswego.concurrent.classpath"/>
Modified: projects/aop/trunk/asintegration/pom.xml
===================================================================
--- projects/aop/trunk/asintegration/pom.xml 2008-09-19 14:56:20 UTC (rev 78712)
+++ projects/aop/trunk/asintegration/pom.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -14,7 +14,7 @@
<url>http://labs.jboss.com/portal/jbossaop</url>
<build>
<sourceDirectory>src/main/</sourceDirectory>
- <testSourceDirectory>src/test/</testSourceDirectory>
+ <testSourceDirectory>src/tests/</testSourceDirectory>
<resources>
<resource>
<directory>src/resources</directory>
@@ -31,6 +31,18 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
@@ -46,10 +58,6 @@
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
@@ -78,18 +86,14 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
<scope>compile</scope>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2008-09-19 14:56:20 UTC (rev 78712)
+++ projects/aop/trunk/build/build.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -79,7 +79,7 @@
<moduleconfig property="modules" selected="${groups}">
<!-- Modules -->
- <module name="aop"/>
+ <!--<module name="aop"/>-->
<module name="asintegration"/>
<module name="aspects"/>
@@ -93,7 +93,7 @@
</group>
<group name="core">
- <include modules="aop"/>
+ <!--<include modules="aop"/>-->
<include modules="asintegration"/>
<include modules="aspects"/>
</group>
@@ -250,7 +250,7 @@
<!-- ================================================================== -->
<!-- Clean up all build output -->
- <target name="clean" depends="createthirdparty,_buildmagic:clean, modules-clean"
+ <target name="clean" depends="createthirdparty,maven-build-clean,_buildmagic:clean, modules-clean"
description="Cleans up most generated files.">
<delete dir="output"/>
</target>
@@ -269,15 +269,13 @@
<target name="main" depends="most"
description="Executes the default target (most)."/>
- <target name="most" depends="createthirdparty, modules-most, install"
+ <target name="most" depends="createthirdparty, maven-build-install, modules-most, install"
description="Executes all modules and builds most everything."/>
<target name="help" depends="_buildmagic:help:build"
description="Show this help message."/>
- <!-- create the thirdparty folder from items in the repository -->
- <!-- then generate a new libraries.ent file and include it in -->
- <!-- the build -->
+ <!-- Define a macro for calling maven -->
<macrodef name="maven">
<attribute name="goal" />
<attribute name="basedir" />
@@ -299,18 +297,21 @@
</classpath>
<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
<sysproperty key="maven.home" value="${maven.dir}" />
- <arg line="--batch-mode ${thirdparty.maven.opts} @{goal}" />
+ <arg line="--batch-mode -Pant-integration-build ${thirdparty.maven.opts} @{goal}" />
</java>
</sequential>
</macrodef>
+ <!-- create the thirdparty folder from items in the repository -->
+ <!-- then generate a new libraries.ent file and include it in -->
+ <!-- the build -->
<target name="createthirdparty" unless="inhibit.downloads"
depends="check.inhibit.downloads, set.proxy">
<property name="maven.dir" value="${basedir}/../tools/maven"/>
<property name="thirdparty.maven.opts" value=""/>
- <maven basedir="${basedir}/../thirdparty" goal="package"/>
+ <maven basedir="${basedir}/../thirdparty" goal="generate-resources"/>
<fail message="Unable to build thirdparty directory. See maven output for details.">
<condition>
@@ -322,6 +323,42 @@
</target>
+ <!-- Run the maven part of the build -->
+ <target name="maven-build-install" depends="createthirdparty">
+
+ <property name="maven.dir" value="${basedir}/../tools/maven"/>
+ <property name="thirdparty.maven.opts" value=""/>
+
+ <maven basedir="${basedir}/../" goal="install"/>
+
+ <fail message="Unable to build maven modules. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+
+ </target>
+
+ <!-- Clean the maven part of the build -->
+ <target name="maven-build-clean" depends="createthirdparty">
+
+ <property name="maven.dir" value="${basedir}/../tools/maven"/>
+ <property name="thirdparty.maven.opts" value=""/>
+
+ <maven basedir="${basedir}/../" goal="clean"/>
+
+ <fail message="Unable to clean maven modules. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+
+ </target>
+
<!-- check if thirdparty libraries are to be downloaded -->
<target name="check.inhibit.downloads">
<condition property="inhibit.downloads">
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2008-09-19 14:56:20 UTC (rev 78712)
+++ projects/aop/trunk/pom.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -36,6 +36,34 @@
<version.xdoclet>1.2.3</version.xdoclet>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.0.9</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.5</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -349,11 +377,23 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-jmx</artifactId>
<version>${version.org.jboss.jbossas}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
<version>${version.org.jboss.jbossas}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -466,7 +506,7 @@
<profiles>
<profile>
- <id>default-modules</id>
+ <id>default-build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -477,9 +517,9 @@
</modules>
</profile>
<profile>
- <id>ant-integration-modules</id>
+ <id>ant-integration-build</id>
<modules>
- <module>thirdparty</module>
+ <module>aop</module>
</modules>
</profile>
</profiles>
Modified: projects/aop/trunk/thirdparty/pom.xml
===================================================================
--- projects/aop/trunk/thirdparty/pom.xml 2008-09-19 14:56:20 UTC (rev 78712)
+++ projects/aop/trunk/thirdparty/pom.xml 2008-09-19 18:01:32 UTC (rev 78713)
@@ -15,8 +15,6 @@
<build>
- <sourceDirectory>src/main</sourceDirectory>
-
<plugins>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
@@ -36,7 +34,7 @@
<scope>compile</scope>
<scope>test</scope>
</includedScopes>
- <copySources>${copySourceJars}</copySources>
+ <copySources>true</copySources>
</configuration>
</execution>
</executions>
@@ -597,19 +595,15 @@
<goals>
<goal>sources</goal>
</goals>
+ <configuration>
+ <silent>true</silent>
+ </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <properties>
- <copySourceJars>true</copySourceJars>
- </properties>
</profile>
</profiles>
- <properties>
- <copySourceJars>false</copySourceJars>
- </properties>
-
</project>
Modified: projects/aop/trunk/tools/lib/buildmagic-tasks.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list