svn commit: r580247 - in /maven/sandbox/trunk/archetypeng: archetypeng-common/src/main/java/org/apache/maven/archetype/common/ archetypeng-common/src/main/java/org/apache/maven/archetype/source/ arche

2007-09-28 Thread jvanzyl 
Author: jvanzyl
Date: Fri Sep 28 01:03:53 2007
New Revision: 580247

URL: http://svn.apache.org/viewvc?rev=580247view=rev
Log:
o the archetype sources are now all components and I left some notes about what 
needs to be done next
  - separate the configuration of archeytpe from the catalog of available 
archetypes

You might store a configuration of where to look for catalogs, say on an URL so 
that you can create new archetypes, up-date
a remote catalog (wiki, or an xml file somewhere) and have developers 
automatically discover them.


Added:

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteRegistryArchetypeDataSource.java
  - copied, changed from r580177, 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java
Modified:

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java

maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java

Modified: 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java?rev=580247r1=580246r2=580247view=diff
==
--- 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
 (original)
+++ 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
 Fri Sep 28 01:03:53 2007
@@ -20,13 +20,11 @@
 package org.apache.maven.archetype.common;
 
 import org.apache.maven.archetype.registry.ArchetypeRegistry;
-
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-
+import java.io.Reader;
 import java.util.List;
 
 public interface ArchetypeRegistryManager
@@ -43,16 +41,19 @@
 throws
 IOException;
 
+ArchetypeRegistry readArchetypeRegistry( Reader reader )
+throws
+IOException,
+XmlPullParserException;
+
 ArchetypeRegistry readArchetypeRegistry( File archetypeRegistryFile )
 throws
 IOException,
-FileNotFoundException,
 XmlPullParserException;
 
 ArchetypeRegistry readArchetypeRegistry()
 throws
 IOException,
