Author: rafale
Date: Mon Dec 10 14:01:56 2007
New Revision: 603066
URL: http://svn.apache.org/viewvc?rev=603066&view=rev
Log:
Temporary fix for the package resolution
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.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/CatalogArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.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/mojos/UpdateLocalCatalogMojo.java
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java?rev=603066&r1=603065&r2=603066&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
Mon Dec 10 14:01:56 2007
@@ -101,4 +101,6 @@
File outputDirectory,
String finalName )
throws DependencyResolutionRequiredException, IOException;
+ void updateLocalCatalog(org.apache.maven.archetype.catalog.Archetype
archetype, String path);
+ void updateLocalCatalog(org.apache.maven.archetype.catalog.Archetype
archetype);
}
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java?rev=603066&r1=603065&r2=603066&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
Mon Dec 10 14:01:56 2007
@@ -32,7 +32,7 @@
{
private ArtifactRepository localRepository;
- private List remoteRepositories;
+// private List remoteRepositories;
private MavenProject project;
@@ -70,17 +70,17 @@
return this;
}
- public List getRemoteRepositories()
- {
- return remoteRepositories;
- }
-
- public ArchetypeCreationRequest setRemoteRepositories( List
remoteRepositories )
- {
- this.remoteRepositories = remoteRepositories;
-
- return this;
- }
+// public List getRemoteRepositories()
+// {
+// return remoteRepositories;
+// }
+//
+// public ArchetypeCreationRequest setRemoteRepositories( List
remoteRepositories )
+// {
+// this.remoteRepositories = remoteRepositories;
+//
+// return this;
+// }
public MavenProject getProject()
{
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java?rev=603066&r1=603065&r2=603066&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
Mon Dec 10 14:01:56 2007
@@ -205,4 +205,22 @@
return new ArchetypeCatalog();
}
}
+
+ public void
updateLocalCatalog(org.apache.maven.archetype.catalog.Archetype archetype) {
+ updateLocalCatalog(archetype,
"${user.home}/.m2/archetype-catalog.xml");
+ }
+
+ public void
updateLocalCatalog(org.apache.maven.archetype.catalog.Archetype archetype,
String path) {
+ try
+ {
+ Properties properties=new Properties();
+ properties.setProperty("file", path);
+ ArchetypeDataSource source = (ArchetypeDataSource)
archetypeSources.get( "catalog" );
+
+ source.updateCatalog(properties, archetype);
+ }
+ catch ( ArchetypeDataSourceException e )
+ {
+ }
+ }
}
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java?rev=603066&r1=603065&r2=603066&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
Mon Dec 10 14:01:56 2007
@@ -45,7 +45,7 @@
ArchetypeCatalog getArchetypeCatalog( Properties properties )
throws ArchetypeDataSourceException;
- void updateCatalog( Properties properties, Archetype archetype, Settings
settings )
+ void updateCatalog( Properties properties, Archetype archetype )
throws ArchetypeDataSourceException;
// ArchetypeDataSourceDescriptor getDescriptor();
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java?rev=603066&r1=603065&r2=603066&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
Mon Dec 10 14:01:56 2007
@@ -94,8 +94,7 @@
}
public void updateCatalog( Properties properties,
- Archetype archetype,
- Settings settings )
+ Archetype archetype )
throws ArchetypeDataSourceException
{
String s = properties.getProperty( ARCHETYPE_CATALOG_PROPERTY );
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java?rev=603066&r1=603065&r2=603066&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
Mon Dec 10 14:01:56 2007
@@ -123,7 +123,7 @@
}
}
- public void updateCatalog( Properties properties, Archetype archetype,
Settings settings )
+ public void updateCatalog( Properties properties, Archetype archetype )
throws ArchetypeDataSourceException
{
throw new ArchetypeDataSourceException( "Not supported yet." );
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=603066&r1=603065&r2=603066&view=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
Mon Dec 10 14:01:56 2007
@@ -143,6 +143,9 @@
/** @parameter expression="${testMode}" */
private boolean testMode;
+ /** @parameter expression="${packageName}" */
+ private String packageName;//Find a better way to resolve the package!!!
enforce usage of the configurator
+
public void execute()
throws
MojoExecutionException,
@@ -173,15 +176,22 @@
ArchetypeCreationRequest request = new ArchetypeCreationRequest()
.setProject( project )
+ /*Used when in interactive mode*/
.setPropertyFile( propertyFile )
.setLanguages( languages )
+ /*Should be refactored to use some ant patterns*/
.setFiltereds( filtereds )
+ /*Should be removed*/
.setIgnoreReplica( ignoreReplica )
+ /*This should be correctly handled*/
.setPreserveCData( preserveCData )
.setKeepParent( keepParent )
.setPartialArchetype( partialArchetype )
+ /*This should be used before there and use only languages and
filtereds*/
.setArchetypeRegistryFile( archetypeRegistryFile )
- .setLocalRepository( localRepository );
+ .setLocalRepository( localRepository )
+ /*this should be resolved and asked for user to verify*/
+ .setPackageName(packageName);
ArchetypeCreationResult result =
archetype.createArchetypeFromProject( request );
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java?rev=603066&r1=603065&r2=603066&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
Mon Dec 10 14:01:56 2007
@@ -20,15 +20,11 @@
package org.apache.maven.archetype.mojos;
import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.source.ArchetypeDataSource;
-import org.apache.maven.archetype.source.ArchetypeDataSourceException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.ContextEnabled;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.util.PropertyUtils;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.Iterator;
@@ -48,6 +44,9 @@
extends AbstractMojo
implements ContextEnabled
{
+ /** @component */
+ private org.apache.maven.archetype.Archetype archetyper;
+
/** @component
role="org.apache.maven.archetype.source.ArchetypeDataSource" */
private Map archetypeSources;
@@ -86,9 +85,12 @@
archetype.setArtifactId( project.getArtifactId( ) );
archetype.setVersion( project.getVersion( ) );
archetype.setDescription( project.getName( ) );
- archetype.setRepository( localRepository.toString( ) );
+// archetype.setRepository( localRepository.toString( ) );
// archetype.setGoals(project.get);
// archetype.setProperties(project.get);
+
+ archetyper.updateLocalCatalog(archetype);
+ /*
File archetypeCatalogPropertiesFile = new File( System.getProperty(
"user.home" ), ".m2/archetype-catalog.properties" );
if ( archetypeCatalogPropertiesFile.exists( ) )
@@ -125,6 +127,7 @@
{
getLog( ).debug( "Not updating wiki catalog" );
}
+ */
}
private Properties getArchetypeSourceProperties( String sourceRoleHint,
Properties archetypeCatalogProperties )
