svn commit: r1163055 - in /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui: pom.xml src/main/java/org/apache/maven/doxia/ide/ec

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 23:50:32 2011
New Revision: 1163055

URL: http://svn.apache.org/viewvc?rev=1163055&view=rev
Log:
Add comments.

Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/AbstractDoxiaPlugin.java

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml?rev=1163055&r1=1163054&r2=1163055&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
 Mon Aug 29 23:50:32 2011
@@ -31,6 +31,13 @@ under the License.
 Doxia Tools :: Eclipse IDE - Common UI Plugin
 Eclipse IDE - Common UI Plugin
 
+
 
 
 /

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/AbstractDoxiaPlugin.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/AbstractDoxiaPlugin.java?rev=1163055&r1=1163054&r2=1163055&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/AbstractDoxiaPlugin.java
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/AbstractDoxiaPlugin.java
 Mon Aug 29 23:50:32 2011
@@ -132,6 +132,15 @@ public abstract class AbstractDoxiaPlugi
 // Private methods
 // --
 
+/*
+ * TODO:
+ * This function gets the icons from a bundle path, not the classpath.
+ * This in turn requires them to be in the root of the source of the 
project
+ * to make the PDE work. It would be better, I think, to put them 
+ * on classpath if Eclipse will let us.
+ */
+
+
 private ImageDescriptor registerImage( String path )
 {
 Assert.isNotNull( path, "path is not initialized." );

svn commit: r1163052 - in /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui: META-INF/MANIFEST.MF build.properties icons/ pom.xm

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 23:47:45 2011
New Revision: 1163052

URL: http://svn.apache.org/viewvc?rev=1163052&view=rev
Log:
Put the icons where Eclipse can find them. How irritating.

Added:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/icons/
  - copied from r1162813, 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/resources/icons/
Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/resources/icons/

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF?rev=1163052&r1=1163051&r2=1163052&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
 Mon Aug 29 23:47:45 2011
@@ -4,7 +4,7 @@ Bundle-Name: Doxia Eclipse IDE plugins c
 Bundle-SymbolicName: org.apache.maven.doxia.ide.eclipse.common.ui
  ;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: 
org.apache.maven.doxia.ide.dependencies;bundle-version="[1.0.0,1.1.0)",
+Require-Bundle: 
org.apache.maven.doxia.ide.dependencies;bundle-version="[1.0.0,1.3.0)",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.ui.ide,

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties?rev=1163052&r1=1163051&r2=1163052&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties
 Mon Aug 29 23:47:45 2011
@@ -1,7 +1,8 @@
 source.. = src/main/java/,\
-   src/main/resources
+   src/main/resources/
 output.. = target/classes/
 bin.includes = META-INF/,\
plugin.properties,\
plugin.xml,\
-  .
+   .,\
+   icons/

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml?rev=1163052&r1=1163051&r2=1163052&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
 Mon Aug 29 23:47:45 2011
@@ -1,5 +1,4 @@
 
-
 
-
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  4.0.0
-
-  
-org.apache.maven.doxia.ide
-plugins
+4.0.0
+
+org.apache.maven.doxia.ide
+plugins
+1.0.0-SNAPSHOT
+
+org.apache.maven.doxia.ide.plugins
+common-ui
 1.0.0-SNAPSHOT
-  
-
-  org.apache.maven.doxia.ide.plugins
-  common-ui
-  1.0.0-SNAPSHOT
-  eclipse-plugin
-  Doxia Tools :: Eclipse IDE - Common UI Plugin
-  Eclipse IDE - Common UI Plugin
-  
-
org.apache.maven.doxia.ide.eclipse.common.ui_${project.version}
-  
+eclipse-plugin
+Doxia Tools :: Eclipse IDE - Common UI Plugin
+Eclipse IDE - Common UI Plugin
+
+
+

svn commit: r1163049 - /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 23:21:46 2011
New Revision: 1163049

URL: http://svn.apache.org/viewvc?rev=1163049&view=rev
Log:
Fix deadlock.

Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java?rev=1163049&r1=1163048&r2=1163049&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java
 Mon Aug 29 23:21:46 2011
@@ -509,13 +509,25 @@ public abstract class AbstractMultiPageE
 /** {@inheritDoc} */
 public void documentChanged( DocumentEvent event )
 {
-DoxiaWrapper.convert( document.get(), getDoxiaFile(), getFormat() 
);
+// avoid deadlock with ourselves by spitting this out to run 
asynchronously.
+Display.getCurrent().asyncExec( new Runnable () {
+
+public void run()
+{
+DoxiaWrapper.convert( document.get(), getDoxiaFile(), 
getFormat() );
+} 
+
+});
+
 }
 
 /** {@inheritDoc} */
 public void documentAboutToBeChanged( DocumentEvent event )
 {
-DoxiaWrapper.convert( document.get(), getDoxiaFile(), getFormat() 
);
+// I (bimargulies) don't believe that we need this and also the 
above. 
+// 
+//DoxiaWrapper.convert( document.get(), getDoxiaFile(), 
getFormat() );
+// 
 }
 }
 }

svn commit: r1163038 - /maven/maven-3/trunk/src/site/site.xml

[hboutemy]

Author: hboutemy
Date: Mon Aug 29 22:08:23 2011
New Revision: 1163038

URL: http://svn.apache.org/viewvc?rev=1163038&view=rev
Log:
added Descriptors Reference menu

Modified:
maven/maven-3/trunk/src/site/site.xml

Modified: maven/maven-3/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/src/site/site.xml?rev=1163038&r1=1163037&r2=1163038&view=diff
==
--- maven/maven-3/trunk/src/site/site.xml (original)
+++ maven/maven-3/trunk/src/site/site.xml Mon Aug 29 22:08:23 2011
@@ -34,6 +34,11 @@ under the License.
   
 
 
+
+  
+  
+
+
 
   
   

svn commit: r1163032 - in /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins: org.apache.maven.doxia.ide.eclipse.apt.ui/ org.apache.maven.doxia.ide.eclipse.confluence.ui/ org

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 21:52:23 2011
New Revision: 1163032

URL: http://svn.apache.org/viewvc?rev=1163032&view=rev
Log:
Get the missing labels to all the places that need them.

Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.properties

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.properties

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.properties

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/plugin.properties

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/plugin.properties

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/plugin.properties

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/plugin.properties

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.properties
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.properties?rev=1163032&r1=1163031&r2=1163032&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.properties
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.properties
 Mon Aug 29 21:52:23 2011
@@ -35,4 +35,18 @@ wizard.name=Apt file
 #
 # Doxia popupMenus
 #