-FileNotFoundException,
 XmlPullParserException;
 
 List getRepositories(

Modified: 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java?rev=580247r1=580246r2=580247view=diff
==
--- 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
 (original)
+++ 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
 Fri Sep 28 01:03:53 2007
@@ -19,7 +19,6 @@
 
 package org.apache.maven.archetype.common;
 
-import org.apache.maven.archetype.registry.Archetype;
 import org.apache.maven.archetype.registry.ArchetypeRegistry;
 import org.apache.maven.archetype.registry.io.xpp3.ArchetypeRegistryXpp3Reader;
 import org.apache.maven.archetype.registry.io.xpp3.ArchetypeRegistryXpp3Writer;
@@ -32,22 +31,14 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;

svn commit: r580346 - in /maven/shared/trunk/maven-reporting-impl: ./ src/main/java/org/apache/maven/reporting/ src/test/java/org/apache/maven/reporting/

2007-09-28 Thread vsiveton 
Author: vsiveton
Date: Fri Sep 28 06:27:58 2007
New Revision: 580346

URL: http://svn.apache.org/viewvc?rev=580346view=rev
Log:
o bumped to doxia's release 1.0-alpha-9
o bumped to maven-reporting-api:2.0.8-SNAPSHOT
o updated javadoc
o updated license header

Modified:
maven/shared/trunk/maven-reporting-impl/pom.xml

maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java

maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java

maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java

Modified: maven/shared/trunk/maven-reporting-impl/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/pom.xml?rev=580346r1=580345r2=580346view=diff
==
--- maven/shared/trunk/maven-reporting-impl/pom.xml (original)
+++ maven/shared/trunk/maven-reporting-impl/pom.xml Fri Sep 28 06:27:58 2007
@@ -25,13 +25,14 @@
 artifactIdmaven-shared-components/artifactId
 version7/version
   /parent
+
   groupIdorg.apache.maven.reporting/groupId
   artifactIdmaven-reporting-impl/artifactId
-  nameMaven Reporting Implementation/name
   version2.1-SNAPSHOT/version
+  nameMaven Reporting Implementation/name
 
   properties
-doxiaVersion1.0-alpha-9-SNAPSHOT/doxiaVersion
+doxiaVersion1.0-alpha-9/doxiaVersion
   /properties
 
   developers
@@ -58,11 +59,6 @@
 /dependency
 dependency
   groupIdorg.apache.maven.doxia/groupId
-  artifactIddoxia-sink-api/artifactId
-  version${doxiaVersion}/version
-/dependency
-dependency
-  groupIdorg.apache.maven.doxia/groupId
   artifactIddoxia-core/artifactId
   version${doxiaVersion}/version
 /dependency
@@ -84,7 +80,7 @@
 dependency
   groupIdorg.apache.maven.reporting/groupId
   artifactIdmaven-reporting-api/artifactId
-  version2.0.4/version
+  version2.0.8-SNAPSHOT/version
 /dependency
 dependency
   groupIdjunit-addons/groupId
@@ -93,6 +89,7 @@
   scopetest/scope
 /dependency
   /dependencies
+
   scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-impl/connection
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-impl/developerConnection

Modified: 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=580346r1=580345r2=580346view=diff
==
--- 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
 (original)
+++ 
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
 Fri Sep 28 06:27:58 2007
@@ -1,19 +1,22 @@
 package org.apache.maven.reporting;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *  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.
+ * 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.
  */
 
 import org.apache.maven.doxia.sink.Sink;
@@ -31,27 +34,24 @@
  *
  * @author a href=[EMAIL PROTECTED]Emmanuel Venisse/a
  * @version $Id$
+ * @since 2.0
  */
 public abstract class AbstractMavenReport
 extends AbstractMojo
 implements MavenReport
 {
+/** The current sink to use */
 private Sink sink;
 
+/** The sink factory to use */
 private SinkFactory sinkFactory;
 
-protected

svn commit: r580391 - in /maven/archiva/tags: archiva-1.0-alpha-2/ archiva-parent-1.0-alpha-2/

2007-09-28 Thread joakime 
Author: joakime
Date: Fri Sep 28 08:40:49 2007
New Revision: 580391

URL: http://svn.apache.org/viewvc?rev=580391view=rev
Log:
Correcting tag name.


Added:
maven/archiva/tags/archiva-1.0-alpha-2/
  - copied from r580390, maven/archiva/tags/archiva-parent-1.0-alpha-2/
Removed:
maven/archiva/tags/archiva-parent-1.0-alpha-2/

svn commit: r580390 - in /maven/archiva/tags: 1.0-beta-1/ archiva-1.0-beta-1/

2007-09-28 Thread joakime 
Author: joakime
Date: Fri Sep 28 08:40:22 2007
New Revision: 580390

URL: http://svn.apache.org/viewvc?rev=580390view=rev
Log:
Correcting tag name.


Added:
maven/archiva/tags/archiva-1.0-beta-1/
  - copied from r580388, maven/archiva/tags/1.0-beta-1/
Removed:
maven/archiva/tags/1.0-beta-1/

svn commit: r580341 - in /maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting: MavenReport.java MavenReportException.java MavenReportRend

2007-09-28 Thread vsiveton 
Author: vsiveton
Date: Fri Sep 28 06:16:17 2007
New Revision: 580341

URL: http://svn.apache.org/viewvc?rev=580341view=rev
Log:
o minor javadoc updates

Modified:

maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java

maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportException.java

maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java

Modified: 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java?rev=580341r1=580340r2=580341view=diff
==
--- 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
 Fri Sep 28 06:16:17 2007
@@ -31,6 +31,7 @@
  * @author a href=[EMAIL PROTECTED]Emmanuel Venisse/a
  * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
  * @version $Id$
+ * @since 2.0
  */
 public interface MavenReport
 {
@@ -45,6 +46,8 @@
 
 /**
  * Generate the report depending the wanted locale.
+ * br/
+ * Mainly used for external reports like javadoc.
  *
  * @param sink the sink to use for the generation.
  * @param locale the wanted locale to generate the report, could be null.

Modified: 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportException.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportException.java?rev=580341r1=580340r2=580341view=diff
==
--- 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportException.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportException.java
 Fri Sep 28 06:16:17 2007
@@ -25,9 +25,13 @@
  * @author Brett Porter
  * @author a href=[EMAIL PROTECTED]Emmanuel Venisse/a
  * @version $Id$
+ * @since 2.0
  */
 public class MavenReportException extends Exception
 {
+/** The serialVersionUID **/
+public static final long serialVersionUID = -6200353563231163785L;
+
 /**
  * Default constructor.
  *

Modified: 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java?rev=580341r1=580340r2=580341view=diff
==
--- 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
 Fri Sep 28 06:16:17 2007
@@ -25,7 +25,8 @@
  * @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
  * @author a href=[EMAIL PROTECTED]Emmanuel Venisse/a
  * @version $Id$
- * @todo Later it may be appropriate to create something like a 
VelocityMavenReportRenderer
+ * @since 2.0
+ * @TODO Later it may be appropriate to create something like a 
VelocityMavenReportRenderer
  * that could take a velocity template and pipe that through Doxia rather than 
coding
  * them up like this.
  */

svn commit: r580459 - in /maven/sandbox/trunk/archetypeng: archetypeng-common/ archetypeng-common/src/main/java/org/apache/maven/archetype/source/ archetypeng-common/src/main/mdo/ archetypeng-plugin/s

2007-09-28 Thread jvanzyl 
Author: jvanzyl
Date: Fri Sep 28 11:58:31 2007
New Revision: 580459

URL: http://svn.apache.org/viewvc?rev=580459view=rev
Log:
o allowing the chaining of archetype sources
o separated out the catalog from the archetype configuration so that now you 
can use a local catalog, a remote catalog, or the wiki source
o everything can be configuration with one properties file in ~/.m2. in my case 
I have deployed a custom Eclipse distribution which
  installs Maven CLI as well and pushes in a simple properties file to control 
Archetype creation and this just delegates everything
  to remote catalogs so that nothing is dependent on a shared maven 
installation to update archetypes.


Added:

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
   (contents, props changed)
  - copied, changed from r580247, 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
   (contents, props changed)
  - copied, changed from r580247, 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteRegistryArchetypeDataSource.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-catalog.mdo
  - copied, changed from r580148, 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-registry.mdo
Removed:

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteRegistryArchetypeDataSource.java
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java

maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/mdo/archetype-registry.mdo

maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java

maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeGenerationQueryer.java

maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeSelectionQueryer.java

maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java

maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java

Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml?rev=580459r1=580458r2=580459view=diff
==
--- maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml Fri Sep 28 
11:58:31 2007
@@ -157,7 +157,20 @@
   version1.0.0/version
   modelsrc/main/mdo/archetype-descriptor.mdo/model
 /configuration
-  /execution  
+  /execution
+  execution
+idarchetype-catalog/id
+goals
+  goaljava/goal
+  goalxsd/goal
+  goalxpp3-reader/goal
+  goalxpp3-writer/goal
+/goals
+configuration
+  version1.0.0/version
+  modelsrc/main/mdo/archetype-catalog.mdo/model
+/configuration
+  /execution
 /executions
   /plugin
   plugin

Copied: 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
 (from r580247, 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java)
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java?p2=maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.javap1=maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.javar1=580247r2=580459rev=580459view=diff
==
--- 
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java
 (original)
+++

svn commit: r580542 - /maven/site/trunk/src/site/xdoc/index.xml.vm

2007-09-28 Thread brianf 
Author: brianf
Date: Fri Sep 28 20:48:40 2007
New Revision: 580542

URL: http://svn.apache.org/viewvc?rev=580542view=rev
Log:
google search box

Modified:
maven/site/trunk/src/site/xdoc/index.xml.vm

Modified: maven/site/trunk/src/site/xdoc/index.xml.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/index.xml.vm?rev=580542r1=580541r2=580542view=diff
==
--- maven/site/trunk/src/site/xdoc/index.xml.vm (original)
+++ maven/site/trunk/src/site/xdoc/index.xml.vm Fri Sep 28 20:48:40 2007
@@ -6,9 +6,20 @@
 author email=[EMAIL PROTECTED]Jason van Zyl/author
   /properties
   body
+
 !-- TODO: news? --
 div id=downloadbox
-  h5Get Maven ${currentVersion}/h5
+h5Search Maven Sites/h5
+!-- Google CSE Search Box Begins  --
+form action=http://www.google.com/cse; 
id=searchbox_006660305041243700248:hyqtfwsewpm
+  input type=hidden name=cx value=006660305041243700248:hyqtfwsewpm /
+  input type=text name=q size=25 /
+  input type=submit name=sa value=Search /
+/form
+script type=text/javascript 
src=http://www.google.com/coop/cse/brand?form=searchbox_006660305041243700248%3Ahyqtfwsewpm;/script
+!-- Google CSE Search Box Ends --
+
+   h5Get Maven ${currentVersion}/h5
   span style=display: block; text-align: right; font-size: 
smallerReleased: 20 June 2007/span
   p
 a href=download.html