[jboss-cvs] JBossAS SVN: r78894 - in projects/aop/trunk: asintegration-core and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 26 10:56:32 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-09-26 10:56:32 -0400 (Fri, 26 Sep 2008)
New Revision: 78894
Added:
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapper.java
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
projects/aop/trunk/asintegration-jmx/src/resources/
projects/aop/trunk/asintegration-jmx/src/resources/META-INF/
projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-service.xml
Removed:
projects/aop/trunk/asintegration-jmx/src/resources/META-INF/aspect-deployer-beans.xml
projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-aspect-library-beans.xml
projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-service.xml
projects/aop/trunk/asintegration-mc/src/resources/META-INF/jboss-service.xml
projects/aop/trunk/asintegration/
Modified:
projects/aop/trunk/asintegration-core/pom.xml
projects/aop/trunk/asintegration-jmx/pom.xml
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/build/build-release.xml
projects/aop/trunk/pom.xml
Log:
[JBAOP-652] Remove asintegration moduleAdd MBean to initialise JBoss4Integration in AS4
Modified: projects/aop/trunk/asintegration-core/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-core/pom.xml 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/asintegration-core/pom.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -44,12 +44,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <excludes>
- <exclude>org/jboss/aop/junit/**</exclude>
- <exclude>org/jboss/aop/asintegration/jboss4/**</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -80,7 +74,7 @@
<fileset dir="${basedir}/src/etc"/>
</copy>
<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
- tofile="${basedir}/output/lib/jboss-aop-deployer-jdk50.jar"/>
+ tofile="${basedir}/output/lib/${project.artifactId}.jar"/>
</tasks>
</configuration>
</execution>
Modified: projects/aop/trunk/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-jmx/pom.xml 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/asintegration-jmx/pom.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -44,12 +44,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <excludes>
- <exclude>org/jboss/aop/junit/**</exclude>
- <exclude>org/jboss/aop/asintegration/jboss4/**</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -80,7 +74,7 @@
<fileset dir="${basedir}/src/etc"/>
</copy>
<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
- tofile="${basedir}/output/lib/jboss-aop-deployer-jdk50.jar"/>
+ tofile="${basedir}/output/lib/${project.artifactId}.jar"/>
</tasks>
</configuration>
</execution>
Modified: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2008-09-26 14:56:32 UTC (rev 78894)
@@ -41,6 +41,7 @@
import org.jboss.aop.asintegration.JBossIntegration;
import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
import org.jboss.aop.domain.ScopedRepositoryClassLoaderDomain;
+import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.mx.server.ServerConstants;
import org.jboss.mx.util.MBeanServerLocator;
@@ -68,6 +69,14 @@
*/
public class JBoss4Integration implements JBossIntegration, ScopedClassPoolFactory
{
+ static {
+ //pre-load necessary classes so that we avoid NoClassDefFoundErrors on JRockit when using the RepositoryClassloader hook
+ //When AspectManager.translate() is called the first time, these classes have not been loaded yet, and this is what causes
+ //JRockit to get confused
+ @SuppressWarnings("unused")
+ Class<?> clazz = HeirarchicalLoaderRepository3.class;
+ }
+
static final ObjectName DEFAULT_LOADER_REPOSITORY = ObjectNameFactory.create(ServerConstants.DEFAULT_LOADER_NAME);
/** The delegate classpool factory */
Modified: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java 2008-09-26 14:56:32 UTC (rev 78894)
@@ -90,25 +90,11 @@
// Public -------------------------------------------------------
- /**
- * Get the integration
- *
- * @return the integration
- */
- public JBossIntegration getJBossIntegration()
+ public void setJBossIntegrationWrapper(JBossIntegrationWrapperMBean integration)
{
- return delegate.getJBossIntegration();
+ JBossIntegration intgr = integration != null ? integration.getIntegration() : null;
+ delegate.setJBossIntegration(intgr);
}
-
- /**
- * Set the integration
- *
- * @param integration the integration
- */
- public void setJBossIntegration(JBossIntegration integration)
- {
- delegate.setJBossIntegration(integration);
- }
protected ScopedClassPoolFactory createFactory() throws Exception
{
Modified: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java 2008-09-26 14:56:32 UTC (rev 78894)
@@ -136,4 +136,9 @@
* Whether or not tu use base-aop.xml
*/
void setUseBaseXml(boolean useBaseXml);
+
+ /**
+ * Sets the MBean containing the JBossIntegration implementation
+ */
+ void setJBossIntegrationWrapper(JBossIntegrationWrapperMBean integration);
}
Added: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapper.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapper.java (rev 0)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapper.java 2008-09-26 14:56:32 UTC (rev 78894)
@@ -0,0 +1,41 @@
+/*
+* 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.deployment;
+
+import org.jboss.aop.asintegration.JBossIntegration;
+import org.jboss.aop.asintegration.jboss4.JBoss4Integration;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class JBoss4IntegrationWrapper implements JBoss4IntegrationWrapperMBean
+{
+ JBoss4Integration integration = new JBoss4Integration();
+
+ public JBossIntegration getIntegration()
+ {
+ return integration;
+ }
+
+}
Added: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java (rev 0)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java 2008-09-26 14:56:32 UTC (rev 78894)
@@ -0,0 +1,32 @@
+/*
+* 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.deployment;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface JBoss4IntegrationWrapperMBean extends JBossIntegrationWrapperMBean
+{
+
+}
Added: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java (rev 0)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java 2008-09-26 14:56:32 UTC (rev 78894)
@@ -0,0 +1,34 @@
+/*
+* 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.deployment;
+
+import org.jboss.aop.asintegration.JBossIntegration;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface JBossIntegrationWrapperMBean
+{
+ JBossIntegration getIntegration();
+}
Copied: projects/aop/trunk/asintegration-jmx/src/resources/META-INF (from rev 78883, projects/aop/trunk/asintegration-mc/src/resources/META-INF)
Deleted: projects/aop/trunk/asintegration-jmx/src/resources/META-INF/aspect-deployer-beans.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/src/resources/META-INF/aspect-deployer-beans.xml 2008-09-26 03:33:33 UTC (rev 78883)
+++ projects/aop/trunk/asintegration-jmx/src/resources/META-INF/aspect-deployer-beans.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Aspect Deployer
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!--
- 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">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></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, org.jboss.cache.jmx, org.jboss.cache.pojo.jmx, org.jboss.ha, org.jboss.invocation</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>
- -->
- </bean>
-
-
-
- <!-- Aspect Deployment -->
- <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
- <depends>AspectManager</depends>
- </bean>
-</deployment>
Deleted: projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-aspect-library-beans.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/src/resources/META-INF/jboss-aspect-library-beans.xml 2008-09-26 03:33:33 UTC (rev 78883)
+++ projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-aspect-library-beans.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Aspect Deployer
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Aspect Library -->
- <bean name="AspectLibrary" class="org.jboss.aop.deployers.JBossAspectLibrary">
- <property name="aspectManager"><inject bean="AspectManager"/></property>
- </bean>
-
- <!-- Add the JMX -->
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
- name="JMXAdvice"
- class="org.jboss.aop.microcontainer.aspects.jmx.JMXLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </aop:lifecycle-configure>
-
-</deployment>
Deleted: projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-service.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/src/resources/META-INF/jboss-service.xml 2008-09-26 03:33:33 UTC (rev 78883)
+++ projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-service.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
-
-<!-- ===================================================================== -->
-<!-- JBoss Server Configuration -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- The code for the service is different for the different run scenarios
- *** JBoss 4.0
- * JDK 1.4 - org.jboss.aop.deployment.AspectManagerService
- * JDK 5 (not using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService
- * JDK 5 (using -javaagent switch) - org.jboss.aop.deployment.AspectManagerServiceJDK5
- * BEA JRockit 1.4.2 - org.jboss.aop.deployment.AspectManagerService
- *** JBoss 3.2
- * JDK 1.4 - org.jboss.aop.deployment.AspectManagerService32
- * JDK 5 (not using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService32
- * JDK 5 (using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService32JDK5
- * BEA JRockit 1.4.2 - org.jboss.aop.deployment.AspectManagerService32
- -->
- <mbean code="@SERVICE_NAME@"
- name="jboss.aop:service=AspectManager">
- <attribute name="EnableLoadtimeWeaving">false</attribute>
- <!-- 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 -->
- <attribute name="SuppressTransformationErrors">true</attribute>
- <attribute name="Prune">true</attribute>
- <attribute name="Include">org.jboss.test, org.jboss.injbossaop</attribute>
- <attribute name="Exclude">org.jboss.</attribute>
- <!-- This avoids instrumentation of hibernate cglib enhanced proxies
- <attribute name="Ignore">*$$EnhancerByCGLIB$$*</attribute> -->
- <attribute name="Optimized">true</attribute>
- <attribute name="Verbose">false</attribute>
- <!--
- Available choices for this attribute are:
- org.jboss.aop.instrument.ClassicInstrumentor (default)
- org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
- <attribute name="Instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</attribute>
- -->
- </mbean>
-
- <mbean code="org.jboss.aop.deployment.AspectDeployer"
- name="jboss.aop:service=AspectDeployer">
- <depends>jboss.system:service=MainDeployer</depends>
- </mbean>
-</server>
Copied: projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-service.xml (from rev 78892, projects/aop/trunk/asintegration-mc/src/resources/META-INF/jboss-service.xml)
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-service.xml (rev 0)
+++ projects/aop/trunk/asintegration-jmx/src/resources/META-INF/jboss-service.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+
+<!-- ===================================================================== -->
+<!-- JBoss Server Configuration -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <mbean code="org.jboss.aop.deployment.JBoss4IntegrationWrapper" name="jboss.aop:service=JBoss4IntegrationWrapper"/>
+
+ <!-- The code for the service is different for the different run scenarios
+ *** JBoss 4.0
+ * JDK 1.4 - org.jboss.aop.deployment.AspectManagerService
+ * JDK 5 (not using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService
+ * JDK 5 (using -javaagent switch) - org.jboss.aop.deployment.AspectManagerServiceJDK5
+ * BEA JRockit 1.4.2 - org.jboss.aop.deployment.AspectManagerService
+ *** JBoss 3.2
+ * JDK 1.4 - org.jboss.aop.deployment.AspectManagerService32
+ * JDK 5 (not using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService32
+ * JDK 5 (using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService32JDK5
+ * BEA JRockit 1.4.2 - org.jboss.aop.deployment.AspectManagerService32
+ -->
+ <mbean code="@SERVICE_NAME@"
+ name="jboss.aop:service=AspectManager">
+ <attribute name="EnableLoadtimeWeaving">false</attribute>
+ <!-- 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 -->
+ <attribute name="SuppressTransformationErrors">true</attribute>
+ <attribute name="Prune">true</attribute>
+ <attribute name="Include">org.jboss.test, org.jboss.injbossaop</attribute>
+ <attribute name="Exclude">org.jboss.</attribute>
+ <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+ <attribute name="Ignore">*$$EnhancerByCGLIB$$*</attribute> -->
+ <attribute name="Optimized">true</attribute>
+ <attribute name="Verbose">false</attribute>
+ <depends optional-attribute-name="JBossIntegrationWrapper" proxy-type="attribute">jboss.aop:service=JBoss4IntegrationWrapper</depends>
+ <!--
+ Available choices for this attribute are:
+ org.jboss.aop.instrument.ClassicInstrumentor (default)
+ org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+ <attribute name="Instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</attribute>
+ -->
+ </mbean>
+
+ <mbean code="org.jboss.aop.deployment.AspectDeployer"
+ name="jboss.aop:service=AspectDeployer">
+ <depends>jboss.system:service=MainDeployer</depends>
+ </mbean>
+</server>
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -47,7 +47,6 @@
<configuration>
<excludes>
<exclude>org/jboss/aop/junit/**</exclude>
- <exclude>org/jboss/aop/asintegration/jboss4/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -80,7 +79,7 @@
<fileset dir="${basedir}/src/etc"/>
</copy>
<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
- tofile="${basedir}/output/lib/jboss-aop-deployer-jdk50.jar"/>
+ tofile="${basedir}/output/lib/${project.artifactId}.jar"/>
</tasks>
</configuration>
</execution>
Deleted: projects/aop/trunk/asintegration-mc/src/resources/META-INF/jboss-service.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/src/resources/META-INF/jboss-service.xml 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/asintegration-mc/src/resources/META-INF/jboss-service.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
-
-<!-- ===================================================================== -->
-<!-- JBoss Server Configuration -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- The code for the service is different for the different run scenarios
- *** JBoss 4.0
- * JDK 1.4 - org.jboss.aop.deployment.AspectManagerService
- * JDK 5 (not using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService
- * JDK 5 (using -javaagent switch) - org.jboss.aop.deployment.AspectManagerServiceJDK5
- * BEA JRockit 1.4.2 - org.jboss.aop.deployment.AspectManagerService
- *** JBoss 3.2
- * JDK 1.4 - org.jboss.aop.deployment.AspectManagerService32
- * JDK 5 (not using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService32
- * JDK 5 (using -javaagent switch) - org.jboss.aop.deployment.AspectManagerService32JDK5
- * BEA JRockit 1.4.2 - org.jboss.aop.deployment.AspectManagerService32
- -->
- <mbean code="@SERVICE_NAME@"
- name="jboss.aop:service=AspectManager">
- <attribute name="EnableLoadtimeWeaving">false</attribute>
- <!-- 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 -->
- <attribute name="SuppressTransformationErrors">true</attribute>
- <attribute name="Prune">true</attribute>
- <attribute name="Include">org.jboss.test, org.jboss.injbossaop</attribute>
- <attribute name="Exclude">org.jboss.</attribute>
- <!-- This avoids instrumentation of hibernate cglib enhanced proxies
- <attribute name="Ignore">*$$EnhancerByCGLIB$$*</attribute> -->
- <attribute name="Optimized">true</attribute>
- <attribute name="Verbose">false</attribute>
- <!--
- Available choices for this attribute are:
- org.jboss.aop.instrument.ClassicInstrumentor (default)
- org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
- <attribute name="Instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</attribute>
- -->
- </mbean>
-
- <mbean code="org.jboss.aop.deployment.AspectDeployer"
- name="jboss.aop:service=AspectDeployer">
- <depends>jboss.system:service=MainDeployer</depends>
- </mbean>
-</server>
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/build/build-release.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -80,14 +80,24 @@
<!-- Add the files from 'asintegration' -->
<!-- ================================================== -->
- <copy todir="${project.release}/docs/aspect-deployer" filtering="no">
- <fileset dir="${project.root}/asintegration/output">
+ <copy todir="${project.release}/docs/asintegration-core" filtering="no">
+ <fileset dir="${project.root}/asintegration-core/output">
<include name="api/**"/>
</fileset>
</copy>
+ <copy todir="${project.release}/docs/asintegration-jmx" filtering="no">
+ <fileset dir="${project.root}/asintegration-jmx/output">
+ <include name="api/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/docs/asintegration-mc" filtering="no">
+ <fileset dir="${project.root}/asintegration-mc/output">
+ <include name="api/**"/>
+ </fileset>
+ </copy>
- <copy todir="${project.release}/src/aspect-deployer" filtering="no">
- <fileset dir="${project.root}/asintegration/src">
+ <copy todir="${project.release}/src/asintegration-core" filtering="no">
+ <fileset dir="${project.root}/asintegration-core/src">
<include name="main/**/*.java"/>
<include name="etc/**"/>
<include name="resources/**"/>
@@ -95,6 +105,24 @@
<exclude name="**/CVS/**"/>
</fileset>
</copy>
+ <copy todir="${project.release}/src/asintegration-jmx" filtering="no">
+ <fileset dir="${project.root}/asintegration-jmx/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/src/asintegration-mc" filtering="no">
+ <fileset dir="${project.root}/asintegration-mc/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
<!-- ================================================== -->
<!-- Add the files from 'aspects' -->
@@ -127,15 +155,14 @@
<property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
<property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50-single.jar"/>
<property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
- <property name="aop.as4-deployer.location" value="${project.root}/asintegration/output/lib/jboss-aop-as4-deployer.jar"/>
- <property name="aop.jboss4.jdk50.location" value="${project.root}/asintegration/output/lib/jboss-aop-jboss4-jdk50.jar"/>
- <!-- TODO I would like to call this jboss-aop-deployer.jar instead, and update name in appserver trunk -->
- <property name="aop.as5-deployer.location" value="${project.root}/asintegration/output/lib/jboss-aop-deployer-jdk50.jar"/>
+ <property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/output/lib/jboss-asintegration-core.jar"/>
+ <property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/output/lib/jboss-asintegration-jmx.jar"/>
+ <property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/output/lib/jboss-asintegration-mc.jar"/>
<property name="aop.jrockit-pluggable-instrumentor.location" value="${project.root}/jrockit-pluggable-instrumentor/target/jrockit-pluggable-instrumentor.jar"/>
<property name="aop.pluggable-instrumentor.location" value="${project.root}/pluggable-instrumentor/target/pluggable-instrumentor.jar"/>
- <property name="aop.readme-as4.location" value="${project.root}/asintegration/src/etc/ReadMe-AS4.txt"/>
- <property name="aop.readme-as5.location" value="${project.root}/asintegration/src/etc/ReadMe-AS5.txt"/>
- <property name="aop.jboss-service.location" value="${project.root}/asintegration/src/resources/META-INF/jboss-service.xml"/>
+ <property name="aop.readme-as4.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS4.txt"/>
+ <property name="aop.readme-as5.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS5.txt"/>
+ <property name="aop.jboss-service.location" value="${project.root}/asintegration-jmx/src/resources/META-INF/jboss-service.xml"/>
<property name="javassist.location" value="${javassist.javassist.lib}/javassist.jar"/>
<property name="jboss-backport-concurrent.location" value="${jboss.backport.concurrent.lib}/jboss-backport-concurrent.jar"/>
@@ -177,18 +204,14 @@
<filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
</filterset>
</copy>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build_jboss4.0.xml" file="../asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build.xml" file="../asintegration/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="../asintegration/src/etc/jboss.properties"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build_jboss4.0.xml" file="../asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build.xml" file="../asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="../asintegration-core/src/etc/jboss.properties"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.50.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.as4-deployer.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.jboss4.jdk50.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-core.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-jmx.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/" file="${aop.readme-as4.location}"/>
- <!--
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-container-metadata-spi.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-container-annotation.location}"/>
- -->
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-reflect.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-mdr.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-common-core.location}"/>
@@ -198,8 +221,10 @@
<!-- The JBoss 5 libs for JDK 5 (JBoss 5 needs JDK 5) -->
<copy todir="${project.release}/jboss-50-install/lib" file="${aop.50.location}"/>
- <copy todir="${project.release}/jboss-50-install/lib" file="${aop.as5-deployer.location}"/>
- <copy todir="${project.release}/jboss-50-install" file="${aop.readme-as4.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-core.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-mc.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-jmx.location}"/>
+ <copy todir="${project.release}/jboss-50-install" file="${aop.readme-as5.location}"/>
<copy todir="${project.release}/jboss-50-install/lib" file="${javassist.location}"/>
<copy todir="${project.release}/jboss-50-install/lib" file="${trove.location}"/>
<copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer" file="${aop.aspect-library50.location}"/>
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2008-09-26 14:55:58 UTC (rev 78893)
+++ projects/aop/trunk/pom.xml 2008-09-26 14:56:32 UTC (rev 78894)
@@ -68,7 +68,9 @@
<module>aop</module>
<module>pluggable-instrumentor</module>
<module>aspects</module>
- <module>asintegration</module>
+ <module>asintegration-core</module>
+ <module>asintegration-jmx</module>
+ <module>asintegration-mc</module>
</modules>
<dependencyManagement>
@@ -283,6 +285,21 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-asintegration-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-asintegration-jmx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-asintegration-mc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloader</artifactId>
<version>${version.org.jboss.cl}</version>
More information about the jboss-cvs-commits
mailing list