[jboss-cvs] JBossAS SVN: r57692 - in trunk: aspects/src/jdk15/org/jboss/aop/deployers aspects/src/jdk15/org/jboss/aop/deployment aspects/src/main/org/jboss/aop/deployment build
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 17 11:30:58 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-17 11:30:53 -0400 (Tue, 17 Oct 2006)
New Revision: 57692
Modified:
trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectManager.java
trunk/aspects/src/jdk15/org/jboss/aop/deployment/AspectManagerServiceJDK5.java
trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java
trunk/build/build-distr.xml
Log:
[JBAOP-292] Package AspectDeployer into deployers/jboss-aop-jdk50.deployers. Rename base-aop.xml to base-aspects.xml when deployed in jboss 5. This was required -aop.xml is a known file extension and the main deployer tries to deploy that before the aspect deployer has been deployed. This in turn meant a deployer failed, which caused it not to do any deployment of the deploy/ folder
Modified: trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectManager.java
===================================================================
--- trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectManager.java 2006-10-17 04:38:28 UTC (rev 57691)
+++ trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectManager.java 2006-10-17 15:30:53 UTC (rev 57692)
@@ -47,7 +47,7 @@
*/
public class AspectManager
{
- AspectManagerServiceJDK5 delegate = new AspectManagerServiceJDK5();
+ AspectManagerServiceJDK5 delegate = new AspectManagerServiceJDK5("base-aspects.xml");
MBeanServer server;
public void setMbeanServer(MBeanServer server)
Modified: trunk/aspects/src/jdk15/org/jboss/aop/deployment/AspectManagerServiceJDK5.java
===================================================================
--- trunk/aspects/src/jdk15/org/jboss/aop/deployment/AspectManagerServiceJDK5.java 2006-10-17 04:38:28 UTC (rev 57691)
+++ trunk/aspects/src/jdk15/org/jboss/aop/deployment/AspectManagerServiceJDK5.java 2006-10-17 15:30:53 UTC (rev 57692)
@@ -35,6 +35,11 @@
{
}
+ public AspectManagerServiceJDK5(String baseXml)
+ {
+ super(baseXml);
+ }
+
protected AOPTransformer transformer = new AOPTransformer();
protected void attachTranslator()
Modified: trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java 2006-10-17 04:38:28 UTC (rev 57691)
+++ trunk/aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java 2006-10-17 15:30:53 UTC (rev 57692)
@@ -74,6 +74,7 @@
protected String exclude;
protected String include;
protected String ignore;
+ private String baseXml = "base-aop.xml";
// Static -------------------------------------------------------
@@ -81,6 +82,11 @@
public AspectManagerService()
{
}
+
+ public AspectManagerService(String baseXml)
+ {
+ this.baseXml = baseXml;
+ }
// Public -------------------------------------------------------
@@ -135,7 +141,7 @@
protected void baseAop()
{
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- URL base = cl.getResource("base-aop.xml");
+ URL base = cl.getResource(baseXml);
try
{
if (base != null)
@@ -144,12 +150,12 @@
}
else
{
- System.out.println("Could not find base-aop.xml file");
+ System.out.println("Could not find " + baseXml + " file in the resources of " + cl);
}
}
catch (Exception e)
{
- System.out.println("Error loading base-aop.xml file" + e);
+ System.out.println("Error loading " + baseXml + " file" + e);
}
}
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2006-10-17 04:38:28 UTC (rev 57691)
+++ trunk/build/build-distr.xml 2006-10-17 15:30:53 UTC (rev 57692)
@@ -192,7 +192,7 @@
<include name="ejb3-persistence.jar"/>
</fileset>
</copy>
-
+
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -260,29 +260,13 @@
</condition>
<!-- Copy the generated libraries -->
- <mkdir dir="${install.server}/all/deploy/${aop.deployer}"/>
<unjar src="${_module.output}/lib/${aop.deployer}"
- dest="${install.server}/all/deploy/${aop.deployer}" />
-
- <!-- For JBoss 5 copy the aop stuff to the lib and conf directories for the time being -->
- <copy todir="${install.server}/all/lib">
- <fileset dir="${install.server}/all/deploy/${aop.deployer}">
- <include name="**/*.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.server}/all/conf">
- <fileset dir="${install.server}/all/deploy/${aop.deployer}">
- <include name="base-aop.xml"/>
- </fileset>
- </copy>
- <copy todir="${install.server}/all/deployers">
- <fileset dir="${install.server}/all/deploy/${aop.deployer}/META-INF">
- <include name="*.xml"/>
- </fileset>
- </copy>
- <delete dir="${install.server}/all/deploy/${aop.deployer}"/>
-
+ dest="${install.server}/all/deployers/${aop.deployer}" />
+ <move file="${install.server}/all/deployers/${aop.deployer}/base-aop.xml"
+ tofile="${install.server}/all/deployers/${aop.deployer}/base-aspects.xml"/>
+
+
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -404,7 +388,7 @@
</copy>
<copy file="${apache.log4j.lib}/snmpTrapAppender.jar"
tofile="${install.all.lib}/log4j-snmp-appender.jar">
- </copy>
+ </copy>
<!-- Copy thirdparty client code -->
<copy todir="${install.client}" filtering="no">
@@ -437,7 +421,7 @@
<property name="_module.name" value="system-jmx" override="true"/>
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
-
+
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-system-jmx.jar"/>
@@ -446,7 +430,7 @@
</target>
<target name="_module-system-jmx-all" depends="_module-system-jmx-most">
</target>
-
+
<!-- ====== -->
<!-- Naming -->
<!-- ====== -->
@@ -1102,7 +1086,7 @@
<fileset dir="${opennms.joesnmp.lib}">
<include name="joesnmp.jar"/>
</fileset>
- </copy>
+ </copy>
<!-- Include the JMX console war unpacked -->
<mkdir dir="${install.server}/all/deploy/jmx-console.war"/>
@@ -1769,7 +1753,7 @@
</fileset>
<fileset dir="${jboss.common.logging.jdk.lib}">
<exclude name="*-sources.jar"/>
- </fileset>
+ </fileset>
<fileset dir="${jboss.jbossxb.lib}">
<include name="jboss-xml-binding.jar"/>
</fileset>
@@ -1822,7 +1806,7 @@
<include name="serializer.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code to server/all/lib -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${apache.logging.lib}">
@@ -1841,7 +1825,7 @@
<include name="wstools.*"/>
</patternset>
</unjar>
-
+
</target>
</project>
More information about the jboss-cvs-commits
mailing list