mcconnell 2004/02/25 03:22:08
Modified: logging maven.xml project.xml
Added: logging/site/xdocs/impl/log4j navigation.xml
Log:
Update test handling and build procedure.
Revision Changes Path
1.4 +11 -3 avalon/logging/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 19 Feb 2004 08:58:03 -0000 1.3
+++ maven.xml 25 Feb 2004 11:22:08 -0000 1.4
@@ -59,7 +59,7 @@
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="project.xml"
+ excludes="project.xml,test/project.xml,**test/project.xml"
goals=""
banner="Building:"
ignoreFailures="false"
@@ -100,6 +100,14 @@
</j:if>
</j:if>
</j:forEach>
+
+ <maven:reactor basedir="${basedir}"
+ includes="test/project.xml"
+ goals=""
+ banner="Testing:"
+ ignoreFailures="false"
+ postProcessing="false" />
+
</goal>
<!--
@@ -300,7 +308,7 @@
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="**/target/**,project.xml"
+ excludes="**/target/**,project.xml,**/test/project.xml"
banner="Building:"
ignoreFailures="false"
postProcessing="true" />
@@ -324,7 +332,7 @@
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="project.xml,logkit/test/**.*"
+ excludes="project.xml,**/test/**.*"
banner="Site Prep:"
ignoreFailures="false"
postProcessing="true" />
1.3 +1 -1 avalon/logging/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/logging/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 13 Feb 2004 08:15:40 -0000 1.2
+++ project.xml 25 Feb 2004 11:22:08 -0000 1.3
@@ -145,7 +145,7 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../</directory>
+ <directory>${basedir}</directory>
<includes>
<include>LICENSE.txt</include>
</includes>
1.1 avalon/logging/site/xdocs/impl/log4j/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Avalon Logging">
<item name="Overview" href="/index.html"/>
<item name="Specification" href="/spec/index.html"/>
<item name="Implementations" href="/impl/index.html">
<item name="LogKit" href="/impl/logkit/index.html"/>
<item name="Log4J" href="/impl/log4j/index.html"/>
</item>
<item name="Examples" href="/examples/index.html"/>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/download.html"/>
</menu>
<menu name="Related Projects">
<item name="Merlin" href="http://avalon.apache.org/merlin"/>
<item name="Repository" href="http://avalon.apache.org/repository"/>
<item name="Utilities" href="http://avalon.apache.org/util"/>
</menu>
</body>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
