Author: asmuts
Date: Mon Feb 6 15:52:14 2006
New Revision: 375418
URL: http://svn.apache.org/viewcvs?rev=375418&view=rev
Log:
fixing project.xml resources
Modified:
jakarta/jcs/trunk/ant_eclipse.xml
jakarta/jcs/trunk/project.properties
jakarta/jcs/trunk/project.xml
Modified: jakarta/jcs/trunk/ant_eclipse.xml
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/ant_eclipse.xml?rev=375418&r1=375417&r2=375418&view=diff
==============================================================================
--- jakarta/jcs/trunk/ant_eclipse.xml (original)
+++ jakarta/jcs/trunk/ant_eclipse.xml Mon Feb 6 15:52:14 2006
@@ -2,38 +2,38 @@
<project name="ant_eclipse" basedir="." default="default">
- <!-- bring in the environmental properties -->
- <property environment="env"/>
- <property name="maven.home" value="${env.MAVEN_HOME}"/>
-
- <!-- make sure we have maven -->
- <target name="check-env" description="Check if environment variables are
set">
- <echo>maven.home = ${maven.home}</echo>
- <fail unless="env.MAVEN_HOME" message="You MUST set MAVEN_HOME first"/>
- </target>
-
- <target name="default" depends="check-env">
-
- <condition property="maven.script" value="maven.bat">
- <and>
- <os family="windows" />
- <equals arg1="${maven.script}" arg2="$${maven.script}" />
- <not>
- <isset property="cygwin.home" />
- </not>
- </and>
- </condition>
-
- <condition property="maven.script" value="maven">
- <equals arg1="${maven.script}" arg2="$${maven.script}" />
- </condition>
-
- <!-- call maven test:test-resources -->
- <exec executable="${maven.script}" failonerror="true">
- <arg value="java:jar-resources"/>
- <arg value="test:test-resources"/>
- </exec>
-
- </target>
+ <!-- bring in the environmental properties -->
+ <property environment="env" />
+ <property name="maven.home" value="${env.MAVEN_HOME}" />
+
+ <!-- make sure we have maven -->
+ <target name="check-env" description="Check if environment variables
are set">
+ <echo>maven.home = ${maven.home}</echo>
+ <fail unless="env.MAVEN_HOME" message="You MUST set MAVEN_HOME
first" />
+ </target>
+
+ <target name="default" depends="check-env">
+
+ <condition property="maven.script" value="maven.bat">
+ <and>
+ <os family="windows" />
+ <equals arg1="${maven.script}"
arg2="$${maven.script}" />
+ <not>
+ <isset property="cygwin.home" />
+ </not>
+ </and>
+ </condition>
+
+ <condition property="maven.script" value="maven">
+ <equals arg1="${maven.script}" arg2="$${maven.script}"
/>
+ </condition>
+
+ <!-- call maven test:test-resources -->
+ <exec executable="${maven.script}" failonerror="true">
+ <arg value="java:jar-resources" />
+ <arg value="test:test-resources" />
+ </exec>
+
+ </target>
</project>
Modified: jakarta/jcs/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/project.properties?rev=375418&r1=375417&r2=375418&view=diff
==============================================================================
--- jakarta/jcs/trunk/project.properties (original)
+++ jakarta/jcs/trunk/project.properties Mon Feb 6 15:52:14 2006
@@ -14,6 +14,12 @@
maven.test.callback.pre-test.buildFile = build.xml
maven.test.callback.pre-test.buildTarget = jcs:test-prepare
+# this only include *UnitTest.java by default
+# this allows us to keep performance tests out of jcoverage,
+# since instrumented perf tests will always fail.
+test=Unit
+
+
maven.core.callback.post-compile.buildFile = build.xml
maven.core.callback.post-compile.buildTarget = jcs:copy-classpath-vm
Modified: jakarta/jcs/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/project.xml?rev=375418&r1=375417&r2=375418&view=diff
==============================================================================
--- jakarta/jcs/trunk/project.xml (original)
+++ jakarta/jcs/trunk/project.xml Mon Feb 6 15:52:14 2006
@@ -2,259 +2,297 @@
<project>
- <pomVersion>3</pomVersion>
- <name>JCS</name>
- <id>jcs</id>
- <currentVersion>1.2.6.8</currentVersion>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://jakarta.apache.org/</url>
- <logo>/images/jakarta.png</logo>
- </organization>
- <inceptionYear>2002</inceptionYear>
- <package>org.apache.jcs</package>
- <logo></logo>
-
-
- <gumpRepositoryId>jakarta</gumpRepositoryId>
-
-
- <shortDescription>Cache</shortDescription>
- <description>Comprehensive Caching System</description>
- <url>http://jakarta.apache.org/turbine/jcs/</url>
-
<issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
- <siteAddress>minotaur.apache.org</siteAddress>
- <siteDirectory>/www/jakarta.apache.org/turbine/jcs/</siteDirectory>
-
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-jcs/</distributionDirectory>
-
- <repository>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/jcs/trunk/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/jcs/trunk/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/jakarta/jcs/trunk/</url>
- </repository>
-
- <mailingLists>
- <mailingList>
- <name>JCS User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-jcs-users/</archive>
- </mailingList>
- <mailingList>
- <name>JCS Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-jcs-dev/</archive>
- </mailingList>
- <mailingList>
- <name>OLD User list</name>
- <subscribe></subscribe>
- <unsubscribe></unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-turbine-jcs-user/</archive>
- </mailingList>
- <mailingList>
- <name>OLD Developer list</name>
- <subscribe></subscribe>
- <unsubscribe></unsubscribe>
-
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-turbine-jcs-dev/</archive>
- </mailingList>
- </mailingLists>
-
-
- <developers>
- <developer>
- <name>Aaron Smuts</name>
- <id>asmuts</id>
- <email>[EMAIL PROTECTED]</email>
- <organization/>
- </developer>
- <developer>
- <name>James Taylor</name>
- <id>jtaylor</id>
- <email>[EMAIL PROTECTED]</email>
- <organization/>
- </developer>
- <developer>
- <name>Hanson Char</name>
- <id>hchar</id>
- <email>[EMAIL PROTECTED]</email>
- <organization/>
- </developer>
- <developer>
- <name>Travis Savo</name>
- <id>tsavo</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>IFilm</organization>
- </developer>
- </developers>
-
- <contributors>
- </contributors>
-
-
- <dependencies>
- <dependency>
- <id>commons-collections</id>
- <version>3.0</version>
- </dependency>
-
- <dependency>
- <id>commons-configuration</id>
- <version>20030706.202021</version>
- </dependency>
-
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- </dependency>
-
- <dependency>
- <id>commons-lang</id>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <id>concurrent</id>
- <version>1.0</version>
-
<url>http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html</url>
- </dependency>
-
- <dependency>
- <id>hsqldb</id>
- <version>1.7.1</version>
- </dependency>
-
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>
-
- <dependency>
- <id>servletapi</id>
- <version>2.2</version>
- </dependency>
-
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
- <version>2.2.8</version>
- </dependency>
-
- <dependency>
- <id>tomcat</id>
- <version>3.2.1</version>
- <jar>tomcat-util-3.2.1.jar</jar>
- </dependency>
-
- <dependency>
- <id>velocity</id>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- </dependency>
-
- <dependency>
- <id>xmlrpc</id>
- <version>1.2-b1</version>
- <url>http://xml.apache.org/xmlrpc/</url>
- </dependency>
-
- <dependency>
- <id>xerces:xercesImpl</id>
- <version>2.6.2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
- <dependency>
- <id>xml-apis</id>
- <version>2.0.2</version>
- <url>http://xml.apache.org/commons/</url>
- </dependency>
-
- <dependency>
- <id>struts</id>
- <version>1.1</version>
- <jar>struts-1.1.jar</jar>
- </dependency>
-
- <dependency>
- <id>berkeleydb</id>
- <version>1.5.0</version>
- </dependency>
- <!--
- <dependency>
- <groupId>maven-plugins</groupId>
- <artifactId>maven-findbugs-plugin</artifactId>
- <version>0.9.1</version>
- <type>plugin</type>
- </dependency>
- -->
- </dependencies>
-
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <aspectSourceDirectories></aspectSourceDirectories>
- <resources/>
- <unitTest>
- <includes>
- <include>**/TestCacheElementRetrieval.java</include>
- <include>**/TestDiskCacheNoMemory.java</include>
- <include>**/TestJCS.java</include>
- <include>**/TestSimpleLoad.java</include>
- <include>**/TestDiskCache.java</include>
- <include>**/TestDiskCacheConcurrent.java</include>
- <include>**/TestDiskCacheConcurrentForDeadLock.java</include>
- <include>**/TestTCPLateralCache.java</include>
- <include>**/TestLateralTCPFilterRemoveHashCode.java</include>
- <include>**/TestLateralTCPIssueRemoveOnPut.java</include>
- <include>**/TestLateralTCPConcurrentForDeadLock.java</include>
- <!--
- <include>**/TestJCSvHashtablePerf.java</include>
+ <pomVersion>3</pomVersion>
+ <name>JCS</name>
+ <id>jcs</id>
+ <currentVersion>1.2.6.8</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://jakarta.apache.org/</url>
+ <logo>/images/jakarta.png</logo>
+ </organization>
+ <inceptionYear>2002</inceptionYear>
+ <package>org.apache.jcs</package>
+ <logo></logo>
+
+
+ <gumpRepositoryId>jakarta</gumpRepositoryId>
+
+
+ <shortDescription>Cache</shortDescription>
+ <description>Comprehensive Caching System</description>
+ <url>http://jakarta.apache.org/turbine/jcs/</url>
+ <issueTrackingUrl>
+ http://issues.apache.org/scarab/servlet/scarab/
+ </issueTrackingUrl>
+ <siteAddress>minotaur.apache.org</siteAddress>
+ <siteDirectory>/www/jakarta.apache.org/turbine/jcs/</siteDirectory>
+ <distributionDirectory>
+ /www/jakarta.apache.org/builds/jakarta-turbine-jcs/
+ </distributionDirectory>
+
+ <repository>
+ <connection>
+
scm:svn:http://svn.apache.org/repos/asf/jakarta/jcs/trunk/
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/jakarta/jcs/trunk/
+ </developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/jakarta/jcs/trunk/</url>
+ </repository>
+
+ <mailingLists>
+ <mailingList>
+ <name>JCS User List</name>
+ <subscribe>
+ [EMAIL PROTECTED]
+ </subscribe>
+ <unsubscribe>
+ [EMAIL PROTECTED]
+ </unsubscribe>
+ <archive>
+
http://mail-archives.apache.org/mod_mbox/jakarta-jcs-users/
+ </archive>
+ </mailingList>
+ <mailingList>
+ <name>JCS Developer List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>
+ [EMAIL PROTECTED]
+ </unsubscribe>
+ <archive>
+
http://mail-archives.apache.org/mod_mbox/jakarta-jcs-dev/
+ </archive>
+ </mailingList>
+ <mailingList>
+ <name>OLD User list</name>
+ <subscribe></subscribe>
+ <unsubscribe></unsubscribe>
+ <archive>
+
http://mail-archives.apache.org/mod_mbox/jakarta-turbine-jcs-user/
+ </archive>
+ </mailingList>
+ <mailingList>
+ <name>OLD Developer list</name>
+ <subscribe></subscribe>
+ <unsubscribe></unsubscribe>
+ <archive>
+
http://mail-archives.apache.org/mod_mbox/jakarta-turbine-jcs-dev/
+ </archive>
+ </mailingList>
+ </mailingLists>
+
+
+ <developers>
+ <developer>
+ <name>Aaron Smuts</name>
+ <id>asmuts</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>James Taylor</name>
+ <id>jtaylor</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Hanson Char</name>
+ <id>hchar</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Travis Savo</name>
+ <id>tsavo</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>IFilm</organization>
+ </developer>
+ </developers>
+
+ <contributors></contributors>
+
+
+ <dependencies>
+ <dependency>
+ <id>commons-collections</id>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-configuration</id>
+ <version>20030706.202021</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-lang</id>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <id>concurrent</id>
+ <version>1.0</version>
+ <url>
+
http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+ </url>
+ </dependency>
+
+ <dependency>
+ <id>hsqldb</id>
+ <version>1.7.1</version>
+ </dependency>
+
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ </dependency>
+
+ <dependency>
+ <id>servletapi</id>
+ <version>2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups-all</artifactId>
+ <version>2.2.8</version>
+ </dependency>
+
+ <dependency>
+ <id>tomcat</id>
+ <version>3.2.1</version>
+ <jar>tomcat-util-3.2.1.jar</jar>
+ </dependency>
+
+ <dependency>
+ <id>velocity</id>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <id>xmlrpc</id>
+ <version>1.2-b1</version>
+ <url>http://xml.apache.org/xmlrpc/</url>
+ </dependency>
+
+ <dependency>
+ <id>xerces:xercesImpl</id>
+ <version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
+ </dependency>
+
+ <dependency>
+ <id>xml-apis</id>
+ <version>2.0.2</version>
+ <url>http://xml.apache.org/commons/</url>
+ </dependency>
+
+ <dependency>
+ <id>struts</id>
+ <version>1.1</version>
+ <jar>struts-1.1.jar</jar>
+ </dependency>
+
+ <dependency>
+ <id>berkeleydb</id>
+ <version>1.5.0</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>maven-plugins</groupId>
+ <artifactId>maven-findbugs-plugin</artifactId>
+ <version>0.9.1</version>
+ <type>plugin</type>
+ </dependency>
-->
- <include>**/TestEventQueueConcurrent.java</include>
- <include>**/TestSimpleEventHandling.java</include>
- <include>**/TestLRUArray.java</include>
- <include>**/TestSortedPrefArray.java</include>
- <include>**/TestRemovalConcurrent.java</include>
- <include>**/TestRemovalSimple.java</include>
- <include>**/TestUDPDiscovery.java</include>
- <include>**/TestSystemPropertyUsage.java</include>
- <include>**/TestCacheManagerStats.java</include>
- </includes>
- <resources>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.ccf</include>
- </includes>
- </resources>
- </unitTest>
- <jars></jars>
- </build>
-
-
- <reports>
- <report>maven-jdepend-plugin</report>
- <report>maven-checkstyle-plugin</report>
- <report>maven-changes-plugin</report>
- <!--
- <report>maven-changelog-plugin</report>
- <report>maven-statcvs-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-jcoverage-plugin</report>
- -->
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-tasklist-plugin</report>
- <report>maven-pmd-plugin</report>
- <report>maven-simian-plugin</report>
- <report>maven-faq-plugin</report>
- </reports>
+ </dependencies>
+
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <aspectSourceDirectories></aspectSourceDirectories>
+
+ <unitTest>
+ <includes>
+ <include>**/*${test}Test.java</include>
+
+
<include>**/TestCacheElementRetrieval.java</include>
+ <include>**/TestDiskCacheNoMemory.java</include>
+ <include>**/TestJCS.java</include>
+ <include>**/TestSimpleLoad.java</include>
+ <include>**/TestDiskCache.java</include>
+
<include>**/TestDiskCacheConcurrent.java</include>
+ <include>
+
**/TestDiskCacheConcurrentForDeadLock.java
+ </include>
+ <include>**/TestTCPLateralCache.java</include>
+ <include>
+
**/TestLateralTCPFilterRemoveHashCode.java
+ </include>
+ <include>
+ **/TestLateralTCPIssueRemoveOnPut.java
+ </include>
+ <include>
+
**/TestLateralTCPConcurrentForDeadLock.java
+ </include>
+ <!--
+
<include>**/TestJCSvHashtablePerf.java</include>
+ -->
+
<include>**/TestEventQueueConcurrent.java</include>
+
<include>**/TestSimpleEventHandling.java</include>
+ <include>**/TestLRUArray.java</include>
+ <include>**/TestSortedPrefArray.java</include>
+ <include>**/TestRemovalConcurrent.java</include>
+ <include>**/TestRemovalSimple.java</include>
+ <include>**/TestUDPDiscovery.java</include>
+
<include>**/TestSystemPropertyUsage.java</include>
+ <include>**/TestCacheManagerStats.java</include>
+ </includes>
+
+ <resources>
+ <resource>
+ <directory>src/test-conf</directory>
+ <includes>
+
<include>**/*.properties</include>
+ <include>**/*.ccf</include>
+ </includes>
+ </resource>
+ </resources>
+
+ </unitTest>
+
+ </build>
+
+
+ <reports>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-changes-plugin</report>
+ <!--
+ <report>maven-changelog-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-statcvs-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-jcoverage-plugin</report>
+ -->
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <report>maven-pmd-plugin</report>
+ <report>maven-simian-plugin</report>
+ <report>maven-faq-plugin</report>
+ </reports>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
