svn commit: r580205 - in /maven/archiva/trunk/archiva-base: archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-repository-layer/src/main/java/org/apache/m
Author: brett
Date: Thu Sep 27 20:17:11 2007
New Revision: 580205
URL: http://svn.apache.org/viewvc?rev=580205view=rev
Log:
[MRM-528] run the correct consumers
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java?rev=580205r1=580204r2=580205view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
Thu Sep 27 20:17:11 2007
@@ -85,6 +85,8 @@
* NOTE: If the consumer opted to batch up processing requests in the
[EMAIL PROTECTED] #processFile(String)} event
* this would be the last opportunity to drain any processing queue's.
* /p
+ *
+ * @todo! this is never called by the RepositoryScannerInstance
*/
public void completeScan();
}
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java?rev=580205r1=580204r2=580205view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
Thu Sep 27 20:17:11 2007
@@ -24,15 +24,17 @@
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.functors.IfClosure;
import org.apache.commons.collections.functors.OrPredicate;
-import org.apache.maven.archiva.common.utils.PathUtil;
+import org.apache.maven.archiva.common.utils.BaseFile;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
-import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.apache.maven.archiva.consumers.functors.PermanentConsumerPredicate;
import org.apache.maven.archiva.model.ArchivaRepository;
+import
org.apache.maven.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
+import
org.apache.maven.archiva.repository.scanner.functors.ConsumerWantsFilePredicate;
+import
org.apache.maven.archiva.repository.scanner.functors.TriggerBeginScanClosure;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -213,32 +215,38 @@
public void executeConsumers( ArchivaRepository repository, File localFile
)
{
// Run the repository consumers
-for ( RepositoryContentConsumer consumer : availableKnownConsumers )
+try
{
-consumeFile( consumer, repository, localFile );
-}
+Closure triggerBeginScan = new TriggerBeginScanClosure(
repository, getLogger() );
-for ( RepositoryContentConsumer consumer : availableInvalidConsumers )
-{
-consumeFile( consumer, repository, localFile );
-}
-}
+CollectionUtils.forAllDo( availableKnownConsumers,
triggerBeginScan );
+CollectionUtils.forAllDo( availableInvalidConsumers,
triggerBeginScan );
-private void consumeFile( RepositoryContentConsumer consumer,
ArchivaRepository
svn commit: r579987 - in /maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api: pom.xml src/main/java/org/apache/maven/reporting/MavenReport.java
Author: vsiveton Date: Thu Sep 27 05:31:07 2007 New Revision: 579987 URL: http://svn.apache.org/viewvc?rev=579987view=rev Log: o bumped to the release doxia-sink-api o used org.apache.maven.doxia.sink.Sink instead of the deprecated org.codehaus.doxia.sink.Sink Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml?rev=579987r1=579986r2=579987view=diff == --- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml Thu Sep 27 05:31:07 2007 @@ -43,7 +43,7 @@ dependency groupIdorg.apache.maven.doxia/groupId artifactIddoxia-sink-api/artifactId - version1.0-alpha-7/version + version1.0-alpha-9/version /dependency /dependencies /project 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=579987r1=579986r2=579987view=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 Thu Sep 27 05:31:07 2007 @@ -19,10 +19,10 @@ * under the License. */ -import org.codehaus.doxia.sink.Sink; - import java.io.File; import java.util.Locale; + +import org.apache.maven.doxia.sink.Sink; /** * The basis for a Maven report.
svn commit: r579996 - 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
Author: vsiveton
Date: Thu Sep 27 05:52:50 2007
New Revision: 579996
URL: http://svn.apache.org/viewvc?rev=579996view=rev
Log:
o updated javadoc. No code change.
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=579996r1=579995r2=579996view=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
Thu Sep 27 05:52:50 2007
@@ -29,34 +29,83 @@
*
* @author Brett Porter
* @author a href=[EMAIL PROTECTED]Emmanuel Venisse/a
+ * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
* @version $Id$
*/
public interface MavenReport
{
+/** Plexus lookup name */
String ROLE = MavenReport.class.getName();
+/** Category for project information reports */
String CATEGORY_PROJECT_INFORMATION = Project Info;
+/** Category for project reports */
String CATEGORY_PROJECT_REPORTS = Project Reports;
-// eventually, we must replace this with the o.a.m.d.s.Sink class as a
parameter
+/**
+ * Generate the report depending the wanted locale.
+ *
+ * @param sink the sink to use for the generation.
+ * @param locale the wanted locale to generate the report, could be null.
+ * @throws MavenReportException if any
+ */
void generate( Sink sink, Locale locale )
throws MavenReportException;
+/**
+ * @return the output name of this report.
+ */
String getOutputName();
-String getName( Locale locale );
-
+/**
+ * Get the category name for this report.
+ *
+ * @return the category name of this report. Should be
codeCATEGORY_PROJECT_INFORMATION/code
+ * or codeCATEGORY_PROJECT_REPORTS/code
+ * [EMAIL PROTECTED] #CATEGORY_PROJECT_INFORMATION}
+ * [EMAIL PROTECTED] #CATEGORY_PROJECT_REPORTS}
+ */
String getCategoryName();
+/**
+ * @param locale the wanted locale to return the report's name, could be
null.
+ * @return the name of this report.
+ */
+String getName( Locale locale );
+
+/**
+ * @param locale the wanted locale to return the report's description,
could be null.
+ * @return the description of this report.
+ */
String getDescription( Locale locale );
-// TODO: remove?
+/**
+ * Set a new output directory. Useful for staging.
+ *
+ * @param outputDirectory the new output directory
+ */
void setReportOutputDirectory( File outputDirectory );
+/**
+ * @return the current report output directory.
+ */
File getReportOutputDirectory();
+/**
+ * An external report is a report which calls a third party program which
generates some reports too.
+ * A good example is javadoc tool.
+ *
+ * @return tttrue/tt if this report is external, ttfalse/tt
otherwise.
+ * Default should ttfalse/tt.
+ */
boolean isExternalReport();
+/**
+ * Verify some conditions before generate the report.
+ *
+ * @return tttrue/tt if this report could be generated, ttfalse/tt
otherwise.
+ * Default should tttrue/tt.
+ */
boolean canGenerateReport();
}
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=579996r1=579995r2=579996view=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
Thu Sep 27 05:52:50 2007
@@ -28,11 +28,22 @@
*/
public class MavenReportException extends Exception
{
+/**
+ * Default constructor.
+ *
+ * @param msg the
svn commit: r580109 - in /maven/plugins/branches/MECLIPSE-242/src: main/java/org/apache/maven/plugin/eclipse/writers/rad/ test/java/org/apache/maven/plugin/eclipse/ test/resources/projects/project-rad
Author: brianf
Date: Thu Sep 27 10:24:32 2007
New Revision: 580109
URL: http://svn.apache.org/viewvc?rev=580109view=rev
Log:
applied patch for MECLIPSE-242
Modified:
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
maven/plugins/branches/MECLIPSE-242/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/pom.xml
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-2/websettings
Modified:
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java?rev=580109r1=580108r2=580109view=diff
==
---
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
(original)
+++
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
Thu Sep 27 10:24:32 2007
@@ -26,6 +26,8 @@
import org.apache.maven.plugin.eclipse.Constants;
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
+import org.apache.maven.plugin.ide.IdeDependency;
+import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.plugin.ide.JeeUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
@@ -36,7 +38,8 @@
*
* @author a href=mailto:[EMAIL PROTECTED]Richard van Nieuwenhoven /a
*/
-public class RadWebSettingsWriter extends AbstractEclipseWriter
+public class RadWebSettingsWriter
+extends AbstractEclipseWriter
{
private static final String
COM_IBM_ETOOLS_SITEEDIT_WIZARDS_PROJECTFEATURE_WEB_SITE_FEATURE =
@@ -64,6 +67,14 @@
private static final String WEBSETTINGS_WEBSETTINGS = websettings;
+private static final String WEBSETTINGS_LIBMODULES = lib-modules;
+
+private static final String WEBSETTINGS_LIBMODULE = lib-module;
+
+private static final String WEBSETTINGS_LM_JAR = jar;
+
+private static final String WEBSETTINGS_LM_PROJECT = project;
+
/**
* the context root to use for this project
*/
@@ -72,8 +83,7 @@
/**
* required default constructor.
*
- * @param warContextRoot
- *the context root to use for this project
+ * @param warContextRoot the context root to use for this project
*/
public RadWebSettingsWriter( String warContextRoot )
{
@@ -83,10 +93,10 @@
/**
* write the websettings file for RAD6 if needed.
*
- * @throws MojoExecutionException
- * when writing the config files was not possible
+ * @throws MojoExecutionException when writing the config files was not
possible
*/
-public void write() throws MojoExecutionException
+public void write()
+throws MojoExecutionException
{
FileWriter w;
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase(
config.getProject().getPackaging() ) )
@@ -109,8 +119,7 @@
/**
* write the websettings file for RAD6.
*
- * @param writer
- *where to write to
+ * @param writer where to write to
*/
private void writeModuleTypeFacetCore( XMLWriter writer )
{
@@ -140,14 +149,51 @@
writer.endElement();
writer.endElement();
writer.endElement();
-writer.endElement();
+
+// library modules
+writer.startElement( WEBSETTINGS_LIBMODULES );
+
+// iterate relevant dependencies (non-test, non-provided, project)
+IdeDependency[] deps = config.getDeps();
+if ( deps != null )
+{
+for ( int i = 0; i deps.length; i++ )
+{
+final IdeDependency dependency = deps[i];
+log.debug( RadWebSettingsWriter: checking dependency +
dependency.toString() );
+
+if ( dependency.isReferencedProject()
!dependency.isTestDependency() !dependency.isProvided() )
+{
+log.debug( RadWebSettingsWriter: dependency +
dependency.toString()
++ selected for inclusion as lib-module );
+
+String depName = IdeUtils.getProjectName(
config.getProjectNameTemplate(), dependency );
+String depJar = dependency.getArtifactId() + .jar;
+
+writer.startElement( WEBSETTINGS_LIBMODULE );
+
+writer.startElement( WEBSETTINGS_LM_JAR );
+
svn commit: r580108 - /maven/plugins/branches/MECLIPSE-242/
Author: brianf Date: Thu Sep 27 10:23:44 2007 New Revision: 580108 URL: http://svn.apache.org/viewvc?rev=580108view=rev Log: made a copy Added: maven/plugins/branches/MECLIPSE-242/ - copied from r580107, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r580144 - in /maven/sandbox/trunk/archetypeng: archetype-common/pom.xml archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java archetype-packaging/p
Author: jvanzyl Date: Thu Sep 27 13:37:26 2007 New Revision: 580144 URL: http://svn.apache.org/viewvc?rev=580144view=rev Log: (empty) Modified: maven/sandbox/trunk/archetypeng/archetype-common/pom.xml maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml maven/sandbox/trunk/archetypeng/pom.xml Modified: maven/sandbox/trunk/archetypeng/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-common/pom.xml?rev=580144r1=580143r2=580144view=diff == --- maven/sandbox/trunk/archetypeng/archetype-common/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/archetype-common/pom.xml Thu Sep 27 13:37:26 2007 @@ -27,14 +27,11 @@ parent groupIdorg.apache.maven.archetype/groupId artifactIdmaven-archetype/artifactId -version1.0-SNAPSHOT/version +version2.0-SNAPSHOT/version /parent - artifactIdarchetype-common/artifactId - nameMaven Archetype Common/name packagingjar/packaging - dependencies dependency groupIdnet.sourceforge.jchardet/groupId Modified: maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=580144r1=580143r2=580144view=diff == --- maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java (original) +++ maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java Thu Sep 27 13:37:26 2007 @@ -147,14 +147,14 @@ Extension extension = new Extension(); extension.setGroupId( org.apache.maven.archetype ); -extension.setArtifactId( archetypeng-packaging ); -extension.setVersion( 1.0-SNAPSHOT ); +extension.setArtifactId( archetype-packaging ); +extension.setVersion( 2.0-SNAPSHOT ); model.getBuild().addExtension( extension ); Plugin plugin = new Plugin(); plugin.setGroupId( org.apache.maven.plugins ); -plugin.setArtifactId( maven-archetypeng-plugin ); -plugin.setVersion( 1.0-SNAPSHOT ); +plugin.setArtifactId( maven-archetype-plugin ); +plugin.setVersion( 2.0-SNAPSHOT ); plugin.setExtensions( true ); model.getBuild().addPlugin( plugin ); getLogger().debug( Creating archetype's pom ); Modified: maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml?rev=580144r1=580143r2=580144view=diff == --- maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml Thu Sep 27 13:37:26 2007 @@ -27,12 +27,8 @@ parent groupIdorg.apache.maven.archetype/groupId artifactIdmaven-archetype/artifactId -version1.0-SNAPSHOT/version +version2.0-SNAPSHOT/version /parent - artifactIdarchetype-packaging/artifactId -version1.0-SNAPSHOT/version - nameMaven ArchetypeNG Packaging/name - /project Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml?rev=580144r1=580143r2=580144view=diff == --- maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml Thu Sep 27 13:37:26 2007 @@ -27,15 +27,13 @@ parent groupIdorg.apache.maven.archetype/groupId artifactIdmaven-archetype/artifactId -version1.0-SNAPSHOT/version +version2.0-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId !-- The purpose is to call mvn archetypeng:* w/out the need to add a plugin group in settings -- artifactIdmaven-archetype-plugin/artifactId - version1.0-SNAPSHOT/version - nameMaven Archetype Plugin/name packagingmaven-plugin/packaging Modified: maven/sandbox/trunk/archetypeng/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/pom.xml?rev=580144r1=580143r2=580144view=diff == --- maven/sandbox/trunk/archetypeng/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/pom.xml Thu Sep 27 13:37:26 2007 @@ -32,7 +32,7
svn commit: r580146 - in /maven/sandbox/trunk/archetypeng: archetype-common/pom.xml archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java archetype-packaging/p
Author: jvanzyl Date: Thu Sep 27 13:40:11 2007 New Revision: 580146 URL: http://svn.apache.org/viewvc?rev=580146view=rev Log: need to stay with archetypeng for now Modified: maven/sandbox/trunk/archetypeng/archetype-common/pom.xml maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml maven/sandbox/trunk/archetypeng/pom.xml Modified: maven/sandbox/trunk/archetypeng/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-common/pom.xml?rev=580146r1=580145r2=580146view=diff == --- maven/sandbox/trunk/archetypeng/archetype-common/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/archetype-common/pom.xml Thu Sep 27 13:40:11 2007 @@ -26,10 +26,10 @@ parent groupIdorg.apache.maven.archetype/groupId -artifactIdmaven-archetype/artifactId +artifactIdmaven-archetypeng/artifactId version2.0-SNAPSHOT/version /parent - artifactIdarchetype-common/artifactId + artifactIdarchetypeng-common/artifactId nameMaven Archetype Common/name packagingjar/packaging dependencies Modified: maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=580146r1=580145r2=580146view=diff == --- maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java (original) +++ maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java Thu Sep 27 13:40:11 2007 @@ -147,13 +147,13 @@ Extension extension = new Extension(); extension.setGroupId( org.apache.maven.archetype ); -extension.setArtifactId( archetype-packaging ); +extension.setArtifactId( archetypeng-packaging ); extension.setVersion( 2.0-SNAPSHOT ); model.getBuild().addExtension( extension ); Plugin plugin = new Plugin(); plugin.setGroupId( org.apache.maven.plugins ); -plugin.setArtifactId( maven-archetype-plugin ); +plugin.setArtifactId( maven-archetypeng-plugin ); plugin.setVersion( 2.0-SNAPSHOT ); plugin.setExtensions( true ); model.getBuild().addPlugin( plugin ); Modified: maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml?rev=580146r1=580145r2=580146view=diff == --- maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml Thu Sep 27 13:40:11 2007 @@ -26,9 +26,9 @@ parent groupIdorg.apache.maven.archetype/groupId -artifactIdmaven-archetype/artifactId +artifactIdmaven-archetypeng/artifactId version2.0-SNAPSHOT/version /parent -artifactIdarchetype-packaging/artifactId +artifactIdarchetypeng-packaging/artifactId nameMaven ArchetypeNG Packaging/name /project Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml?rev=580146r1=580145r2=580146view=diff == --- maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml Thu Sep 27 13:40:11 2007 @@ -26,14 +26,14 @@ parent groupIdorg.apache.maven.archetype/groupId -artifactIdmaven-archetype/artifactId +artifactIdmaven-archetypeng/artifactId version2.0-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId !-- The purpose is to call mvn archetypeng:* w/out the need to add a plugin group in settings -- - artifactIdmaven-archetype-plugin/artifactId + artifactIdmaven-archetypeng-plugin/artifactId nameMaven Archetype Plugin/name packagingmaven-plugin/packaging @@ -69,18 +69,8 @@ /dependency dependency groupIdorg.apache.maven.archetype/groupId - artifactIdarchetype-common/artifactId - version1.0-SNAPSHOT/version -/dependency -dependency - groupIdorg.apache.maven.archetype/groupId - artifactIdarchetype-generator/artifactId - version1.0-SNAPSHOT/version -/dependency -dependency - groupIdorg.apache.maven.archetype/groupId -
svn commit: r580148 - in /maven/sandbox/trunk/archetypeng: archetype-common/ archetype-packaging/ archetype-plugin/ archetypeng-common/ archetypeng-common/src/ archetypeng-packaging/ archetypeng-packa
Author: jvanzyl Date: Thu Sep 27 13:43:15 2007 New Revision: 580148 URL: http://svn.apache.org/viewvc?rev=580148view=rev Log: must use archetypeng for now Added: maven/sandbox/trunk/archetypeng/archetypeng-common/ - copied from r580141, maven/sandbox/trunk/archetypeng/archetype-common/ maven/sandbox/trunk/archetypeng/archetypeng-common/pom.xml - copied unchanged from r580147, maven/sandbox/trunk/archetypeng/archetype-common/pom.xml maven/sandbox/trunk/archetypeng/archetypeng-common/src/ - copied from r580147, maven/sandbox/trunk/archetypeng/archetype-common/src/ maven/sandbox/trunk/archetypeng/archetypeng-packaging/ - copied from r580141, maven/sandbox/trunk/archetypeng/archetype-packaging/ maven/sandbox/trunk/archetypeng/archetypeng-packaging/pom.xml - copied unchanged from r580147, maven/sandbox/trunk/archetypeng/archetype-packaging/pom.xml maven/sandbox/trunk/archetypeng/archetypeng-packaging/src/ - copied from r580147, maven/sandbox/trunk/archetypeng/archetype-packaging/src/ maven/sandbox/trunk/archetypeng/archetypeng-plugin/ - copied from r580141, maven/sandbox/trunk/archetypeng/archetype-plugin/ maven/sandbox/trunk/archetypeng/archetypeng-plugin/pom.xml - copied unchanged from r580147, maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/ - copied from r580147, maven/sandbox/trunk/archetypeng/archetype-plugin/src/ Removed: maven/sandbox/trunk/archetypeng/archetype-common/ maven/sandbox/trunk/archetypeng/archetype-packaging/ maven/sandbox/trunk/archetypeng/archetype-plugin/
svn commit: r580149 - /maven/sandbox/trunk/archetypeng/pom.xml
Author: jvanzyl Date: Thu Sep 27 13:45:25 2007 New Revision: 580149 URL: http://svn.apache.org/viewvc?rev=580149view=rev Log: must use archetypeng for now Modified: maven/sandbox/trunk/archetypeng/pom.xml Modified: maven/sandbox/trunk/archetypeng/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/pom.xml?rev=580149r1=580148r2=580149view=diff == --- maven/sandbox/trunk/archetypeng/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/pom.xml Thu Sep 27 13:45:25 2007 @@ -38,9 +38,9 @@ packagingpom/packaging modules -modulearchetype-common/module -modulearchetype-plugin/module -modulearchetype-packaging/module +modulearchetypeng-common/module +modulearchetypeng-plugin/module +modulearchetypeng-packaging/module /modules licenses
svn commit: r580152 - /maven/sandbox/trunk/archetypeng/pom.xml
Author: jvanzyl Date: Thu Sep 27 13:58:19 2007 New Revision: 580152 URL: http://svn.apache.org/viewvc?rev=580152view=rev Log: fixing another POM entry Modified: maven/sandbox/trunk/archetypeng/pom.xml Modified: maven/sandbox/trunk/archetypeng/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/pom.xml?rev=580152r1=580151r2=580152view=diff == --- maven/sandbox/trunk/archetypeng/pom.xml (original) +++ maven/sandbox/trunk/archetypeng/pom.xml Thu Sep 27 13:58:19 2007 @@ -60,8 +60,8 @@ dependencies dependency groupIdorg.apache.maven.archetype/groupId -artifactIdarchetype-common/artifactId -version1.0-SNAPSHOT/version +artifactIdarchetypeng-common/artifactId +version2.0-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId
svn commit: r580156 - /maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
Author: jvanzyl
Date: Thu Sep 27 14:12:15 2007
New Revision: 580156
URL: http://svn.apache.org/viewvc?rev=580156view=rev
Log:
o need the JAR mojo
Added:
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
(with props)
Added:
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java?rev=580156view=auto
==
---
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
(added)
+++
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
Thu Sep 27 14:12:15 2007
@@ -0,0 +1,139 @@
+/*
+ * 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.
+ */
+
+package org.apache.maven.archetype.mojos;
+
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+
+import java.io.File;
+
+/**
+ * @author rafale
+ * @goal jar
+ * @phasepackage
+ * @requiresProject
+ */
+public class JarMojo
+extends AbstractMojo
+{
+/**
+ * Directory containing the classes.
+ *
+ * @parameter expression=${project.build.outputDirectory}
+ * @required
+ */
+private File archetypeDirectory;
+
+/**
+ * The maven archive configuration to use.
+ *
+ * pSee a
+ *
href=http://maven.apache.org/ref/current/maven-archiver/apidocs/org/apache/maven/archiver/MavenArchiveConfiguration.html;
+ * the Javadocs for MavenArchiveConfiguration/a./p
+ *
+ * @parameter
+ */
+private MavenArchiveConfiguration archive = new MavenArchiveConfiguration
();
+
+/**
+ * Name of the generated JAR.
+ *
+ * @parameter alias=jarName expression=${project.build.finalName}
+ * @required
+ */
+private String finalName;
+
+/**
+ * The Jar archiver.
+ *
+ * @parameter
expression=${component.org.codehaus.plexus.archiver.Archiver#jar}
+ * @required
+ */
+private JarArchiver jarArchiver;
+
+/**
+ * Directory containing the generated JAR.
+ *
+ * @parameter expression=${project.build.directory}
+ * @required
+ */
+private File outputDirectory;
+
+/**
+ * The maven project.
+ *
+ * @parameter expression=${project}
+ * @required
+ * @readonly
+ */
+private MavenProject project;
+
+protected static File getJarFile ( File basedir, String finalName )
+{
+return new File ( basedir, finalName + .jar );
+}
+
+public void execute ()
+throws MojoExecutionException, MojoFailureException
+{
+File jarFile = createArchive ();
+project.getArtifact ().setFile ( jarFile );
+}
+
+private File createArchive ()
+throws MojoExecutionException
+{
+File jarFile = getJarFile ( outputDirectory, finalName );
+
+MavenArchiver archiver = new MavenArchiver ();
+
+archiver.setArchiver ( jarArchiver );
+
+archiver.setOutputFile ( jarFile );
+
+archive.setForced ( true );
+
+try
+{
+if ( !archetypeDirectory.exists () )
+{
+getLog ().warn ( JAR will be empty - no content was marked
for inclusion! );
+}
+else
+{
+archiver.getArchiver ().addDirectory ( archetypeDirectory );
+}
+
+archiver.createArchive ( project, archive );
+
+return jarFile;
+}
+catch ( Exception e )
+{
+throw new MojoExecutionException ( Error assembling JAR, e );
+}
+}
+}
Propchange:
svn commit: r580168 - 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
Author: jvanzyl
Date: Thu Sep 27 14:34:56 2007
New Revision: 580168
URL: http://svn.apache.org/viewvc?rev=580168view=rev
Log:
o use the registry source as the default
Added:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java
- copied, changed from r580148,
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.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-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=580168r1=580167r2=580168view=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
Thu Sep 27 14:34:56 2007
@@ -49,6 +49,12 @@
FileNotFoundException,
XmlPullParserException;
+ArchetypeRegistry readArchetypeRegistry()
+throws
+IOException,
+FileNotFoundException,
+XmlPullParserException;
+
List getRepositories(
List pomRemoteRepositories,
String remoteRepositories,
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=580168r1=580167r2=580168view=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
Thu Sep 27 14:34:56 2007
@@ -54,6 +54,8 @@
extends AbstractLogEnabled
implements ArchetypeRegistryManager
{
+private static File DEFAULT_REGISTRY = new File( System.getProperty(
user.home ), .m2/archetype.xml );
+
/**
* Used to create ArtifactRepository objects given the urls of the remote
repositories.
*
@@ -140,6 +142,14 @@
}
return languages;
+}
+
+public ArchetypeRegistry readArchetypeRegistry()
+throws
+IOException,
+XmlPullParserException
+{
+return readArchetypeRegistry( DEFAULT_REGISTRY );
}
public ArchetypeRegistry readArchetypeRegistry( File archetypeRegistryFile
)
Copied:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java
(from r580148,
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java?p2=maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.javap1=maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.javar1=580148r2=580168rev=580168view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java
Thu Sep 27 14:34:56 2007
@@ -1,100 +1,35 @@
package org.apache.maven.archetype.source;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.net.URL;
-import java.util.LinkedHashMap;
+import org.apache.maven.archetype.common.ArchetypeRegistryManager;
+import org.apache.maven.archetype.registry.Archetype;
+
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
-import
svn commit: r580176 - in /maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4: ./ pom.xml src/ src/main/ src/main/resources/ src/main/resources/DummyResource.tx
Author: brianf Date: Thu Sep 27 15:20:28 2007 New Revision: 580176 URL: http://svn.apache.org/viewvc?rev=580176view=rev Log: added missing test files Added: maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt Added: maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml?rev=580176view=auto == --- maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml (added) +++ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml Thu Sep 27 15:20:28 2007 @@ -0,0 +1,15 @@ +?xml version=1.0 encoding=UTF-8? +project xmlns=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; + modelVersion4.0.0/modelVersion + parent + groupIdeclipse.test/groupId + artifactIdproject-rad-5/artifactId + version0.0.1-SNAPSHOT/version + /parent + packagingjar/packaging + groupIdeclipse.test/groupId + artifactIdproject-rad-5_4/artifactId + version0.0.1-SNAPSHOT/version +/project \ No newline at end of file Added: maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt?rev=580176view=auto == (empty)
svn commit: r580177 - 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
Author: jvanzyl
Date: Thu Sep 27 15:33:56 2007
New Revision: 580177
URL: http://svn.apache.org/viewvc?rev=580177view=rev
Log:
o add a standard registry source, as going out to the wiki should just be an
option and a one time shot
o also for each archetype that is created on the local system, add it to the
registry so that you can try what you just created
Modified:
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/RegistryArchetypeDataSource.java
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/DefaultArchetypeSelector.java
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=580177r1=580176r2=580177view=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
Thu Sep 27 15:33:56 2007
@@ -149,6 +149,8 @@
IOException,
XmlPullParserException
{
+System.out.println( DEFAULT_REGISTRY = + DEFAULT_REGISTRY );
+
return readArchetypeRegistry( DEFAULT_REGISTRY );
}
Modified:
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/RegistryArchetypeDataSource.java?rev=580177r1=580176r2=580177view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RegistryArchetypeDataSource.java
Thu Sep 27 15:33:56 2007
@@ -2,10 +2,13 @@
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.archetype.registry.Archetype;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.io.IOException;
/** @author Jason van Zyl */
public class RegistryArchetypeDataSource
@@ -23,7 +26,18 @@
{
Map archetypes = new HashMap();
-for ( Iterator i =
archetypeRegistryManager.getDefaultArchetypeRegistry().getArchetypes().iterator();
i.hasNext(); )
+List list;
+
+try
+{
+list =
archetypeRegistryManager.readArchetypeRegistry().getArchetypes();
+}
+catch ( Exception e )
+{
+throw new ArchetypeDataSourceException( Error reading
~/.m2/archetype.xml );
+}
+
+for ( Iterator i = list.iterator(); i.hasNext(); )
{
Archetype archetype = (Archetype) i.next();
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=580177r1=580176r2=580177view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
Thu Sep 27 15:33:56 2007
@@ -19,16 +19,21 @@
package org.apache.maven.archetype.mojos;
+import org.apache.maven.archetype.common.ArchetypePropertiesManager;
+import org.apache.maven.archetype.common.ArchetypeRegistryManager;
+import org.apache.maven.archetype.common.Constants;
+import org.apache.maven.archetype.creator.ArchetypeCreator;
+import org.apache.maven.archetype.registry.Archetype;
+import org.apache.maven.archetype.registry.ArchetypeRegistry;
+import org.apache.maven.archetype.ui.ArchetypeCreationConfigurator;
import org.apache.maven.plugin.AbstractMojo;
import
svn commit: r580183 - in /maven/archiva/trunk/archiva-base/archiva-repository-layer/src: main/java/org/apache/maven/archiva/repository/project/ main/java/org/apache/maven/archiva/repository/project/wr
Author: joakime
Date: Thu Sep 27 16:35:03 2007
New Revision: 580183
URL: http://svn.apache.org/viewvc?rev=580183view=rev
Log:
[MRM-488] properties in pom are not resolved (at least while browsing)
Preparing ModelWriter to aide in testing of issue.
Added:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelWriter.java
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400Writer.java
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/expected-poms/
- copied from r579720,
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/effective-poms/
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/expected-poms/maven-parent-4.pom
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/expected-poms/model-write-400-simple.pom
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom
(with props)
Removed:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/effective-poms/
Added:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelWriter.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelWriter.java?rev=580183view=auto
==
---
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelWriter.java
(added)
+++
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelWriter.java
Thu Sep 27 16:35:03 2007
@@ -0,0 +1,57 @@
+package org.apache.maven.archiva.repository.project;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.archiva.model.ArchivaProjectModel;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * ProjectModelWriter
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Joakim Erdfelt/a
+ * @version $Id$
+ */
+public interface ProjectModelWriter
+{
+/**
+ * Write a project model out to disk.
+ *
+ * @param model the model to write.
+ * @param pomFile the (pom) file on disk to write to.
+ * @throws ProjectModelException if there was a problem with the model
itself.
+ * @throws IOException if there was a problem writing the pom file.
+ */
+public void write( ArchivaProjectModel model, File pomFile )
+throws ProjectModelException, IOException;
+
+/**
+ * Write a project model out to a [EMAIL PROTECTED] Writer}.
+ *
+ * @param model the model to write.
+ * @param writer the writer (stream) to write to.
+ * @throws ProjectModelException if there was a problem with the model
itself.
+ * @throws IOException if there was a problem writing the pom file.
+ */
+public void write( ArchivaProjectModel model, Writer writer )
+throws ProjectModelException, IOException;
+}
Propchange:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelWriter.java
--
svn commit: r580196 - in /maven/enforcer/trunk: ./ enforcer-api/ enforcer-rules/ enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/main/java/org/apache/maven/plugins/e
Author: brianf
Date: Thu Sep 27 19:26:19 2007
New Revision: 580196
URL: http://svn.apache.org/viewvc?rev=580196view=rev
Log:
new rule to enforce no repositories in the poms.
Added:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/EnforcerTestUtils.java
Modified:
maven/enforcer/trunk/ (props changed)
maven/enforcer/trunk/enforcer-api/ (props changed)
maven/enforcer/trunk/enforcer-rules/ (props changed)
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
maven/enforcer/trunk/maven-enforcer-plugin/ (props changed)
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/util/EnforcerUtils.java
Propchange: maven/enforcer/trunk/
--
--- svn:ignore (added)
+++ svn:ignore Thu Sep 27 19:26:19 2007
@@ -0,0 +1,2 @@
+target
+archetype.properties
Propchange: maven/enforcer/trunk/enforcer-api/
--
--- svn:ignore (original)
+++ svn:ignore Thu Sep 27 19:26:19 2007
@@ -7,3 +7,4 @@
*.iws
*.iml
.settings
+archetype.properties
Propchange: maven/enforcer/trunk/enforcer-rules/
--
--- svn:ignore (added)
+++ svn:ignore Thu Sep 27 19:26:19 2007
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+.settings
+archetype.properties
Added:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java?rev=580196view=auto
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
(added)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
Thu Sep 27 19:26:19 2007
@@ -0,0 +1,113 @@
+package org.apache.maven.plugins.enforcer;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtils;
+import org.apache.maven.project.MavenProject;
+import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+/**
+ * @author a href=mailto:[EMAIL PROTECTED]Brian Fox/a
+ *
+ */
+public class RequireNoRepositories
+implements EnforcerRule
+{
+/**
+ * The message to be printed in case the condition
+ * returns btrue/b
+ *
+ * @required
+ * @parameter
+ */
+public String message;
+
+public void execute ( EnforcerRuleHelper helper )
+throws EnforcerRuleException
+{
+EnforcerRuleUtils utils = new EnforcerRuleUtils( helper );
+
+MavenProject project;
+try
+{
+project = (MavenProject) helper.evaluate( ${project} );
+
+List models = utils.getModelsRecursively( project.getGroupId(),
project.getArtifactId(), project
+.getVersion(), new File( project.getBasedir(), pom.xml ) );
+
+ List badModels = checkModels( models );
+
+ // if anything was found, log it then append the
+ // optional message.
+ if ( !badModels.isEmpty() )
+ {
+ StringBuffer newMsg = new StringBuffer();
+ newMsg.append( Some poms have repositories defined:\n );
+ Iterator iter =
svn commit: r580187 - in /maven/archiva/trunk: ./ archiva-base/archiva-configuration/ archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/reposi
Author: brett Date: Thu Sep 27 17:12:03 2007 New Revision: 580187 URL: http://svn.apache.org/viewvc?rev=580187view=rev Log: [MRM-528] run consumers as artifacts arrive via proxy Added: maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/StubRepositoryContentConsumers.java (with props) Modified: maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml maven/archiva/trunk/archiva-base/archiva-indexer/pom.xml maven/archiva/trunk/archiva-base/archiva-policies/pom.xml maven/archiva/trunk/archiva-base/archiva-proxy/pom.xml maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml maven/archiva/trunk/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumerUtilTest.java maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/pom.xml maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml maven/archiva/trunk/pom.xml Modified: maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml?rev=580187r1=580186r2=580187view=diff == --- maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml (original) +++ maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml Thu Sep 27 17:12:03 2007 @@ -72,12 +72,6 @@ groupIdorg.codehaus.plexus/groupId artifactIdplexus-container-default/artifactId /dependency -!-- Test Deps -- -dependency - groupIdeasymock/groupId - artifactIdeasymock/artifactId - scopetest/scope -/dependency /dependencies build plugins Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java?rev=580187r1=580186r2=580187view=diff == --- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java (original) +++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java Thu Sep 27 17:12:03 2007 @@ -113,6 +113,8 @@ artifact.getType() ); artifactDao.deleteArtifact( queriedArtifact ); + +// TODO [MRM-37]: re-run the database consumers to clean up } /** Modified: maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml?rev=580187r1=580186r2=580187view=diff == --- maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml (original) +++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml Thu Sep 27 17:12:03 2007 @@ -80,11 +80,6 @@