-menu.styles=&Styles
\ No newline at end of file
+menu.styles=&Styles
+
+#
+# Doxia Actions
+#
+action.bold.label=&Bold
+action.bold.tooltip=Bold
+action.italic.label=&Italic
+action.italic.tooltip=Italic
+action.monospaced.label=&Monospaced
+action.monospaced.tooltip=Monospaced
+action.table.label=&Table
+action.table.tooltip=Table
+action.link.label=&Link
+action.link.tooltip=Link

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.properties
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.properties?rev=1163032&r1=1163031&r2=1163032&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.properties
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.properties
 Mon Aug 29 21:52:23 2011
@@ -35,4 +35,18 @@ wizard.name=Confluence file
 #
 # Doxia popupMenus
 #
-menu.styles=&Styles
\ No newline at end of file
+menu.styles=&Styles
+
+#
+# Doxia Actions
+#
+action.bold.label=&Bold
+action.bold.tooltip=Bold
+action.italic.label=&Italic
+action.italic.tooltip=Italic
+action.monospaced.label=&Monospaced
+action.monospaced.tooltip=Monospaced
+action.table.label=&Table
+action.table.tooltip=Table
+action.link.label=&Link
+action.link.tooltip=Link
\ No newline at end of file

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.properties
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.properties?rev=1163032&r1=1163031&r2=1163032&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.properties
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.properties
 Mon Aug 29 21:52:23 2011
@@ -35,4 +35,18 @@ wizard.name=Docbook file
 #
 # Doxia popupMenus
 #
-menu.styles=&Styles
\ No newline at end of file
+menu.styles=&Styles
+
+#
+# Doxia Actions
+#
+action.bold.label=&Bold
+action.bold.tooltip=Bold
+action.italic.label=&Italic
+action.italic.tooltip=Italic
+action.monospaced.label=&Monospaced
+action.monospaced.tooltip=Monospaced
+action.table.label=&Table
+action.table.tooltip=Table
+action.link.label=&Link
+action.link.tooltip=Link
\ No newline at end of file

Modified: 
maven/sandbox/branches/doxia-

svn commit: r1163019 - /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/apt/index.apt

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 21:34:13 2011
New Revision: 1163019

URL: http://svn.apache.org/viewvc?rev=1163019&view=rev
Log:
More doc.

Modified:
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/apt/index.apt

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/apt/index.apt?rev=1163019&r1=1163018&r2=1163019&view=diff
==
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/apt/index.apt 
(original)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/apt/index.apt 
Mon Aug 29 21:34:13 2011
@@ -6,10 +6,109 @@
  25 August 2011
  -
 
-Structure
+Overview
 
-  [org.apache.maven.doxia.eclipse.dependencies] builds an OSGi bundle with all 
of the dependencies
+  A collection of Eclipse Editors for the common file formats of
+  Doxia:
+
+  * APT
+
+  * Confluence
+
+  * DocBook (simple)
+
+  * FML
+
+  * TWiki
+
+  * XDOC
+
+  * XHTML
+
+  These are made up of an OSGi bundle containing Doxia itself, plus a
+  series of Eclipse plugins that provide the editors.
+
+Tree Structure
+
+  [doxia-osgi] builds an OSGi bundle with all of the dependencies
   that are not OSGi in their native form. Due to a Tycho limitation, you have 
