From doxia-commits-return-922-apmail-maven-doxia-commits-archive=maven.apache.org@maven.apache.org Thu May 15 17:50:49 2008 Return-Path: Delivered-To: apmail-maven-doxia-commits-archive@www.apache.org Received: (qmail 175 invoked from network); 15 May 2008 17:50:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 May 2008 17:50:49 -0000 Received: (qmail 21963 invoked by uid 500); 15 May 2008 17:50:51 -0000 Delivered-To: apmail-maven-doxia-commits-archive@maven.apache.org Received: (qmail 21954 invoked by uid 500); 15 May 2008 17:50:51 -0000 Mailing-List: contact doxia-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: doxia-dev@maven.apache.org Delivered-To: mailing list doxia-commits@maven.apache.org Received: (qmail 21943 invoked by uid 99); 15 May 2008 17:50:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 May 2008 10:50:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 May 2008 17:49:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DADF92388A09; Thu, 15 May 2008 10:50:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r656758 - in /maven/doxia: doxia-tools/trunk/doxia-ide/eclipse/ doxia-tools/trunk/doxia-ide/netbeans/ doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/ doxia-tools/trunk/doxia-ide/netbeans/src/main/... Date: Thu, 15 May 2008 17:50:12 -0000 To: doxia-commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080515175012.DADF92388A09@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Thu May 15 10:50:11 2008 New Revision: 656758 URL: http://svn.apache.org/viewvc?rev=656758&view=rev Log: o Set svn:eol-style=native Modified: maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/README.TXT (contents, props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/pom.xml (contents, props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataLoader.java (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataLoaderBeanInfo.java (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataNode.java (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataObject.java (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptHyperlinkProvider.java (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptUptodateStatusProvider.java (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/nbm/module.xml (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/AptResolver.xml (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/AptTemplate.apt (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/Bundle.properties (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/apt/Bundle.properties (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/apt/CodeTemplates.xml (props changed) maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/layer.xml (props changed) maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/httpbean.mdo (contents, props changed) maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/linkcheck.mdo (contents, props changed) maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo (contents, props changed) Modified: maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/README.TXT URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/README.TXT?rev=656758&r1=656757&r2=656758&view=diff ============================================================================== --- maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/README.TXT (original) +++ maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/README.TXT Thu May 15 10:50:11 2008 @@ -1,30 +1,30 @@ -Eclipse plugin for Apache Maven Doxia - -Required Prerequisites: -* Eclipse SDK Platform (http://download.eclipse.org/eclipse/downloads/) -* Web Tools Platform (http://download.eclipse.org/webtools/downloads/) - - EMF - - EMF XSD - - GEF - - DTP - - WTP Tool Developers -* doxia-converter (https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-converter) - - Need to build it - - Put apache-doxia-1.0-SNAPSHOT-jar-with-dependencies.jar in ./plugins/org.apache.maven.doxia.ide.eclipse.common.ui/lib - unneeded since r650510 -* needs Java 5 to build since Eclipse uses Java 5 -* M2_HOME needs to be set - unneeded since r651102 - -Known Limitations: -* Needs to bump to WSTP M6 due to: - - https://bugs.eclipse.org/bugs/show_bug.cgi?id=212330 - - https://bugs.eclipse.org/bugs/show_bug.cgi?id=224040 - -TODO: -* mavenize the plugins - done in r650510 -* Add more PatternRule for text plugin (Apt, confluence, twiki) - done in r650506, r650503, r650502 -* Review editor colors - done in r650501 -* add more actions like add list, comment/uncomment in Apt... - -References: -* DOXIA-233: Create an Eclipse plugin to edit Doxia files +Eclipse plugin for Apache Maven Doxia + +Required Prerequisites: +* Eclipse SDK Platform (http://download.eclipse.org/eclipse/downloads/) +* Web Tools Platform (http://download.eclipse.org/webtools/downloads/) + - EMF + - EMF XSD + - GEF + - DTP + - WTP Tool Developers +* doxia-converter (https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-converter) + - Need to build it + - Put apache-doxia-1.0-SNAPSHOT-jar-with-dependencies.jar in ./plugins/org.apache.maven.doxia.ide.eclipse.common.ui/lib - unneeded since r650510 +* needs Java 5 to build since Eclipse uses Java 5 +* M2_HOME needs to be set - unneeded since r651102 + +Known Limitations: +* Needs to bump to WSTP M6 due to: + - https://bugs.eclipse.org/bugs/show_bug.cgi?id=212330 + - https://bugs.eclipse.org/bugs/show_bug.cgi?id=224040 + +TODO: +* mavenize the plugins - done in r650510 +* Add more PatternRule for text plugin (Apt, confluence, twiki) - done in r650506, r650503, r650502 +* Review editor colors - done in r650501 +* add more actions like add list, comment/uncomment in Apt... + +References: +* DOXIA-233: Create an Eclipse plugin to edit Doxia files * DOXIA-228: Create a new tool to handle module conversion \ No newline at end of file Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/README.TXT ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/pom.xml?rev=656758&r1=656757&r2=656758&view=diff ============================================================================== --- maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/pom.xml Thu May 15 10:50:11 2008 @@ -1,94 +1,94 @@ - - - 4.0.0 - org.apache.maven.doxia.ide - netbeans - nbm - 1.0-SNAPSHOT - Doxia Editing integration for NetBeans - - - - - netbeans - repository hosting netbeans.org api artifacts - http://deadlock.netbeans.org/maven2 - - - - - - org.netbeans.api - org-openide-util - RELEASE60 - - - org.netbeans.api - org-openide-filesystems - RELEASE60 - - - org.netbeans.api - org-openide-loaders - RELEASE60 - - - org.netbeans.api - org-openide-nodes - RELEASE60 - - - org.netbeans.api - org-openide-text - RELEASE60 - - - org.netbeans.api - org-openide-windows - RELEASE60 - - - org.netbeans.api - org-netbeans-modules-editor-lib - RELEASE60 - - - - - org.netbeans.api - org-netbeans-modules-editor-errorstripe-api - RELEASE60 - - - - - - org.codehaus.mojo - nbm-maven-plugin - 2.6.2 - true - - src/main/nbm/module.xml - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - - - - + + + 4.0.0 + org.apache.maven.doxia.ide + netbeans + nbm + 1.0-SNAPSHOT + Doxia Editing integration for NetBeans + + + + + netbeans + repository hosting netbeans.org api artifacts + http://deadlock.netbeans.org/maven2 + + + + + + org.netbeans.api + org-openide-util + RELEASE60 + + + org.netbeans.api + org-openide-filesystems + RELEASE60 + + + org.netbeans.api + org-openide-loaders + RELEASE60 + + + org.netbeans.api + org-openide-nodes + RELEASE60 + + + org.netbeans.api + org-openide-text + RELEASE60 + + + org.netbeans.api + org-openide-windows + RELEASE60 + + + org.netbeans.api + org-netbeans-modules-editor-lib + RELEASE60 + + + + + org.netbeans.api + org-netbeans-modules-editor-errorstripe-api + RELEASE60 + + + + + + org.codehaus.mojo + nbm-maven-plugin + 2.6.2 + true + + src/main/nbm/module.xml + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + + Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataLoader.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataLoaderBeanInfo.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataNode.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptDataObject.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptHyperlinkProvider.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/java/org/apache/maven/doxia/ide/netbeans/apt/AptUptodateStatusProvider.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/nbm/module.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/AptResolver.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/AptTemplate.apt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/Bundle.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/apt/Bundle.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/apt/CodeTemplates.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-tools/trunk/doxia-ide/netbeans/src/main/resources/org/apache/maven/doxia/ide/netbeans/layer.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/httpbean.mdo URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/httpbean.mdo?rev=656758&r1=656757&r2=656758&view=diff ============================================================================== --- maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/httpbean.mdo (original) +++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/httpbean.mdo Thu May 15 10:50:11 2008 @@ -1,140 +1,140 @@ - - - - - - http - HttpBean - Bean for supported HTTP parameters. - - - package - org.apache.maven.doxia.linkcheck - - - - - HttpBean - - 1.0.0 - - - method - -
HTTP GET
-
- The HTTP GET method is defined in section 9.3 of - RFC2616: -
- The GET method means retrieve whatever information (in the form of an - entity) is identified by the Request-URI. -
-
-
HTTP HEAD
-
- The HTTP HEAD method is defined in section 9.4 of - RFC2616: -
- The HEAD method is identical to GET except that the server MUST NOT - return a message-body in the response. -
-
- - ]]>
- 1.0.0 - true - String - head -
- - followRedirects - false otherwise. - ]]> - 1.0.0 - true - boolean - - - proxyHost - - 1.0.0 - true - String - - - proxyPort - - 1.0.0 - true - int - 0 - - - proxyUser - - 1.0.0 - true - String - - - proxyPassword - - 1.0.0 - true - String - - - proxyNtlmHost - - 1.0.0 - true - String - - - proxyNtlmDomain - - 1.0.0 - true - String - -
-
-
-
+ + + + + + http + HttpBean + Bean for supported HTTP parameters. + + + package + org.apache.maven.doxia.linkcheck + + + + + HttpBean + + 1.0.0 + + + method + +
HTTP GET
+
+ The HTTP GET method is defined in section 9.3 of + RFC2616: +
+ The GET method means retrieve whatever information (in the form of an + entity) is identified by the Request-URI. +
+
+
HTTP HEAD
+
+ The HTTP HEAD method is defined in section 9.4 of + RFC2616: +
+ The HEAD method is identical to GET except that the server MUST NOT + return a message-body in the response. +
+
+ + ]]>
+ 1.0.0 + true + String + head +
+ + followRedirects + false otherwise. + ]]> + 1.0.0 + true + boolean + + + proxyHost + + 1.0.0 + true + String + + + proxyPort + + 1.0.0 + true + int + 0 + + + proxyUser + + 1.0.0 + true + String + + + proxyPassword + + 1.0.0 + true + String + + + proxyNtlmHost + + 1.0.0 + true + String + + + proxyNtlmDomain + + 1.0.0 + true + String + +
+
+
+
Propchange: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/httpbean.mdo ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/linkcheck.mdo URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/linkcheck.mdo?rev=656758&r1=656757&r2=656758&view=diff ============================================================================== --- maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/linkcheck.mdo (original) +++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/linkcheck.mdo Thu May 15 10:50:11 2008 @@ -1,274 +1,274 @@ - - - - - - linkcheck - LinkcheckModel - Model for the linkcheck report. - - - package - org.apache.maven.doxia.linkcheck.model - - - - - LinkcheckModel - <linkcheck> element is the root of the linkcheck descriptor. - ]]> - 1.0.0 - - - files - <file> elements. - ]]> - 1.0.0 - - LinkcheckFile - * - - true - - - - - LinkcheckFile - <file> to be checked. - ]]> - 1.0.0 - - - absolutePath - 1.0.0 - - String - true - - - relativePath - 1.0.0 - - String - true - - - successful - 1.0.0 - - int - true - -1 - - - unsuccessful - 1.0.0 - - int - true - -1 - - - results - 1.0.0 - - - LinkcheckFileResult - * - - true - - - - - 1.0.0 - - - - - - - - LinkcheckFileResult - - 1.0.0 - - - target - - 1.0.0 - String - true - - - status - - 1.0.0 - String - true - - - errorMessage - - 1.0.0 - String - true - - - - - 1.0.0 - - - - - - - - + + + + + + linkcheck + LinkcheckModel + Model for the linkcheck report. + + + package + org.apache.maven.doxia.linkcheck.model + + + + + LinkcheckModel + <linkcheck> element is the root of the linkcheck descriptor. + ]]> + 1.0.0 + + + files + <file> elements. + ]]> + 1.0.0 + + LinkcheckFile + * + + true + + + + + LinkcheckFile + <file> to be checked. + ]]> + 1.0.0 + + + absolutePath + 1.0.0 + + String + true + + + relativePath + 1.0.0 + + String + true + + + successful + 1.0.0 + + int + true + -1 + + + unsuccessful + 1.0.0 + + int + true + -1 + + + results + 1.0.0 + + + LinkcheckFileResult + * + + true + + + + + 1.0.0 + + + + + + + + LinkcheckFileResult + + 1.0.0 + + + target + + 1.0.0 + String + true + + + status + + 1.0.0 + String + true + + + errorMessage + + 1.0.0 + String + true + + + + + 1.0.0 + + + + + + + + Propchange: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/mdo/linkcheck.mdo ------------------------------------------------------------------------------ svn:eol-style = native 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=656758&r1=656757&r2=656758&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 Thu May 15 10:50:11 2008 @@ -1,157 +1,157 @@ - - - - - - fml - Fml - This is a reference for the FML (FAQ Markup Language) descriptor used in Maven Doxia.

