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.
---
/dev/null | 279 ----------------------------------------------
opends/build.xml | 66 ----------
opends/resource/DynamicConstants.java.stubs | 10 -
3 files changed, 2 insertions(+), 353 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">
diff --git a/opends/ext/aspectj/LICENSE-AspectJ.html b/opends/ext/aspectj/LICENSE-AspectJ.html
deleted file mode 100644
index 8f7d0a4..0000000
--- a/opends/ext/aspectj/LICENSE-AspectJ.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-
-<head>
-<title>AspectJ License</title>
-
-
-</head>
-
-<BODY BGCOLOR="white">
-
-<h2 align="center"><b>AspectJ<sup><small>TM</small></sup>
- Compiler and Core Tools License</b></h2>
-
-<p>This is a binary-only release. Source code
-is available from
-<a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p>
-
-<p>The Eclipse Foundation makes available all content in this distribution ("Content").
- Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
- Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
- at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
- <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
- being redistributed by another party ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the Redistributor's license
- that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
- indicated below, the terms and conditions of the EPL still apply to any source code in the Content
- and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-
- <h3>Third Party Content</h3>
- <p>The Content includes items that have been sourced from third parties as set out below. If you
- did not receive this Content directly from the Eclipse Foundation, the following is provided
- for informational purposes only, and you should look to the Redistributor?s license for
- terms and conditions of use.</p>
- <em>
-
- <h4>BCEL v5.1</h4>
- <p>This product contains software developed by the
- Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p>
-
- <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
- BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source
- code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code
- is made available under the Apache Software License v1.1</p>
-
- <h4>ASM v2.2.1</h4>
- <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>)
- The source code for ASM is available from the ObjectWeb download site at
- <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>.
- <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>.
- The license is also reproduced here:
- </p>
-
-<pre>Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
-</em>
-
-</body>
-
-</html>
diff --git a/opends/ext/aspectj/README-AspectJ.html b/opends/ext/aspectj/README-AspectJ.html
deleted file mode 100644
index 0a8305a..0000000
--- a/opends/ext/aspectj/README-AspectJ.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>AspectJ Readme</title>
-<STYLE TYPE="text/css">
-<!--
-
- /* FOR THE SDA PAGE */
-
- /*
- BODY {margin-top: 15px; margin-left: 15px; margin-right: 15px;}
- */
-
- A:link {
- color:#4756AC;
- }
- A:visited {
- color:#60657B;
- }
- A:hover {
- color:red
- }
-
- INPUT {font:12px "Courier New", sans-serif;}
-
- H2 {
- font:18px/18px Verdana, Arial, Helvetica, sans-serif;
- color:black;
- font-weight:bold;
- margin-left: 10px;
- line-height:110%;
- }
- H3 {
- font:18px/18px Verdana, Arial, Helvetica, sans-serif;
- color:black;
- font-weight:bold;
- margin-left: 10px;
- line-height:110%;
- }
- H4 {
- font:15px/16px Verdana, Arial, Helvetica, sans-serif;
- color:black;
- font-weight:bold;
- margin-left: 10px;
- line-height:140%;
- }
- P {
- font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- margin-right: 10px;
- margin-left: 10px;
- line-height:130%;
- }
- .paragraph {
- font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- margin-right: 10px;
- margin-left: 10px;
- line-height:130%;
- }
- .smallParagraph {
- font:11px/11px Verdana, Arial, Helvetica, sans-serif;
- margin-right: 10px;
- margin-left: 10px;
- line-height:130%;
- }
- /*
- LI {
- font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- text-align:justify;
- margin-right: 10px;
- margin-left: 15px;
- line-height:120%;
- }
-
- UL {
- font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- text-align:justify;
- margin-right: 10px;
- margin-left: 15px;
- line-height:120%;
- }*/
-
- DL {
- font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- text-align:justify;
- margin-right: 10px;
- margin-left: 15px;
- line-height:120%;
- }
- B { font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- font-weight:bold;
- line-height:140%;
- }
- .footer {
- font:10px/10px Verdana, Arial, Helvetica, sans-serif;
- color:#888888;
- text-align:left
- }
- .figureTitle {
- font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- text-align:justify;
- text-align:center
- }
- .copyrightNotice {
- font:10px/10px Verdana, Arial, Helvetica, sans-serif;
- color:#999999;
- line-height:110%;
- }
- .smallHeading {
- font:13px/13px Verdana, Arial, Helvetica, sans-serif;
- font-weight:bold;
- line-height:110%;
- }
- .tinyHeading {
- font:11px/11px Verdana, Arial, Helvetica, sans-serif;
- font-weight:bold;
- line-height:120%;
- }
- .newsText {
- font:11px/11px Verdana, Arial, Helvetica, sans-serif;
- line-height:130%;
- }
- .smallParagraph {
- font:11px/11px Verdana, Arial, Helvetica, sans-serif;
- line-height:130%;
- }
- .fancyHeading {
- font:20px/20px Chantilly, Arial, Helvetica, sans-serif;
- margin-right: 10px;
- color:#6f7a92;
- margin-left: 10px;
- line-height:130%;
- }
-
--->
-</STYLE>
-</head>
-
-<BODY BGCOLOR="white">
-
-<h2 align="center">AspectJ<sup><small>TM</small></sup></h2>
-
-<p align="center"><i>Version 1.5.3 released on Wednesday Nov 22, 2006.</i></p>
-
-<h3>1 Contents of this Package</h3>
-
-<UL>
- <li>the <a href="bin"><CODE><aspectj install dir>/bin</CODE></a>
- directory has scripts for
- <ul>
- <li><CODE>ajc</CODE>: the compiler for the AspectJ language</li>
-
- <!-- XXX removed references to ajdoc and ajdb -->
- <li><CODE>ajbrowser</CODE>: a graphical editor for
- compiling programs with <CODE>ajc</CODE>
- and navigating the crosscutting structure of those programs</li>
- </ul>
-
- <li>the directory <a href="lib"><CODE><aspectj install dir>/lib</CODE></a>
- has the AspectJ binaries,
- <ul>
- <li><CODE><a href="lib/aspectjtools.jar">aspectjtools.jar</a></CODE>: libraries for
- <code>ajc</code>, <code>ajbrowser</code>, and the Ant tasks</li>
-
- <li><CODE>aspectjrt.jar</CODE>: runtime library for AspectJ programs</li>
- </ul>
- </li>
- <li>the directory <a href="doc"><CODE><aspectj install dir>/doc</CODE></a>
- has examples, programming and development environment guides,
- instructions for the Ant tasks, a README for 1.1 changes,
- and a quick reference, all linked
- from the <a href="doc/index.html">index</a> page.
- </li>
- <li>this <a href="README-AspectJ.html">README-AspectJ.html</a>, and
- </li>
- <li>the <a href="LICENSE-AspectJ.html">LICENSE-AspectJ.html</a>
- applying to this distribution.
- </li>
-</UL>
-
-<hr>
-
-<h3>2 Install Procedure</h3>
-
-<p>The AspectJ tools <code>ajc</code> and <code>ajbrowser</code> are
-Java programs that can be run indirectly from the scripts or
-directly from <code>aspectjtools.jar</code>.
-The <code>aspectjrt.jar</code> needs to be on the classpath
-when compiling or running programs compiled
-by <code>ajc</code>. This procedure shows ways to do that.
-</p>
-
-<p>After finishing automatic installation, we recommend that the
-following steps to complete your installation:</p>
-
- <p><b>2.1 Add <CODE><aspectj install dir>/lib/aspectjrt.jar</CODE>
- to your class path</b></p>
-
-<blockquote>
- <p>This small .jar file contains classes required to compile programs
- with the ajc compiler, and to run programs compiled with the ajc
- compiler. You must have these classes somewhere on your class path
- when running programs compiled with ajc. For detailed instructions
- please see the <a href="#configInstructions">Configuration
- Instructions</a> at the bottom of this document.</p>
-</blockquote>
-
- <p><b>2.2 Put the AspectJ <code>bin</code> directory on your PATH</b></p>
-
-<blockquote>
- <p>Modify your PATH to include <code><b><aspectj install
- dir>/bin</b></code>. This will make it easier to run ajc.
- For detailed instructions please see the
- <a href="#configInstructions">Configuration Instructions</a> at the
- bottom of this document.</p>
-</blockquote>
-
-<p><b>2.3 Review the documentation and examples </b></p>
-
-<blockquote>
- <p>Development and programming guides
- are available in <a href="doc/index.html">docs</a>,
- and example programs and an Ant script are available in
- <a href="doc/examples/">examples</a>.
-</blockquote>
-
-<p>If you did not use the automatic installation process, you may wish
-to create short launch scripts to start ajc easily (section 3).</p>
-
-<hr>
-
-<h3>3. Running the Tools</h3>
-
-<p>If you did not use the automatic installation process or the
-default launch scripts do not work on your system, you may wish to
-create short launch scripts to start ajc easily. </p>
-
-<p>You can also run the <code>aspectjtools.jar</code> directly
-using java's -jar option:
-
-<blockquote>
-<CODE>C:\jdk1.3\bin\java.exe -jar D:\aspectj\lib\aspectjtools.jar %*</CODE>
-</blockquote>
-
-<p>With no arguments or only argument list (.lst) files, this will launch
-<code>ajbrowser</code>, the GUI structure browser; otherwise, it will
-run <code>ajc</code>, the AspectJ compiler. This means that
-if your browser is set up to run jar files, clicking a link
-to <a href="lib/aspectjtools.jar">lib/aspectjtools.jar</a> will
-launch <code>ajbrowser</code>.
-
-<p> You can also create scripts like those created by the installer.
-These scripts use full paths that are system dependent so you will
-likely have to change these. </p>
-
-<p>Here's a sample launch script for WinNT and Win2K (note that this
-is single line in the .bat file):</p>
-
-<blockquote>
-<CODE>C:\jdk1.3\bin\java.exe -classpath D:\aspectj\lib\aspectjtools.jar -Xmx64M
-org.aspectj.tools.ajc.Main %*</CODE>
-</blockquote>
-
-<p>Here's a sample launch script for a Unix shell (on Linux using Sun's JDK1.3):</p>
-
-<blockquote>
-<CODE>/usr/java/jdk1.3/jre/bin/java -classpath /home/aspectj/lib/aspectjtools.jar -Xmx64M org.aspectj.tools.ajc.Main "$@"</CODE>
-</blockquote>
-
-<hr>
-<h3><a name="configInstructions">4. Configuration Instructions</a></h3>
-
-<h4>4.1 Adding <code><aspectj install dir>/lib/aspectjrt.jar</code> to your classpath</h4>
-
-<p>There are several ways to add this jar file to your classpath:</p>
-
-<ul>
- <li>
- copy <code>aspectjrt.jar</code> to the <code>jdk/jre/lib/ext</code> directory</li>
- <li>
- add <code>aspectjrt.jar</code> to your CLASSPATH
- environment variable (see the next section for details)</li>
- <li>
- always use the "<code>-classpath aspectjrt.jar</code>" option when running
- programs compiled with ajc</li>
-</ul>
-<h4>4.2 <A NAME="6.1">Setting the Environment Variables on Windows</A></h4>
-
-<P>The following instructions use the PATH variable as an example, but
-this process is identical for the CLASSPATH variable. </P>
-
-<P>You can do the variables permanently for all the shells that you
-will run or temporarily only for the current shell. To change the
-PATH only in the current shell, and assuming you've installed AspectJ
-in <code>C:\apps\aspectj</code>, type:</P>
-
-<blockquote><code>> set PATH=%PATH%;C:\apps\aspectj\bin</code></blockquote>
-
-<P><b>Changing Environment Variables Permanently on WinNT and Win2000</b>
-<ul>
- <li>
- <p class="paragraph">open the Environment Variables dialog
- <ul>
- <li>
- <p class="paragraph">WinNT: in "Control Panels" double-click
- "System" and select the "Environment" tab</li>
- <li>
- <p class="paragraph">Win2K: in "Control Panels" double-click
- "System", select the "Advanced" tab and click the
- "Environment Variables..." button</li>
- </ul>
- </li>
- <li>
- <p class="paragraph">select the environment variable for editing, or add it
- using the "New..." button if it does not exist</li>
- <li>
- <p class="paragraph">add the new entry separated from the others by a
- semi-colon (;) and close the dialog</li>
- <li>
- <p class="paragraph">note that the change will not affect shells that were
- already running </li>
-</ul>
-<P><b>Changing Environment Variables Permanently on Win9x</b>
-<ul>
- <li>
- <p class="paragraph">open the AUTOEXEC.BAT with an editor such as NotePad</li>
-
-<LI>
- <p class="paragraph">edit the PATH statement to include the new entry and save
- the file, e.g.<BR>
-
-<blockquote>
- <CODE>PATH C:\WINDOWS;C:\WINDOWS\COMMAND;C:\;C:\DOS;C:\apps\aspectj\bin</CODE>
- </blockquote>
-</LI>
-<LI>
- <p class="paragraph">note that the change will not affect shells that were
- already running
-</ul>
-
-</body>
-
-</html>
diff --git a/opends/ext/aspectj/bin/aj b/opends/ext/aspectj/bin/aj
deleted file mode 100755
index b26b6ac..0000000
--- a/opends/ext/aspectj/bin/aj
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# This file generated by AspectJ installer
-# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526
-
-if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
-fi
-if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
-fi
-
-"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjweaver.jar" "-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader" "-Daj.class.path=$ASPECTPATH:$CLASSPATH" "-Daj.aspect.path=$ASPECTPATH" "$@"
diff --git a/opends/ext/aspectj/bin/aj5 b/opends/ext/aspectj/bin/aj5
deleted file mode 100755
index 03ea136..0000000
--- a/opends/ext/aspectj/bin/aj5
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# This file generated by AspectJ installer
-# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526
-
-if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
-fi
-if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
-fi
-
-"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjweaver.jar:$CLASSPATH" "-javaagent:$ASPECTJ_HOME/lib/aspectjweaver.jar" "$@"
diff --git a/opends/ext/aspectj/bin/ajbrowser b/opends/ext/aspectj/bin/ajbrowser
deleted file mode 100755
index e55d97b..0000000
--- a/opends/ext/aspectj/bin/ajbrowser
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# This file generated by AspectJ installer
-# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526
-
-if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
-fi
-if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
-fi
-
-"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx64M org.aspectj.tools.ajbrowser.Main "$@"
diff --git a/opends/ext/aspectj/bin/ajc b/opends/ext/aspectj/bin/ajc
deleted file mode 100755
index 949a541..0000000
--- a/opends/ext/aspectj/bin/ajc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# This file generated by AspectJ installer
-# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526
-
-if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
-fi
-if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
-fi
-
-"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx64M org.aspectj.tools.ajc.Main "$@"
diff --git a/opends/ext/aspectj/bin/ajdoc b/opends/ext/aspectj/bin/ajdoc
deleted file mode 100755
index c383887..0000000
--- a/opends/ext/aspectj/bin/ajdoc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# This file generated by AspectJ installer
-# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526
-
-if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
-fi
-if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
-fi
-
-"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx64M org.aspectj.tools.ajdoc.Main "$@"
diff --git a/opends/ext/aspectj/lib/aspectjlib.jar b/opends/ext/aspectj/lib/aspectjlib.jar
deleted file mode 100644
index eb12847..0000000
--- a/opends/ext/aspectj/lib/aspectjlib.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/aspectj/lib/aspectjrt.jar b/opends/ext/aspectj/lib/aspectjrt.jar
deleted file mode 100644
index 72662db..0000000
--- a/opends/ext/aspectj/lib/aspectjrt.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/aspectj/lib/aspectjtools.jar b/opends/ext/aspectj/lib/aspectjtools.jar
deleted file mode 100644
index d7f205d..0000000
--- a/opends/ext/aspectj/lib/aspectjtools.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/aspectj/lib/aspectjweaver.jar b/opends/ext/aspectj/lib/aspectjweaver.jar
deleted file mode 100644
index 7574b27..0000000
--- a/opends/ext/aspectj/lib/aspectjweaver.jar
+++ /dev/null
Binary files differ
diff --git a/opends/lib/aspectjrt.jar b/opends/lib/aspectjrt.jar
deleted file mode 100644
index 72662db..0000000
--- a/opends/lib/aspectjrt.jar
+++ /dev/null
Binary files differ
diff --git a/opends/resource/DynamicConstants.java.stubs b/opends/resource/DynamicConstants.java.stubs
index aefc29e..a5dbc9e 100644
--- a/opends/resource/DynamicConstants.java.stubs
+++ b/opends/resource/DynamicConstants.java.stubs
@@ -157,12 +157,6 @@
"${ADMINISTRATION_GUIDE_URL}";
/**
- * Indicates wheater this build includes AspectJ weaving for the debug logging
- * framework.
- */
- public static boolean WEAVE_ENABLED = ${WEAVE_ENABLED};
-
- /**
* A string representation of the version number.
*/
public static String VERSION_NUMBER_STRING =
@@ -296,10 +290,6 @@
}
catch(Exception ex) {}
try{
- WEAVE_ENABLED = (Boolean)c.getField("WEAVE_ENABLED").get(obj);
- }
- catch (Exception ex) {}
- try{
VERSION_NUMBER_STRING =
(String)c.getField("VERSION_NUMBER_STRING").get(obj);
}
diff --git a/opends/src/server/org/opends/server/loggers/debug/DebugAspect.java b/opends/src/server/org/opends/server/loggers/debug/DebugAspect.java
deleted file mode 100644
index 1d6f4cd..0000000
--- a/opends/src/server/org/opends/server/loggers/debug/DebugAspect.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2009 Sun Microsystems, Inc.
- */
-package org.opends.server.loggers.debug;
-
-import org.aspectj.lang.annotation.*;
-import org.aspectj.lang.JoinPoint;
-
-import static
- org.opends.server.loggers.debug.DebugLogger.DEFAULT_CONSTRUCTOR_LEVEL;
-import static
- org.opends.server.loggers.debug.DebugLogger.DEFAULT_ENTRY_EXIT_LEVEL;
-import static
- org.opends.server.loggers.debug.DebugLogger.DEFAULT_THROWN_LEVEL;
-
-/**
- * An aspect for source-code tracing at the method level.
- *
- * One DebugLogger aspect instance exists for each Java class using tracing.
- * Tracer must be registered with the DebugLogger.
- *
- * Logging is always done at a level basis, with debug log messages
- * exceeding the trace threshold being traced, others being discarded.
- */
-@Aspect()
-public class DebugAspect
-{
- /**
- * Pointcut for matching static context events.
- */
- @Pointcut("!this(Object)")
- private void staticContext()
- {
- }
-
- /**
- * Pointcut for matching non static context events.
- * @param obj The object being operated on.
- */
- @Pointcut("this(obj)")
- private void nonStaticContext(Object obj)
- {
- }
-
- /**
- * Pointcut for matching all toString() methods.
- */
- @Pointcut("execution(* *..toString(..))")
- private void toStringMethod()
- {
- }
-
- /**
- * Pointcut for matching all getMessage() methods.
- */
- @Pointcut("execution(String org.opends.server." +
- "messages.MessageHandler.getMessage(..))")
- private void getMessageMethod()
- {
- }
-
- /**
- * Pointcut for matching all getDebugProperties() methods.
- * TODO: Make this less general. Find out if pointcut matches
- * subclass methods.
- */
- @Pointcut("execution(* *..getDebugProperties(..))")
- private void getDebugPropertiesMethod()
- {
- }
-
- /**
- * Pointcut for matching all logging related classes.
- */
- @Pointcut("within(org.opends.server.loggers.*+ || " +
- "org.opends.server.loggers.debug..*+ || " +
- "org.opends.server.types.DebugLogLevel+ || " +
- "org.opends.server.types.DebugLogCategory+ || " +
- "org.opends.server.api.DebugLogPublisher+ || " +
- "org.opends.server.util.TimeThread+ ||" +
- "org.opends.server.util.MultiOutputStream+)")
- private void debugRelatedClasses()
- {
- }
-
- /**
- * Pointcut to exclude all pointcuts which should not be adviced by the
- * debug logger.
- */
- @Pointcut("toStringMethod() || getMessageMethod() || " +
- "getDebugPropertiesMethod() || debugRelatedClasses()")
- private void excluded()
- {
- }
-
- /**
- * Pointcut for matching the execution of all public methods.
- */
- @Pointcut("execution(!@(DebugLogger.NoDebugTracing || " +
- "DebugLogger.NoEntryDebugTracing) public * *(..)) && " +
- "!excluded()")
- void tracedEntryMethod()
- {
- }
-
- /**
- * Pointcut for matching the execution of all public methods.
- */
- @Pointcut("execution(!@(DebugLogger.NoDebugTracing || " +
- "DebugLogger.NoExitDebugTracing) public * *(..)) && " +
- "!excluded()")
- void tracedExitMethod()
- {
- }
-
- /**
- * Pointcut for matching the execution of all public methods.
- */
- @Pointcut("execution(@DebugLogger.TraceThrown public * *(..)) && " +
- "!excluded()")
- void tracedThrownMethod()
- {
- }
-
- /**
- * Pointcut for matching the execution of all constructors.
- */
- @Pointcut("execution(!@(DebugLogger.NoDebugTracing || " +
- "DebugLogger.NoEntryDebugTracing) public new(..)) && !excluded()")
- void tracedEntryConstructor()
- {
- }
-
- /**
- * Pointcut for matching the execution of all constructors.
- */
- @Pointcut("execution(!@(DebugLogger.NoDebugTracing || " +
- "DebugLogger.NoExitDebugTracing) public new(..)) && !excluded()")
- void tracedExitConstructor()
- {
- }
-
- /**
- * Pointcut for matching only if there are publishers.
- *
- * @return if debug logging is enabled.
- */
- @Pointcut("if()")
- public static boolean shouldTrace()
- {
- return DebugLogger.enabled;
- }
-
- /**
- * AspectJ Implementation.
- *
- * @param thisJoinPoint the JoinPoint reflection object.
- */
- @Before("shouldTrace() && tracedEntryConstructor()")
- public void traceConstructor(JoinPoint thisJoinPoint)
- {
- String signature =
- thisJoinPoint.getSignature().getDeclaringTypeName();
- Object[] args = thisJoinPoint.getArgs();
- DebugTracer tracer = DebugLogger.getTracer(signature);
- if(tracer != null)
- {
- tracer.debugConstructor(
- DEFAULT_CONSTRUCTOR_LEVEL, args);
- }
- }
-
- /**
- * AspectJ Implementation.
- *
- * @param thisJoinPoint the JoinPoint reflection object.
- * @param obj the object this method operations on.
- */
- @Before("shouldTrace() && tracedEntryMethod() && nonStaticContext(obj)")
- public void traceNonStaticMethodEntry(JoinPoint thisJoinPoint, Object obj)
- {
- String signature =
- thisJoinPoint.getSignature().getDeclaringTypeName();
- Object[] args = thisJoinPoint.getArgs();
- Object callerInstance = thisJoinPoint.getThis();
- DebugTracer tracer = DebugLogger.getTracer(signature);
- if(tracer != null)
- {
- tracer.debugMethodEntry(
- DEFAULT_ENTRY_EXIT_LEVEL, callerInstance, args);
- }
- }
-
- /**
- * AspectJ Implementation.
- *
- * @param thisJoinPoint the JoinPoint reflection object.
- */
- @Before("shouldTrace() && tracedEntryMethod() && staticContext()")
- public void traceStaticMethodEntry(JoinPoint thisJoinPoint)
- {
- String signature =
- thisJoinPoint.getSignature().getDeclaringTypeName();
- Object[] args = thisJoinPoint.getArgs();
- DebugTracer tracer = DebugLogger.getTracer(signature);
- if(tracer != null)
- {
- tracer.debugStaticMethodEntry(
- DEFAULT_ENTRY_EXIT_LEVEL, args);
- }
- }
-
- /**
- * AspectJ Implementation.
- *
- * @param thisJoinPointStaticPart the JoinPoint reflection object.
- * @param ret the return value of the method.
- */
- @AfterReturning(pointcut = "shouldTrace() && " +
- "(tracedExitMethod() || tracedExitConstructor())",
- returning = "ret")
- public void traceReturn(JoinPoint.StaticPart thisJoinPointStaticPart,
- Object ret)
- {
- String signature =
- thisJoinPointStaticPart.getSignature().getDeclaringTypeName();
- DebugTracer tracer = DebugLogger.getTracer(signature);
- if(tracer != null)
- {
- tracer.debugReturn(
- DEFAULT_ENTRY_EXIT_LEVEL, ret);
- }
- }
-
- /**
- * AspectJ Implementation.
- *
- * @param thisJoinPointStaticPart the JoinPoint reflection object.
- * @param ex the exception thrown.
- */
- @SuppressAjWarnings({"adviceDidNotMatch"})
- @AfterThrowing(pointcut = "shouldTrace() && tracedThrownMethod()",
- throwing = "ex")
- public void traceThrown(JoinPoint.StaticPart thisJoinPointStaticPart,
- Throwable ex)
- {
- String signature =
- thisJoinPointStaticPart.getSignature().getDeclaringTypeName();
- DebugTracer tracer = DebugLogger.getTracer(signature);
- if(tracer != null)
- {
- tracer.debugThrown(
- DEFAULT_THROWN_LEVEL, ex);
- }
- }
-}
--
Gitblit v1.10.0