to run mvn install
-  on this before building the <<>> subdirectory.
+  on this before building the <<>> subdirectory.
+
+  [eclipse-plugins] contains all of the other material, using Tycho to make 
eclipse plugins.
+
+Build Process
+
+  The goal here is to permit both a relatively normal Maven build
+  process and active development inside Eclipse. Due to the unsettled
+  state of the technologies that can connect Maven and Eclipse, what
+  we have is something of a camel.
+
+  The first task is to package Doxia in OSGi. In, perhaps, a perfect
+  world, all the relevant Doxia bits-and-pieces would have independent
+  OSGi metadata, and be deployed in a public P2 repository (e.g. the
+  Nexus Pro at repository.apache.org). However, this would be
+  considerable effort for dubious value, and further the Doxia
+  components have the same package in multiple components, which
+  causes 'split package' syndrome in OSGi.
+
+  Rather than add OSGi metadata to all of the individual pieces, this
+  project builds a single bundle that incorporates all of them, and
+  then exports their APIs. The work is done by the
+  <<>> in
+  <<>>.
+  The POM includes all the configuration for the bundle.
+
+  The present author does not know how all of this gets along with the 
+  <<>>. OSGi versioning works differently from
+  the usual Maven convention. Since we're not publishing via the
+  deploy plugin, it's probably safest to tag, update versions, and
+  release by hand. It only has to happen once per Doxia release.
+
+  See Peter Kriens'
+  explanation of the muddle with OSGi version numbers
+  {{{http://www.osgi.org/blog/2011/06/negative-qualifiers.html}here}}.
+
+  One solution goes like this: you release (e.g.) 1.0.0. Then
+  set the version number to 1.0.100.qualifier, and use the
+  auto-generated qualifiers. Then, to make a release, you set the
+  version to (e.g.) 1.1.0. This means giving up on the third digit,
+  but we don't generally use three numbers around Maven anyhow.
+
+  The <<>> directory takes the plugin and packages it
+  up as a feature in a P2 repository. This is just for convenience;
+  I've found that Eclipse more reliably imports projects from here
+  than from the target directory where the bundle plugin operates.
+
+  Once Doxia is 'bundled', the next problem is the Eclipse plugins
+  themselves. Here, in the <<>> directory, the build
+  uses the Tycho plugins. The Tycho plugins produce Eclipse-compatible
+  OSGi bundles with a minimum of configuration. They also have a
+  minimum of documentation and useful logging messages. So when things
+  go wrong, it can get confusing in a hurry.
+
+  Tycho will grab the Doxia bundle from the Maven local repository,
+  but not if it is built in the same reactor. Thus, you have to run
+  mvn twice: once to build doxia-osgi, and once for the plugins.
+
+  The <<>> build delivers its results in
+  <<>>. That
+  is a P2 repository.
+
+  It can be copied to any old http server and away it goes.
+
+  I don't know why we would care to bother to make an 'update site' 
+  as opposed to a P2 repo.
+
+  Tycho is completely incompatible with the
+  <<>>, so, again, some sort of manual procedure
+  is called for.
+
+
+
+
+
+
+
+
+  
 
-  [eclipse] contains all of the other material, using Tycho to make eclipse 
plugins.

svn commit: r1162996 - in /maven/archetype/trunk/maven-archetype-plugin/src/site: apt/archetype-overview.odg resources/images/archetype-overview.png

[hboutemy]

Author: hboutemy
Date: Mon Aug 29 20:49:59 2011
New Revision: 1162996

URL: http://svn.apache.org/viewvc?rev=1162996&view=rev
Log:
updated overview schema

Modified:

maven/archetype/trunk/maven-archetype-plugin/src/site/apt/archetype-overview.odg

maven/archetype/trunk/maven-archetype-plugin/src/site/resources/images/archetype-overview.png

Modified: 
maven/archetype/trunk/maven-archetype-plugin/src/site/apt/archetype-overview.odg
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/site/apt/archetype-overview.odg?rev=1162996&r1=1162995&r2=1162996&view=diff
==
Binary files - no diff available.

Modified: 
maven/archetype/trunk/maven-archetype-plugin/src/site/resources/images/archetype-overview.png
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/site/resources/images/archetype-overview.png?rev=1162996&r1=1162995&r2=1162996&view=diff
==
Binary files - no diff available.

svn commit: r1162986 - /maven/archetype/trunk/maven-archetype-plugin/src/site/apt/index.apt

[hboutemy]

Author: hboutemy
Date: Mon Aug 29 20:28:01 2011
New Revision: 1162986

URL: http://svn.apache.org/viewvc?rev=1162986&view=rev
Log:
separated goals into 2 groups: direct use and bound to default lifecycle

Modified:
maven/archetype/trunk/maven-archetype-plugin/src/site/apt/index.apt

Modified: maven/archetype/trunk/maven-archetype-plugin/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/site/apt/index.apt?rev=1162986&r1=1162985&r2=1162986&view=diff
==
--- maven/archetype/trunk/maven-archetype-plugin/src/site/apt/index.apt 
(original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/site/apt/index.apt Mon Aug 
29 20:28:01 2011
@@ -50,7 +50,7 @@ Maven Archetype Plugin
 
 * Goals Overview
 
-  The archetype plugin has seven goals:
+  The archetype plugin has four goals for direct use:
 
   * <{{{./create-mojo.html}archetype:create}} (deprecated)> creates a Maven 
project from an
 archetype. It use the behaviour of the 
{{{/plugins/maven-archetype-plugin-1.0-alpha-7/}Archetype Plugin version 
1.0-alpha-7}}.
@@ -65,15 +65,17 @@ Maven Archetype Plugin
   * {{{./crawl-mojo.html}archetype:crawl}} search a repository
 for archetypes and updates a catalog.
 
-  * {{{./jar-mojo.html}archetype:jar}} is bound to the <<>> phase 
(see the
-{{{../archetype-packaging/}'maven-archetype' packaging}}) and is used to 
build the archetype jar artifact.
+  []
+
+  and three goals bound to default lifecycle by 
{{{../archetype-packaging/}'maven-archetype' packaging}}:
+
+  * {{{./jar-mojo.html}archetype:jar}} (bound to the <<>> phase) is 
used to build the archetype jar artifact.
 
-  * {{{./integration-test-mojo.html}archetype:integration-test}} is bound to 
the <<>> phase (see the
-{{{../archetype-packaging/}'maven-archetype' packaging}}) and is used to 
execute archetype integration tests
-by generating sample projects from the just built archetype.
+  * {{{./integration-test-mojo.html}archetype:integration-test}} (bound to the 
<<>> phase) is used to execute
+archetype integration tests by generating sample projects from the just 
built archetype.
 
-  * {{{./update-local-catalog-mojo.html}archetype:update-local-catalog}} is 
bound to the <<>> phase(see the
-{{{../archetype-packaging/}'maven-archetype' packaging}}) and is used to 
update the local catalog.
+  * {{{./update-local-catalog-mojo.html}archetype:update-local-catalog}} 
(bound to the <<>> phase) is used to update
+the local catalog.
 
   []
 

svn commit: r1162973 - /maven/archetype/trunk/archetype-common/src/site/site.xml

[hboutemy]

Author: hboutemy
Date: Mon Aug 29 20:13:28 2011
New Revision: 1162973

URL: http://svn.apache.org/viewvc?rev=1162973&view=rev
Log:
added a link to Maven Archetype Plugin

Modified:
maven/archetype/trunk/archetype-common/src/site/site.xml

Modified: maven/archetype/trunk/archetype-common/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/site/site.xml?rev=1162973&r1=1162972&r2=1162973&view=diff
==
--- maven/archetype/trunk/archetype-common/src/site/site.xml (original)
+++ maven/archetype/trunk/archetype-common/src/site/site.xml Mon Aug 29 
20:13:28 2011
@@ -30,6 +30,7 @@ under the License.
   
 
 
+  
   
 
 

svn commit: r1162970 - /maven/archetype/trunk/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo

[hboutemy]

Author: hboutemy
Date: Mon Aug 29 20:07:43 2011
New Revision: 1162970

URL: http://svn.apache.org/viewvc?rev=1162970&view=rev
Log:
fixed typo

Modified:

maven/archetype/trunk/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo

Modified: 
maven/archetype/trunk/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo?rev=1162970&r1=1162969&r2=1162970&view=diff
==
--- 
maven/archetype/trunk/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo
 (original)
+++ 
maven/archetype/trunk/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo
 Mon Aug 29 20:07:43 2011
@@ -118,7 +118,7 @@
   FileSet
   
   
 

svn commit: r1162967 - /maven/archetype/trunk/pom.xml

[hboutemy]

Author: hboutemy
Date: Mon Aug 29 19:58:24 2011
New Revision: 1162967

URL: http://svn.apache.org/viewvc?rev=1162967&view=rev
Log:
configured site staging URL

Modified:
maven/archetype/trunk/pom.xml

Modified: maven/archetype/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1162967&r1=1162966&r2=1162967&view=diff
==
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Mon Aug 29 19:58:24 2011
@@ -248,6 +248,12 @@ under the License.
   ${mavenPluginPluginVersion}
 
 
+  maven-site-plugin
+  
+
scp://people.apache.org/www/maven.apache.org/archetype-${project.version}
+  
+
+
   org.apache.maven.plugins
   maven-war-plugin
   2.1.1

svn commit: r1162965 - /maven/archetype/trunk/archetype-packaging/src/site/apt/index.apt.vm

[hboutemy]

Author: hboutemy
Date: Mon Aug 29 19:55:02 2011
New Revision: 1162965

URL: http://svn.apache.org/viewvc?rev=1162965&view=rev
Log:
better doc rendering

Modified:
maven/archetype/trunk/archetype-packaging/src/site/apt/index.apt.vm

Modified: maven/archetype/trunk/archetype-packaging/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-packaging/src/site/apt/index.apt.vm?rev=1162965&r1=1162964&r2=1162965&view=diff
==
--- maven/archetype/trunk/archetype-packaging/src/site/apt/index.apt.vm 
(original)
+++ maven/archetype/trunk/archetype-packaging/src/site/apt/index.apt.vm Mon Aug 
29 19:55:02 2011
@@ -49,7 +49,9 @@ Usage
 
[]
 

+   Typical <<>> contains:
+
++---
 
   ...
   maven-archetype
@@ -74,4 +76,4 @@ Usage
 
   
 

++---

svn commit: r1162951 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

[rfscholte]

Author: rfscholte
Date: Mon Aug 29 19:25:33 2011
New Revision: 1162951

URL: http://svn.apache.org/viewvc?rev=1162951&view=rev
Log:
Fix MCOMPILER-148: Misleading documentation on  

Modified:

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1162951&r1=1162950&r2=1162951&view=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 Mon Aug 29 19:25:33 2011
@@ -124,6 +124,7 @@ public abstract class AbstractCompilerMo
  * The -encoding argument for the Java compiler.
  *
  * @parameter expression="${encoding}" 
default-value="${project.build.sourceEncoding}"
+ * @since 2.1
  */
 private String encoding;
 

svn commit: r1162949 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm

[rfscholte]

Author: rfscholte
Date: Mon Aug 29 19:19:31 2011
New Revision: 1162949

URL: http://svn.apache.org/viewvc?rev=1162949&view=rev
Log:
Fix MCOMPILER-147: The usage page should use pluginManagement for configuring 
the plugin

Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm

Modified: maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm?rev=1162949&r1=1162948&r2=1162949&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm 
(original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/site/apt/usage.apt.vm Mon Aug 
29 19:19:31 2011
@@ -44,29 +44,35 @@ mvn test-compile
 +-
 
   The above command will execute both <<>> and
-  <<>> since the compile phase happens a few phases
-  before the test-compile phase.
+  <<>> since the <<>> phase happens a few phases
+  before the <<>> phase.
 
 * Configuring Your Compiler Plugin
 
   Since the Compiler Plugin executes automatically during their phases, you
-  don't have to put <<>> unlike the other plugins.
+  don't have to put <<>> unlike many other plugins. However, you
+  should specify the version of the Compiler Plugin.
 
 +-
 
   ...
   
-
-  
-org.apache.maven.plugins
-maven-compiler-plugin
-${project.version}
-
-  
-
-  
-
+
+  
+
+  org.apache.maven.plugins
+  maven-compiler-plugin
+  ${project.version}
+  
+
+  
+
+  
+
   
   ...
 
 +-
+
+  <>: Maven 3.0 will issue warnings if you do not specify the version of 
a
+  plugin.

svn commit: r1162942 - /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/interim-p2/

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 18:47:26 2011
New Revision: 1162942

URL: http://svn.apache.org/viewvc?rev=1162942&view=rev
Log:
Throw away experiment in service up p2 from svn.

Modified:
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/interim-p2/

svn commit: r1162941 - in /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins: ./ features/ features/org.apache.maven.doxia.ide.eclipse.feature/

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 18:44:11 2011
New Revision: 1162941

URL: http://svn.apache.org/viewvc?rev=1162941&view=rev
Log:
Build all the way down to a p2 site.

Added:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
   (with props)
Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml

Added: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml?rev=1162941&view=auto
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
 (added)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
 Mon Aug 29 18:44:11 2011
@@ -0,0 +1,27 @@
+
+
+
+
+   
+   
+  
+   
+

Propchange: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
--
svn:eol-style = native

Propchange: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/category.xml
--
svn:mime-type = text/plain

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml?rev=1162941&r1=1162940&r2=1162941&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/feature.xml
 Mon Aug 29 18:44:11 2011
@@ -21,8 +21,8 @@ under the License.
 
 
 
http://maven.apache.org/doxia/";>
@@ -114,4 +114,11 @@ under the License.
  version="0.0.0"
  unpack="false"/>
 
+   
+
 

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml?rev=1162941&r1=1162940&r2=1162941&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/org.apache.maven.doxia.ide.eclipse.feature/pom.xml
 Mon Aug 29 18:44:11 2011
@@ -23,14 +23,14 @@ under the License.
   4.0.0
 
   
+1.0.0-SNAPSHOT
 org.apache.maven.doxia.ide
 features
-1.0-tycho-SNAPSHOT
-../pom.xml
   
 
   org.apache.maven.doxia.ide.features
   default-feature
+  eclipse-feature
   Doxia Tools :: Eclipse IDE - Common Feature
   Eclipse IDE - Common Feature
 

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml?rev=1162941&r1=1162940&r2=1162941&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/features/pom.xml
 Mon Aug 29 18:44:11 2011
@@ -24,9 +24,8 @@ under the License.
 
   
 org.apache.maven.doxia.ide
-eclipse
-1.0-tycho-SNAPSHOT
-../pom.xml
+eclipse-plugins
+1.0.0-SNAPSHOT
   
 
   org.apache.maven.doxia.ide
@@ -35,41 +34,48 @@ under the License.
   Doxia Tools :: Eclipse IDE - Parent Features POM
   Eclipse IDE - Parent Features POM
 
+  
+  
+
+  org.apache.maven.doxia.ide
+  d

svn commit: r1162918 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

[rfscholte]

Author: rfscholte
Date: Mon Aug 29 17:50:52 2011
New Revision: 1162918

URL: http://svn.apache.org/viewvc?rev=1162918&view=rev
Log:
MCOMPILER-135: add example to javadoc for annotation processor parameter

Modified:

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1162918&r1=1162917&r2=1162918&view=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 Mon Aug 29 17:50:52 2011
@@ -219,13 +219,14 @@ public abstract class AbstractCompilerMo
  * varies based on the compiler version.
  * 
  * 
- * To pass -Xmaxerrs 1000 -Xlint -Xlint:-path you should 
include the following:
+ * To pass -Xmaxerrs 1000 -Xlint -Xlint:-path -Averbose=true 
you should include the following:
  * 
  * 
  * 
  *   1000
  *   
  *   
+ *   true
  * 
  * 
  * @parameter

svn commit: r1162905 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/mcompiler-135/ it/mcompiler-135/src/ it/mcompiler-135/src/main/ it/mcompiler-135/src/main/java/ main/java/org/apache/maven/

[rfscholte]

Author: rfscholte
Date: Mon Aug 29 17:19:50 2011
New Revision: 1162905

URL: http://svn.apache.org/viewvc?rev=1162905&view=rev
Log:
Fix MCOMPILER-135: Passing multiple parameters to Java 6 annotation processors 
with javac does not work

Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/

maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/

maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/

maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
Modified:

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

Added: 
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties?rev=1162905&view=auto
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/invoker.properties
 Mon Aug 29 17:19:50 2011
@@ -0,0 +1,2 @@
+invoker.goals = clean compile
+invoker.java.version = 1.6+
\ No newline at end of file

Added: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml?rev=1162905&view=auto
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml 
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/pom.xml Mon 
Aug 29 17:19:50 2011
@@ -0,0 +1,27 @@
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+  org.apache.maven.plugins.compiler.it
+  mcompiler-135
+  1.0-SNAPSHOT
+
+  
+
+  
+org.apache.maven.plugins
+maven-compiler-plugin
+@project.version@
+
+  true
+  1.6
+  1.6
+
+  true
+  src/main/webapp
+
+
+  
+
+
+  
+

Added: 
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java?rev=1162905&view=auto
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
 (added)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-135/src/main/java/MyClass.java
 Mon Aug 29 17:19:50 2011
@@ -0,0 +1,4 @@
+public class MyClass
+{
+
+}

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1162905&r1=1162904&r2=1162905&view=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 Mon Aug 29 17:19:50 2011
@@ -452,7 +452,15 @@ public abstract class AbstractCompilerMo
 {
 key = "-" + key;
 }
-cplrArgsCopy.put( key, value );
+
+if( key.startsWith( "-A" ) && StringUtils.isNotEmpty( 
value ) )
+{
+cplrArgsCopy.put( key + "=" + value, null );
+}
+else
+{
+cplrArgsCopy.put( key, value );
+}
 }
 }
 if ( !StringUtils.isEmpty( effectiveCompilerArgument ) )

svn commit: r1162903 - /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 17:05:00 2011
New Revision: 1162903

URL: http://svn.apache.org/viewvc?rev=1162903&view=rev
Log:
eliminate nasty x resulting from 'shading' rather than incorporating the 
dependencies.

Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml?rev=1162903&r1=1162902&r2=1162903&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
 Mon Aug 29 17:05:00 2011
@@ -36,6 +36,7 @@ under the License.
 1.2
 1.2
 2.3.5
+   $
 
 
 
@@ -122,11 +123,25 @@ under the License.
 maven-bundle-plugin
 true
 
+ target/dump.txt
 
+   $${tstamp}
+   
+   1.0.0.${stamp}
+   
+   
+
*;scope=compile|runtime
+   <_exportcontents>
+ 
org.apache.maven.doxia.*,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output
+   
 
!com.apple.mrj,!com.sun.*,!javax.*,!org.apache.commons.*,!org.apache.log,!org.apache.xmlbeans,!org.apache.tools.*,!org.apache.xml.*,!org.codehaus.*,!sun.*,*
 true
 <_nouses>true

svn commit: r1162861 - in /maven/wagon/trunk: ./ wagon-provider-api/ wagon-provider-test/ wagon-providers/ wagon-providers/wagon-file/ wagon-providers/wagon-ftp/ wagon-providers/wagon-http-lightweight

[olamy]

Author: olamy
Date: Mon Aug 29 15:24:11 2011
New Revision: 1162861

URL: http://svn.apache.org/viewvc?rev=1162861&view=rev
Log:
magnify :-)  maven projects names

Modified:
maven/wagon/trunk/pom.xml
maven/wagon/trunk/wagon-provider-api/pom.xml
maven/wagon/trunk/wagon-provider-test/pom.xml
maven/wagon/trunk/wagon-providers/pom.xml
maven/wagon/trunk/wagon-providers/wagon-file/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml
maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml
maven/wagon/trunk/wagon-providers/wagon-http-shared4/pom.xml
maven/wagon/trunk/wagon-providers/wagon-http/pom.xml
maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml
maven/wagon/trunk/wagon-tcks/pom.xml
maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml

Modified: maven/wagon/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1162861&r1=1162860&r2=1162861&view=diff
==
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Mon Aug 29 15:24:11 2011
@@ -32,7 +32,7 @@ under the License.
   2.0-SNAPSHOT
   pom
 
-  Maven Wagon
+  Apache Maven Wagon
   Tools to manage artifacts and deployment
   http://maven.apache.org/wagon
   2003

Modified: maven/wagon/trunk/wagon-provider-api/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/pom.xml?rev=1162861&r1=1162860&r2=1162861&view=diff
==
--- maven/wagon/trunk/wagon-provider-api/pom.xml (original)
+++ maven/wagon/trunk/wagon-provider-api/pom.xml Mon Aug 29 15:24:11 2011
@@ -28,7 +28,7 @@ under the License.
   
 
   wagon-provider-api
-  Maven Wagon API
+  Apache Maven Wagon :: API
   Maven Wagon API that defines the contract between different 
Wagon implementations
 
   

Modified: maven/wagon/trunk/wagon-provider-test/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=1162861&r1=1162860&r2=1162861&view=diff
==
--- maven/wagon/trunk/wagon-provider-test/pom.xml (original)
+++ maven/wagon/trunk/wagon-provider-test/pom.xml Mon Aug 29 15:24:11 2011
@@ -28,7 +28,7 @@ under the License.
   
 
   wagon-provider-test
-  Maven Wagon Provider Test
+  Apache Maven Wagon :: Provider Test
   Suite of tests for Wagon implementations
 
   

Modified: maven/wagon/trunk/wagon-providers/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/pom.xml?rev=1162861&r1=1162860&r2=1162861&view=diff
==
--- maven/wagon/trunk/wagon-providers/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/pom.xml Mon Aug 29 15:24:11 2011
@@ -29,7 +29,7 @@ under the License.
 
   wagon-providers
   pom
-  Maven Wagon Providers
+  Apache Maven Wagon :: Providers
 
   
 wagon-file

Modified: maven/wagon/trunk/wagon-providers/wagon-file/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/pom.xml?rev=1162861&r1=1162860&r2=1162861&view=diff
==
--- maven/wagon/trunk/wagon-providers/wagon-file/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-file/pom.xml Mon Aug 29 15:24:11 
2011
@@ -28,7 +28,7 @@ under the License.
   
 
   wagon-file
-  Maven Wagon File Provider
+  Apache Maven Wagon :: Providers :: File Provider
   
 Wagon that gets and puts artifacts using file system protocol
   

Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml?rev=1162861&r1=1162860&r2=1162861&view=diff
==
--- maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml Mon Aug 29 15:24:11 2011
@@ -28,7 +28,7 @@ under the License.
   
 
   wagon-ftp
-  Maven Wagon FTP Provider
+  Apache Maven Wagon :: Providers :: FTP Provider
   
 Wagon that gets and puts artifacts from and to remote server using FTP 
protocol
   

Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml?rev=1162861&r1=1162860&r2=1162861&view=diff
==
--- maven/wa

svn commit: r1162826 - /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 14:23:19 2011
New Revision: 1162826

URL: http://svn.apache.org/viewvc?rev=1162826&view=rev
Log:
Add the missing activation policy.

Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF?rev=1162826&r1=1162825&r2=1162826&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
 Mon Aug 29 14:23:19 2011
@@ -32,3 +32,4 @@ Bundle-RequiredExecutionEnvironment: J2S
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
 Bundle-Activator: org.apache.maven.doxia.ide.eclipse.common.ui.CommonPlugin
+Bundle-ActivationPolicy: lazy

svn commit: r1162795 - in /maven/wagon/trunk: pom.xml wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java

[olamy]

Author: olamy
Date: Mon Aug 29 13:22:03 2011
New Revision: 1162795

URL: http://svn.apache.org/viewvc?rev=1162795&view=rev
Log:
restore 1.5 compat and add animal sniffer check to not commit failure :-)

Modified:
maven/wagon/trunk/pom.xml

maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java

Modified: maven/wagon/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1162795&r1=1162794&r2=1162795&view=diff
==
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Mon Aug 29 13:22:03 2011
@@ -345,6 +345,27 @@ under the License.
 maven-surefire-plugin
 2.9
   
+  
+org.codehaus.mojo
+animal-sniffer-maven-plugin
+1.7
+
+  
+org.codehaus.mojo.signature
+java15
+1.0
+  
+
+
+  
+check-java-1.5-compat
+process-classes
+
+  check
+
+  
+
+  
 
   
 

Modified: 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java?rev=1162795&r1=1162794&r2=1162795&view=diff
==
--- 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java
 Mon Aug 29 13:22:03 2011
@@ -52,7 +52,9 @@ public class EasyX509TrustManager
 }
 catch ( Exception e )
 {
-throw new IOException( e.getMessage(), e );
+IOException ioe = new IOException( e.getMessage() );
+ioe.initCause( e );
+throw ioe;
 }
 }
 

