rolling back doxia-ide move to doxia-tools in r1307894, was a bad idea
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk@1326141 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml b/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
index 256e36d..0a713c1 100644
--- a/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
+++ b/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
@@ -35,7 +35,7 @@
<description>Make an OSGi bundle of the required non-OSGi components</description>
<properties>
- <doxiaVersion>1.2</doxiaVersion>
+ <doxiaVersion>1.3</doxiaVersion>
<doxiaConverterVersion>1.2</doxiaConverterVersion>
<maven-bundle-plugin-version>2.3.5</maven-bundle-plugin-version>
</properties>
diff --git a/eclipse/doxia-osgi/pom.xml b/eclipse/doxia-osgi/pom.xml
index 8cabfa8..e52fd5d 100644
--- a/eclipse/doxia-osgi/pom.xml
+++ b/eclipse/doxia-osgi/pom.xml
@@ -38,9 +38,9 @@
<url>http://maven.apache.org/doxia</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/doxia-osgi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/doxia-osgi</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/doxia-osgi</url>
</scm>
<issueManagement>
<system>jira</system>
diff --git a/eclipse/eclipse-plugins/pom.xml b/eclipse/eclipse-plugins/pom.xml
index fc69a4d..ca8bd2e 100644
--- a/eclipse/eclipse-plugins/pom.xml
+++ b/eclipse/eclipse-plugins/pom.xml
@@ -38,9 +38,9 @@
<url>http://maven.apache.org/doxia</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse-plugins</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse-plugins</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse-plugins</url>
</scm>
<issueManagement>
<system>jira</system>
diff --git a/eclipse/site/pom.xml b/eclipse/site/pom.xml
index a335a78..07ea114 100644
--- a/eclipse/site/pom.xml
+++ b/eclipse/site/pom.xml
@@ -34,14 +34,14 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Website for the Apache Maven Doxia Eclipse plugin.</description>
- <url>http://maven.apache.org/doxia</url><!-- TODO -->
+ <description>Website for the Apache Maven Doxia Eclipse Editor plugin.</description>
+ <url>http://maven.apache.org/doxia/doxia-tools/doxia-ide/eclipse/</url>
<!-- The project basedir and not the site -->
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/eclipse/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk/eclipse/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -51,6 +51,12 @@
<system>Jenkins</system>
<url>https://builds.apache.org/job/doxia-eclipse-editor/</url>
</ciManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia-tools/doxia-ide/eclipse/</url>
+ </site>
+ </distributionManagement>
<build>
<pluginManagement>
diff --git a/eclipse/site/src/site/apt/development.apt b/eclipse/site/src/site/apt/development.apt
index e98b0ca..e511979 100644
--- a/eclipse/site/src/site/apt/development.apt
+++ b/eclipse/site/src/site/apt/development.apt
@@ -1,5 +1,5 @@
-----
- Development of Apache Doxia Eclipse Plugin
+ Development of Apache Doxia Eclipse Editor Plugin
-----
Vincent Siveton
Benson Margulies
@@ -27,15 +27,15 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Development of Apache Doxia Eclipse Plugin
+Development of Apache Doxia Eclipse Editor Plugin
The project is divided in an OSGi bundle containing Apache Doxia and a set of Eclipse plugins and features.
- The build uses {{{http://tycho.sonatype.org/}Tycho}} and of course Apache Maven (version 3).
+ 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
- OSGi bundle containing Doxia itself (org.apache.maven.doxia.eclipse.dependencies).
+ 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.
@@ -59,14 +59,14 @@
* Eclipse plugins
- The plugins are divided in a common project (org.apache.maven.doxia.ide.eclipse.common.ui), which contains all
+ 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).
* Building
Tycho won't resolve through the reactor for the bundle, so you need to build
- org.apache.maven.doxia.eclipse.dependencies project first:
+ <<<org.apache.maven.doxia.eclipse.dependencies>>> project first:
+-------------------------------+
mvn clean install -f doxia-osgi/pom.xml
@@ -81,5 +81,5 @@
|_ Builds Eclipse plugins
+-------------------------------+
- See the {{{http://svn.apache.org/repos/asf/maven/sandbox/trunk/doxia/doxia-ide/eclipse/README.TXT}README.TXT}}
+ See the {{{http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-ide/eclipse/README.TXT}README.TXT}}
for more informations.
diff --git a/eclipse/site/src/site/xdoc/index.xml b/eclipse/site/src/site/xdoc/index.xml
index 2c6f65d..4b650c6 100644
--- a/eclipse/site/src/site/xdoc/index.xml
+++ b/eclipse/site/src/site/xdoc/index.xml
@@ -22,7 +22,7 @@
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 Plugin</title>
+ <title>Welcome to Apache Doxia Eclipse Editor Plugin</title>
<author email="vsiveton@apache.org">Vincent Siveton</author>
</properties>
@@ -34,23 +34,23 @@
</div>
</section>
- <section name="Apache Doxia Eclipse Plugin">
+ <section name="Apache Doxia Eclipse Editor Plugin">
<p>
- Apache Doxia Eclipse Plugin is an Eclipse plugin under development. It includes several
+ Apache Doxia Eclipse Editor Plugin is an Eclipse plugin under development. It includes several
new tools to support all
<a href="http://maven.apache.org/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 Plugin do for you?">
+ <subsection name="What can Apache Doxia Eclipse Editor Plugin do for you?">
<p>
This Eclipse Plugin:
</p>
<ul>
<li>Supports all Apache Doxia file formats</li>
- <li>Shows the rendering of any Apache Doxia files directly, without running <code>mvn site</code></li>
+ <li>Shows the rendering of any Apache Doxia file directly, without running <code>mvn site</code></li>
<li>Supports color and styles highlighting in the editors</li>
- <li>Provides helpers to insert commonly used patterns in each format (bold, italic, monospace, link, table)</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>
</ul>
<p>
