svn commit: r737781 - in /maven/doxia/doxia/branches/doxia-1.0.x: ./ doxia-modules/pom.xml pom.xml
Author: dennisl
Date: Mon Jan 26 19:12:21 2009
New Revision: 737781
URL: http://svn.apache.org/viewvc?rev=737781&view=rev
Log:
o Merge r725783 from trunk.
Modified:
maven/doxia/doxia/branches/doxia-1.0.x/ (props changed)
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml
maven/doxia/doxia/branches/doxia-1.0.x/pom.xml
Propchange: maven/doxia/doxia/branches/doxia-1.0.x/
--
svn:mergeinfo = /maven/doxia/doxia/trunk:725783
Modified: maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml?rev=737781&r1=737780&r2=737781&view=diff
==
--- maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml Mon Jan 26
19:12:21 2009
@@ -47,7 +47,7 @@
org.apache.maven.doxia
doxia-core
- tests
+ test-jar
test
Modified: maven/doxia/doxia/branches/doxia-1.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/pom.xml?rev=737781&r1=737780&r2=737781&view=diff
==
--- maven/doxia/doxia/branches/doxia-1.0.x/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/pom.xml Mon Jan 26 19:12:21 2009
@@ -131,7 +131,7 @@
org.apache.maven.doxia
doxia-core
${projectVersion}
-tests
+test-jar
svn commit: r737793 - in /maven/doxia/doxia/branches/doxia-1.0.x: ./ doxia-book/src/site/ doxia-core/src/site/ doxia-maven-plugin/src/site/ doxia-modules/doxia-module-apt/src/site/ doxia-modules/doxia
Author: dennisl Date: Mon Jan 26 19:26:34 2009 New Revision: 737793 URL: http://svn.apache.org/viewvc?rev=737793&view=rev Log: o Merge r709883 from trunk. Added: maven/doxia/doxia/branches/doxia-1.0.x/doxia-core/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-core/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-core/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-core/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-confluence/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-confluence/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-docbook-simple/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-docbook-simple/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-fml/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-fml/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-itext/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-itext/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-latex/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-latex/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-rtf/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-rtf/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-twiki/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-twiki/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xhtml/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xhtml/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/src/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/src/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/src/site/ - copied from r709883, maven/doxia/doxia/trunk/doxia-modules/src/site/ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/src/site/site.xml - copied unchanged from r709883, maven/doxia/doxia/trunk/doxia-modules/src/site/site.xml maven/doxia/doxia/branches/doxia-1.0.x/doxia-sink-api/src/site/ - copied from r709883, maven/doxia/doxia/
svn commit: r737798 - /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
Author: hboutemy
Date: Mon Jan 26 19:49:32 2009
New Revision: 737798
URL: http://svn.apache.org/viewvc?rev=737798&view=rev
Log:
updated decoration.mdo to adapt to new Modello version
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=737798&r1=737797&r2=737798&view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
Mon Jan 26 19:49:32 2009
@@ -20,7 +20,7 @@
-->
http://modello.codehaus.org/MODELLO/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0
http://modello.codehaus.org/xsd/modello-1.0.0.xsd";
- xsd.namespace="http://maven.apache.org/DECORATION/1.0.0";
xsd.target-namespace="http://maven.apache.org/DECORATION/1.0.0";>
+ xml.namespace="http://maven.apache.org/DECORATION/${version}";>
decoration
Decoration
1.0.0
-
+
Logo
*
true
-
+
skin
1.0.0
-
+
LinkItem
*
true
-
+
breadcrumbs
1.0.0
-
+
LinkItem
*
true
-
+
menus
1.0.0
-
+
Menu
*
@@ -447,13 +447,13 @@
String
true
-
+
items
1.0.0
-
+
MenuItem
*
@@ -497,11 +497,11 @@
String
true
-
+
items
Menu item.
1.0.0
-
+
MenuItem
*
svn commit: r737827 - in /maven/doxia/doxia/trunk: doxia-book/src/main/modello/book.mdo doxia-core/src/main/mdo/document.mdo doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
Author: hboutemy
Date: Mon Jan 26 20:35:33 2009
New Revision: 737827
URL: http://svn.apache.org/viewvc?rev=737827&view=rev
Log:
updated models to match latest Modello version
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo
maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo?rev=737827&r1=737826&r2=737827&view=diff
==
--- maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo Mon Jan 26
20:35:33 2009
@@ -19,7 +19,7 @@
-->
http://modello.codehaus.org/MODELLO/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0
http://modello.codehaus.org/xsd/modello-1.0.0.xsd";
- xsd.namespace="http://maven.apache.org/BOOK/1.0.0";
xsd.target-namespace="http://maven.apache.org/BOOK/1.0.0";>
+ xml.namespace="http://maven.apache.org/BOOK/${version}";>
book
BookModel
@@ -130,11 +130,11 @@
true
-
+
poweredBy
Powered by logos.
1.0.0
-
+
Logo
*
@@ -335,32 +335,32 @@
DOM
true
-
+
links
A list of links to display in the
navigation.
1.0.0
-
+
LinkItem
*
true
-
+
breadcrumbs
A list of breadcrumbs to display in the
navigation.
1.0.0
-
+
LinkItem
*
true
true
-
+
menus
Menus to include in the navigation.
1.0.0
-
+
Menu
*
@@ -430,11 +430,11 @@
String
true
-
+
items
Menu item.
1.0.0
-
+
MenuItem
*
@@ -470,11 +470,11 @@
String
true
-
+
items
Menu item.
1.0.0
-
+
MenuItem
*
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo?rev=737827&r1=737826&r2=737827&view=diff
==
--- maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo Mon Jan 26
20:35:33 2009
@@ -19,7 +19,7 @@
under the License.
-->
-
+http://maven.apache.org/DOCUMENT/${version}";>
document
Document
-
+
DocumentAuthor
*
@@ -156,14 +156,14 @@
String
true
-
+
keyWords
1.0.0
-
+
String
*
@@ -767,13 +767,13 @@
Date
true
-
+
authors
1.0.0
-
+
DocumentAuthor
*
@@ -846,13 +846,13 @@
int
true
-
+
items
1.0.0
-
+
DocumentTOCItem
*
@@ -895,13 +895,13 @@
boolean
true
-
+
items
1.0.0
-
+
DocumentTOCItem
*
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo?rev=737827&r1=737826&r2=737827&view=diff
==
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
Mon Jan 26 20:35:33 2009
@@ -60,13 +60,13 @@
true
true
-
+
parts
1.0.0
-
+
Part
*
@@ -99,13 +99,13 @@
String
true
-
+
faqs
1.0.0
-
+
svn commit: r737882 - /maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml
Author: dennisl Date: Mon Jan 26 21:59:33 2009 New Revision: 737882 URL: http://svn.apache.org/viewvc?rev=737882&view=rev Log: o Remove inherited stuff. o Use the 1.1 version of the skin. Modified: maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml Modified: maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml?rev=737882&r1=737881&r2=737882&view=diff == --- maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml (original) +++ maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml Mon Jan 26 21:59:33 2009 @@ -22,43 +22,19 @@ --> - -Doxia -images/apache-maven-project-2.png - - -images/maven-logo-2.gif - - org.apache.maven.skins maven-stylus-skin -1.0.1 +1.1 - - http://www.apache.org/"/> - http://maven.apache.org/maven-1.x"/> - http://maven.apache.org/"/> - http://maven.apache.org/scm"/> - http://maven.apache.org/wagon"/> - http://maven.apache.org/jxr"/> - http://maven.apache.org/doxia"/> - - - - http://www.google-analytics.com/urchin.js"; type="text/javascript"> - - -_uacct = "UA-140879-1"; -urchinTracker(); - - + + http://maven.apache.org/index.html"; /> + http://maven.apache.org/doxia/index.html"; /> + - -
svn commit: r737932 - in /maven/doxia/doxia/branches/doxia-1.0.x: ./ doxia-modules/pom.xml pom.xml
Author: dennisl
Date: Mon Jan 26 23:13:45 2009
New Revision: 737932
URL: http://svn.apache.org/viewvc?rev=737932&view=rev
Log:
o Revert the merge of r725783 from trunk, because the javadoc plugin failed
after the merge.
Modified:
maven/doxia/doxia/branches/doxia-1.0.x/ (props changed)
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml
maven/doxia/doxia/branches/doxia-1.0.x/pom.xml
Propchange: maven/doxia/doxia/branches/doxia-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 23:13:45 2009
@@ -1 +1 @@
-/maven/doxia/doxia/trunk:709883,725783
+/maven/doxia/doxia/trunk:709883
Modified: maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml?rev=737932&r1=737931&r2=737932&view=diff
==
--- maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/pom.xml Mon Jan 26
23:13:45 2009
@@ -47,7 +47,7 @@
org.apache.maven.doxia
doxia-core
- test-jar
+ tests
test
Modified: maven/doxia/doxia/branches/doxia-1.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/pom.xml?rev=737932&r1=737931&r2=737932&view=diff
==
--- maven/doxia/doxia/branches/doxia-1.0.x/pom.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/pom.xml Mon Jan 26 23:13:45 2009
@@ -131,7 +131,7 @@
org.apache.maven.doxia
doxia-core
${projectVersion}
-test-jar
+tests
