[jboss-cvs] JBossAS SVN: r107671 - in projects/aop/tags: JBoss_AOP_2_1_6_GA_CP01 and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 18 12:42:35 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-08-18 12:42:34 -0400 (Wed, 18 Aug 2010)
New Revision: 107671
Added:
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aophelper/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-core/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-jmx/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-mc/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aspects/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/build/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/deployers/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pluggable-instrumentor/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pom.xml
Removed:
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aophelper/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-core/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-jmx/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-mc/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aspects/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/build/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/deployers/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pluggable-instrumentor/pom.xml
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pom.xml
Modified:
projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/jrockit-pluggable-instrumentor/pom.xml
Log:
[maven-release-plugin] copy for tag JBoss_AOP_2_1_6_GA_CP01
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01 (from rev 107581, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP)
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,448 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <packaging>jar</packaging>
- <name>JBoss AOP Framework</name>
- <description>JBoss AOP Framework</description>
- <url>http://www.jboss.org/jbossaop</url>
- <build>
- <finalName>${artifactId}</finalName>
- <resources>
- <resource>
- <directory>docs</directory>
- <includes>
- <include>jboss-aop_1_0.dtd</include>
- <include>jboss-aop_2_0.xsd</include>
- </includes>
- </resource>
- <resource>
- <directory>src/etc</directory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/test</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
- <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>
- <!-- The tests here are skipped, and for now
- - they should be run with ant until some of the maven issues
- - can be worked out. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <skip>true</skip>
- <forkMode>always</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <trimStackTrace>false</trimStackTrace>
- <useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>create-test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestEntries>
- <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <executions>
- <execution>
- <id>jdk50-client</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/client.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- <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>
- <execution>
- <id>client-sources</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/client-sources.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>single</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/single.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- <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>
- <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="${project.build.directory}/lib" />
- <copy todir="${project.build.directory}/etc">
- <fileset dir="${basedir}/src/etc" />
- </copy>
- <copy file="${project.build.directory}/${project.artifactId}.jar" tofile="${project.build.directory}/lib/jboss-aop.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-sources.jar" tofile="${project.build.directory}/lib/jboss-aop-sources.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-client.jar" tofile="${project.build.directory}/lib/jboss-aop-client.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar" tofile="${project.build.directory}/lib/jboss-aop-client-sources.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-single.jar" tofile="${project.build.directory}/lib/jboss-aop-single.jar" />
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>public-api</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>site</phase>
- <configuration>
- <tasks>
- <property name="source.java" value="${project.build.sourceDirectory}" />
-
- <javadoc sourcepath="${project.build.sourceDirectory}" destdir="${project.build.directory}/site/public-apidocs" classpathref="maven.compile.classpath" verbose="false">
- <doctitle><![CDATA[<h1>${project.name} Final User API Documentation</h1>]]></doctitle>
- <bottom><![CDATA[
- <i>
- <div align="center">
- <font size="-1">Copyright © 2004 JBoss Inc. All Rights Reserved.</font>
- </div>
- </i>
- ]]></bottom>
- <source file="${source.java}/org/jboss/aop/AdviceType.java" />
- <source file="${source.java}/org/jboss/aop/Advised.java" />
- <source file="${source.java}/org/jboss/aop/Advisor.java" />
- <source file="${source.java}/org/jboss/aop/AnnotationIntroductionDef.java" />
- <source file="${source.java}/org/jboss/aop/Aspect.java" />
- <source file="${source.java}/org/jboss/aop/AspectManager.java" />
- <source file="${source.java}/org/jboss/aop/CallerConstructorInfo.java" />
- <source file="${source.java}/org/jboss/aop/CallerMethodInfo.java" />
- <source file="${source.java}/org/jboss/aop/CFlowDef.java" />
- <source file="${source.java}/org/jboss/aop/CFlowStackDef.java" />
- <source file="${source.java}/org/jboss/aop/ClassAdvisor.java" /><!--?? Keep this one??? -->
- <source file="${source.java}/org/jboss/aop/ConByConInfo.java" />
- <source file="${source.java}/org/jboss/aop/ConByMethodInfo.java" />
- <source file="${source.java}/org/jboss/aop/ConstructionInfo.java" />
- <source file="${source.java}/org/jboss/aop/ConstructorInfo.java" />
- <source file="${source.java}/org/jboss/aop/DeclareError.java" />
- <source file="${source.java}/org/jboss/aop/DeclareWarning.java" />
- <source file="${source.java}/org/jboss/aop/Domain.java" />
- <source file="${source.java}/org/jboss/aop/DomainDefinition.java" /> <!-- Keep this one?? -->
- <source file="${source.java}/org/jboss/aop/DynamicCFlowDef.java" />
- <source file="${source.java}/org/jboss/aop/FieldInfo.java" />
- <source file="${source.java}/org/jboss/aop/MethodByConInfo.java" />
- <source file="${source.java}/org/jboss/aop/MethodByMethodInfo.java" />
- <source file="${source.java}/org/jboss/aop/MethodInfo.java" />
- <source file="${source.java}/org/jboss/aop/InstanceAdvised.java" />
- <source file="${source.java}/org/jboss/aop/InstanceAdvisor.java" />
- <source file="${source.java}/org/jboss/aop/InstanceDomain.java" /> <!--?? Keep this one here?? -->
- <source file="${source.java}/org/jboss/aop/Introduction.java" />
- <source file="${source.java}/org/jboss/aop/Mixin.java" />
- <source file="${source.java}/org/jboss/aop/PointcutDef.java" />
- <source file="${source.java}/org/jboss/aop/Precedence.java" />
- <source file="${source.java}/org/jboss/aop/PrecedenceAdvice.java" />
- <source file="${source.java}/org/jboss/aop/PrecedenceInterceptor.java" />
- <source file="${source.java}/org/jboss/aop/Prepare.java" />
- <source file="${source.java}/org/jboss/aop/TypeDef.java" />
- <source file="${source.java}/org/jboss/aop/advice/AdviceBinding.java" />
- <source file="${source.java}/org/jboss/aop/advice/AdviceFactory.java" />
- <source file="${source.java}/org/jboss/aop/advice/AspectDefinition.java" />
- <source file="${source.java}/org/jboss/aop/advice/AspectFactory.java" />
- <source file="${source.java}/org/jboss/aop/advice/GenericAspectFactory.java" />
- <source file="${source.java}/org/jboss/aop/advice/GenericInterceptorFactory.java" />
- <source file="${source.java}/org/jboss/aop/advice/Interceptor.java" />
- <source file="${source.java}/org/jboss/aop/advice/InterceptorFactory.java" />
- <source file="${source.java}/org/jboss/aop/advice/InvalidAdviceException.java" />
- <source file="${source.java}/org/jboss/aop/advice/NoMatchingAdviceException.java" />
- <source file="${source.java}/org/jboss/aop/advice/Scope.java" />
- <source file="${source.java}/org/jboss/aop/advice/annotation/Arg.java" />
- <source file="${source.java}/org/jboss/aop/advice/annotation/Args.java" />
- <source file="${source.java}/org/jboss/aop/advice/annotation/Caller.java" />
- <source file="${source.java}/org/jboss/aop/advice/annotation/JoinPoint.java" />
- <source file="${source.java}/org/jboss/aop/advice/annotation/Return.java" />
- <source file="${source.java}/org/jboss/aop/advice/annotation/Target.java" />
- <source file="${source.java}/org/jboss/aop/advice/annotation/Thrown.java" />
- <source file="${source.java}/org/jboss/aop/annotation/compiler/AnnotationCompiler.java" /> <!-- ?? Investigate more on this package before decide what to keep here -->
- <source file="${source.java}/org/jboss/aop/ant/AnnotationC.java" />
- <source file="${source.java}/org/jboss/aop/ant/AopC.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/CallerInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/ConstructionInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/ConstructorCalledByConstructorInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/ConstructorCalledByMethodInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/ConstructorInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/CurrentInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/FieldInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/FieldReadInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/FieldWriteInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/Invocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/Joinpoint.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/MethodCalledByConstructorInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/MethodCalledByMethodInvocation.java" />
- <source file="${source.java}/org/jboss/aop/joinpoint/MethodInvocation.java" />
- <source file="${source.java}/org/jboss/aop/metadata/SimpleMetaData.java" />
- <!-- TODO add metadata binding here -->
- <source file="${source.java}/org/jboss/aop/pointcut/DynamicCFlow.java" />
- <source file="${source.java}/org/jboss/aop/pointcut/Pointcut.java" />
- <source file="${source.java}/org/jboss/aop/pointcut/ast/ParseException.java" />
-
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
- </javadoc>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- </dependency>
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <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>
- <profile>
- <id>jrockit-build</id>
- <activation>
- <property>
- <name>jrockit.home</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>jrockit-compile</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <echo message="jrockit.home=${jrockit.home}" />
- <!-- in older versions of jrockit the weaving stuff lives in managementapi.jar, in newer in management-agent.jar -->
- <available file="${jrockit.home}/jre/lib/managementapi.jar" property="OLD_JROCKIT" value="managementapi.jar" />
- <available file="${jrockit.home}/jre/lib/management-agent.jar" property="NEW_JROCKIT" value="rt.jar" />
- <condition property="JROCKIT_API_AVAILABLE" value="${OLD_JROCKIT}">
- <and>
- <isset property="OLD_JROCKIT" />
- <not>
- <isset property="NEW_JROCKIT" />
- </not>
- </and>
- </condition>
- <condition property="JROCKIT_API_AVAILABLE" value="${NEW_JROCKIT}">
- <and>
- <isset property="NEW_JROCKIT" />
- <not>
- <isset property="OLD_JROCKIT" />
- </not>
- </and>
- </condition>
- <path id="javac.jrockit.classpath">
- <path refid="maven.compile.classpath" />
- <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}" />
- </path>
-
- <property name="build.compiler" value="extJavac" />
- <fail unless="JROCKIT_API_AVAILABLE">
- JRockit API Not Available. Skipping JRockit compile.
- </fail>
- <javac destdir="${project.build.outputDirectory}" target="1.4" source="1.4">
- <src path="${project.build.sourceDirectory}" />
- <include name="org/jboss/aop/hook/JRockit*" />
- <classpath refid="javac.jrockit.classpath" />
- </javac>
- <mkdir dir="${project.build.directory}/lib" />
- <jar jarfile="${project.build.directory}/lib/jrockit-pluggable-instrumentor.jar" manifest="${basedir}/src/etc/default.mf">
- <fileset dir="${project.build.outputDirectory}">
- <include name="org/jboss/aop/hook/JRockitPluggableClassPreProcessor.class" />
- <include name="org/jboss/aop/hook/JDK14*.class" />
- </fileset>
- <fileset file="${basedir}/src/etc/jbossorg-eula.txt" />
- </jar>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,448 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss AOP Framework</name>
+ <description>JBoss AOP Framework</description>
+ <url>http://www.jboss.org/jbossaop</url>
+ <build>
+ <finalName>${artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>docs</directory>
+ <includes>
+ <include>jboss-aop_1_0.dtd</include>
+ <include>jboss-aop_2_0.xsd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/etc</directory>
+ <includes>
+ <include>jbossorg-eula.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources/test</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <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>
+ <!-- The tests here are skipped, and for now
+ - they should be run with ant until some of the maven issues
+ - can be worked out. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <skip>true</skip>
+ <forkMode>always</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>create-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
+ <Can-Redefine-Classes>true</Can-Redefine-Classes>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>jdk50-client</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/client.xml</descriptor>
+ </descriptors>
+ <finalName>${artifactId}</finalName>
+ <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>
+ <execution>
+ <id>client-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/client-sources.xml</descriptor>
+ </descriptors>
+ <finalName>${artifactId}</finalName>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${pom.url}</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>single</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/single.xml</descriptor>
+ </descriptors>
+ <finalName>${artifactId}</finalName>
+ <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>
+ <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="${project.build.directory}/lib" />
+ <copy todir="${project.build.directory}/etc">
+ <fileset dir="${basedir}/src/etc" />
+ </copy>
+ <copy file="${project.build.directory}/${project.artifactId}.jar" tofile="${project.build.directory}/lib/jboss-aop.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-sources.jar" tofile="${project.build.directory}/lib/jboss-aop-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client.jar" tofile="${project.build.directory}/lib/jboss-aop-client.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar" tofile="${project.build.directory}/lib/jboss-aop-client-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-single.jar" tofile="${project.build.directory}/lib/jboss-aop-single.jar" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>public-api</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>site</phase>
+ <configuration>
+ <tasks>
+ <property name="source.java" value="${project.build.sourceDirectory}" />
+
+ <javadoc sourcepath="${project.build.sourceDirectory}" destdir="${project.build.directory}/site/public-apidocs" classpathref="maven.compile.classpath" verbose="false">
+ <doctitle><![CDATA[<h1>${project.name} Final User API Documentation</h1>]]></doctitle>
+ <bottom><![CDATA[
+ <i>
+ <div align="center">
+ <font size="-1">Copyright © 2004 JBoss Inc. All Rights Reserved.</font>
+ </div>
+ </i>
+ ]]></bottom>
+ <source file="${source.java}/org/jboss/aop/AdviceType.java" />
+ <source file="${source.java}/org/jboss/aop/Advised.java" />
+ <source file="${source.java}/org/jboss/aop/Advisor.java" />
+ <source file="${source.java}/org/jboss/aop/AnnotationIntroductionDef.java" />
+ <source file="${source.java}/org/jboss/aop/Aspect.java" />
+ <source file="${source.java}/org/jboss/aop/AspectManager.java" />
+ <source file="${source.java}/org/jboss/aop/CallerConstructorInfo.java" />
+ <source file="${source.java}/org/jboss/aop/CallerMethodInfo.java" />
+ <source file="${source.java}/org/jboss/aop/CFlowDef.java" />
+ <source file="${source.java}/org/jboss/aop/CFlowStackDef.java" />
+ <source file="${source.java}/org/jboss/aop/ClassAdvisor.java" /><!--?? Keep this one??? -->
+ <source file="${source.java}/org/jboss/aop/ConByConInfo.java" />
+ <source file="${source.java}/org/jboss/aop/ConByMethodInfo.java" />
+ <source file="${source.java}/org/jboss/aop/ConstructionInfo.java" />
+ <source file="${source.java}/org/jboss/aop/ConstructorInfo.java" />
+ <source file="${source.java}/org/jboss/aop/DeclareError.java" />
+ <source file="${source.java}/org/jboss/aop/DeclareWarning.java" />
+ <source file="${source.java}/org/jboss/aop/Domain.java" />
+ <source file="${source.java}/org/jboss/aop/DomainDefinition.java" /> <!-- Keep this one?? -->
+ <source file="${source.java}/org/jboss/aop/DynamicCFlowDef.java" />
+ <source file="${source.java}/org/jboss/aop/FieldInfo.java" />
+ <source file="${source.java}/org/jboss/aop/MethodByConInfo.java" />
+ <source file="${source.java}/org/jboss/aop/MethodByMethodInfo.java" />
+ <source file="${source.java}/org/jboss/aop/MethodInfo.java" />
+ <source file="${source.java}/org/jboss/aop/InstanceAdvised.java" />
+ <source file="${source.java}/org/jboss/aop/InstanceAdvisor.java" />
+ <source file="${source.java}/org/jboss/aop/InstanceDomain.java" /> <!--?? Keep this one here?? -->
+ <source file="${source.java}/org/jboss/aop/Introduction.java" />
+ <source file="${source.java}/org/jboss/aop/Mixin.java" />
+ <source file="${source.java}/org/jboss/aop/PointcutDef.java" />
+ <source file="${source.java}/org/jboss/aop/Precedence.java" />
+ <source file="${source.java}/org/jboss/aop/PrecedenceAdvice.java" />
+ <source file="${source.java}/org/jboss/aop/PrecedenceInterceptor.java" />
+ <source file="${source.java}/org/jboss/aop/Prepare.java" />
+ <source file="${source.java}/org/jboss/aop/TypeDef.java" />
+ <source file="${source.java}/org/jboss/aop/advice/AdviceBinding.java" />
+ <source file="${source.java}/org/jboss/aop/advice/AdviceFactory.java" />
+ <source file="${source.java}/org/jboss/aop/advice/AspectDefinition.java" />
+ <source file="${source.java}/org/jboss/aop/advice/AspectFactory.java" />
+ <source file="${source.java}/org/jboss/aop/advice/GenericAspectFactory.java" />
+ <source file="${source.java}/org/jboss/aop/advice/GenericInterceptorFactory.java" />
+ <source file="${source.java}/org/jboss/aop/advice/Interceptor.java" />
+ <source file="${source.java}/org/jboss/aop/advice/InterceptorFactory.java" />
+ <source file="${source.java}/org/jboss/aop/advice/InvalidAdviceException.java" />
+ <source file="${source.java}/org/jboss/aop/advice/NoMatchingAdviceException.java" />
+ <source file="${source.java}/org/jboss/aop/advice/Scope.java" />
+ <source file="${source.java}/org/jboss/aop/advice/annotation/Arg.java" />
+ <source file="${source.java}/org/jboss/aop/advice/annotation/Args.java" />
+ <source file="${source.java}/org/jboss/aop/advice/annotation/Caller.java" />
+ <source file="${source.java}/org/jboss/aop/advice/annotation/JoinPoint.java" />
+ <source file="${source.java}/org/jboss/aop/advice/annotation/Return.java" />
+ <source file="${source.java}/org/jboss/aop/advice/annotation/Target.java" />
+ <source file="${source.java}/org/jboss/aop/advice/annotation/Thrown.java" />
+ <source file="${source.java}/org/jboss/aop/annotation/compiler/AnnotationCompiler.java" /> <!-- ?? Investigate more on this package before decide what to keep here -->
+ <source file="${source.java}/org/jboss/aop/ant/AnnotationC.java" />
+ <source file="${source.java}/org/jboss/aop/ant/AopC.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/CallerInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/ConstructionInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/ConstructorCalledByConstructorInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/ConstructorCalledByMethodInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/ConstructorInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/CurrentInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/FieldInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/FieldReadInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/FieldWriteInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/Invocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/Joinpoint.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/MethodCalledByConstructorInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/MethodCalledByMethodInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/joinpoint/MethodInvocation.java" />
+ <source file="${source.java}/org/jboss/aop/metadata/SimpleMetaData.java" />
+ <!-- TODO add metadata binding here -->
+ <source file="${source.java}/org/jboss/aop/pointcut/DynamicCFlow.java" />
+ <source file="${source.java}/org/jboss/aop/pointcut/Pointcut.java" />
+ <source file="${source.java}/org/jboss/aop/pointcut/ast/ParseException.java" />
+
+ <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+ </javadoc>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <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>
+ <profile>
+ <id>jrockit-build</id>
+ <activation>
+ <property>
+ <name>jrockit.home</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>jrockit-compile</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <echo message="jrockit.home=${jrockit.home}" />
+ <!-- in older versions of jrockit the weaving stuff lives in managementapi.jar, in newer in management-agent.jar -->
+ <available file="${jrockit.home}/jre/lib/managementapi.jar" property="OLD_JROCKIT" value="managementapi.jar" />
+ <available file="${jrockit.home}/jre/lib/management-agent.jar" property="NEW_JROCKIT" value="rt.jar" />
+ <condition property="JROCKIT_API_AVAILABLE" value="${OLD_JROCKIT}">
+ <and>
+ <isset property="OLD_JROCKIT" />
+ <not>
+ <isset property="NEW_JROCKIT" />
+ </not>
+ </and>
+ </condition>
+ <condition property="JROCKIT_API_AVAILABLE" value="${NEW_JROCKIT}">
+ <and>
+ <isset property="NEW_JROCKIT" />
+ <not>
+ <isset property="OLD_JROCKIT" />
+ </not>
+ </and>
+ </condition>
+ <path id="javac.jrockit.classpath">
+ <path refid="maven.compile.classpath" />
+ <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}" />
+ </path>
+
+ <property name="build.compiler" value="extJavac" />
+ <fail unless="JROCKIT_API_AVAILABLE">
+ JRockit API Not Available. Skipping JRockit compile.
+ </fail>
+ <javac destdir="${project.build.outputDirectory}" target="1.4" source="1.4">
+ <src path="${project.build.sourceDirectory}" />
+ <include name="org/jboss/aop/hook/JRockit*" />
+ <classpath refid="javac.jrockit.classpath" />
+ </javac>
+ <mkdir dir="${project.build.directory}/lib" />
+ <jar jarfile="${project.build.directory}/lib/jrockit-pluggable-instrumentor.jar" manifest="${basedir}/src/etc/default.mf">
+ <fileset dir="${project.build.outputDirectory}">
+ <include name="org/jboss/aop/hook/JRockitPluggableClassPreProcessor.class" />
+ <include name="org/jboss/aop/hook/JDK14*.class" />
+ </fileset>
+ <fileset file="${basedir}/src/etc/jbossorg-eula.txt" />
+ </jar>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,403 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.aop.proxy;
-
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.ProtectionDomain;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtField;
-import javassist.CtMethod;
-import javassist.CtNewMethod;
-import javassist.Modifier;
-import javassist.SerialVersionUID;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.ClassAdvisor;
-import org.jboss.aop.ClassInstanceAdvisor;
-import org.jboss.aop.InstanceAdvisor;
-import org.jboss.aop.instrument.Instrumentor;
-import org.jboss.aop.instrument.TransformerCommon;
-import org.jboss.aop.util.JavassistMethodHashing;
-import org.jboss.aop.util.reference.MethodPersistentReference;
-import org.jboss.aop.util.reference.PersistentReference;
-import org.jboss.util.collection.WeakValueHashMap;
-
-
-/**
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ClassProxyFactory
-{
- private static Object maplock = new Object();
- private static WeakValueHashMap<String, Class<?>> classnameMap = new WeakValueHashMap<String, Class<?>>();
- private static WeakHashMap<ClassLoader, WeakHashMap<Class<?>, WeakReference<Class<?>>>> proxyCache = new WeakHashMap<ClassLoader, WeakHashMap<Class<?>, WeakReference<Class<?>>>>();
- private static WeakHashMap<Class<?>, Map<Long, MethodPersistentReference>> methodMapCache = new WeakHashMap<Class<?>, Map<Long, MethodPersistentReference>>();
-
- public static final String GENERATED_PROXIES_PACKAGE = "org.jboss.aop.generatedproxies";
-
- public static ClassProxy newInstance(Class<?> clazz) throws Exception
- {
- return newInstance(clazz, null);
- }
-
- public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins) throws Exception
- {
- return newInstance(clazz, mixins, new ClassInstanceAdvisor());
- }
-
- public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins, boolean interceptWriteReplace) throws Exception
- {
- return newInstance(clazz, mixins, new ClassInstanceAdvisor(), interceptWriteReplace);
- }
-
- private static Class<?> getProxyClass(Class<?> clazz, ProxyMixin[] mixins, boolean interceptWriteReplace)
- throws Exception
- {
- // Don't make a proxy of a proxy !
- if (ClassProxy.class.isAssignableFrom(clazz)) clazz = clazz.getSuperclass();
-
- ClassPool pool = AspectManager.instance().findClassPool(clazz);
- if (pool == null) throw new NullPointerException("Could not find ClassPool");
-
-
- Class<?> proxyClass = null;
- synchronized (maplock)
- {
- WeakHashMap<Class<?>, WeakReference<Class<?>>> proxiesForLoader = proxyCache.get(pool.getClassLoader());
- if (proxiesForLoader == null)
- {
- proxiesForLoader = new WeakHashMap<Class<?>, WeakReference<Class<?>>>();
- proxyCache.put(pool.getClassLoader(), proxiesForLoader);
- }
- if (proxiesForLoader != null)
- {
- WeakReference<Class<?>> ref = proxiesForLoader.get(pool.getClassLoader());
- if (ref != null)
- {
- proxyClass = ref.get();
- }
- }
- if (proxyClass == null)
- {
- proxyClass = generateProxy(pool, clazz, mixins, interceptWriteReplace);
- classnameMap.put(clazz.getName(), proxyClass);
- proxiesForLoader.put(clazz, new WeakReference<Class<?>>(proxyClass));
- HashMap<Long, MethodPersistentReference> map = methodMap(clazz);
- methodMapCache.put(proxyClass, map);
- }
- }
- return proxyClass;
- }
-
- public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins, InstanceAdvisor advisor) throws Exception
- {
- return newInstance(clazz, mixins, advisor, false);
-
- }
-
- public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins, InstanceAdvisor advisor, boolean interceptWriteReplace) throws Exception
- {
- Class<?> proxyClass = getProxyClass(clazz, mixins, interceptWriteReplace);
- ClassProxy proxy = (ClassProxy) proxyClass.newInstance();
- proxy.setMixins(mixins);
- proxy._setInstanceAdvisor(advisor);
- return proxy;
-
- }
-
- public static HashMap<Long, MethodPersistentReference> getMethodMap(String classname)
- {
- synchronized (maplock)
- {
- Class<?> clazz = classnameMap.get(classname);
- if (clazz == null) return null;
- return (HashMap<Long, MethodPersistentReference>) methodMapCache.get(clazz);
- }
- }
-
- public static HashMap<Long, MethodPersistentReference> getMethodMap(Class<?> clazz)
- {
- HashMap<Long, MethodPersistentReference> map = getMethodMap(clazz.getName());
- if (map != null) return map;
- try
- {
- return methodMap(clazz);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
- }
-
- private static int counter = 0;
-
- private static CtClass createProxyCtClass(ClassPool pool, ProxyMixin[] mixins, Class<?> clazz, boolean interceptWriteReplace)
- throws Exception
- {
- String packageName = clazz.getPackage().getName();
- if (packageName.startsWith("java.") || packageName.startsWith("sun."))
- {
- packageName = GENERATED_PROXIES_PACKAGE;
- }
- String classname = null;
- synchronized (ClassProxyFactory.class)
- {
- classname = packageName + ".AOPClassProxy$" + counter++;
- }
-
- CtClass template = pool.get("org.jboss.aop.proxy.ClassProxyTemplate");
- CtClass superclass = pool.get(clazz.getName());
-
- CtField mixinField = template.getField("mixins");
- CtField instanceAdvisor = template.getField("instanceAdvisor");
-
- CtClass proxy = TransformerCommon.makeClass(pool, classname, superclass);
-
- mixinField = new CtField(mixinField.getType(), "mixins", proxy);
- mixinField.setModifiers(Modifier.PRIVATE);
- Instrumentor.addSyntheticAttribute(mixinField);
- proxy.addField(mixinField);
- instanceAdvisor = new CtField(instanceAdvisor.getType(), "instanceAdvisor", proxy);
- instanceAdvisor.setModifiers(Modifier.PRIVATE);
- proxy.addField(instanceAdvisor);
-
- CtMethod writeEx = CtNewMethod.make(" public void writeExternal(java.io.ObjectOutput out)\n" +
- " throws java.io.IOException\n" +
- " {\n" +
- " }", proxy);
- Instrumentor.addSyntheticAttribute(writeEx);
- CtMethod readEx = CtNewMethod.make(" public void readExternal(java.io.ObjectInput in)\n" +
- " throws java.io.IOException, ClassNotFoundException\n" +
- " {\n" +
- " }", proxy);
- Instrumentor.addSyntheticAttribute(readEx);
- CtMethod getInstanceAdvisor = CtNewMethod.make(" public org.jboss.aop.InstanceAdvisor _getInstanceAdvisor()\n" +
- " {\n" +
- " return instanceAdvisor;\n" +
- " }", proxy);
- Instrumentor.addSyntheticAttribute(getInstanceAdvisor);
- CtMethod setInstanceAdvisor = CtNewMethod.make(" public void _setInstanceAdvisor(org.jboss.aop.InstanceAdvisor newAdvisor)\n" +
- " {\n" +
- " instanceAdvisor = (org.jboss.aop.ClassInstanceAdvisor) newAdvisor;\n" +
- " }", proxy);
- Instrumentor.addSyntheticAttribute(setInstanceAdvisor);
- CtMethod dynamicInvoke = CtNewMethod.make(" public org.jboss.aop.joinpoint.InvocationResponse _dynamicInvoke(org.jboss.aop.joinpoint.Invocation invocation)\n" +
- " throws Throwable\n" +
- " {\n" +
- " ((org.jboss.aop.joinpoint.InvocationBase) invocation).setInstanceResolver(instanceAdvisor.getMetaData());\n" +
- " org.jboss.aop.advice.Interceptor[] aspects = instanceAdvisor.getInterceptors();\n" +
- " return new org.jboss.aop.joinpoint.InvocationResponse(invocation.invokeNext(aspects));\n" +
- " }", proxy);
- Instrumentor.addSyntheticAttribute(dynamicInvoke);
- CtMethod setMixins = CtNewMethod.make(" public void setMixins(org.jboss.aop.proxy.ProxyMixin[] mixins)\n" +
- " {\n" +
- " this.mixins = mixins;\n" +
- " }", proxy);
- Instrumentor.addSyntheticAttribute(setMixins);
- CtMethod writeReplace = CtNewMethod.make(" public Object writeReplace() throws java.io.ObjectStreamException\n" +
- " {\n" +
- " return new org.jboss.aop.proxy.MarshalledClassProxy(this.getClass().getSuperclass(), mixins, instanceAdvisor);\n" +
- " }", proxy);
- Instrumentor.addSyntheticAttribute(writeReplace);
-
- proxy.addMethod(writeEx);
- proxy.addMethod(readEx);
- proxy.addMethod(getInstanceAdvisor);
- proxy.addMethod(setInstanceAdvisor);
- proxy.addMethod(dynamicInvoke);
- proxy.addMethod(setMixins);
- if (!interceptWriteReplace)
- proxy.addMethod(writeReplace);
-
- /*
- CtMethod writeEx = template.getDeclaredMethod("writeExternal");
- CtMethod readEx = template.getDeclaredMethod("readExternal");
- CtMethod getInstanceAdvisor = template.getDeclaredMethod("_getInstanceAdvisor");
- CtMethod setInstanceAdvisor = template.getDeclaredMethod("_setInstanceAdvisor");
- CtMethod dynamicInvoke = template.getDeclaredMethod("_dynamicInvoke");
- CtMethod setMixins = template.getDeclaredMethod("setMixins");
- CtMethod writeReplace = template.getDeclaredMethod("writeReplace");
-
-
-
-
- proxy.addMethod(CtNewMethod.copy(writeEx, proxy, null));
- proxy.addMethod(CtNewMethod.copy(readEx, proxy, null));
- proxy.addMethod(CtNewMethod.copy(getInstanceAdvisor, proxy, null));
- proxy.addMethod(CtNewMethod.copy(setInstanceAdvisor, proxy, null));
- proxy.addMethod(CtNewMethod.copy(dynamicInvoke, proxy, null));
- proxy.addMethod(CtNewMethod.copy(setMixins, proxy, null));
- proxy.addMethod(CtNewMethod.copy(writeReplace, proxy, null));
- */
-
-
- proxy.addInterface(pool.get("org.jboss.aop.proxy.ClassProxy"));
- proxy.addInterface(pool.get("java.io.Externalizable"));
- proxy.addInterface(pool.get("org.jboss.aop.instrument.Untransformable"));
- proxy.addInterface(pool.get("org.jboss.aop.proxy.MethodMapped"));
-
- CtClass map = pool.get("java.util.Map");
- CtField methodMap = new CtField(map, "methodMap", proxy);
- methodMap.setModifiers(Modifier.PRIVATE | Modifier.STATIC);
- proxy.addField(methodMap);
- CtMethod getMethodMap = CtNewMethod.getter("getMethodMap", methodMap);
- getMethodMap.setModifiers(Modifier.PUBLIC);
- proxy.addMethod(getMethodMap);
-
- HashSet<String> addedInterfaces = new HashSet<String>();
- HashSet<Long> addedMethods = new HashSet<Long>();
- if (mixins != null)
- {
- for (int i = 0; i < mixins.length; i++)
- {
- HashSet<Long> mixinMethods = new HashSet<Long>();
- Class<?>[] mixinf = mixins[i].getInterfaces();
- ClassPool mixPool = AspectManager.instance().findClassPool(mixins[i].getMixin().getClass());
- CtClass mixClass = mixPool.get(mixins[i].getMixin().getClass().getName());
- for (int j = 0; j < mixinf.length; j++)
- {
- if (addedInterfaces.contains(mixinf[j].getName())) throw new Exception("2 mixins are implementing the same interfaces");
- ClassPool mixIntfPool = AspectManager.instance().findClassPool(mixinf[j]);
- CtClass intfClass = mixIntfPool.get(mixinf[j].getName());
- CtMethod[] methods = intfClass.getMethods();
- for (int m = 0; m < methods.length; m++)
- {
- if (methods[m].getDeclaringClass().getName().equals("java.lang.Object")) continue;
- Long hash = new Long(JavassistMethodHashing.methodHash(methods[m]));
- if (mixinMethods.contains(hash)) continue;
- if (addedMethods.contains(hash)) throw new Exception("More than one mixin has same method");
- mixinMethods.add(hash);
- addedMethods.add(hash);
- String returnStr = (methods[m].getReturnType().equals(CtClass.voidType)) ? "" : "return ";
- String code = "{" +
- " " + mixClass.getName() + " mixin = (" + mixClass.getName() + ")mixins[" + i + "].getMixin();" +
- " " + returnStr + " mixin." + methods[m].getName() + "($$);" +
- "}";
- CtMethod newMethod = CtNewMethod.make(methods[m].getReturnType(), methods[m].getName(), methods[m].getParameterTypes(), methods[m].getExceptionTypes(), code, proxy);
- newMethod.setModifiers(Modifier.PUBLIC);
- proxy.addMethod(newMethod);
- }
-
- proxy.addInterface(intfClass);
- addedInterfaces.add(intfClass.getName());
- }
- }
- }
-
- HashMap<Long, CtMethod> allMethods = JavassistMethodHashing.getMethodMap(superclass);
-
- if (interceptWriteReplace)
- allMethods.put(JavassistMethodHashing.methodHash(writeReplace), writeReplace);
-
- for (Map.Entry<Long, CtMethod> entry : allMethods.entrySet())
- {
- CtMethod m = entry.getValue();
- if (!Modifier.isPublic(m.getModifiers()) || Modifier.isStatic(m.getModifiers())) continue;
-
- Long hash = entry.getKey();
- if (addedMethods.contains(hash)) continue;
- addedMethods.add(hash);
- String aopReturnStr = (m.getReturnType().equals(CtClass.voidType)) ? "" : "return ($r)";
- String args = "null";
- if (m.getParameterTypes().length > 0) args = "$args";
- String code = "{ " +
- " org.jboss.aop.advice.Interceptor[] aspects = instanceAdvisor.getInterceptors(); " +
- " org.jboss.aop.MethodInfo mi = new org.jboss.aop.MethodInfo(); " +
- " mi.setHash(" + hash.longValue() + "L);" +
- " org.jboss.aop.proxy.ProxyMethodInvocation invocation = new org.jboss.aop.proxy.ProxyMethodInvocation(this, mi, aspects); " +
- " invocation.setInstanceResolver(instanceAdvisor.getMetaData()); " +
- " invocation.setArguments(" + args + "); " +
- " " + aopReturnStr + " invocation.invokeNext(); " +
- "}";
- CtMethod newMethod = CtNewMethod.make(m.getReturnType(), m.getName(), m.getParameterTypes(), m.getExceptionTypes(), code, proxy);
- newMethod.setModifiers(Modifier.PUBLIC);
- proxy.addMethod(newMethod);
- }
- SerialVersionUID.setSerialVersionUID(proxy);
- return proxy;
- }
-
- private static Class<?> generateProxy(ClassPool pool, Class<?> clazz, ProxyMixin[] mixins, boolean interceptWriteReplace) throws Exception
- {
- CtClass proxy = createProxyCtClass(pool, mixins, clazz, interceptWriteReplace);
- ProtectionDomain pd = clazz.getProtectionDomain();
- Class<?> proxyClass = TransformerCommon.toClass(proxy, pd);
- Map<Long, MethodPersistentReference> methodmap = ClassProxyFactory.getMethodMap(proxyClass);
- Field field = proxyClass.getDeclaredField("methodMap");
- SecurityActions.setAccessible(field);
- field.set(null, methodmap);
- return proxyClass;
- }
-
- private static void populateMethodTables(HashMap<Long, MethodPersistentReference> advised, List<Long> ignoredHash, Class<?> superclass)
- throws Exception
- {
- if (superclass == null) return;
- if (superclass.getName().equals("java.lang.Object")) return;
-
- Method[] declaredMethods = superclass.getDeclaredMethods();
- for (int i = 0; i < declaredMethods.length; i++)
- {
- if (ClassAdvisor.isAdvisable(declaredMethods[i]))
- {
- //if a method is marked as a "volatile/bridge" method, we need to
- //ignore it and check that other implementations of that method
- // (in superclasses) are not added either.
- if(!java.lang.reflect.Modifier.isVolatile( declaredMethods[i].getModifiers()))
- {
- long hash = org.jboss.aop.util.MethodHashing.methodHash(declaredMethods[i]);
- if(!ignoredHash.contains(new Long(hash)))
- advised.put(new Long(hash), new MethodPersistentReference(declaredMethods[i], PersistentReference.REFERENCE_WEAK));
- }
- else
- {
- long hash = org.jboss.aop.util.MethodHashing.methodHash(declaredMethods[i]);
- ignoredHash.add(new Long(hash));
- }
- }
- }
-
- populateMethodTables(advised, ignoredHash, superclass.getSuperclass());
-
- }
-
- public static HashMap<Long, MethodPersistentReference> methodMap(Class<?> clazz)
- throws Exception
- {
- HashMap<Long, MethodPersistentReference> methods = new HashMap<Long, MethodPersistentReference>();
- List<Long> ignoredHash = new ArrayList<Long>();
- populateMethodTables(methods, ignoredHash, clazz);
- return methods;
- }
-
-}
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java (from rev 107582, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,403 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.proxy;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtMethod;
+import javassist.CtNewMethod;
+import javassist.Modifier;
+import javassist.SerialVersionUID;
+
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.ClassInstanceAdvisor;
+import org.jboss.aop.InstanceAdvisor;
+import org.jboss.aop.instrument.Instrumentor;
+import org.jboss.aop.instrument.TransformerCommon;
+import org.jboss.aop.util.JavassistMethodHashing;
+import org.jboss.aop.util.reference.MethodPersistentReference;
+import org.jboss.aop.util.reference.PersistentReference;
+import org.jboss.util.collection.WeakValueHashMap;
+
+
+/**
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ClassProxyFactory
+{
+ private static Object maplock = new Object();
+ private static WeakValueHashMap<String, Class<?>> classnameMap = new WeakValueHashMap<String, Class<?>>();
+ private static WeakHashMap<ClassLoader, WeakHashMap<Class<?>, WeakReference<Class<?>>>> proxyCache = new WeakHashMap<ClassLoader, WeakHashMap<Class<?>, WeakReference<Class<?>>>>();
+ private static WeakHashMap<Class<?>, Map<Long, MethodPersistentReference>> methodMapCache = new WeakHashMap<Class<?>, Map<Long, MethodPersistentReference>>();
+
+ public static final String GENERATED_PROXIES_PACKAGE = "org.jboss.aop.generatedproxies";
+
+ public static ClassProxy newInstance(Class<?> clazz) throws Exception
+ {
+ return newInstance(clazz, null);
+ }
+
+ public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins) throws Exception
+ {
+ return newInstance(clazz, mixins, new ClassInstanceAdvisor());
+ }
+
+ public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins, boolean interceptWriteReplace) throws Exception
+ {
+ return newInstance(clazz, mixins, new ClassInstanceAdvisor(), interceptWriteReplace);
+ }
+
+ private static Class<?> getProxyClass(Class<?> clazz, ProxyMixin[] mixins, boolean interceptWriteReplace)
+ throws Exception
+ {
+ // Don't make a proxy of a proxy !
+ if (ClassProxy.class.isAssignableFrom(clazz)) clazz = clazz.getSuperclass();
+
+ ClassPool pool = AspectManager.instance().findClassPool(clazz);
+ if (pool == null) throw new NullPointerException("Could not find ClassPool");
+
+
+ Class<?> proxyClass = null;
+ synchronized (maplock)
+ {
+ WeakHashMap<Class<?>, WeakReference<Class<?>>> proxiesForLoader = proxyCache.get(pool.getClassLoader());
+ if (proxiesForLoader == null)
+ {
+ proxiesForLoader = new WeakHashMap<Class<?>, WeakReference<Class<?>>>();
+ proxyCache.put(pool.getClassLoader(), proxiesForLoader);
+ }
+ if (proxiesForLoader != null)
+ {
+ WeakReference<Class<?>> ref = proxiesForLoader.get(pool.getClassLoader());
+ if (ref != null)
+ {
+ proxyClass = ref.get();
+ }
+ }
+ if (proxyClass == null)
+ {
+ proxyClass = generateProxy(pool, clazz, mixins, interceptWriteReplace);
+ classnameMap.put(clazz.getName(), proxyClass);
+ proxiesForLoader.put(clazz, new WeakReference<Class<?>>(proxyClass));
+ HashMap<Long, MethodPersistentReference> map = methodMap(clazz);
+ methodMapCache.put(proxyClass, map);
+ }
+ }
+ return proxyClass;
+ }
+
+ public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins, InstanceAdvisor advisor) throws Exception
+ {
+ return newInstance(clazz, mixins, advisor, false);
+
+ }
+
+ public static ClassProxy newInstance(Class<?> clazz, ProxyMixin[] mixins, InstanceAdvisor advisor, boolean interceptWriteReplace) throws Exception
+ {
+ Class<?> proxyClass = getProxyClass(clazz, mixins, interceptWriteReplace);
+ ClassProxy proxy = (ClassProxy) proxyClass.newInstance();
+ proxy.setMixins(mixins);
+ proxy._setInstanceAdvisor(advisor);
+ return proxy;
+
+ }
+
+ public static HashMap<Long, MethodPersistentReference> getMethodMap(String classname)
+ {
+ synchronized (maplock)
+ {
+ Class<?> clazz = classnameMap.get(classname);
+ if (clazz == null) return null;
+ return (HashMap<Long, MethodPersistentReference>) methodMapCache.get(clazz);
+ }
+ }
+
+ public static HashMap<Long, MethodPersistentReference> getMethodMap(Class<?> clazz)
+ {
+ HashMap<Long, MethodPersistentReference> map = getMethodMap(clazz.getName());
+ if (map != null) return map;
+ try
+ {
+ return methodMap(clazz);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
+ }
+ }
+
+ private static int counter = 0;
+
+ private static CtClass createProxyCtClass(ClassPool pool, ProxyMixin[] mixins, Class<?> clazz, boolean interceptWriteReplace)
+ throws Exception
+ {
+ String packageName = clazz.getPackage().getName();
+ if (packageName.startsWith("java.") || packageName.startsWith("sun."))
+ {
+ packageName = GENERATED_PROXIES_PACKAGE;
+ }
+ String classname = null;
+ synchronized (ClassProxyFactory.class)
+ {
+ classname = packageName + ".AOPClassProxy$" + counter++;
+ }
+
+ CtClass template = pool.get("org.jboss.aop.proxy.ClassProxyTemplate");
+ CtClass superclass = pool.get(clazz.getName());
+
+ CtField mixinField = template.getField("mixins");
+ CtField instanceAdvisor = template.getField("instanceAdvisor");
+
+ CtClass proxy = TransformerCommon.makeClass(pool, classname, superclass);
+
+ mixinField = new CtField(mixinField.getType(), "mixins", proxy);
+ mixinField.setModifiers(Modifier.PRIVATE);
+ Instrumentor.addSyntheticAttribute(mixinField);
+ proxy.addField(mixinField);
+ instanceAdvisor = new CtField(instanceAdvisor.getType(), "instanceAdvisor", proxy);
+ instanceAdvisor.setModifiers(Modifier.PRIVATE);
+ proxy.addField(instanceAdvisor);
+
+ CtMethod writeEx = CtNewMethod.make(" public void writeExternal(java.io.ObjectOutput out)\n" +
+ " throws java.io.IOException\n" +
+ " {\n" +
+ " }", proxy);
+ Instrumentor.addSyntheticAttribute(writeEx);
+ CtMethod readEx = CtNewMethod.make(" public void readExternal(java.io.ObjectInput in)\n" +
+ " throws java.io.IOException, ClassNotFoundException\n" +
+ " {\n" +
+ " }", proxy);
+ Instrumentor.addSyntheticAttribute(readEx);
+ CtMethod getInstanceAdvisor = CtNewMethod.make(" public org.jboss.aop.InstanceAdvisor _getInstanceAdvisor()\n" +
+ " {\n" +
+ " return instanceAdvisor;\n" +
+ " }", proxy);
+ Instrumentor.addSyntheticAttribute(getInstanceAdvisor);
+ CtMethod setInstanceAdvisor = CtNewMethod.make(" public void _setInstanceAdvisor(org.jboss.aop.InstanceAdvisor newAdvisor)\n" +
+ " {\n" +
+ " instanceAdvisor = (org.jboss.aop.ClassInstanceAdvisor) newAdvisor;\n" +
+ " }", proxy);
+ Instrumentor.addSyntheticAttribute(setInstanceAdvisor);
+ CtMethod dynamicInvoke = CtNewMethod.make(" public org.jboss.aop.joinpoint.InvocationResponse _dynamicInvoke(org.jboss.aop.joinpoint.Invocation invocation)\n" +
+ " throws Throwable\n" +
+ " {\n" +
+ " ((org.jboss.aop.joinpoint.InvocationBase) invocation).setInstanceResolver(instanceAdvisor.getMetaData());\n" +
+ " org.jboss.aop.advice.Interceptor[] aspects = instanceAdvisor.getInterceptors();\n" +
+ " return new org.jboss.aop.joinpoint.InvocationResponse(invocation.invokeNext(aspects));\n" +
+ " }", proxy);
+ Instrumentor.addSyntheticAttribute(dynamicInvoke);
+ CtMethod setMixins = CtNewMethod.make(" public void setMixins(org.jboss.aop.proxy.ProxyMixin[] mixins)\n" +
+ " {\n" +
+ " this.mixins = mixins;\n" +
+ " }", proxy);
+ Instrumentor.addSyntheticAttribute(setMixins);
+ CtMethod writeReplace = CtNewMethod.make(" public Object writeReplace() throws java.io.ObjectStreamException\n" +
+ " {\n" +
+ " return new org.jboss.aop.proxy.MarshalledClassProxy(this.getClass().getSuperclass(), mixins, instanceAdvisor);\n" +
+ " }", proxy);
+ Instrumentor.addSyntheticAttribute(writeReplace);
+
+ proxy.addMethod(writeEx);
+ proxy.addMethod(readEx);
+ proxy.addMethod(getInstanceAdvisor);
+ proxy.addMethod(setInstanceAdvisor);
+ proxy.addMethod(dynamicInvoke);
+ proxy.addMethod(setMixins);
+ if (!interceptWriteReplace)
+ proxy.addMethod(writeReplace);
+
+ /*
+ CtMethod writeEx = template.getDeclaredMethod("writeExternal");
+ CtMethod readEx = template.getDeclaredMethod("readExternal");
+ CtMethod getInstanceAdvisor = template.getDeclaredMethod("_getInstanceAdvisor");
+ CtMethod setInstanceAdvisor = template.getDeclaredMethod("_setInstanceAdvisor");
+ CtMethod dynamicInvoke = template.getDeclaredMethod("_dynamicInvoke");
+ CtMethod setMixins = template.getDeclaredMethod("setMixins");
+ CtMethod writeReplace = template.getDeclaredMethod("writeReplace");
+
+
+
+
+ proxy.addMethod(CtNewMethod.copy(writeEx, proxy, null));
+ proxy.addMethod(CtNewMethod.copy(readEx, proxy, null));
+ proxy.addMethod(CtNewMethod.copy(getInstanceAdvisor, proxy, null));
+ proxy.addMethod(CtNewMethod.copy(setInstanceAdvisor, proxy, null));
+ proxy.addMethod(CtNewMethod.copy(dynamicInvoke, proxy, null));
+ proxy.addMethod(CtNewMethod.copy(setMixins, proxy, null));
+ proxy.addMethod(CtNewMethod.copy(writeReplace, proxy, null));
+ */
+
+
+ proxy.addInterface(pool.get("org.jboss.aop.proxy.ClassProxy"));
+ proxy.addInterface(pool.get("java.io.Externalizable"));
+ proxy.addInterface(pool.get("org.jboss.aop.instrument.Untransformable"));
+ proxy.addInterface(pool.get("org.jboss.aop.proxy.MethodMapped"));
+
+ CtClass map = pool.get("java.util.Map");
+ CtField methodMap = new CtField(map, "methodMap", proxy);
+ methodMap.setModifiers(Modifier.PRIVATE | Modifier.STATIC);
+ proxy.addField(methodMap);
+ CtMethod getMethodMap = CtNewMethod.getter("getMethodMap", methodMap);
+ getMethodMap.setModifiers(Modifier.PUBLIC);
+ proxy.addMethod(getMethodMap);
+
+ HashSet<String> addedInterfaces = new HashSet<String>();
+ HashSet<Long> addedMethods = new HashSet<Long>();
+ if (mixins != null)
+ {
+ for (int i = 0; i < mixins.length; i++)
+ {
+ HashSet<Long> mixinMethods = new HashSet<Long>();
+ Class<?>[] mixinf = mixins[i].getInterfaces();
+ ClassPool mixPool = AspectManager.instance().findClassPool(mixins[i].getMixin().getClass());
+ CtClass mixClass = mixPool.get(mixins[i].getMixin().getClass().getName());
+ for (int j = 0; j < mixinf.length; j++)
+ {
+ if (addedInterfaces.contains(mixinf[j].getName())) throw new Exception("2 mixins are implementing the same interfaces");
+ ClassPool mixIntfPool = AspectManager.instance().findClassPool(mixinf[j]);
+ CtClass intfClass = mixIntfPool.get(mixinf[j].getName());
+ CtMethod[] methods = intfClass.getMethods();
+ for (int m = 0; m < methods.length; m++)
+ {
+ if (methods[m].getDeclaringClass().getName().equals("java.lang.Object")) continue;
+ Long hash = new Long(JavassistMethodHashing.methodHash(methods[m]));
+ if (mixinMethods.contains(hash)) continue;
+ if (addedMethods.contains(hash)) throw new Exception("More than one mixin has same method");
+ mixinMethods.add(hash);
+ addedMethods.add(hash);
+ String returnStr = (methods[m].getReturnType().equals(CtClass.voidType)) ? "" : "return ";
+ String code = "{" +
+ " " + mixClass.getName() + " mixin = (" + mixClass.getName() + ")mixins[" + i + "].getMixin();" +
+ " " + returnStr + " mixin." + methods[m].getName() + "($$);" +
+ "}";
+ CtMethod newMethod = CtNewMethod.make(methods[m].getReturnType(), methods[m].getName(), methods[m].getParameterTypes(), methods[m].getExceptionTypes(), code, proxy);
+ newMethod.setModifiers(Modifier.PUBLIC);
+ proxy.addMethod(newMethod);
+ }
+
+ proxy.addInterface(intfClass);
+ addedInterfaces.add(intfClass.getName());
+ }
+ }
+ }
+
+ HashMap<Long, CtMethod> allMethods = JavassistMethodHashing.getMethodMap(superclass);
+
+ if (interceptWriteReplace)
+ allMethods.put(JavassistMethodHashing.methodHash(writeReplace), writeReplace);
+
+ for (Map.Entry<Long, CtMethod> entry : allMethods.entrySet())
+ {
+ CtMethod m = entry.getValue();
+ if (!Modifier.isPublic(m.getModifiers()) || Modifier.isStatic(m.getModifiers())) continue;
+
+ Long hash = entry.getKey();
+ if (addedMethods.contains(hash)) continue;
+ addedMethods.add(hash);
+ String aopReturnStr = (m.getReturnType().equals(CtClass.voidType)) ? "" : "return ($r)";
+ String args = "null";
+ if (m.getParameterTypes().length > 0) args = "$args";
+ String code = "{ " +
+ " org.jboss.aop.advice.Interceptor[] aspects = instanceAdvisor.getInterceptors(); " +
+ " org.jboss.aop.MethodInfo mi = new org.jboss.aop.MethodInfo(); " +
+ " mi.setHash(" + hash.longValue() + "L);" +
+ " org.jboss.aop.proxy.ProxyMethodInvocation invocation = new org.jboss.aop.proxy.ProxyMethodInvocation(this, mi, aspects); " +
+ " invocation.setInstanceResolver(instanceAdvisor.getMetaData()); " +
+ " invocation.setArguments(" + args + "); " +
+ " " + aopReturnStr + " invocation.invokeNext(); " +
+ "}";
+ CtMethod newMethod = CtNewMethod.make(m.getReturnType(), m.getName(), m.getParameterTypes(), m.getExceptionTypes(), code, proxy);
+ newMethod.setModifiers(Modifier.PUBLIC);
+ proxy.addMethod(newMethod);
+ }
+ SerialVersionUID.setSerialVersionUID(proxy);
+ return proxy;
+ }
+
+ private static Class<?> generateProxy(ClassPool pool, Class<?> clazz, ProxyMixin[] mixins, boolean interceptWriteReplace) throws Exception
+ {
+ CtClass proxy = createProxyCtClass(pool, mixins, clazz, interceptWriteReplace);
+ ProtectionDomain pd = clazz.getProtectionDomain();
+ Class<?> proxyClass = TransformerCommon.toClass(proxy, pd);
+ Map<Long, MethodPersistentReference> methodmap = ClassProxyFactory.getMethodMap(proxyClass);
+ Field field = proxyClass.getDeclaredField("methodMap");
+ SecurityActions.setAccessible(field);
+ field.set(null, methodmap);
+ return proxyClass;
+ }
+
+ private static void populateMethodTables(HashMap<Long, MethodPersistentReference> advised, List<Long> ignoredHash, Class<?> superclass)
+ throws Exception
+ {
+ if (superclass == null) return;
+ if (superclass.getName().equals("java.lang.Object")) return;
+
+ Method[] declaredMethods = SecurityActions.getDeclaredMethods(superclass);
+ for (int i = 0; i < declaredMethods.length; i++)
+ {
+ if (ClassAdvisor.isAdvisable(declaredMethods[i]))
+ {
+ //if a method is marked as a "volatile/bridge" method, we need to
+ //ignore it and check that other implementations of that method
+ // (in superclasses) are not added either.
+ if(!java.lang.reflect.Modifier.isVolatile( declaredMethods[i].getModifiers()))
+ {
+ long hash = org.jboss.aop.util.MethodHashing.methodHash(declaredMethods[i]);
+ if(!ignoredHash.contains(new Long(hash)))
+ advised.put(new Long(hash), new MethodPersistentReference(declaredMethods[i], PersistentReference.REFERENCE_WEAK));
+ }
+ else
+ {
+ long hash = org.jboss.aop.util.MethodHashing.methodHash(declaredMethods[i]);
+ ignoredHash.add(new Long(hash));
+ }
+ }
+ }
+
+ populateMethodTables(advised, ignoredHash, superclass.getSuperclass());
+
+ }
+
+ public static HashMap<Long, MethodPersistentReference> methodMap(Class<?> clazz)
+ throws Exception
+ {
+ HashMap<Long, MethodPersistentReference> methods = new HashMap<Long, MethodPersistentReference>();
+ List<Long> ignoredHash = new ArrayList<Long>();
+ populateMethodTables(methods, ignoredHash, clazz);
+ return methods;
+ }
+
+}
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,137 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.proxy;
-
-import java.lang.reflect.AccessibleObject;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-class SecurityActions
-{
- interface SetAccessibleAction
- {
- void setAccessible(AccessibleObject accessibleObject);
-
- SetAccessibleAction PRIVILEGED = new SetAccessibleAction()
- {
- public void setAccessible(final AccessibleObject accessibleObject)
- {
- try
- {
- AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
- {
- public Object run() throws Exception
- {
- accessibleObject.setAccessible(true);
- return null;
- }
- });
- }
- catch (PrivilegedActionException e)
- {
- throw new RuntimeException("Error setting " + accessibleObject + " as accessible ", e.getException());
- }
- }
- };
-
- SetAccessibleAction NON_PRIVILEGED = new SetAccessibleAction()
- {
- public void setAccessible(AccessibleObject accessibleObject)
- {
- accessibleObject.setAccessible(true);
- }
- };
- }
-
- static void setAccessible(AccessibleObject accessibleObject)
- {
- if (System.getSecurityManager() == null)
- {
- SetAccessibleAction.NON_PRIVILEGED.setAccessible(accessibleObject);
- }
- else
- {
- SetAccessibleAction.PRIVILEGED.setAccessible(accessibleObject);
- }
- }
-
- public static class GetContextClassLoaderAction implements PrivilegedAction<ClassLoader>
- {
- public static GetContextClassLoaderAction INSTANCE = new GetContextClassLoaderAction();
-
- public ClassLoader run()
- {
- return Thread.currentThread().getContextClassLoader();
- }
- }
-
- static ClassLoader getContextClassLoader()
- {
- if (System.getSecurityManager() == null)
- return Thread.currentThread().getContextClassLoader();
- else
- return AccessController.doPrivileged(GetContextClassLoaderAction.INSTANCE);
- }
-
- interface GetClassLoaderAction
- {
- ClassLoader getClassLoader(Class<?> clazz);
-
- GetClassLoaderAction NON_PRIVILEGED = new GetClassLoaderAction() {
-
- public ClassLoader getClassLoader(Class<?> clazz)
- {
- return clazz.getClassLoader();
- }};
-
- GetClassLoaderAction PRIVILEGED = new GetClassLoaderAction() {
-
- public ClassLoader getClassLoader(final Class<?> clazz)
- {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-
- public ClassLoader run()
- {
- return clazz.getClassLoader();
- }});
- }};
- }
-
- static ClassLoader getClassLoader(Class<?> clazz)
- {
- if (System.getSecurityManager() == null)
- {
- return GetClassLoaderAction.NON_PRIVILEGED.getClassLoader(clazz);
- }
- else
- {
- return GetClassLoaderAction.PRIVILEGED.getClassLoader(clazz);
- }
- }
-}
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java (from rev 107582, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aop/src/main/java/org/jboss/aop/proxy/SecurityActions.java 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,174 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.proxy;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+class SecurityActions
+{
+ interface SetAccessibleAction
+ {
+ void setAccessible(AccessibleObject accessibleObject);
+
+ SetAccessibleAction PRIVILEGED = new SetAccessibleAction()
+ {
+ public void setAccessible(final AccessibleObject accessibleObject)
+ {
+ try
+ {
+ AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+ {
+ public Object run() throws Exception
+ {
+ accessibleObject.setAccessible(true);
+ return null;
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw new RuntimeException("Error setting " + accessibleObject + " as accessible ", e.getException());
+ }
+ }
+ };
+
+ SetAccessibleAction NON_PRIVILEGED = new SetAccessibleAction()
+ {
+ public void setAccessible(AccessibleObject accessibleObject)
+ {
+ accessibleObject.setAccessible(true);
+ }
+ };
+ }
+
+ static void setAccessible(AccessibleObject accessibleObject)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ SetAccessibleAction.NON_PRIVILEGED.setAccessible(accessibleObject);
+ }
+ else
+ {
+ SetAccessibleAction.PRIVILEGED.setAccessible(accessibleObject);
+ }
+ }
+
+ public static class GetContextClassLoaderAction implements PrivilegedAction<ClassLoader>
+ {
+ public static GetContextClassLoaderAction INSTANCE = new GetContextClassLoaderAction();
+
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ }
+
+ static ClassLoader getContextClassLoader()
+ {
+ if (System.getSecurityManager() == null)
+ return Thread.currentThread().getContextClassLoader();
+ else
+ return AccessController.doPrivileged(GetContextClassLoaderAction.INSTANCE);
+ }
+
+ interface GetClassLoaderAction
+ {
+ ClassLoader getClassLoader(Class<?> clazz);
+
+ GetClassLoaderAction NON_PRIVILEGED = new GetClassLoaderAction() {
+
+ public ClassLoader getClassLoader(Class<?> clazz)
+ {
+ return clazz.getClassLoader();
+ }};
+
+ GetClassLoaderAction PRIVILEGED = new GetClassLoaderAction() {
+
+ public ClassLoader getClassLoader(final Class<?> clazz)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+
+ public ClassLoader run()
+ {
+ return clazz.getClassLoader();
+ }});
+ }};
+ }
+
+ static ClassLoader getClassLoader(Class<?> clazz)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ return GetClassLoaderAction.NON_PRIVILEGED.getClassLoader(clazz);
+ }
+ else
+ {
+ return GetClassLoaderAction.PRIVILEGED.getClassLoader(clazz);
+ }
+ }
+
+ interface GetDeclaredMethodsAction
+ {
+ Method[] getDeclaredMethods(Class<?> clazz);
+
+ GetDeclaredMethodsAction NON_PRIVILEGED = new GetDeclaredMethodsAction() {
+
+ public Method[] getDeclaredMethods(Class<?> clazz)
+ {
+ return clazz.getDeclaredMethods();
+ }};
+
+ GetDeclaredMethodsAction PRIVILEGED = new GetDeclaredMethodsAction() {
+
+ public Method[] getDeclaredMethods(final Class<?> clazz)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
+
+ public Method[] run()
+ {
+ return clazz.getDeclaredMethods();
+ }});
+ }};
+ }
+
+ static Method[] getDeclaredMethods(Class<?> clazz)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ return GetDeclaredMethodsAction.NON_PRIVILEGED.getDeclaredMethods(clazz);
+ }
+ else
+ {
+ return GetDeclaredMethodsAction.PRIVILEGED.getDeclaredMethods(clazz);
+ }
+ }
+}
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aophelper/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aophelper/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aophelper/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,135 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>aophelper</artifactId>
- <packaging>jar</packaging>
- <version>2.1.6.GA</version>
- <name>JBoss AOP Helper</name>
-
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>snapshots.jboss.org</id>
- <name>JBoss Maven Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jbossaop-plugin</artifactId>
- <version>1.0.0.GA</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- -->
-
-
- </dependencies>
-
- <repositories>
- <repository>
- <id>jboss_repo</id>
- <name>JBoss Maven Repository</name>
- <url>http://repository.jboss.com/maven2</url>
- </repository>
- </repositories>
-
- <build>
- <finalName>${artifactId}</finalName>
- <sourceDirectory>src/main/java</sourceDirectory>
- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <defaultGoal>install</defaultGoal>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- <directory>target</directory>
-
-
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${jdkVersion}</source>
- <target>${jdkVersion}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>run-aophelper</id>
- <activation>
- <property>
- <name>run-aophelper</name>
- </property>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jbossaop-plugin</artifactId>
- <version>1.0.0.GA</version>
- <executions>
- <execution>
- <id>compile</id>
- <configuration>
- <aoppaths>
- <aoppath>src/main/resources/jboss-aop.xml</aoppath>
- </aoppaths>
- </configuration>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>run</id>
- <configuration>
- <aoppaths>
- <aoppath>src/main/resources/jboss-aop.xml</aoppath>
- </aoppaths>
- <loadtime>true</loadtime>
- <executable>org.jboss.aophelper.ui.AopHelperFrame</executable>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <properties>
- <jdkVersion>1.5</jdkVersion>
- </properties>
-
-</project>
\ No newline at end of file
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aophelper/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aophelper/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aophelper/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aophelper/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,135 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>aophelper</artifactId>
+ <packaging>jar</packaging>
+ <version>2.1.6.GA_CP01</version>
+ <name>JBoss AOP Helper</name>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Maven Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jbossaop-plugin</artifactId>
+ <version>1.0.0.GA</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ -->
+
+
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>jboss_repo</id>
+ <name>JBoss Maven Repository</name>
+ <url>http://repository.jboss.com/maven2</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>target</directory>
+
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${jdkVersion}</source>
+ <target>${jdkVersion}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>run-aophelper</id>
+ <activation>
+ <property>
+ <name>run-aophelper</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jbossaop-plugin</artifactId>
+ <version>1.0.0.GA</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <configuration>
+ <aoppaths>
+ <aoppath>src/main/resources/jboss-aop.xml</aoppath>
+ </aoppaths>
+ </configuration>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>run</id>
+ <configuration>
+ <aoppaths>
+ <aoppath>src/main/resources/jboss-aop.xml</aoppath>
+ </aoppaths>
+ <loadtime>true</loadtime>
+ <executable>org.jboss.aophelper.ui.AopHelperFrame</executable>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <jdkVersion>1.5</jdkVersion>
+ </properties>
+
+</project>
\ No newline at end of file
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-core/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-core/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,133 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- <packaging>jar</packaging>
- <name>JBoss AOP AS Integration Core</name>
- <description>JBoss AOP AS Integrationi Core</description>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/jboss/test/aop/classpool/support/a/A.class</exclude>
- <exclude>org/jboss/test/aop/classpool/support/b/B.class</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>create-test-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>process-test-classes</phase>
- <configuration>
- <tasks>
- <property name="test.jar.suffix" value="-test-classpool-" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/support/a/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/support/b/*.class" />
- <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/support/a" />
- <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/support/b" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </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>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- <executions>
- <execution>
- <id>surefire-report</id>
- <goals>
- <goal>report-only</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <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>
- <!--dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- </dependency-->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-core/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-core/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-core/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-core/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,133 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss AOP AS Integration Core</name>
+ <description>JBoss AOP AS Integrationi Core</description>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/test/aop/classpool/support/a/A.class</exclude>
+ <exclude>org/jboss/test/aop/classpool/support/b/B.class</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>create-test-jars</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <property name="test.jar.suffix" value="-test-classpool-" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/support/a/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/support/b/*.class" />
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/support/a" />
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/support/b" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ <executions>
+ <execution>
+ <id>surefire-report</id>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <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>
+ <!--dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-main</artifactId>
+ </dependency-->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-jmx/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,147 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-asintegration-jmx</artifactId>
- <packaging>jar</packaging>
- <name>JBoss AOP AS Integration JMX</name>
- <description>JBoss AOP AS Integration JMX</description>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/jboss/test/aop/classpool/ucl/support/excluded/**</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>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- <executions>
- <execution>
- <id>surefire-report</id>
- <goals>
- <goal>report-only</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>create-test-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>process-test-classes</phase>
- <configuration>
- <tasks>
- <property name="test.jar.suffix" value="-test-classpool-" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/a/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/a/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/b/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/b/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/c/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/c/*.class" />
- <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/ucl/support/excluded" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>pluggable-instrumentor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-jmx/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-jmx/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-jmx/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-jmx/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,147 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss AOP AS Integration JMX</name>
+ <description>JBoss AOP AS Integration JMX</description>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/test/aop/classpool/ucl/support/excluded/**</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>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ <executions>
+ <execution>
+ <id>surefire-report</id>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>create-test-jars</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <property name="test.jar.suffix" value="-test-classpool-" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/a/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/a/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/b/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/b/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/c/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/c/*.class" />
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/ucl/support/excluded" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-mc/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-mc/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,173 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-asintegration-mc</artifactId>
- <packaging>jar</packaging>
- <name>JBoss AOP AS Integration MC</name>
- <description>JBoss AOP AS Integration MC</description>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>org/jboss/aop/junit/**</exclude>
- <exclude>org/jboss/test/aop/classpool/jbosscl/support/excluded/**</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>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>org/jboss/test/**/*TestCase.class</include>
- </includes>
- <excludes>
- <exclude>org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.class</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>build.testlog</name>
- <value>target/surefire-reports/tests.log</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- <executions>
- <execution>
- <id>surefire-report</id>
- <goals>
- <goal>report-only</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>create-test-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>process-test-classes</phase>
- <configuration>
- <tasks>
- <property name="test.jar.suffix" value="-test-classpool-" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}replacereferences-parent.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**" />
- <exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/*.class" />
- </fileset>
- </jar>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}replacereferences-child.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**" />
- <exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/ParentCaller.class" />
- </fileset>
- </jar>
- <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/support/excluded" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>pluggable-instrumentor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-mc/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/asintegration-mc/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-mc/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/asintegration-mc/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,173 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss AOP AS Integration MC</name>
+ <description>JBoss AOP AS Integration MC</description>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/aop/junit/**</exclude>
+ <exclude>org/jboss/test/aop/classpool/jbosscl/support/excluded/**</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>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.class</include>
+ </includes>
+ <excludes>
+ <exclude>org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.class</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>build.testlog</name>
+ <value>target/surefire-reports/tests.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ <executions>
+ <execution>
+ <id>surefire-report</id>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>create-test-jars</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <property name="test.jar.suffix" value="-test-classpool-" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class" />
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}replacereferences-parent.jar">
+ <fileset dir="${project.build.testOutputDirectory}">
+ <include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**" />
+ <exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/*.class" />
+ </fileset>
+ </jar>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}replacereferences-child.jar">
+ <fileset dir="${project.build.testOutputDirectory}">
+ <include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**" />
+ <exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/ParentCaller.class" />
+ </fileset>
+ </jar>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/support/excluded" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aspects/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aspects/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aspects/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,90 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>jboss-aop-parent</artifactId>
- <groupId>org.jboss.aop</groupId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-aspects</artifactId>
- <name>JBoss AOP Aspects</name>
- <description>JBoss AOP Aspects</description>
-
- <build>
- <finalName>${artifactId}</finalName>
- <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>
- <testExcludes>
- <testExclude>org/jboss/test/asynch/**</testExclude>
- <testExclude>org/jboss/test/proxyfactory/**</testExclude>
- <testExclude>org/jboss/test/aspects/mock/MockTestCase.java</testExclude>
- </testExcludes>
- </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>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- </dependency>
-
- <!-- Test scope dependencies -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- <!--<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <type>test-jar</type>
- </dependency>-->
- </dependencies>
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aspects/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aspects/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aspects/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/aspects/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,90 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>jboss-aop-parent</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-aspects</artifactId>
+ <name>JBoss AOP Aspects</name>
+ <description>JBoss AOP Aspects</description>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <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>
+ <testExcludes>
+ <testExclude>org/jboss/test/asynch/**</testExclude>
+ <testExclude>org/jboss/test/proxyfactory/**</testExclude>
+ <testExclude>org/jboss/test/aspects/mock/MockTestCase.java</testExclude>
+ </testExcludes>
+ </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>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ </dependency>
+
+ <!-- Test scope dependencies -->
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <type>test-jar</type>
+ </dependency>-->
+ </dependencies>
+</project>
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/build/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/build/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,56 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-dist</artifactId>
- <packaging>jar</packaging>
- <name>JBoss AOP Distribution Build</name>
- <description>JBoss AOP Distribution Build</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code</groupId>
- <artifactId>jarjar</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>jrockit-module</id>
- <activation>
- <property>
- <name>jrockit.home</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jrockit-pluggable-instrumentor</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/build/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/build/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/build/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/build/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-dist</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss AOP Distribution Build</name>
+ <description>JBoss AOP Distribution Build</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code</groupId>
+ <artifactId>jarjar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>jrockit-module</id>
+ <activation>
+ <property>
+ <name>jrockit.home</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jrockit-pluggable-instrumentor</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/deployers/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/deployers/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/deployers/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>jboss-aop-parent</artifactId>
- <groupId>org.jboss.aop</groupId>
- <version>2.1.6.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-deployers</artifactId>
- <name>JBoss AOP Deployers</name>
- <description>JBoss AOP Deployers</description>
-
- <build>
- <finalName>${artifactId}</finalName>
- <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>
- </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>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/deployers/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/deployers/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/deployers/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/deployers/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>jboss-aop-parent</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-deployers</artifactId>
+ <name>JBoss AOP Deployers</name>
+ <description>JBoss AOP Deployers</description>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <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>
+ </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>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Modified: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/jrockit-pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/jrockit-pluggable-instrumentor/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/jrockit-pluggable-instrumentor/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
+ <version>2.1.6-SNAPSHOT</version>
</parent>
<artifactId>jrockit-pluggable-instrumentor</artifactId>
<packaging>jar</packaging>
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pluggable-instrumentor/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pluggable-instrumentor/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <version>2.1.6.GA</version>
- </parent>
- <artifactId>pluggable-instrumentor</artifactId>
- <packaging>jar</packaging>
- <name>JBoss AOP Pluggable Instrumentor</name>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- <Premain-Class>org.jboss.aop.standalone.PluggableInstrumentor</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pluggable-instrumentor/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pluggable-instrumentor/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pluggable-instrumentor/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pluggable-instrumentor/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.6.GA_CP01</version>
+ </parent>
+ <artifactId>pluggable-instrumentor</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss AOP Pluggable Instrumentor</name>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${pom.url}</Implementation-URL>
+ <Premain-Class>org.jboss.aop.standalone.PluggableInstrumentor</Premain-Class>
+ <Can-Redefine-Classes>true</Can-Redefine-Classes>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pom.xml
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pom.xml 2010-08-13 08:28:10 UTC (rev 107581)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -1,517 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-parent</artifactId>
- <packaging>pom</packaging>
- <version>2.1.6.GA</version>
- <description>JBoss AOP</description>
- <name>JBoss AOP Parent POM</name>
- <url>http://www.jboss.org/jbossaop/</url>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/aop/tags/JBoss_AOP_2_1_6_GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/aop/tags/JBoss_AOP_2_1_6_GA</developerConnection>
- </scm>
-
- <properties>
- <version.javassist.javassist>3.10.0.GA</version.javassist.javassist>
- <version.org.jboss.jbossas>5.1.0.GA</version.org.jboss.jbossas>
- <version.org.jboss.jboss-common-core>2.2.15.GA</version.org.jboss.jboss-common-core>
- <version.org.jboss.cl>2.0.6.SP1</version.org.jboss.cl>
- <version.org.jboss.deployers>2.0.8.GA</version.org.jboss.deployers>
- <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
- <version.org.jboss.jboss-reflect>2.0.2.GA</version.org.jboss.jboss-reflect>
- <version.org.jboss.jboss-vfs>2.1.3.SP1</version.org.jboss.jboss-vfs>
- <version.org.jboss.microcontainer.jboss-kernel>2.0.9.GA</version.org.jboss.microcontainer.jboss-kernel>
- <version.org.jboss.logging>2.1.0.GA</version.org.jboss.logging>
- <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
- <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
- <version.xdoclet>1.2.3</version.xdoclet>
- <version.jarjar>1.0</version.jarjar>
- </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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/aop/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <arguments>-Djrockit.home=${jrockit.home}</arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>aop</module>
- <module>pluggable-instrumentor</module>
- <module>aspects</module>
- <module>asintegration-core</module>
- <module>asintegration-jmx</module>
- <module>asintegration-mc</module>
- <module>aophelper</module>
- <module>deployers</module>
- <module>build</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- <version>1.0.0.CR5</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.javacc</groupId>
- <artifactId>javacc</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist.javassist}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <version>${version.org.jboss.jboss-reflect}</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.org.jboss.jboss-common-core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.org.jboss.jboss-vfs}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>-->
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>pluggable-instrumentor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jrockit-pluggable-instrumentor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-mc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- <version>${version.org.jboss.cl}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-classloading-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- <version>${version.org.jboss.cl}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading-vfs</artifactId>
- <version>${version.org.jboss.cl}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.org.jboss.deployers}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-classloading-spi</artifactId>
- <version>${version.org.jboss.integration}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-corba-ots-spi</artifactId>
- <version>${version.org.jboss.integration}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-deployment-spi</artifactId>
- <version>${version.org.jboss.integration}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- <version>${version.org.jboss.integration}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.CR2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>2.5.0.CR2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <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.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.org.jboss.logging}</version>
- </dependency>
- <dependency>
- <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>
- <artifactId>jboss-managed</artifactId>
- <version>${version.org.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${version.org.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.1.7.CR2</version>
- <exclusions>
- <exclusion>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- <!-- ant-junit should be excluded because it causes tests to
- - run twice in the ant test scripts -->
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- </dependency>
- <dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>snmptrapappender</groupId>
- <artifactId>snmpTrapAppender</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-ejb-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-hibernate-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-java-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-jboss-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-jmx-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-portlet-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-web-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-xdoclet-module</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xjavadoc</artifactId>
- <version>${version.xdoclet}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code</groupId>
- <artifactId>jarjar</artifactId>
- <version>${version.jarjar}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <quiet>true</quiet>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>jrockit-module</id>
- <activation>
- <property>
- <name>jrockit.home</name>
- </property>
- </activation>
- <modules>
- <module>jrockit-pluggable-instrumentor</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
Copied: projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pom.xml (from rev 107669, projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/pom.xml)
===================================================================
--- projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pom.xml (rev 0)
+++ projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01/pom.xml 2010-08-18 16:42:34 UTC (rev 107671)
@@ -0,0 +1,517 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>2.1.6.GA_CP01</version>
+ <description>JBoss AOP</description>
+ <name>JBoss AOP Parent POM</name>
+ <url>http://www.jboss.org/jbossaop/</url>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/aop/tags/JBoss_AOP_2_1_6_GA_CP01</developerConnection>
+ </scm>
+
+ <properties>
+ <version.javassist.javassist>3.10.0.GA</version.javassist.javassist>
+ <version.org.jboss.jbossas>5.1.0.GA</version.org.jboss.jbossas>
+ <version.org.jboss.jboss-common-core>2.2.15.GA</version.org.jboss.jboss-common-core>
+ <version.org.jboss.cl>2.0.6.SP1</version.org.jboss.cl>
+ <version.org.jboss.deployers>2.0.8.GA</version.org.jboss.deployers>
+ <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
+ <version.org.jboss.jboss-reflect>2.0.2.GA</version.org.jboss.jboss-reflect>
+ <version.org.jboss.jboss-vfs>2.1.3.SP1</version.org.jboss.jboss-vfs>
+ <version.org.jboss.microcontainer.jboss-kernel>2.0.9.GA</version.org.jboss.microcontainer.jboss-kernel>
+ <version.org.jboss.logging>2.1.0.GA</version.org.jboss.logging>
+ <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
+ <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
+ <version.xdoclet>1.2.3</version.xdoclet>
+ <version.jarjar>1.0</version.jarjar>
+ </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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/aop/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <!--arguments>-Djrockit.home=${jrockit.home}</arguments-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>aop</module>
+ <module>pluggable-instrumentor</module>
+ <module>aspects</module>
+ <module>asintegration-core</module>
+ <module>asintegration-jmx</module>
+ <module>asintegration-mc</module>
+ <module>aophelper</module>
+ <module>deployers</module>
+ <module>build</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ <version>1.0.0.CR5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.javacc</groupId>
+ <artifactId>javacc</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${version.javassist.javassist}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.org.jboss.jboss-reflect}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.org.jboss.mdr}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.org.jboss.jboss-common-core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.org.jboss.jboss-vfs}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>-->
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jrockit-pluggable-instrumentor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ <version>${version.org.jboss.cl}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-classloading-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${version.org.jboss.cl}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ <version>${version.org.jboss.cl}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-classloading-spi</artifactId>
+ <version>${version.org.jboss.integration}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-corba-ots-spi</artifactId>
+ <version>${version.org.jboss.integration}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-deployment-spi</artifactId>
+ <version>${version.org.jboss.integration}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>${version.org.jboss.integration}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ <version>1.5.0.CR2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-servlet-api</artifactId>
+ <version>2.5.0.CR2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <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.jbossas</groupId>
+ <artifactId>jboss-as-main</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.org.jboss.logging}</version>
+ </dependency>
+ <dependency>
+ <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>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.org.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${version.org.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.1.7.CR2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <!-- ant-junit should be excluded because it causes tests to
+ - run twice in the ant test scripts -->
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss-update1</version>
+ </dependency>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>snmptrapappender</groupId>
+ <artifactId>snmpTrapAppender</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-ejb-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-hibernate-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-java-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-jboss-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-jmx-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-portlet-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-web-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-xdoclet-module</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xjavadoc</artifactId>
+ <version>${version.xdoclet}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code</groupId>
+ <artifactId>jarjar</artifactId>
+ <version>${version.jarjar}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <quiet>true</quiet>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>jrockit-module</id>
+ <activation>
+ <property>
+ <name>jrockit.home</name>
+ </property>
+ </activation>
+ <modules>
+ <module>jrockit-pluggable-instrumentor</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
More information about the jboss-cvs-commits
mailing list