-

An XSD is available at:

- - ]]>
- - - package - org.apache.maven.doxia.module.fml.model - - - - - Faqs - <faqs> element is the root of the FML descriptor. - The following table lists all of the possible child elements. - ]]> - 1.0.0 - - - title - - 1.0.0 - String - FAQ - true - - - toplink - - 1.0.0 - boolean - true - true - - - parts - - 1.0.0 - - Part - * - - true - - - - - Part - - 1.0.0 - - - id - 1.0.0 - - String - true - - - title - 1.0.0 - - String - true - - - faqs - - 1.0.0 - - Faq - * - - true - - - - - Faq - - 1.0.0 - - - id - - 1.0.0 - String - true - - - question - - 1.0.0 - String - true - - - answer - - 1.0.0 - String - true - - - - -
+ + + + + + fml + Fml + This is a reference for the FML (FAQ Markup Language) descriptor used in Maven Doxia.

+

An XSD is available at:

+ + ]]>
+ + + package + org.apache.maven.doxia.module.fml.model + + + + + Faqs + <faqs> element is the root of the FML descriptor. + The following table lists all of the possible child elements. + ]]> + 1.0.0 + + + title + + 1.0.0 + String + FAQ + true + + + toplink + + 1.0.0 + boolean + true + true + + + parts + + 1.0.0 + + Part + * + + true + + + + + Part + + 1.0.0 + + + id + 1.0.0 + + String + true + + + title + 1.0.0 + + String + true + + + faqs + + 1.0.0 + + Faq + * + + true + + + + + Faq + + 1.0.0 + + + id + + 1.0.0 + String + true + + + question + + 1.0.0 + String + true + + + answer + + 1.0.0 + String + true + + + + +
Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo ------------------------------------------------------------------------------ svn:eol-style = native