vmassol 2003/09/21 02:35:26
Modified: framework build.xml
Added: framework/src/aspect/org/apache/cactus/util/log LogAspect.aj
Removed: framework/src/java/share/org/apache/cactus/util/log
LogAspect.aj
Log:
Moved aspects for a separate source tree
Revision Changes Path
1.66 +5 -1 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- build.xml 6 Aug 2003 19:31:19 -0000 1.65
+++ build.xml 21 Sep 2003 09:35:25 -0000 1.66
@@ -48,6 +48,7 @@
location="${src.java.dir}/j2ee${j2ee.api}"/>
<property name="src.test.dir" location="${src.dir}/test"/>
<property name="src.test.share.dir" location="${src.test.dir}/share"/>
+ <property name="src.aspect.dir" location="${src.dir}/aspect"/>
<property name="build.dir" location="${base.dir}/."/>
<property name="conf.dir" location="${base.dir}/conf"/>
<property name="web.dir" location="${base.dir}/web"/>
@@ -172,6 +173,7 @@
optimize="${optimize}">
<src path="${target.src.dir}"/>
<src path="${src.java.specific.dir}"/>
+ <src path="${src.aspect.dir}"/>
<exclude name="**/package.html"/>
<exclude name="**/overview.html"/>
<classpath refid="project.classpath"/>
@@ -210,6 +212,7 @@
<uptodate targetfile="${target.dir}/${cactus.jar.name}.jar">
<srcfiles dir="${target.src.dir}"/>
<srcfiles dir="${src.java.specific.dir}"/>
+ <srcfiles dir="${src.aspect.dir}"/>
</uptodate>
</not>
</condition>
@@ -226,6 +229,7 @@
optimize="${optimize}">
<src path="${target.src.dir}"/>
<src path="${src.java.specific.dir}"/>
+ <src path="${src.aspect.dir}"/>
<exclude name="**/package.html"/>
<exclude name="**/overview.html"/>
<classpath refid="project.classpath"/>
1.1
jakarta-cactus/framework/src/aspect/org/apache/cactus/util/log/LogAspect.aj
Index: LogAspect.aj
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. 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. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Cactus", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
* ITS 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.cactus.util.log;
import org.aspectj.lang.reflect.*;
import org.aspectj.lang.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Log every entry and exit of methods.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
*
* @version $Id: LogAspect.java,v 1.3 2002/07/22 12:26:04 vmassol Exp $
*/
public aspect LogAspect
{
/**
* All objects in the log package. We don't want to log these as they are
* the object that perform the logging and thus at execution time we would
* enter an infinite recursive loop.
*/
pointcut logObjectCalls() :
execution(public * org.apache.cactus.util.log..*(..))
|| execution(public *
org.apache.cactus.util.ClassLoaderUtils.loadPropertyResourceBundle(..));
/**
* All public static methods that have parameters.
*/
pointcut publicStaticMethodsWithParameterCalls() :
!execution(public static * org.apache.cactus..*())
&& execution(public static * org.apache.cactus..*(..));
/**
* All public methods that have parameters.
*/
pointcut publicMethodsWithParameterCalls() :
!execution(public * org.apache.cactus..*())
&& execution(public * org.apache.cactus..*(..));
/**
* All public methods that return values
*/
pointcut publicMethodsWithReturnValueCalls() :
!execution(public void org.apache.cactus..*(..))
&& execution(public * org.apache.cactus..*(..));
/**
* Log all entries and exits of static methods that have no return values.
*/
Object around() :
!logObjectCalls()
&& publicMethodsWithParameterCalls()
&& publicStaticMethodsWithParameterCalls()
&& !publicMethodsWithReturnValueCalls()
{
// Get The logger to perform logging
Log logger =
LogFactory.getLog(thisJoinPoint.getSignature().getDeclaringType());
if (logger.isDebugEnabled())
{
// Log the entry
logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Log the exit
logger.debug('>' + thisJoinPoint.getSignature().getName());
return result;
}
return proceed();
}
/**
* Log all entries and exits of non-static methods that have no return
* values.
*/
Object around() :
!logObjectCalls()
&& publicMethodsWithParameterCalls()
&& !publicStaticMethodsWithParameterCalls()
&& !publicMethodsWithReturnValueCalls()
{
// The class that uses the method that has been called
final Class target = thisJoinPoint.getTarget().getClass();
// Get The logger to perform logging
Log logger = LogFactory.getLog(target);
if (logger.isDebugEnabled())
{
// Log the entry
logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Log the exit
logger.debug('>' + thisJoinPoint.getSignature().getName());
return result;
}
return proceed();
}
/**
* Log all entries and exits of static methods that have return values.
*/
Object around() :
!logObjectCalls()
&& publicMethodsWithParameterCalls()
&& publicMethodsWithReturnValueCalls()
&& publicStaticMethodsWithParameterCalls()
{
// Get The logger to perform logging
Log logger =
LogFactory.getLog(thisJoinPoint.getSignature().getDeclaringType());
if (logger.isDebugEnabled())
{
// Log the entry
logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Compute the exit string to print
final StringBuffer exitString =
new StringBuffer(thisJoinPoint.getSignature().getName());
exitString.append(' ');
exitString.append('=');
exitString.append(' ');
exitString.append('[');
exitString.append(result);
exitString.append(']');
// Log the exit
logger.debug('>' + exitString.toString());
return result;
}
return proceed();
}
/**
* Log all entries and exits of non-static methods that have return values.
*/
Object around() :
!logObjectCalls()
&& publicMethodsWithParameterCalls()
&& publicMethodsWithReturnValueCalls()
&& !publicStaticMethodsWithParameterCalls()
{
// The class that uses the method that has been called
final Class target = thisJoinPoint.getTarget().getClass();
// Get The logger to perform logging
Log logger = LogFactory.getLog(target);
if (logger.isDebugEnabled())
{
// Log the entry
logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Compute the exit string to print
final StringBuffer exitString =
new StringBuffer(thisJoinPoint.getSignature().getName());
exitString.append(' ');
exitString.append('=');
exitString.append(' ');
exitString.append('[');
exitString.append(result);
exitString.append(']');
// Log the exit
logger.debug('>' + exitString.toString());
return result;
}
return proceed();
}
/**
* @return the full signature of a method
*/
private final String getFullSignature(final JoinPoint jp)
{
StringBuffer buffer = new StringBuffer();
buffer.append(jp.getSignature().getName());
buffer.append('(');
final Object[] objs = jp.getArgs();
if (objs.length > 0)
{
for (int i = 0; i < objs.length - 1; i++)
{
buffer.append('[');
buffer.append(objs[i]);
buffer.append(']');
buffer.append(',');
buffer.append(' ');
}
buffer.append('[');
buffer.append(objs[objs.length - 1]);
buffer.append(']');
}
buffer.append(')');
return buffer.toString();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
