[jboss-cvs] JBossAS SVN: r102570 - in projects/aop/trunk: build and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 18 11:17:31 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-18 11:17:29 -0400 (Thu, 18 Mar 2010)
New Revision: 102570
Added:
projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-aop.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml
Modified:
projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/build/build.xml
Log:
[JBAOP-772] Created a jboss-60-install-jboss-aop-build.xml script, a needed feature for testing aop trunk against as trunk, and a needed feature for releasing aop 2.2.0.
Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2010-03-18 14:48:48 UTC (rev 102569)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2010-03-18 15:17:29 UTC (rev 102570)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project default="install" name="JBoss/AOP Application Server installation">
+<project default="install" name="JBoss/AOP Application Server 4.x installation">
<target name="init">
<!-- ========================================= -->
Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml 2010-03-18 14:48:48 UTC (rev 102569)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml 2010-03-18 15:17:29 UTC (rev 102570)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project default="install" name="JBoss/AOP Application Server installation">
+<project default="install" name="JBoss/AOP Application Server 5.x installation">
<target name="init">
<!-- ========================================= -->
Added: projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-aop.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-aop.xml (rev 0)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-aop.xml 2010-03-18 15:17:29 UTC (rev 102570)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ AOP configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
+
+ <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
+ <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
+ <root>${jboss.lib.url}jboss-aop-deployers.jar</root>
+ <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
+ <root>${jboss.lib.url}jboss-classpool.jar</root>
+ <root>${jboss.lib.url}jboss-classpool-jbosscl.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
+ </classloader>
+
+ <!-- Integration -->
+ <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
+
+ <bean name="AOPClassPoolFactory" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory">
+ <constructor>
+ <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
+ <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
+ <property name="classPoolFactory"><inject bean="AOPClassPoolFactory"/></property>
+ <property name="aopClassLoaderScopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+ </bean>
+
+ <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
+ <property name="managerBean">AspectManager</property>
+ <property name="managerProperty">aspectManager</property>
+ </bean>
+
+ <!-- bean name="AOPBootstrap" class="org.jboss.aop.asintegration.jboss5.AOPBootstrap" -->
+ <!-- This one lives in AS 5 source tree -->
+ <!-- property name="policy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+ <property name="manager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean-->
+
+<bean name="ClassLoaderDomainRegistry" class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
+ <constructor factoryMethod="getRegistry">
+ <factory bean="AOPClassLoaderScopingPolicy"/>
+ </constructor>
+ </bean>
+
+
+ <bean name="AOPRegisterModuleCallback" class="org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback">
+ <!-- classloader><null/></classloader -->
+ <constructor>
+ <parameter><inject bean="ClassLoaderDomainRegistry"/></parameter>
+ </constructor>
+ <install method="addModuleRegistry" bean="ClassLoading" whenRequired="Start">
+ <parameter><this/></parameter>
+ </install>
+ <install method="addModule">
+ <parameter><inject bean="bootstrap-classloader:0.0.0$MODULE"/></parameter>
+ </install>
+<!-- <install method="addModule" -->
+ <uninstall method="removeModuleRegistry" bean="ClassLoading" whenRequired="Start">
+ <parameter><this/></parameter>
+ </uninstall>
+ </bean>
+
+
+
+<!--
+ Valid values for the AspectManager bean for use with enableTransformer=true are:
+ * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
+ * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
+ -->
+ <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
+ <constructor>
+ <parameter><![CDATA[
+ <aop>
+ <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
+ <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
+ <advice name="process" aspect="mainDeployer"/>
+ </bind>
+ <aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
+ <bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
+ <advice name="setValue" aspect="persist"/>
+ </bind>
+ </aop>]]>
+ </parameter>
+ </constructor>
+
+ <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
+
+ <property name="enableLoadtimeWeaving">false</property>
+ <!-- only relevant when EnableLoadtimeWeaving is true.
+ When transformer is on, every loaded class gets
+ transformed. If AOP can't find the class, then it
+ throws an exception. Sometimes, classes may not have
+ all the classes they reference. So, the Suppressing
+ is needed. (i.e. Jboss cache in the default configuration -->
+ <property name="suppressTransformationErrors">true</property>
+ <property name="prune">true</property>
+ <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
+ <property name="exclude">org.jboss.</property>
+ <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+ <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
+ <property name="optimized">true</property>
+ <property name="verbose">false</property>
+ <!--
+ Available choices for this attribute are:
+ org.jboss.aop.instrument.ClassicInstrumentor (default)
+ org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+ <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
+ -->
+ <!--
+ By default the deployment of the aspects contained in
+ ../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
+ are not deployed. To turn on deployment uncomment this property
+ <property name="useBaseXml">true</property>
+ -->
+ </bean>
+
+</deployment>
Added: projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml (rev 0)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml 2010-03-18 15:17:29 UTC (rev 102570)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="install" name="JBoss/AOP Application Server 6.x installation">
+
+ <target name="init">
+ <!-- ========================================= -->
+ <!-- Set the jboss root and server config here -->
+ <!-- ========================================= -->
+ <property file="jboss.properties"/>
+
+ <!-- The rest are automatic -->
+ <property name="jboss.config.dir" value="${jboss.home}/server/${jboss.config}"/>
+ <property name="jboss.bin.dir" value="${jboss.home}/bin"/>
+ <property name="jboss.client.dir" value="${jboss.home}/client"/>
+ <property name="jboss.backup.dir" value="${jboss.config.dir}/deployers.bak"/>
+ <property name="jboss.bootstrap.dir" value="${jboss.config.dir}/conf/bootstrap"/>
+
+ <available file="${jboss.home}" property="jboss.exists" type="dir"/>
+ <fail unless="jboss.exists" message="${jboss.home} does not exist. Modify 'jboss.home' in jboss.properties to be a valid root of a jboss installation"/>
+
+ <available file="${jboss.bin.dir}" property="bin.exists" type="dir"/>
+ <fail unless="bin.exists" message="${jboss.bin.dir} does not exist. Modify 'jboss.home' in jboss.properties to be a valid root of a jboss installation"/>
+
+ <available file="${jboss.client.dir}" property="client.exists" type="dir"/>
+ <fail unless="client.exists" message="${jboss.client.dir} does not exist. Modify 'jboss.config' in jboss.properties to be a valid server configuration"/>
+
+ <available file="${jboss.config.dir}" property="config.exists" type="dir"/>
+ <fail unless="config.exists" message="${jboss.config.dir} does not exist. Modify 'jboss.config' in jboss.properties to be a valid server configuration"/>
+
+ <available file="${jboss.bootstrap.dir}" property="bootstrap.exists" type="dir"/>
+ <fail unless="bootstrap.exists" message="${jboss.bootstrap.dir} does not exist. Modify 'jboss.config' in jboss.properties to be a valid server configuration"/>
+
+ <property name="deployers.dir" value="${jboss.config.dir}/deployers"/>
+
+ <property name="aspect.deployer" value="${deployers.dir}/jboss-aop-jboss5.deployer"/>
+ <available file="${aspect.deployer}" property="deployer.exists" type="dir"/>
+ <fail unless="deployer.exists" message="${aspect.deployer} does not exist."/>
+
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <available file="${jboss.lib}" property="lib.exists" type="dir"/>
+ <fail unless="lib.exists" message="${jboss.lib} does not exist. Modify 'jboss.home' in jboss.properties to be a valid root of a jboss installation"/>
+
+ <property name="jboss.aop.lib" value="../lib"/>
+ <available file="${jboss.aop.lib}" property="lib.jboss.aop.exists"/>
+ <fail unless="lib.jboss.aop.exists" message="${jboss.aop.lib} does not exist. Modify build.xml, setting the value of the property 'jboss.aop.lib' to be the path of the JBoss AOP lib installation directory."/>
+
+ <property name="lib.jbossaop-client" value="${jboss.aop.lib}/jboss-aop-client.jar"/>
+ <available file="${lib.jbossaop-client}" property="lib.jbossaop-client.exists"/>
+ <fail unless="lib.jbossaop-client.exists" message="${lib.jbossaop-client} does not exist. Modify build.xml, setting the value of the property 'jboss.aop.lib' to be the path of the JBoss AOP lib installation directory."/>
+
+ <property name="lib.jbossaop-client.injboss" value="${jboss.client.dir}/jboss-aop-client.jar"/>
+ <available file="${lib.jbossaop-client.injboss}" property="lib.jbossaop-client.injboss.exists"/>
+ <fail unless="lib.jbossaop-client.injboss.exists" message="${lib.jbossaop-client.injboss} does not exist. Modify 'jboss.home' in jboss.properties to be a valid root of a jboss installation"/>
+
+ <property name="bak.jbossaop-client" value="${jboss.client.dir}/jboss-aop-client.bak"/>
+ <available file="${bak.jbossaop-client}" property="jbossaop-client.bak.exists"/>
+ <condition property="backup.jbossaop-client" value="true">
+ <not>
+ <isset property="jbossaop-client.bak.exists"/>
+ </not>
+ </condition>
+
+ <tstamp>
+ <format property="tstamp" pattern="yyyyMMdd-HHmmss"/>
+ </tstamp>
+ </target>
+
+
+ <target name="backup.lib" depends="init">
+ <property name="old.lib" value="${jboss.lib}-${tstamp}.bak"/>
+ <echo>Backing up existing lib directory to ${old.lib}</echo>
+ <copy todir="${old.lib}">
+ <fileset dir="${jboss.lib}"/>
+ </copy>
+ </target>
+
+ <target name="backup.deployer" depends="init">
+ <mkdir dir="${jboss.backup.dir}"/>
+ <echo>Backing up existing aop deployer to ${old.deployer}</echo>
+ <copy todir="${jboss.backup.dir}/jboss-aop-jboss5.deployer-${tstamp}.bak">
+ <fileset dir="${aspect.deployer}"/>
+ </copy>
+ </target>
+
+ <target name="backup.client.lib" if="backup.jbossaop-client">
+ <echo>Backing up existing ${lib.jbossaop-client.injboss} to ${bak.jbossaop-client}</echo>
+ <copy file="${lib.jbossaop-client.injboss}" tofile="${bak.jbossaop-client}"/>
+ </target>
+
+ <target name="install.lib" depends="backup.lib,backup.client.lib">
+ <copy todir="${jboss.lib}" overwrite="true">
+ <fileset dir="lib">
+ <include name="*"/>
+ </fileset>
+ </copy>
+ <copy file="${lib.jbossaop-client}" tofile="${lib.jbossaop-client.injboss}"/>
+ </target>
+
+ <target name="install.deployer" depends="backup.deployer">
+ <copy todir="${aspect.deployer}" overwrite="true">
+ <fileset dir="jboss-aop-jboss5.deployer">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="install.bin" depends="init">
+ <copy todir="${jboss.bin.dir}" overwrite="true">
+ <fileset dir="../lib">
+ <include name="pluggable-instrumentor.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="install.aop.xml" depends="init">
+ <copy file="aop.xml" todir="${jboss.bootstrap.dir}" overwrite="true"/>
+ </target>
+
+
+ <target name="install" depends="install.lib,install.deployer,install.bin,install.aop.xml"/>
+</project>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2010-03-18 14:48:48 UTC (rev 102569)
+++ projects/aop/trunk/build/build.xml 2010-03-18 15:17:29 UTC (rev 102570)
@@ -382,7 +382,21 @@
<copy tofile="${project.release}/jboss-50-install/lib/javassist.jar" file="${javassist:javassist:jar}"/>
<copy tofile="${project.release}/jboss-50-install/lib/trove.jar" file="${trove:trove:jar}"/>
<copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.pluggable-instrumentor.location}"/>
+ <copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.pluggable-instrumentor.location}"/>
+
+ <!-- The JBoss 6 libs for JDK 6 (JBoss 6 needs JDK6) -->
+ <copy todir="${project.release}/jboss-60-install/lib" file="${aop.50.location}"/>
+ <copy todir="${project.release}/jboss-60-install/lib" file="${aop.asintegration-core.location}"/>
+ <copy todir="${project.release}/jboss-60-install/lib" file="${aop.asintegration-mc.location}"/>
+ <!-- TODO create a readme as6! -->
+ <!-- <copy todir="${project.release}/jboss-60-install" file="${aop.readme-as5.location}"/> -->
+ <copy tofile="${project.release}/jboss-60-install/build.xml" file="../asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml"/>
+ <copy tofile="${project.release}/jboss-60-install/aop.xml" file="../asintegration-core/src/etc/jboss-60-install-aop.xml"/>
+ <copy todir="${project.release}/jboss-60-install" file="../asintegration-core/src/etc/jboss.properties"/>
+ <copy tofile="${project.release}/jboss-60-install/lib/javassist.jar" file="${javassist:javassist:jar}"/>
+ <copy tofile="${project.release}/jboss-60-install/lib/trove.jar" file="${trove:trove:jar}"/>
+ <copy todir="${project.release}/jboss-60-install/jboss-aop-jboss5.deployer/" file="${aop.aspect-library50.location}"/>
+ <copy todir="${project.release}/jboss-60-install/jboss-aop-jboss5.deployer/" file="${aop.pluggable-instrumentor.location}"/>
<!-- Copy aophelper to the dist -->
<mkdir dir="${project.release}/aophelper"/>
More information about the jboss-cvs-commits
mailing list