[jboss-cvs] JBossAS SVN: r79593 - in projects/aop/trunk: aop and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 16 12:03:09 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-10-16 12:03:09 -0400 (Thu, 16 Oct 2008)
New Revision: 79593
Modified:
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration-core/pom.xml
projects/aop/trunk/asintegration-jmx/pom.xml
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/build/pom.xml
projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml
projects/aop/trunk/pluggable-instrumentor/pom.xml
projects/aop/trunk/pom.xml
Log:
[maven-release-plugin] prepare release JBoss_AOP_2_0_0_CR20
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/aop/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,11 +1,8 @@
-<?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">
+<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.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.aop</groupId>
@@ -172,21 +169,16 @@
<phase>package</phase>
<configuration>
<tasks>
- <mkdir dir="${basedir}/output"/>
- <mkdir dir="${basedir}/output/lib"/>
+ <mkdir dir="${basedir}/output" />
+ <mkdir dir="${basedir}/output/lib" />
<copy todir="${basedir}/output/etc">
- <fileset dir="${basedir}/src/etc"/>
+ <fileset dir="${basedir}/src/etc" />
</copy>
- <copy file="${project.build.directory}/${project.artifactId}.jar"
- tofile="${basedir}/output/lib/jboss-aop-jdk50.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-sources.jar"
- tofile="${basedir}/output/lib/jboss-aop-jdk50-sources.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-client.jar"
- tofile="${basedir}/output/lib/jboss-aop-jdk50-client.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar"
- tofile="${basedir}/output/lib/jboss-aop-jdk50-client-sources.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-single.jar"
- tofile="${basedir}/output/lib/jboss-aop-jdk50-single.jar"/>
+ <copy file="${project.build.directory}/${project.artifactId}.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-sources.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-client.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-client-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-single.jar" tofile="${basedir}/output/lib/jboss-aop-jdk50-single.jar" />
</tasks>
</configuration>
</execution>
@@ -198,12 +190,9 @@
<phase>site</phase>
<configuration>
<tasks>
- <property name="source.java" value="${project.build.sourceDirectory}"/>
+ <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">
+ <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>
@@ -212,83 +201,83 @@
</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"/>
+ <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"/>
+ <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/"/>
+ <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
</javadoc>
</tasks>
</configuration>
@@ -411,51 +400,48 @@
<phase>compile</phase>
<configuration>
<tasks>
- <echo message="jrockit.home=${jrockit.home}"/>
+ <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"/>
+ <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"/>
+ <isset property="OLD_JROCKIT" />
<not>
- <isset property="NEW_JROCKIT"/>
+ <isset property="NEW_JROCKIT" />
</not>
</and>
</condition>
<condition property="JROCKIT_API_AVAILABLE" value="${NEW_JROCKIT}">
<and>
- <isset property="NEW_JROCKIT"/>
+ <isset property="NEW_JROCKIT" />
<not>
- <isset property="OLD_JROCKIT"/>
+ <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 refid="maven.compile.classpath" />
+ <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}" />
</path>
- <property name="build.compiler" value="extJavac"/>
+ <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 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="${basedir}/output"/>
- <mkdir dir="${basedir}/output/lib"/>
- <jar jarfile="${basedir}/output/lib/jrockit-pluggable-instrumentor.jar"
- manifest="${basedir}/src/etc/default.mf">
+ <mkdir dir="${basedir}/output" />
+ <mkdir dir="${basedir}/output/lib" />
+ <jar jarfile="${basedir}/output/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"/>
+ <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"/>
+ <fileset file="${basedir}/src/etc/jbossorg-eula.txt" />
</jar>
</tasks>
</configuration>
@@ -468,4 +454,4 @@
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: projects/aop/trunk/asintegration-core/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-core/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/asintegration-core/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,11 +1,8 @@
-<?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">
+<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.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-asintegration-core</artifactId>
@@ -114,4 +111,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: projects/aop/trunk/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-jmx/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/asintegration-jmx/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,11 +1,8 @@
-<?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">
+<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.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-asintegration-jmx</artifactId>
@@ -103,4 +100,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,11 +1,8 @@
-<?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">
+<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.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-asintegration-mc</artifactId>
@@ -124,4 +121,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/aspects/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,148 +1,144 @@
-<?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">
- <parent>
- <artifactId>jboss-aop-parent</artifactId>
- <groupId>org.jboss.aop</groupId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-aspects</artifactId>
- <name>JBoss AOP Aspects</name>
- <description>JBoss AOP Aspects</description>
-
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <!--<testSourceDirectory>src/test</testSourceDirectory>-->
- <resources>
- <resource>
- <directory>docs</directory>
- <includes>
- <include>jboss-aop_1_0.dtd</include>
- </includes>
- </resource>
- <resource>
- <directory>src/etc</directory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources</directory>
- </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>
- <testExcludes>
- <testExclude>org/jboss/test/asynch/**</testExclude>
- <testExclude>org/jboss/test/proxyfactory/**</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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>copy-output-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="${basedir}/output"/>
- <mkdir dir="${basedir}/output/lib"/>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
- tofile="${basedir}/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
- tofile="${basedir}/output/lib/jboss-standalone-aspect-library-sources.jar"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Clean the output directory created by the antrun plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/output</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>bsh</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>jboss</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>
-
+<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.0.0.CR20</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-aspects</artifactId>
+ <name>JBoss AOP Aspects</name>
+ <description>JBoss AOP Aspects</description>
+
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <!--<testSourceDirectory>src/test</testSourceDirectory>-->
+ <resources>
+ <resource>
+ <directory>docs</directory>
+ <includes>
+ <include>jboss-aop_1_0.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/etc</directory>
+ <includes>
+ <include>jbossorg-eula.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources</directory>
+ </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>
+ <testExcludes>
+ <testExclude>org/jboss/test/asynch/**</testExclude>
+ <testExclude>org/jboss/test/proxyfactory/**</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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>copy-output-jars</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${basedir}/output" />
+ <mkdir dir="${basedir}/output/lib" />
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" tofile="${basedir}/output/lib/jboss-standalone-aspect-library-jdk50.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" tofile="${basedir}/output/lib/jboss-standalone-aspect-library-sources.jar" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Clean the output directory created by the antrun plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>bsh</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>jboss</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>
\ No newline at end of file
Modified: projects/aop/trunk/build/pom.xml
===================================================================
--- projects/aop/trunk/build/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/build/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,11 +1,8 @@
-<?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">
+<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.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-dist</artifactId>
@@ -39,4 +36,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,11 +1,9 @@
-<?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">
+<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.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</version>
</parent>
<artifactId>jrockit-pluggable-instrumentor</artifactId>
<packaging>jar</packaging>
@@ -77,42 +75,40 @@
<phase>compile</phase>
<configuration>
<tasks>
- <echo message="jrockit.home=${jrockit.home}"/>
+ <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"/>
+ <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"/>
+ <isset property="OLD_JROCKIT" />
<not>
- <isset property="NEW_JROCKIT"/>
+ <isset property="NEW_JROCKIT" />
</not>
</and>
</condition>
<condition property="JROCKIT_API_AVAILABLE" value="${NEW_JROCKIT}">
<and>
- <isset property="NEW_JROCKIT"/>
+ <isset property="NEW_JROCKIT" />
<not>
- <isset property="OLD_JROCKIT"/>
+ <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 refid="maven.compile.classpath" />
+ <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}" />
</path>
- <property name="build.compiler" value="extJavac"/>
+ <property name="build.compiler" value="extJavac" />
<fail unless="JROCKIT_API_AVAILABLE">
JRockit API Not Available. Skipping JRockit compile.
</fail>
- <mkdir dir="${project.build.outputDirectory}"/>
- <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"/>
+ <mkdir dir="${project.build.outputDirectory}" />
+ <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>
</tasks>
</configuration>
@@ -129,4 +125,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: projects/aop/trunk/pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/trunk/pluggable-instrumentor/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/pluggable-instrumentor/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,11 +1,10 @@
<?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">
+<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.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</version>
</parent>
<artifactId>pluggable-instrumentor</artifactId>
<packaging>jar</packaging>
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2008-10-16 15:48:27 UTC (rev 79592)
+++ projects/aop/trunk/pom.xml 2008-10-16 16:03:09 UTC (rev 79593)
@@ -1,7 +1,4 @@
-<?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">
+<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>
@@ -13,13 +10,13 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR20</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/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/aop/trunk/</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/aop/tags/JBoss_AOP_2_0_0_CR20</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/aop/tags/JBoss_AOP_2_0_0_CR20</developerConnection>
</scm>
<properties>
@@ -607,4 +604,4 @@
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list