Author: hboutemy
Date: Wed Jul 26 20:04:42 2017
New Revision: 1803104
URL: http://svn.apache.org/viewvc?rev=1803104&view=rev
Log:
- updated url of CI update site (workspace requires authentication)
- consistently use "Apache Doxia Eclipse Editors" naming
Modified:
maven/doxia/doxia-ide/trunk/eclipse/README.TXT
maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/pom.xml
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/pom.xml
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/pom.xml
maven/doxia/doxia-ide/trunk/eclipse/site/pom.xml
maven/doxia/doxia-ide/trunk/eclipse/site/src/site/apt/development.apt
maven/doxia/doxia-ide/trunk/eclipse/site/src/site/site.xml
maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/index.xml
maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/usage.xml
Modified: maven/doxia/doxia-ide/trunk/eclipse/README.TXT
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/README.TXT?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/README.TXT (original)
+++ maven/doxia/doxia-ide/trunk/eclipse/README.TXT Wed Jul 26 20:04:42 2017
@@ -1,4 +1,4 @@
-Eclipse plugin for Apache Maven Doxia
+Apache Doxia Eclipse Editors
Requirements:
* Maven 3 (!)
@@ -6,7 +6,7 @@ Requirements:
Building (with Maven 3):
-Tycho (http://tycho.sonatype.org) won't resolve through the reactor for the
bundle, so you need to build org.apache.maven.doxia.eclipse.dependencies
project first:
+Tycho (http://www.eclipse.org/tycho/) won't resolve through the reactor for
the bundle, so you need to build org.apache.maven.doxia.eclipse.dependencies
project first:
mvn clean install -f doxia-osgi/pom.xml
|_ Makes an OSGi bundle of doxia.
@@ -15,11 +15,11 @@ mvn clean install -f eclipse-plugins/pom
|_ Creates a feature and a P2 repository
|_ Builds Eclipse plugins
-The generated Eclipse Update Site will be available in:
+The generated Eclipse update site will be available in:
eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/target/site/
Update site generated by Jenkins CI server:
-https://builds.apache.org/view/M-R/view/Maven/job/doxia-eclipse-editor/ws/doxia-ide-eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/target/site/
+https://builds.apache.org/view/M-R/view/Maven/job/doxia-eclipse-editor/Maven-generated_Site/eclipse
Plugin Development with Eclipse Helios:
Modified: maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/pom.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/pom.xml (original)
+++ maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/pom.xml Wed Jul 26 20:04:42
2017
@@ -35,7 +35,7 @@ under the License.
<packaging>pom</packaging>
<description>Make an OSGi bundle consisting of Doxia, and put it in a P2
repo.</description>
- <url>http://maven.apache.org/doxia/doxia-ide/eclipse/</url>
+ <url>https://maven.apache.org/doxia/doxia-ide/eclipse/</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi</connection>
@@ -48,7 +48,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/job/doxia-eclipse-editor/</url>
+
<url>https://builds.apache.org/view/M-R/view/Maven/job/doxia-eclipse-editor/</url>
</ciManagement>
<!--
Modified:
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
---
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
(original)
+++
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
Wed Jul 26 20:04:42 2017
@@ -19,7 +19,7 @@ specific language governing permissions
under the License.
-->
<site>
- <category-def name="org.apache.maven.doxia.ide.eclipse" label="Apache Maven
Doxia Editors"/>
+ <category-def name="org.apache.maven.doxia.ide.eclipse" label="Apache Maven
Doxia Eclipse Editors"/>
<feature
url="features/org.apache.maven.doxia.ide.eclipse.feature_1.0.0.qualifier.jar"
id="org.apache.maven.doxia.ide.eclipse.feature"
version="1.0.0.qualifier">
<category name="org.apache.maven.doxia.ide.eclipse"/>
Modified:
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
---
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml
(original)
+++
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml
Wed Jul 26 20:04:42 2017
@@ -21,20 +21,20 @@ under the License.
<feature
id="org.apache.maven.doxia.ide.eclipse.feature"
- label="Doxia Editors Feature"
+ label="Apache Doxia Eclipse Editors"
version="1.0.0.qualifier"
provider-name="Apache Maven">
- <description url="http://maven.apache.org/doxia/";>
- Apache Maven Doxia Eclipse Plugin provides development editors, wizards
and other useful stuffs for Doxia.
+ <description url="http://maven.apache.org/doxia/doxia-ide/eclipse/";>
+ Apache Doxia Eclipse Editors provide development editors, wizards and
other useful stuff for Doxia.
</description>
- <copyright url="http://maven.apache.org/doxia/";>
+ <copyright url="https://maven.apache.org/doxia/";>
The Apache Software Foundation
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.txt";>
- The Apache Software License, Version 2.0
+ Apache License, Version 2.0
</license>
<requires>
Modified: maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/pom.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/pom.xml
(original)
+++ maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/features/pom.xml Wed
Jul 26 20:04:42 2017
@@ -72,8 +72,8 @@ under the License.
</execution>
</executions>
<configuration>
- <metadataRepositoryName>Doxia Editor Plugins</metadataRepositoryName>
- <artifactRepositoryName>Doxia Editor plugins</artifactRepositoryName>
+ <metadataRepositoryName>Apache Doxia Eclipse
Editors</metadataRepositoryName>
+ <artifactRepositoryName>Apache Doxia Eclipse
Editors</artifactRepositoryName>
<compressRepository>false</compressRepository>
</configuration>
</plugin>
Modified: maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/pom.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/pom.xml (original)
+++ maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/pom.xml Wed Jul 26
20:04:42 2017
@@ -48,7 +48,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/job/doxia-eclipse-editor/</url>
+
<url>https://builds.apache.org/view/M-R/view/Maven/job/doxia-eclipse-editor/</url>
</ciManagement>
<properties>
Modified: maven/doxia/doxia-ide/trunk/eclipse/site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/site/pom.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/site/pom.xml (original)
+++ maven/doxia/doxia-ide/trunk/eclipse/site/pom.xml Wed Jul 26 20:04:42 2017
@@ -34,7 +34,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Website for the Apache Maven Doxia Eclipse Editor
plugin.</description>
+ <description>Website for Apache Maven Doxia Eclipse Editors.</description>
<url>https://maven.apache.org/doxia/doxia-ide/eclipse/</url>
<!-- The project basedir and not the site -->
@@ -49,7 +49,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/job/doxia-eclipse-editor/</url>
+
<url>https://builds.apache.org/view/M-R/view/Maven/job/doxia-eclipse-editor/</url>
</ciManagement>
<distributionManagement>
<site>
Modified: maven/doxia/doxia-ide/trunk/eclipse/site/src/site/apt/development.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/site/src/site/apt/development.apt?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/site/src/site/apt/development.apt
(original)
+++ maven/doxia/doxia-ide/trunk/eclipse/site/src/site/apt/development.apt Wed
Jul 26 20:04:42 2017
@@ -1,5 +1,5 @@
-----
- Development of Apache Doxia Eclipse Editor Plugin
+ Development of Apache Doxia Eclipse Editors
-----
Vincent Siveton
Benson Margulies
@@ -27,21 +27,22 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Development of Apache Doxia Eclipse Editor Plugin
+Development of Apache Doxia Eclipse Editors
The project is divided in an OSGi bundle containing Apache Doxia and a set
of Eclipse plugins and features.
The build uses {{{http://www.eclipse.org/tycho/}Tycho}} and of course Apache
Maven (version 3).
* Doxia Components as an OSGi plugin
- To have eclipse plugins that use the insides of Doxia, we need at least one
+ To have Eclipse plugins that use the insides of Doxia, we need at least one
OSGi bundle containing Doxia itself
(<<<org.apache.maven.doxia.eclipse.dependencies>>>).
This could be arranged by adding OSGi
manifest metadata to them one-at-a-time, but I doubt that anyone has much
enthusiasm for that.
- The initial attempt at this using the maven-bundle-plugin was relatively
simple.
- By using Embed-Dependencies and _exportcontents, you can instruct it to
+ The initial attempt at this using the
+
{{{http://felix.apache.org/components/bundle-plugin/}<<<maven-bundle-plugin>>>}}
was relatively simple.
+ By using <<<Embed-Dependencies>>> and <<<_exportcontents>>>, you can
instruct it to
grab all the maven dependencies of the current project as jars embedded in
the
bundle jar, and set up the manifest to match.
@@ -61,7 +62,7 @@ Development of Apache Doxia Eclipse Edit
The plugins are divided in a common project
(<<<org.apache.maven.doxia.ide.eclipse.common.ui>>>), which contains all
generic classes to handle actions, dialogs, editors, rules and wizards.
- Other plugins are specific implementations for a given Doxia format (i.e.
APT).
+ Other plugins are specific implementations for a given Doxia format (e.g.
APT).
* Building
Modified: maven/doxia/doxia-ide/trunk/eclipse/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/site/src/site/site.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/site/src/site/site.xml (original)
+++ maven/doxia/doxia-ide/trunk/eclipse/site/src/site/site.xml Wed Jul 26
20:04:42 2017
@@ -21,7 +21,7 @@
*/
-->
-<project name="Apache Doxia Eclipse Plugin"
+<project name="Apache Doxia Eclipse Editors"
xmlns="http://maven.apache.org/DECORATION/1.7.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0
http://maven.apache.org/xsd/decoration-1.7.0.xsd";>
Modified: maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/index.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/index.xml (original)
+++ maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/index.xml Wed Jul 26
20:04:42 2017
@@ -22,7 +22,7 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
<properties>
- <title>Welcome to Apache Doxia Eclipse Editor Plugin</title>
+ <title>Welcome to Apache Doxia Eclipse Editors</title>
<author email="[email protected]">Vincent Siveton</author>
</properties>
@@ -34,24 +34,24 @@ under the License.
</div>
</section>
- <section name="Apache Doxia Eclipse Editor Plugin">
+ <section name="Apache Doxia Eclipse Editors">
<p>
- Apache Doxia Eclipse Editor Plugin is an Eclipse plugin under
development. It includes several
- new tools to support all
+ Apache Doxia Eclipse Editors is a collection of Eclipse plugins under
development.
+ It includes several new tools to support all
<a href="/doxia/references/index.html">Apache Doxia formats</a> in
Eclipse,
i.e. APT, Confluence, Simplified DocBook, FML, TWiki, XDOC and Xhtml.
Moreover, it comes also with wizards.
</p>
- <subsection name="What can Apache Doxia Eclipse Editor Plugin do for
you?">
+ <subsection name="What can Apache Doxia Eclipse Editors do for you?">
<p>
- This Eclipse Plugin:
+ These Eclipse plugins:
</p>
<ul>
- <li>Supports all Apache Doxia file formats (as of version 1.3, ie.
Markdown not yet supported)</li>
- <li>Shows the rendering of any Apache Doxia file directly, without
running <code>mvn site</code> or <code>mvn site:run</code></li>
- <li>Supports source level color and styles highlighting in the
editors</li>
- <li>Provides helpers to insert commonly used patterns in each format
(bold, italic, monospaced, link, table)</li>
- <li>Includes wizards for creating new Apache Doxia files</li>
+ <li>Support all Apache Doxia file formats (as of version 1.3, ie.
Markdown not yet supported)</li>
+ <li>Show the rendering of any Apache Doxia file directly, without
running <code>mvn site</code> or <code>mvn site:run</code></li>
+ <li>Support source level color and styles highlighting in the
editors</li>
+ <li>Provide helpers to insert commonly used patterns in each format
(bold, italic, monospaced, link, table)</li>
+ <li>Include wizards for creating new Apache Doxia files</li>
</ul>
<p>
See the <a href="usage.html">usage page</a> for screenshots and more
information.
@@ -66,15 +66,15 @@ under the License.
</subsection>
<subsection name="Installation">
<p>
- Use the Eclipse Update Manager to install this plugin:
+ Use the Eclipse Update Manager to install these plugins:
</p>
<pre class="source">Go to "Help -> Install New Software... -> Work
with:"</pre>
<p>
- You can use the following update site: <a href="./eclipse">Doxia
Editor Plugins Eclipse update site</a>.
+ You can use the following update site: <a href="./eclipse">Apache
Doxia Eclipse Editors update site</a>.
</p>
<p>
You can also use the update site generated by <a
href="./integration.html">ASF's Jenkins CI job</a> to get the latest updates:
- <a
href="https://builds.apache.org/view/M-R/view/Maven/job/doxia-eclipse-editor/ws/doxia-ide-eclipse/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/target/site/";>Doxia
Editor Plugins Eclipse (latest build) update site</a>.
+ <a
href="https://builds.apache.org/view/M-R/view/Maven/job/doxia-eclipse-editor/Maven-generated_Site/eclipse";>Apache
Doxia Eclipse Editors (latest build) update site</a>.
</p>
</subsection>
</section>
Modified: maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/usage.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/usage.xml?rev=1803104&r1=1803103&r2=1803104&view=diff
==============================================================================
--- maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/usage.xml (original)
+++ maven/doxia/doxia-ide/trunk/eclipse/site/src/site/xdoc/usage.xml Wed Jul 26
20:04:42 2017
@@ -22,14 +22,14 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
<properties>
- <title>Usage of Apache Doxia Eclipse Plugin</title>
+ <title>Usage of Apache Doxia Eclipse Editors</title>
<author email="[email protected]">Vincent Siveton</author>
</properties>
<body>
<section name="Usage">
<p>
- The Apache Doxia Eclipse plugin is a set of editors and wizards for
Eclipse to support all
+ Apache Doxia Eclipse Editors is a set of editors and wizards for
Eclipse to support all
<a href="/doxia/references/index.html">Apache Doxia formats</a>
i.e. APT, Confluence, Simplified DocBook, FML, TWiki, XDOC and Xhtml.
</p>
