[jboss-cvs] JBossAS SVN: r72519 - projects/aop/trunk/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 21 17:04:44 EDT 2008
Author: stalep
Date: 2008-04-21 17:04:44 -0400 (Mon, 21 Apr 2008)
New Revision: 72519
Modified:
projects/aop/trunk/build/build-release.xml
projects/aop/trunk/build/build.xml
Log:
[JBAOP-556] removed jdk14 references.
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2008-04-21 19:37:25 UTC (rev 72518)
+++ projects/aop/trunk/build/build-release.xml 2008-04-21 21:04:44 UTC (rev 72519)
@@ -124,19 +124,29 @@
&libraries;
+<!--
<property name="aop.14.location" value="${project.root}/aop/output/lib/jboss-aop.jar"/>
+ -->
<property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
+ <!--
<property name="aop.aspect-library14.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk14.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.as4-deployer-jdk14.location" value="${project.root}/asintegration/output/lib/jboss-aop-as4-deployer-jdk14.jar"/>
+ -->
<property name="aop.jboss4.jdk50.location" value="${project.root}/asintegration/output/lib/jboss-aop-jboss4-jdk50.jar"/>
+ <!--
<property name="aop.jboss4.jdk14.location" value="${project.root}/asintegration/output/lib/jboss-aop-jboss4-jdk14.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.jrockit-pluggable-instrumentor.location" value="${project.root}/aop/output/lib/jrockit-pluggable-instrumentor.jar"/>
<property name="aop.pluggable-instrumentor.location" value="${project.root}/aop/output/lib/pluggable-instrumentor.jar"/>
+ <!--
<property name="aop.jdk14-pluggable-instrumentor.location" value="${project.root}/aop/output/lib/jdk14-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"/>
@@ -144,7 +154,9 @@
<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"/>
<property name="jboss-common-core.location" value="${jboss/common.core.lib}/jboss-common-core.jar"/>
+ <!--
<property name="jboss-common-core14.location" value="${jboss/common.core.14.lib}/jboss-common-core-jdk14.jar"/>
+ -->
<property name="jboss-logging-log4j.location" value="${jboss/common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
<property name="jboss-logging-spi.location" value="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
<!--
@@ -164,6 +176,7 @@
<property name="trove.location" value="${trove.trove.lib}/trove.jar"/>
+<!--
<mkdir dir="output/temp/jboss-reflect-classes"/>
<mkdir dir="output/temp/jboss-reflect-classes14"/>
<mkdir dir="output/temp/jboss-mdr-classes"/>
@@ -211,6 +224,7 @@
<property name="jboss-reflect-jdk14.location" value="output/temp/jboss-reflect-jdk14.jar"/>
<property name="jboss-mdr-jdk14.location" value="output/temp/jboss-mdr-jdk14.jar"/>
+ -->
<!--
Create the MC container.jar subset with org.jboss.metadata.spi and org.jboss.annotation,factory classes since
@@ -277,16 +291,19 @@
<copy todir="${project.release}/lib-50/retro" file="${jbossretro.location}"/>
<!-- The JDK 1.4 libs -->
+ <!--
<copy todir="${project.release}/lib-14" file="${aop.14.location}"/>
<copy todir="${project.release}/lib-14" file="${aop.aspect-library14.location}"/>
<copy todir="${project.release}/lib-14" file="${aop.jdk14-pluggable-instrumentor.location}"/>
<copy todir="${project.release}/lib-14" file="${javassist.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-common-core14.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-backport-concurrent.location}"/>
+ -->
<!--
<copy todir="${project.release}/lib-14" file="${jboss-container14.location}"/>
-->
+ <!--
<copy todir="${project.release}/lib-14" file="${jboss-reflect-jdk14.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-mdr-jdk14.location}"/>
@@ -296,8 +313,10 @@
<copy todir="${project.release}/lib-14" file="${log4j.location}"/>
<copy todir="${project.release}/lib-14" file="${qdox.location}"/>
<copy todir="${project.release}/lib-14" file="${trove.location}"/>
+ -->
<!-- The JBoss 4.0.x libs for JDK 1.4 (JBoss 4.2.x needs JDK 5)-->
+ <!--
<copy file="${aop.jboss-service.location}" tofile="output/temp/jboss-service-jdk4.xml" filtering="true">
<filterset>
<filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerService"/>
@@ -311,18 +330,27 @@
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${aop.as4-deployer-jdk14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${aop.jboss4.jdk14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${aop.readme-as4.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-backport-concurrent.location}"/><!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-backport-concurrent.location}"/>
+ -->
+ <!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
+<!--
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${jboss-reflect-jdk14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${jboss-mdr-jdk14.location}"/>
+ -->
<!--
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-container-metadata-spi14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-container-annotation14.location}"/>
-->
+ <!--
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${javassist.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jbossretro-rt.location}"/><!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jbossretro-rt.location}"/>
+ -->
+ <!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
+ <!--
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${trove.location}"/>
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk4.xml"/>
+ -->
<!-- The JBoss 4.0.x and 4.2.x libs for JDK 5 -->
<copy file="${aop.jboss-service.location}" tofile="output/temp/jboss-service-jdk50.xml" filtering="true">
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2008-04-21 19:37:25 UTC (rev 72518)
+++ projects/aop/trunk/build/build.xml 2008-04-21 21:04:44 UTC (rev 72519)
@@ -334,11 +334,15 @@
<property name="aop15.dir" value="${repository.home}/jboss/aop/${ver}/lib"/>
<property name="aop15.resources.dir" value="${repository.home}/jboss/aop/${ver}/resources"/>
+ <!--
<property name="aop14.dir" value="${repository.home}/jboss/aop14/${ver}/lib"/>
+ -->
<mkdir dir="${aop15.dir}"/>
<mkdir dir="${aop15.resources.dir}"/>
+ <!--
<mkdir dir="${aop14.dir}"/>
+ -->
<copy todir="${aop15.dir}">
<fileset dir="../aop/output/lib">
@@ -366,6 +370,7 @@
<include name="jboss-aspect-library-beans.xml"/>
</fileset>
</copy>
+ <!--
<copy todir="${aop14.dir}">
<fileset dir="../aop/output/lib">
<include name="jboss-aop.jar"/>
@@ -383,6 +388,7 @@
<include name="jboss-standalone-aspects-src.zip"/>
</fileset>
</copy>
+ -->
</target>
</project>
More information about the jboss-cvs-commits
mailing list