svn commit: r1162787 - /maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm

[olamy]

Author: olamy
Date: Mon Aug 29 13:03:39 2011
New Revision: 1162787

URL: http://svn.apache.org/viewvc?rev=1162787&view=rev
Log:
use interpolation mechanism for site documentation in wagon-scm missed to add 
the file

Added:
maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm

Added: maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm?rev=1162787&view=auto
==
--- maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm 
(added)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm Mon 
Aug 29 13:03:39 2011
@@ -0,0 +1,111 @@
+ --
+ Maven Wagon SCM
+ --
+ Carlos Sanchez
+ --
+ 2006-03-07
+ --
+
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements.  See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership.  The ASF licenses this file
+ ~~ to you 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Maven Wagon SCM Usage
+
+ You need to add some extensions
+ (wagon-scm, maven-scm-manager-plexus and the maven-scm-provider for your SCM 
system, see examples below)
+ to your pom and use URLs in the
+ {{{http://maven.apache.org/scm/scm-url-format.html}SCM format}}.
+
+
+Deploying your Maven site to Subversion
+
+ Add the following extensions to your pom and use a wagon-scm url in the 
distributionManagement site url.
+
+--
+  
+
+  
+org.apache.maven.wagon
+wagon-scm
+${project.version}
+  
+  
+org.apache.maven.scm
+maven-scm-manager-plexus
+${mavenScmVersion}
+  
+  
+org.apache.maven.scm
+maven-scm-provider-svnexe
+${mavenScmVersion}
+  
+
+  
+  
+
+  my.svn.server
+  scm:svn:https://usern...@svn.apache.org/svn/root/module
+
+  
+--
+
+
+Deploying your Maven site to CVS
+
+ Same as before, but changing svnexe to cvsexe and using a CVS svn url.
+
+--
+  
+
+  
+org.apache.maven.wagon
+wagon-scm
+${project.version}
+  
+  
+org.apache.maven.scm
+maven-scm-manager-plexus
+${mavenScmVersion}
+  
+  
+org.apache.maven.scm
+maven-scm-provider-cvsexe
+${mavenScmVersion}
+  
+
+  
+  
+
+  my.cvs.server
+  scm:cvs:ext:usern...@cvs.apache.org:/cvs/root:module
+
+  
+--
+
+
+
+Using a Subversion based remote repository in Maven 2
+
+ Not tested yet
+
+
+Using a CVS based remote repository in Maven 2
+
+ Not tested yet

svn commit: r1162786 - in /maven/wagon/trunk: pom.xml wagon-providers/wagon-scm/pom.xml wagon-providers/wagon-scm/src/site/apt/usage.apt

[olamy]

Author: olamy
Date: Mon Aug 29 13:03:17 2011
New Revision: 1162786

URL: http://svn.apache.org/viewvc?rev=1162786&view=rev
Log:
use interpolation mechanism for site documentation in wagon-scm

Modified:
maven/wagon/trunk/pom.xml
maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml
maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt

Modified: maven/wagon/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1162786&r1=1162785&r2=1162786&view=diff
==
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Mon Aug 29 13:03:17 2011
@@ -353,6 +353,7 @@ under the License.
   
 org.apache.maven.plugins
 maven-javadoc-plugin
+2.8
 
   
 http://java.sun.com/j2ee/1.4/docs/api

Modified: maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml?rev=1162786&r1=1162785&r2=1162786&view=diff
==
--- maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml Mon Aug 29 13:03:17 2011
@@ -34,37 +34,37 @@ under the License.
   
 
   
-1.5
+1.5
   
 
   
 
   org.apache.maven.scm
   maven-scm-api
-  ${maven.scm.version}
+  ${mavenScmVersion}
 
 
   org.apache.maven.scm
   maven-scm-manager-plexus
-  ${maven.scm.version}
+  ${mavenScmVersion}
   runtime
 
 
   org.apache.maven.scm
   maven-scm-test
-  ${maven.scm.version}
+  ${mavenScmVersion}
   test
 
 
   org.apache.maven.scm
   maven-scm-provider-cvsexe
-  ${maven.scm.version}
+  ${mavenScmVersion}
   test
 
 
   org.apache.maven.scm
   maven-scm-provider-svnexe
-  ${maven.scm.version}
+  ${mavenScmVersion}
   test
 
   

svn commit: r1162785 - /maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml

[olamy]

Author: olamy
Date: Mon Aug 29 13:02:57 2011
New Revision: 1162785

URL: http://svn.apache.org/viewvc?rev=1162785&view=rev
Log:
upgrade maven scm version used in wagon-scm

Modified:
maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml

Modified: maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml?rev=1162785&r1=1162784&r2=1162785&view=diff
==
--- maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml Mon Aug 29 13:02:57 2011
@@ -34,7 +34,7 @@ under the License.
   
 
   
-1.0
+1.5
   
 
   

svn commit: r1162784 - /maven/wagon/trunk/pom.xml

[olamy]

Author: olamy
Date: Mon Aug 29 13:02:34 2011
New Revision: 1162784

URL: http://svn.apache.org/viewvc?rev=1162784&view=rev
Log:
upgrade to last parent pom

Modified:
maven/wagon/trunk/pom.xml

Modified: maven/wagon/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1162784&r1=1162783&r2=1162784&view=diff
==
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Mon Aug 29 13:02:34 2011
@@ -23,7 +23,7 @@ under the License.
   
 maven-parent
 org.apache.maven
-19
+21
 ../pom/maven/pom.xml
   
 
@@ -302,6 +302,7 @@ under the License.
 
   
 
+  org.apache.maven.plugins
   maven-release-plugin
   
 
https://svn.apache.org/repos/asf/maven/wagon/tags
@@ -309,6 +310,7 @@ under the License.
   
 
 
+  org.apache.maven.plugins
   maven-site-plugin
   
 
scp://people.apache.org/www/maven.apache.org/wagon-${project.version}
@@ -320,7 +322,6 @@ under the License.
   
 org.apache.maven.plugins
 maven-compiler-plugin
-2.3.2
 
   1.5
   1.5
@@ -352,7 +353,6 @@ under the License.
   
 org.apache.maven.plugins
 maven-javadoc-plugin
-2.8
 
   
 http://java.sun.com/j2ee/1.4/docs/api

svn commit: r1162783 - in /maven/wagon/trunk: src/site/apt/ wagon-provider-api/src/site/apt/ wagon-provider-test/src/site/apt/ wagon-providers/wagon-file/src/site/apt/ wagon-providers/wagon-ftp/src/si

[olamy]

Author: olamy
Date: Mon Aug 29 13:01:52 2011
New Revision: 1162783

URL: http://svn.apache.org/viewvc?rev=1162783&view=rev
Log:
add missing license headers

Modified:
maven/wagon/trunk/src/site/apt/index.apt
maven/wagon/trunk/wagon-provider-api/src/site/apt/index.apt
maven/wagon/trunk/wagon-provider-test/src/site/apt/index.apt
maven/wagon/trunk/wagon-providers/wagon-file/src/site/apt/index.apt
maven/wagon/trunk/wagon-providers/wagon-ftp/src/site/apt/index.apt

maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/site/apt/index.apt
maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/index.apt
maven/wagon/trunk/wagon-providers/wagon-scm/src/site/apt/usage.apt
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/site/apt/index.apt
maven/wagon/trunk/wagon-providers/wagon-ssh/src/site/apt/index.apt

maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/site/apt/index.apt

Modified: maven/wagon/trunk/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/src/site/apt/index.apt?rev=1162783&r1=1162782&r2=1162783&view=diff
==
--- maven/wagon/trunk/src/site/apt/index.apt (original)
+++ maven/wagon/trunk/src/site/apt/index.apt Mon Aug 29 13:01:52 2011
@@ -6,6 +6,26 @@
  2005-10-25
  --
 
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements.  See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership.  The ASF licenses this file
+ ~~ to you 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Maven Wagon
 
  Maven Wagon is a transport abstraction that is used in Maven's artifact and

Modified: maven/wagon/trunk/wagon-provider-api/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/site/apt/index.apt?rev=1162783&r1=1162782&r2=1162783&view=diff
==
--- maven/wagon/trunk/wagon-provider-api/src/site/apt/index.apt (original)
+++ maven/wagon/trunk/wagon-provider-api/src/site/apt/index.apt Mon Aug 29 
13:01:52 2011
@@ -6,6 +6,26 @@
  2006-04-16
  --
 
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements.  See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership.  The ASF licenses this file
+ ~~ to you 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Maven Wagon API
 
  The Wagon API project defines {{{./apidocs/}a simple API}} for transferring 
resources

Modified: maven/wagon/trunk/wagon-provider-test/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/site/apt/index.apt?rev=1162783&r1=1162782&r2=1162783&view=diff
==
--- maven/wagon/trunk/wagon-provider-test/src/site/apt/index.apt (original)
+++ maven/wagon/trunk/wagon-provider-test/src/site/apt/index.apt Mon Aug 29 
13:01:52 2011
@@ -6,6 +6,26 @@
  2006-04-16
  --
 
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements.  See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership.  The ASF licenses this file
+ ~~ to you 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

svn commit: r1162782 - /maven/wagon/trunk/wagon-providers/wagon-http/src/site/apt/index.apt

[olamy]

Author: olamy
Date: Mon Aug 29 13:01:13 2011
New Revision: 1162782

URL: http://svn.apache.org/viewvc?rev=1162782&view=rev
Log:
add some notes of new system props for http wagon

Modified:
maven/wagon/trunk/wagon-providers/wagon-http/src/site/apt/index.apt

Modified: maven/wagon/trunk/wagon-providers/wagon-http/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/site/apt/index.apt?rev=1162782&r1=1162781&r2=1162782&view=diff
==
--- maven/wagon/trunk/wagon-providers/wagon-http/src/site/apt/index.apt 
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/src/site/apt/index.apt Mon Aug 
29 13:01:13 2011
@@ -2,18 +2,53 @@
  Maven Wagon HTTP
  --
  Carlos Sanchez
+ Olivier Lamy
  --
- 2006-04-16
+ 2011-08-29
  --
 
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements.  See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership.  The ASF licenses this file
+ ~~ to you 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Maven Wagon HTTP
 
  This project is an implementation of Wagon provider for HTTP access.
- It uses {{{http://jakarta.apache.org/commons/httpclient/}commons-httpclient}} 
as lower lever layer.
+ It uses {{{http://hc.apache.org/httpcomponents-client-ga/}Apache 
HttpComponents client}} as lower lever layer.
  
- It enables Maven to use remote repositories stored in HTTP servers. It 
doesn't allow deployment.
+ It enables Maven to use remote repositories stored in HTTP servers.
 
 
 Features
 
- * Get files from HTTP Server
+ Prior to version 2.0, a pooled http connection manager is used.
+ The pooled feature is enabled by default, you can configure it trough the 
following system properties :
+
+ * maven.wagon.http.pool = true/false (default true), enable/disable the 
pooled mechanism.
+
+ * maven.wagon.httpconnectionManager.maxPerRoute = integer (default : 20), 
maximum number of http(s) connection per destination.
+
+ * maven.wagon.httpconnectionManager.maxTotal = integer (default 40), maximum 
number of htp(s) connection.
+
+ * maven.wagon.http.ssl.easy = true/false (default true), enable/disable use 
of easy ssl check for user generated certificates.
+
+ * maven.wagon.http.ssl.allowall = true/false (default true), enable/disable 
match of the server's X.509 certificate. If disable, a browser like check will 
be used.
+
+ * maven.wagon.http.ssl.ignore.validity.dates = true/false (default true), 
ignore issue with certifactes dates.
+

svn commit: r1162781 - /maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java

[olamy]

Author: olamy
Date: Mon Aug 29 13:00:56 2011
New Revision: 1162781

URL: http://svn.apache.org/viewvc?rev=1162781&view=rev
Log:
add some javadoc on sys props available

Modified:

maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java

Modified: 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=1162781&r1=1162780&r2=1162781&view=diff
==
--- 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
 Mon Aug 29 13:00:56 2011
@@ -231,7 +231,8 @@ public abstract class AbstractHttpClient
 protected ClientConnectionManager clientConnectionManager = new 
SingleClientConnManager();
 
 /**
- * olamy make pool option enable by default
+ * use http(s) connection pool mechanism.
+ * enabled by default
  *
  * @since 2.0
  */
@@ -239,17 +240,26 @@ public abstract class AbstractHttpClient
 Boolean.valueOf( System.getProperty( "maven.wagon.http.pool", "true" ) 
);
 
 /**
+ * skip failure on certificate validity checks.
+ * enabled by default
+ *
  * @since 2.0
  */
 protected static boolean sslEasy = Boolean.valueOf( System.getProperty( 
"maven.wagon.http.ssl.easy", "true" ) );
 
 /**
+ * ssl hostname verifier is allow all by default. Disable this will use a 
browser compat hostname verifier
+ * enabled by default
+ *
  * @since 2.0
  */
 protected static boolean sslAllowAll =
 Boolean.valueOf( System.getProperty( "maven.wagon.http.ssl.allowall", 
"true" ) );
 
 /**
+ * if using sslEasy certificate date issues will be ignored
+ * enabled by default
+ *
  * @since 2.0
  */
 protected static boolean IGNORE_SSL_VALIDITY_DATES =
@@ -299,6 +309,7 @@ public abstract class AbstractHttpClient
 
 /**
  * disable all host name verification
+ *
  * @since 2.0
  */
 private static class EasyHostNameVerifier

svn commit: r1162779 - in /maven/wagon/trunk/wagon-providers: wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/ wagon-http/ wagon-http/src/test/java/org/apache/maven/wagon/providers

[olamy]

Author: olamy
Date: Mon Aug 29 13:00:32 2011
New Revision: 1162779

URL: http://svn.apache.org/viewvc?rev=1162779&view=rev
Log:
allow by default some easy ssl which disable ssl check : certificate validity, 
hostname verification

Added:

maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/EasyX509TrustManager.java
Modified:

maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
maven/wagon/trunk/wagon-providers/wagon-http/pom.xml

maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java

Modified: 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=1162779&r1=1162778&r2=1162779&view=diff
==
--- 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
 Mon Aug 29 13:00:32 2011
@@ -37,6 +37,10 @@ import org.apache.http.client.params.Cli
 import org.apache.http.client.params.CookiePolicy;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.params.ConnRoutePNames;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.conn.ssl.X509HostnameVerifier;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.SingleClientConnManager;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
@@ -60,6 +64,9 @@ import org.apache.maven.wagon.resource.R
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -67,6 +74,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
+import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -212,16 +220,44 @@ public abstract class AbstractHttpClient
 
 private DefaultHttpClient client;
 
+/**
+ * @since 2.0
+ */
 protected static ClientConnectionManager connectionManagerPooled;
 
+/**
+ * @since 2.0
+ */
 protected ClientConnectionManager clientConnectionManager = new 
SingleClientConnManager();
 
-// olamy make pool option enable by default
-protected static boolean useClientManagerSingle = Boolean.getBoolean( 
"maven.wagon.httpconnectionManager.notpooled" );
+/**
+ * olamy make pool option enable by default
+ *
+ * @since 2.0
+ */
+protected static boolean useClientManagerPooled =
+Boolean.valueOf( System.getProperty( "maven.wagon.http.pool", "true" ) 
);
+
+/**
+ * @since 2.0
+ */
+protected static boolean sslEasy = Boolean.valueOf( System.getProperty( 
"maven.wagon.http.ssl.easy", "true" ) );
+
+/**
+ * @since 2.0
+ */
+protected static boolean sslAllowAll =
+Boolean.valueOf( System.getProperty( "maven.wagon.http.ssl.allowall", 
"true" ) );
+
+/**
+ * @since 2.0
+ */
+protected static boolean IGNORE_SSL_VALIDITY_DATES =
+Boolean.valueOf( System.getProperty( 
"maven.wagon.http.ssl.ignore.validity.dates", "true" ) );
 
 static
 {
-if ( useClientManagerSingle )
+if ( !useClientManagerPooled )
 {
 System.out.println( "http connection pool disabled in wagon http" 
);
 }
@@ -236,6 +272,23 @@ public abstract class AbstractHttpClient
 threadSafeClientConnManager.setDefaultMaxPerRoute( maxPerRoute );
 threadSafeClientConnManager.setMaxTotal( maxTotal );
 
+if ( sslEasy )
+{
+try
+{
+SSLSocketFactory sslSocketFactory =
+new SSLSocketFactory( 
EasyX509TrustManager.createEasySSLContext(), sslAllowAll
+? new EasyHostNameVerifier()
+: new BrowserCompatHostnameVerifier() );
+Scheme httpsScheme = new Scheme( "https", 443, 
sslSocketFactory );
+
+threadSafeClientConnManager.getSchemeRegistry().register( 
httpsScheme );
+}
+catch ( IOException e )
+  

svn commit: r1162759 - in /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins: ./ plugins/ plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/ plugins/org.apache.maven.doxia.ide.eclips

[bimargulies]

Author: bimargulies
Date: Mon Aug 29 12:28:22 2011
New Revision: 1162759

URL: http://svn.apache.org/viewvc?rev=1162759&view=rev
Log:
Check in a cleaned up version in spite of my spinning around on making m2e work.

Modified:

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.help/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/pom.xml

maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/pom.xml
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml
 Mon Aug 29 12:28:22 2011
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven.doxia.ide
 plugins
-1.0-tycho-SNAPSHOT
+1.0.0-SNAPSHOT
 ../pom.xml
   
 
@@ -35,16 +35,6 @@ under the License.
   eclipse-plugin
   Doxia Tools :: Eclipse IDE - APT UI Plugin
   Eclipse IDE - APT UI Plugin
-
-  
-
-
-  org.apache.maven.doxia.ide
-  dependencies
-  1.0.0-SNAPSHOT
-
-  
-
   
 
org.apache.maven.doxia.ide.eclipse.apt.ui_${project.version}
   

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF?rev=1162759&r1=1162758&r2=1162759&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
 Mon Aug 29 12:28:22 2011
@@ -4,7 +4,7 @@ Bundle-Name: Doxia Eclipse IDE plugins c
 Bundle-SymbolicName: org.apache.maven.doxia.ide.eclipse.common.ui
  ;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.apache.maven.doxia.ide.dependencies,
+Require-Bundle: 
org.apache.maven.doxia.ide.dependencies;bundle-version="[1.0.0,1.1.0)",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.ui.ide,

Modified: 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff
==
--- 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
 (original)
+++ 
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
 Mon Aug 29 12:28:22 2011
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven.doxia.ide
 plugins
-1.0-tycho-