aheritier 2004/08/25 12:58:20
Modified: xdoc/src/plugin-test .cvsignore maven.xml project.xml
Added: xdoc/src/plugin-test/test01 .cvsignore maven.xml project.xml
xdoc/src/plugin-test/test01/common links.xml
xdoc/src/plugin-test/test01/testdocs testjsltosite.xml
xdoc/src/plugin-test/test01/xdocs-replacement navigation.xml
test.xml
Removed: xdoc/src/plugin-test/common links.xml
xdoc/src/plugin-test/testdocs testjsltosite.xml
xdoc/src/plugin-test/xdocs-replacement navigation.xml
test.xml
Log:
tests reorganization
Revision Changes Path
1.2 +3 -0 maven-plugins/xdoc/src/plugin-test/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-test/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Sep 2003 08:35:33 -0000 1.1
+++ .cvsignore 25 Aug 2004 19:58:20 -0000 1.2
@@ -1,2 +1,5 @@
+gump.xml
*.log
+targetdist
+dist
target
1.7 +8 -15 maven-plugins/xdoc/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-test/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 29 Jun 2004 13:55:38 -0000 1.6
+++ maven.xml 25 Aug 2004 19:58:20 -0000 1.7
@@ -16,24 +16,17 @@
*/
-->
<project xmlns:util="jelly:util"
+ xmlns:maven="jelly:maven"
xmlns:j="jelly:core"
xmlns:assert="assert"
- xmlns:doc="doc">
+ xmlns:ant="jelly:ant">
- <goal name="testPlugin" prereqs="clean,test-xdoc,test-jsltosite">
- <!-- bad xdoc leaves files open <attainGoal name="clean"/> -->
- </goal>
-
- <goal name="test-xdoc">
- <j:set var="maven.docs.src" value="${basedir}/xdocs-replacement"/>
- <attainGoal name="xdoc"/>
- <assert:assertFileExists file="${maven.docs.dest}/test.html"/>
- </goal>
-
-
- <goal name="test-jsltosite">
- <doc:jslToSite srcdir="${basedir}/testdocs" />
- <assert:assertFileExists file="${maven.docs.dest}/testjsltosite.html"/>
+ <goal name="testPlugin">
+ <maven:reactor basedir="${basedir}"
+ includes="test*/project.xml"
+ goals="testPlugin"
+ banner="Test"
+ ignoreFailures="false"/>
</goal>
</project>
1.4 +3 -17 maven-plugins/xdoc/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-test/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 30 Jun 2004 04:20:54 -0000 1.3
+++ project.xml 25 Aug 2004 19:58:20 -0000 1.4
@@ -27,11 +27,11 @@
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
- <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
+ <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
</organization>
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
- <logo>http://maven.apache.org/images/maven.jpg</logo>
+ <logo>http://maven.apache.org/images/maven.gif</logo>
<description>Test for Maven Xdoc plugin</description>
<shortDescription>Test for Maven Xdoc plugin</shortDescription>
<url>http://maven.apache.org/reference/plugins/xdoc/</url>
@@ -40,18 +40,4 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/xdoc/</connection>
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/xdoc/</url>
</repository>
- <developers>
- <developer>
- <name>dIon Gillard</name>
- <id>dion</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Multitask Consulting</organization>
- <roles>
- <role>Documentation</role>
- </roles>
- </developer>
- </developers>
-
- <build>
- </build>
-</project>
+</project>
\ No newline at end of file
1.1 maven-plugins/xdoc/src/plugin-test/test01/.cvsignore
Index: .cvsignore
===================================================================
*.log
target
1.1 maven-plugins/xdoc/src/plugin-test/test01/maven.xml
Index: maven.xml
===================================================================
<!--
/*
* Copyright 2001-2004 The 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 xmlns:util="jelly:util"
xmlns:j="jelly:core"
xmlns:assert="assert"
xmlns:doc="doc">
<goal name="testPlugin" prereqs="clean,test-xdoc,test-jsltosite">
<!-- bad xdoc leaves files open <attainGoal name="clean"/> -->
</goal>
<goal name="test-xdoc">
<j:set var="maven.docs.src" value="${basedir}/xdocs-replacement"/>
<attainGoal name="xdoc"/>
<assert:assertFileExists file="${maven.docs.dest}/test.html"/>
</goal>
<goal name="test-jsltosite">
<doc:jslToSite srcdir="${basedir}/testdocs" />
<assert:assertFileExists file="${maven.docs.dest}/testjsltosite.html"/>
</goal>
</project>
1.1 maven-plugins/xdoc/src/plugin-test/test01/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The 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>
<pomVersion>3</pomVersion>
<id>test-maven-xdoc-plugin</id>
<name>Maven Xdoc Plugin 01</name>
<groupId>maven</groupId>
<currentVersion>1.0</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
<logo>http://maven.apache.org/images/apache-maven-project.png</logo>
</organization>
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
<logo>http://maven.apache.org/images/maven.gif</logo>
<description>Test for Maven Xdoc plugin</description>
<shortDescription>Test for Maven Xdoc plugin</shortDescription>
<url>http://maven.apache.org/reference/plugins/xdoc/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/xdoc/</connection>
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/xdoc/</url>
</repository>
<developers>
<developer>
<name>dIon Gillard</name>
<id>dion</id>
<email>[EMAIL PROTECTED]</email>
<organization>Multitask Consulting</organization>
<roles>
<role>Documentation</role>
</roles>
</developer>
</developers>
</project>
1.1 maven-plugins/xdoc/src/plugin-test/test01/common/links.xml
Index: links.xml
===================================================================
<!--
/*
* Copyright 2001-2004 The 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.
*/
-->
<!-- $Id: links.xml,v 1.1 2004/08/25 19:58:20 aheritier Exp $ -->
<!ENTITY _module '<code><module></code>'>
<!ENTITY module '<a href="descriptor.html#module">&_module;</a>'>
<!ENTITY _service '<code><service></code>'>
<!ENTITY service '<a href="descriptor.html#service">&_service;</a>'>
<!ENTITY _extension-point '<code><extension-point></code>'>
<!ENTITY extension-point '<a
href="descriptor.html#extension-point">&_extension-point;</a>'>
<!ENTITY _create-instance '<code><create-instance></code>'>
<!ENTITY create-instance '<a
href="descriptor.html#create-instance">&_create-instance;</a>'>
<!ENTITY _invoke-factory '<code><invoke-factory></code>'>
<!ENTITY invoke-factory '<a
href="descriptor.html#invoke-factory">&_invoke-factory;</a>'>
<!ENTITY _interceptor '<code><interceptor></code>'>
<!ENTITY interceptor '<a href="descriptor.html#interceptor">&_interceptor;</a>'>
<!ENTITY _description '<code><description></code>'>
<!ENTITY description '<a href="descriptor.html#description">&_description;</a>'>
<!ENTITY _extension '<code><extension></code>'>
<!ENTITY extension '<a href="descriptor.html#extension">&_extension;</a>'>
<!ENTITY _extend-service '<code><extend-service></code>'>
<!ENTITY extend-service '<a
href="descriptor.html#extend-service">&_extend-service;</a>'>
<!ENTITY _schema '<code><schema></code>'>
<!ENTITY schema '<a href="descriptor.html#schema">&_schema;</a>'>
<!ENTITY _parameters-schema '<code><parameters-schema></code>'>
<!ENTITY parameters-schema '<a
href="descriptor.html#schema">&_parameters-schema;</a>'>
<!ENTITY _element '<code><element></code>'>
<!ENTITY element '<a href="descriptor.html#element">&_element;</a>'>
<!ENTITY _attribute '<code><attribute></code>'>
<!ENTITY attribute '<a href="descriptor.html#attribute">&_attribute;</a>'>
<!ENTITY _rules '<code><rules></code>'>
<!ENTITY rules '<a href="descriptor.html#rules">&_rules;</a>'>
<!-- XML entities for the XML processing rules (documented seperately from the
rest). -->
<!ENTITY _create-object '<code><create-object></code>'>
<!ENTITY create-object '<a href="rules.html#create-object">&_create-object;</a>'>
<!ENTITY _invoke-parent '<code><invoke-parent></code>'>
<!ENTITY invoke-parent '<a href="rules.html#invoke-parent">&_invoke-parent;</a>'>
<!ENTITY _read-attribute '<code><read-attribute></code>'>
<!ENTITY read-attribute '<a href="rules.html#read-attribute">&_read-attribute;</a>'>
<!ENTITY _read-content '<code><read-content></code>'>
<!ENTITY read-content '<a href="rules.html#read-content">&_read-content;</a>'>
<!ENTITY _set-parent '<code><set-parent></code>'>
<!ENTITY set-parent '<a href="rules.html#set-parent">&_set-parent;</a>'>
1.1
maven-plugins/xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml
Index: testjsltosite.xml
===================================================================
<?xml version="1.0"?>
<!--
/*
* Copyright 2001-2004 The 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.
*/
-->
<document>
<properties>
<title>Xdoc test Document</title>
</properties>
<body>
<section name="test jslToSite tag">
<p>empty document</p>
<p>
This document is generated separately from other xdoc documents
but should retain the site stylesheet and navigation.
</p>
</section>
</body>
</document>
1.1
maven-plugins/xdoc/src/plugin-test/test01/xdocs-replacement/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
/*
* Copyright 2001-2004 The 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 name="Test Maven xdoc Plugin">
<title>Test Maven xdoc Plugin</title>
<body>
<links>
<item name="Maven" href="http://maven.apache.org/"/>
</links>
<menu name="Overview">
<item name="Test" href="/test.html"/>
<item name="Test 2" href="/testjsltosite.html"/>
</menu>
</body>
</project>
1.1
maven-plugins/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
Index: test.xml
===================================================================
<?xml version="1.0"?>
<!--
/*
* Copyright 2001-2004 The 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.
*/
-->
<!-- $Id: test.xml,v 1.1 2004/08/25 19:58:20 aheritier Exp $ -->
<!DOCTYPE document [
<!ENTITY % common-links SYSTEM "../common/links.xml">
%common-links;
]>
<document>
<properties>
<title>Introduction to HiveMind</title>
<author email="[EMAIL PROTECTED]">Howard M. Lewis Ship</author>
</properties>
<body>
<section name="test1">
&_module;
<p><a href="#Section 2">blah</a></p>
</section>
<section name="Section 2">
<p><a href="/servlet/x?param=1&q=foo">foo -> bar</a></p>
</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
