From 6225172ce1aba3545d54830c1a9a965f0bd6c5b7 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Wed, 23 Sep 2009 18:56:06 +0000
Subject: [PATCH] Fix for issue 2531: Removed all AspectJ dependencies.
---
opends/build.xml | 66 +--------------------------------
1 files changed, 2 insertions(+), 64 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index ba52b19..9c1896e 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -399,13 +399,6 @@
</not>
</condition>
- <condition property="WEAVE_ENABLED" value="false">
- <not>
- <isset property="WEAVE_ENABLED" />
- </not>
- </condition>
-
-
<!--
! For some reason, some Apple VMs put quotes around the value of the
@@ -501,7 +494,7 @@
PRODUCT_NAME, SHORT_NAME, MAJOR_VERSION, MINOR_VERSION, POINT_VERSION,
VERSION_QUALIFIER, FIX_IDS, timestamp, user.name, java.version,
java.vendor, java.vm.version, JVM_VENDOR, DEBUG_BUILD, REVISION_NUMBER,URL_REPOSITORY,
- WEAVE_ENABLED, VERSION_NUMBER_STRING
+ VERSION_NUMBER_STRING
If you change the name of any of those properties in this build.xml
you'll need to reflect the same change in the .stubs file
-->
@@ -617,7 +610,7 @@
<!-- Compile the Directory Server source files. -->
<target name="cleancompile"
- depends="cleaninit,compilequicksetup,weave"
+ depends="cleaninit,compilequicksetup"
description="Recompile the Directory Server source files.">
</target>
@@ -659,36 +652,6 @@
- <target name="prepweave">
- <condition property="weave.enabled" value="true">
- <equals arg1="${WEAVE_ENABLED}" arg2="true" />
- </condition>
- </target>
-
-
-
- <target name="weave" if="weave.enabled" depends="prepweave">
- <echo message=" Weaving the source code with automatic AspectJ debug logging."/>
- <echo message=" Build with -DWEAVE_ENABLED=false to turn this off."/>
- <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
- <classpath>
- <pathelement location="${aj.lib.dir}/aspectjtools.jar" />
- </classpath>
- </taskdef>
-
- <iajc inpath="${classes.dir}" destdir="${classes.dir}"
- debug="true" debuglevel="${build.debuglevel}" source="1.5" target="1.5"
- deprecation="true" fork="true" maxmem="${MEM}">
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="*.jar" />
- </fileset>
- </classpath>
- </iajc>
- </target>
-
-
-
<!-- Compile the Quick Setup source files. -->
<target name="compilequicksetup" depends="buildtools,compile"
description="Compile the Quick Setup source files.">
@@ -1909,10 +1872,6 @@
<echo message=" -Dtest.failed=true"/>
<echo message=" runs only the tests that failed last time"/>
<echo message=""/>
- <echo message=" -DWEAVE_ENABLED=false" />
- <echo message=" builds the server without the debug logging facility." />
- <echo message=" No debug logging messages will be included on test failures." />
- <echo message=""/>
<echo message=" -Dorg.opends.server.debug.target=org.opends.server.core:level=verbose,category=data"/>
<echo message=" for example only include debug messages in the core"/>
<echo message=" package that are related to data access and at the" />
@@ -2175,27 +2134,6 @@
- <!--
- ! Previously a dependency of the nightly, all, testall and test targets.
- ! Weaving is now disabled by default due to the excessive need for memory
- ! during weaving.
- ! -->
- <target name="enableweave">
- <condition property="WEAVE_ENABLED" value="true">
- <not>
- <or>
- <isset property="WEAVE_ENABLED" />
- <isset property="test.groups" />
- <isset property="test.packages" />
- <isset property="test.classes" />
- <isset property="test.methods" />
- </or>
- </not>
- </condition>
- </target>
-
-
-
<target name="testreport"
depends="test"
description="Takes testng results and convert them into JUnit compatible xml">
--
Gitblit v1.10.0