vmassol 2002/08/14 15:04:09
Modified: framework Tag: CACTUS_14_BRANCH build.xml
. Tag: CACTUS_14_BRANCH build.properties.sample
Added: framework/src/java/share/org/apache/cactus/util/log Tag:
CACTUS_14_BRANCH LogAspect.aj LogManagerAspect.aj
Removed: framework/src/java/share/org/apache/cactus/util/log Tag:
CACTUS_14_BRANCH LogAspect.java
LogManagerAspect.java
Log:
replace extension for Aspects from .java to .aj to prevent IDEs from compiling
Aspects with a java compiler ...
Revision Changes Path
No revision
No revision
1.1.2.1 +264 -0
jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/Attic/LogAspect.aj
1.1.2.1 +65 -0
jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/Attic/LogManagerAspect.aj
No revision
No revision
1.22.2.1 +3 -3 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- build.xml 28 Jul 2002 21:11:55 -0000 1.22
+++ build.xml 14 Aug 2002 22:04:08 -0000 1.22.2.1
@@ -252,7 +252,7 @@
<mkdir dir="${clover.db.dir}"/>
<property name="clover.excludes"
-
value="**/*Aspect.java,**/Test*.java,**/Mock*.java,**/AssertUtils.java,**/ClientCookie.java"/>
+
value="**/*Aspect.aj,**/Test*.java,**/Mock*.java,**/AssertUtils.java,**/ClientCookie.java"/>
</target>
@@ -310,7 +310,7 @@
<!-- We exclude the Logging Aspect as it adds 2 new methods for
each method to log and thus leads to flawed test coverage
statistics -->
- <exclude name="**/LogAspect.java"/>
+ <exclude name="**/LogAspect.aj"/>
<classpath refid="project.class.path"/>
</ajc>
@@ -608,7 +608,7 @@
<fileset dir="${src.java.dir}">
<include name="**/*.java"/>
- <exclude name="**/*Aspect.java"/>
+ <exclude name="**/*Aspect.aj"/>
</fileset>
<fileset dir="${src.test.dir}">
<include name="**/*.java"/>
No revision
No revision
1.23.2.1 +13 -13 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- build.properties.sample 28 Jul 2002 21:18:53 -0000 1.23
+++ build.properties.sample 14 Aug 2002 22:04:08 -0000 1.23.2.1
@@ -19,35 +19,35 @@
# Location of all jars. Note: This is not a mandatory property. It is only
# used here so that it can be reused when defining the location of all the jars
# below. You do not have to put all the external jars in a single location.
-lib.repo = c:/apps/repo
+lib.repo = c:/apps/maven/repository
# The location of the J2EE API jar. Depending on the version (1.2 or 1.3) of
# it, the corresponding Cactus Framework will be built. For example if you use
# J2EE 1.3 jar, then the Cactus jar will contain the Filter Redirector which is
# only available for Servlet 2.3 (part of J2EE 1.3).
-j2ee.jar = ${lib.repo}/j2ee-1.3.jar
+j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
# Location of the Servlet API jar (it is needed because we want to copy it
# in the Cactus distribution).
-servlet.jar = ${lib.repo}/servletapi-2.3.jar
+servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
# The location of the Commons Logging jar
-commons.logging.jar = ${lib.repo}/commons-logging-1.0.jar
+commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.jar
# The location of the log4j jar
-log4j.jar = ${lib.repo}/log4j-1.2.5.jar
+log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.5.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ${lib.repo}/commons-httpclient-2.0alpha1-20020720.jar
+commons.httpclient.jar =
${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0alpha1-20020606.jar
# The location of the Httpunit jar
-httpunit.jar = ${lib.repo}/httpunit-1.4.1.jar
+httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.4.1.jar
# The location of the AspectJ runtime jar
-aspectjrt.jar = ${lib.repo}/aspectjrt-1.0.5.jar
+aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.5.jar
# The location of the Junit jar
-junit.jar = ${lib.repo}/junit-3.7.jar
+junit.jar = ${lib.repo}/junit/jars/junit-3.7.jar
# CVS executable to use for documentation generation (used to automatically
# generate web site changelog).
@@ -59,8 +59,8 @@
# Locations J2EE APIs for the "all" target (which builds the Cactus framework
# for both APIs)
-#j2ee.12.jar = ${lib.repo}/j2ee-1.2.jar
-#j2ee.13.jar = ${lib.repo}/j2ee-1.3.jar
+j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
+j2ee.13.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
# The port to use for starting the servers during unit testing. If not
# sepcified, it defaults to port 8080.
@@ -105,7 +105,7 @@
#clover.enable = true
# Clover jar
-clover.jar = ${lib.repo}/clover-0.6b.jar
+clover.jar = ${lib.repo}/clover/jars/clover-0.6b.jar
# -----------------------------------------------------------------------------
# Optional properties used by the build-admin.xml Ant build script only
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
