[jboss-cvs] JBossAS SVN: r62996 - in trunk/aspects: src/main/org/jboss/aop and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 11 12:26:56 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-11 12:26:56 -0400 (Fri, 11 May 2007)
New Revision: 62996
Removed:
trunk/aspects/src/main/org/jboss/aop/deployers/
trunk/aspects/src/main/org/jboss/aop/deployment/
trunk/aspects/src/resources/META-INF/
Modified:
trunk/aspects/.classpath
trunk/aspects/build.xml
Log:
[JBAS-4414] Move AS integration code out of trunk and into aop
Modified: trunk/aspects/.classpath
===================================================================
--- trunk/aspects/.classpath 2007-05-11 16:15:59 UTC (rev 62995)
+++ trunk/aspects/.classpath 2007-05-11 16:26:56 UTC (rev 62996)
@@ -35,5 +35,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml 2007-05-11 16:15:59 UTC (rev 62995)
+++ trunk/aspects/build.xml 2007-05-11 16:26:56 UTC (rev 62996)
@@ -106,7 +106,6 @@
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
-<!--property name="source15.java" value="${module.source}/jdk15"/-->
<property name="source.test" value="${module.source}/test"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.resources" value="${module.source}/resources"/>
@@ -116,9 +115,7 @@
<property name="build.reports" value="${module.output}/reports"/>
<property name="build.gen-src" value="${module.output}/gen-src"/>
<property name="build.classes" value="${module.output}/classes"/>
- <property name="build.classes.retro" value="${module.output}/classes-retro"/>
<property name="build.resources" value="${module.output}/resources"/>
-<!--property name="build15.classes" value="${module.output}/classes15"/-->
<property name="build.lib" value="${module.output}/lib"/>
<property name="build.unpacked" value="${module.output}/unpacked"/>
<property name="build.api" value="${module.output}/api"/>
@@ -154,12 +151,6 @@
<pathelement path="${build.classes}"/>
<path refid="javac.classpath"/>
</path>
- <path id="jbossretro.classpath">
- <path refid="apache.ant.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss.jbossretro.classpath"/>
- <path refid="jboss.backport.concurrent.classpath"/>
- </path>
<!-- xdoclet -->
<path id="xdoclet.task.classpath">
@@ -184,7 +175,7 @@
<target name="compile"
description="Compile all source files."
- depends="_default:compile-etc, _default:compile-resources, compile-classes, retrotranslate">
+ depends="_default:compile-etc, _default:compile-resources, compile-classes">
<!-- Add module specific elements here. -->
</target>
@@ -209,21 +200,6 @@
</javac>
</target>
- <target name="retrotranslate" depends="compile-classes">
- <mkdir dir="${build.classes.retro}"/>
-
- <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
- <retro compilerclasspathref="jbossretro.classpath" destdir="${build.classes.retro}">
- <classpath refid="jbossretro.classpath"/>
- <classpath refid="javac15.classpath"/>
- <classpath>
- <pathelement path="${build.classes}"/>
- </classpath>
- <src path="${build.classes}"/>
- </retro>
- </target>
-
-
<!--+====================================================================+-->
<!--| Generate Output |-->
<!--| |-->
@@ -242,20 +218,10 @@
<mkdir dir="${build.lib}"/>
<!-- Build jboss-aspect-deployer-jdk50.jar -->
- <jar destfile="${build.lib}/jboss-aop-deployer-jdk50.jar" manifest="${build.etc}/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset dir="${build.classes}">
- <!-- Include everything else -->
- <include name="org/jboss/aop/deploy*/**"/>
- <exclude name="org/jboss/aop/deployers/JBossAspectLibrary.class"/>
- </fileset>
- </jar>
-
- <!-- Build jboss-aspect-deployer-jdk50.jar -->
<jar destfile="${build.lib}/jboss-aspect-library-jdk50.jar" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
- <include name="org/jboss/aop/deployers/JBossAspectLibrary.class"/>
+ <!--include name="org/jboss/aop/deployers/JBossAspectLibrary.class"/-->
<include name="org/jboss/aop/junit/**"/>
<include name="org/jboss/aspects/**"/>
</fileset>
@@ -293,119 +259,22 @@
</fileset>
</jar>
- <jar destfile="${build.lib}/jboss-aspect-library-jdk50-jb32.jar" manifest="${build.etc}/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset dir="${build.classes}">
- <!-- Include everything else -->
- </fileset>
- <fileset dir="${build.etc}">
- <include name="org/jboss/**/*.xml"/>
- </fileset>
- <zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar">
- <include name="org/jboss/util/file/ArchiveBrowser*.class"/>
- <include name="org/jboss/util/file/ClassFileFilter.class"/>
- <include name="org/jboss/util/file/DirectoryArchiveBrowser.class"/>
- <include name="org/jboss/util/file/JarArchiveBrowser.class"/>
- </zipfileset>
- </jar>
-
- <mkdir dir="${build.meta.inf}"/>
- <copy file="${source.resources}/META-INF/jboss-service.xml" todir="${build.meta.inf}" filtering="true">
- <filterset>
- <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/jboss-aop-jdk50.deployer" manifest="${build.etc}/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
- <fileset file="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
- <fileset file="${project.root}/aspects/src/etc/base-aop.xml"/>
- <!-- fileset file="${javassist.lib}/javassist.jar"/-->
- <fileset file="${trove.lib}/trove.jar"/>
- <fileset dir="${module.output}">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
-
<copy file="${project.root}/aspects/src/etc/base-aop.xml" tofile="${build.meta.inf}/base-aspects.xml"/>
+
+ <available file="${build.lib}/jboss-aspect-library-jdk50.jar" property="a1"/>
+ <available file="${jboss.aop.lib}/jboss-aspect-library-beans.xml" property="a1"/>
<jar destfile="${build.lib}/jboss-aop-jboss5.deployer" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
<fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
- <!--fileset file="${jboss.aop.lib}/jboss-aop-jdk50.jar"/-->
- <fileset file="${build.meta.inf}/base-aspects.xml"/>
- <!--fileset file="${javassist.lib}/javassist.jar"/-->
- <!--fileset file="${trove.lib}/trove.jar"/-->
- <!--fileset dir="${source.resources}">
- <include name="META-INF/aspect-deployer-beans.xml"/>
- </fileset-->
- <fileset dir="${source.resources}">
- <include name="META-INF/jboss-aspect-library-beans.xml"/>
- </fileset>
+ <fileset file="${build.meta.inf}/base-aspects.xml"/>
+ <zipfileset prefix="META-INF" dir="${jboss.aop.lib}">
+ <include name="jboss-aspect-library-beans.xml"/>
+ </zipfileset>
</jar>
<delete dir="${build.meta.inf}"/>
</target>
- <target name="jars14" depends="retrotranslate">
- <mkdir dir="${build.lib}"/>
-
- <!-- Build jboss-aspects.jar -->
- <jar destfile="${build.lib}/jboss-aspect-library.jar" manifest="${build.etc}/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset dir="${build.classes.retro}">
- <!-- Include everything else -->
- <include name="org/jboss/**"/>
- </fileset>
- <fileset dir="${build.etc}">
- <include name="org/jboss/**/*.xml"/>
- </fileset>
- <fileset dir="${build.resources}">
- <include name="aop-deployer_1_1.xsd"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/jboss-aspect-library32.jar" manifest="${build.etc}/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset dir="${build.classes.retro}">
- <!-- Include everything else -->
- <include name="org/jboss/**"/>
- </fileset>
- <fileset dir="${build.etc}">
- <include name="org/jboss/**/*.xml"/>
- </fileset>
- <zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar">
- <include name="org/jboss/util/file/ArchiveBrowser*.class"/>
- <include name="org/jboss/util/file/ClassFileFilter.class"/>
- <include name="org/jboss/util/file/DirectoryArchiveBrowser.class"/>
- <include name="org/jboss/util/file/JarArchiveBrowser.class"/>
- </zipfileset>
- </jar>
-
- <mkdir dir="${build.meta.inf}"/>
- <copy file="${source.resources}/META-INF/jboss-service.xml" todir="${build.meta.inf}" filtering="true">
- <filterset>
- <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerService"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/jboss-aop.deployer" manifest="${build.etc}/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset file="${build.lib}/jboss-aspect-library.jar"/>
- <fileset file="${jboss.aop.lib}/jboss-aop.jar"/>
- <fileset file="${project.root}/aspects/src/etc/base-aop.xml"/>
- <fileset file="${javassist.lib}/javassist.jar"/>
- <fileset file="${trove.lib}/trove.jar"/>
- <fileset dir="${module.output}" >
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
- <delete dir="${build.meta.inf}"/>
-
- <!-- Generate checksums -->
- <call target="_default:compile-checksums"/>
-
- </target>
-
-
<!-- ================================================================== -->
<!-- Cleaning -->
<!-- ================================================================== -->
@@ -427,162 +296,6 @@
<!-- Install & Release -->
<!-- ================================================================== -->
- <target name="dist" depends="javadocs, init">
- <delete file="${aop.version}.zip"/>
- <copy todir="docs" filtering="no">
- <fileset dir="output">
- <include name="api/**"/>
- </fileset>
- </copy>
-
- <mkdir dir="${build.unpacked}"/>
-
- <mkdir dir="${build.unpacked}/jboss-aop.deployer"/>
- <unjar src="${build.lib}/jboss-aop.deployer"
- dest="${build.unpacked}/jboss-aop.deployer"/>
-
- <mkdir dir="${build.unpacked}/jboss-aop-jdk50.deployer"/>
- <unjar src="${build.lib}/jboss-aop-jdk50.deployer"
- dest="${build.unpacked}/jboss-aop-jdk50.deployer"/>
-
-
- <zip zipfile="${aop.version}.zip">
- <zipfileset dir="../aop/docs" prefix="${aop.version}/docs/aspect-framework">
- <include name="api/**"/>
- <include name="index.html"/>
- <include name="misc/*.html"/>
- <include name="misc/*.jpg"/>
- <include name="examples/**"/>
- <exclude name="**/CVS/**"/>
- <exclude name="**/*.wiki"/>
- </zipfileset>
- <zipfileset dir="../aop/docs/reference/build" prefix="${aop.version}/docs/aspect-framework">
- <include name="**/*"/>
- <exclude name="**/CVS/**"/>
- <exclude name="**/*.wiki"/>
- </zipfileset>
- <zipfileset dir="docs" prefix="${aop.version}/docs/aspect-library">
- <include name="api/**"/>
- <include name="**/*.html"/>
- <include name="**/*.jpg"/>
- <include name="examples/**"/>
- <exclude name="**/CVS/**"/>
- <exclude name="**/*.wiki"/>
- </zipfileset>
- <zipfileset dir="${build.unpacked}" prefix="${aop.version}/jboss-40-install">
- <include name="**/*"/>
- </zipfileset>
- <zipfileset dir="${build.lib}" prefix="${aop.version}/lib">
- <include name="jboss-aspect-library.jar"/>
- </zipfileset>
- <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib">
- <include name="jdk14-pluggable-instrumentor.jar"/>
- <include name="jrockit-pluggable-instrumentor.jar"/>
- <include name="jboss-aop.jar"/>
- </zipfileset>
- <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib">
- <include name="javassist.jar"/>
- </zipfileset>
- <zipfileset dir="${trove.lib}" prefix="${aop.version}/lib">
- <include name="trove.jar"/>
- </zipfileset>
- <zipfileset dir="${qdox.qdox.lib}" prefix="${aop.version}/lib">
- <include name="qdox.jar"/>
- </zipfileset>
- <zipfileset dir="${jboss.common.lib}" prefix="${aop.version}/lib">
- <include name="jboss-common.jar"/>
- </zipfileset>
- <zipfileset dir="${oswego.concurrent.lib}" prefix="${aop.version}/lib">
- <include name="concurrent.jar"/>
- </zipfileset>
- <zipfileset dir="${beanshell.beanshell.lib}" prefix="${aop.version}/lib">
- <include name="bsh-1.3.0.jar"/>
- </zipfileset>
-
- <zipfileset dir="${build.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
- <include name="jboss-aspect-library-jdk50-jb32.jar"/>
- </zipfileset>
- <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
- <include name="jboss-aop-jdk50.jar"/>
- </zipfileset>
- <zipfileset dir="${javassist.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
- <include name="javassist.jar"/>
- </zipfileset>
- <zipfileset dir="${trove.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
- <include name="trove.jar"/>
- </zipfileset>
-
-
- <zipfileset dir="${build.lib}" prefix="${aop.version}/jboss-32-install">
- <include name="jboss-aspect-library32.jar"/>
- </zipfileset>
- <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/jboss-32-install">
- <include name="jboss-aop.jar"/>
- </zipfileset>
- <zipfileset dir="${javassist.lib}" prefix="${aop.version}/jboss-32-install">
- <include name="javassist.jar"/>
- </zipfileset>
- <zipfileset dir="${trove.lib}" prefix="${aop.version}/jboss-32-install">
- <include name="trove.jar"/>
- </zipfileset>
-
- <zipfileset dir="${build.lib}" prefix="${aop.version}/lib-50">
- <include name="jboss-aspect-library-jdk50.jar"/>
- <include name="jboss-aspect-jdk50-client.jar"/>
- </zipfileset>
- <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib-50">
- <include name="jboss-aop-jdk50.jar"/>
- <include name="pluggable-instrumentor.jar"/>
- <include name="jboss-aop-jdk50-client.jar"/>
- <include name="jrockit-pluggable-instrumentor.jar"/>
- </zipfileset>
- <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib-50">
- <include name="javassist.jar"/>
- </zipfileset>
- <zipfileset dir="${trove.lib}" prefix="${aop.version}/lib-50">
- <include name="trove.jar"/>
- </zipfileset>
- <zipfileset dir="${qdox.qdox.lib}" prefix="${aop.version}/lib-50">
- <include name="qdox.jar"/>
- </zipfileset>
- <zipfileset dir="${jboss.common.lib}" prefix="${aop.version}/lib-50">
- <include name="jboss-common.jar"/>
- </zipfileset>
- <zipfileset dir="${oswego.concurrent.lib}" prefix="${aop.version}/lib-50">
- <include name="concurrent.jar"/>
- </zipfileset>
- <zipfileset dir="${beanshell.beanshell.lib}" prefix="${aop.version}/lib-50">
- <include name="bsh-1.3.0.jar"/>
- </zipfileset>
-
- <zipfileset dir="../aop/src/resources/bin" prefix="${aop.version}/bin">
- <include name="*.sh"/>
- <include name="*.bat"/>
- <exclude name="**/CVS/**"/>
- </zipfileset>
- <zipfileset file="src/etc/base-aop.xml" prefix="${aop.version}/etc"/>
- <zipfileset file="RELEASE_NOTES.html" prefix="${aop.version}"/>
- <zipfileset dir="src" prefix="${aop.version}/src/aspect-library">
- <include name="jdk15/**/*.java"/>
- <include name="main/**/*.java"/>
- <include name="main/**/*.xml"/>
- <include name="test/**/*.java"/>
- <include name="test/**/*.xml"/>
- <include name="resources/**/*.xml"/>
- <exclude name="**/CVS/**"/>
- </zipfileset>
- <zipfileset dir="../aop/src" prefix="${aop.version}/src/aspect-framework">
- <include name="jdk15/**/*.java"/>
- <include name="main/**/*.java"/>
- <include name="main/**/*.xml"/>
- <include name="test/**/*.java"/>
- <include name="test/**/*.xml"/>
- <include name="resources/**/*.xml"/>
- <exclude name="**/CVS/**"/>
- </zipfileset>
- </zip>
- </target>
-
<!-- ================================================================== -->
<!-- Misc. -->
<!-- ================================================================== -->
@@ -593,11 +306,11 @@
<target name="all"
description="Builds everything."
- depends="output, jars14, docs"/>
+ depends="output, docs"/>
<target name="most"
description="Builds almost everything."
- depends="output, jars14"/>
+ depends="output"/>
<target name="help"
description="Show this help message."
More information about the jboss-cvs-commits
mailing list