o Adding group id and version when creating a archetype.

o Adding licenses.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163293 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Trygve Laugstol 2005-01-06 13:03:10 +00:00
parent b5add4d660
commit f5052b6d5a
11 changed files with 261 additions and 46 deletions

View File

@ -1,13 +1,25 @@
/*
* Copyright (c) 2004 Your Corporation. All Rights Reserved.
*/
package org.apache.maven.archetype;
import org.apache.maven.artifact.repository.ArtifactRepository;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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 java.util.Map;
import java.util.Set;
import java.io.File;
import org.apache.maven.artifact.repository.ArtifactRepository;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@ -23,6 +35,7 @@ public interface Archetype
String ARCHETYPE_POM = "pom.xml";
void createArchetype( String archetypeId, ArtifactRepository localRepository, Set remoteRepositories, Map parameters )
void createArchetype( String archetypeGroupId, String archetypeArtifactId, String archetypeVersion,
ArtifactRepository localRepository, Set remoteRepositories, Map parameters )
throws ArchetypeNotFoundException, ArchetypeDescriptorException, ArchetypeTemplateProcessingException;
}

View File

@ -1,8 +1,21 @@
/*
* Copyright (c) 2004 Your Corporation. All Rights Reserved.
*/
package org.apache.maven.archetype;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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.
*/
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$

View File

@ -1,8 +1,21 @@
/*
* Copyright (c) 2004 Your Corporation. All Rights Reserved.
*/
package org.apache.maven.archetype;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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.
*/
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$

View File

@ -1,8 +1,21 @@
/*
* Copyright (c) 2004 Your Corporation. All Rights Reserved.
*/
package org.apache.maven.archetype;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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.
*/
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$

View File

@ -1,27 +1,45 @@
package org.apache.maven.archetype;
import org.apache.maven.archetype.descriptor.ArchetypeDescriptor;
import org.apache.maven.archetype.descriptor.ArchetypeDescriptorBuilder;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.velocity.VelocityComponent;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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 java.io.File;
import java.io.FileWriter;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Writer;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.net.URLClassLoader;
import java.net.URL;
import org.apache.maven.archetype.descriptor.ArchetypeDescriptor;
import org.apache.maven.archetype.descriptor.ArchetypeDescriptorBuilder;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.velocity.VelocityComponent;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@ -48,20 +66,30 @@ public class DefaultArchetype
// artifactId = maven-foo-archetype
// version = latest
public void createArchetype( String archetypeId, ArtifactRepository localRepository, Set remoteRepositories, Map parameters )
public void createArchetype( String archetypeGroupId, String archetypeArtifactId, String archetypeVersion,
ArtifactRepository localRepository, Set remoteRepositories, Map parameters )
throws ArchetypeNotFoundException, ArchetypeDescriptorException, ArchetypeTemplateProcessingException
{
Artifact archetypeJar = wagonManager.createArtifact( "maven", "maven-archetype-" + archetypeId, "1.0-alpha-1-SNAPSHOT", "jar" );
// ----------------------------------------------------------------------
// Download the archetype
// ----------------------------------------------------------------------
Artifact archetypeJar =
wagonManager.createArtifact( archetypeGroupId, archetypeArtifactId, archetypeVersion, "jar" );
try
{
artifactResolver.resolve( archetypeJar, remoteRepositories, localRepository );
}
catch ( Exception e )
catch ( ArtifactResolutionException e )
{
throw new ArchetypeNotFoundException( "Cannot download archetype.", e );
}
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
String outputDirectory = (String) parameters.get( "outputDirectory" );
String packageName = (String) parameters.get( "package" );
@ -109,26 +137,32 @@ public void createArchetype( String archetypeId, ArtifactRepository localReposit
context.put( key, value );
}
ClassLoader old = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader( archetypeJarLoader );
try
{
ClassLoader old = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader( archetypeJarLoader );
processTemplate( outputDirectory, context, ARCHETYPE_POM, null );
processSources( outputDirectory, context, descriptor.getSources(), packageName );
processSources( outputDirectory, context, descriptor.getTestSources(), packageName );
Thread.currentThread().setContextClassLoader( old );
}
catch ( Exception e )
{
throw new ArchetypeTemplateProcessingException( "Error processing templates.", e );
}
finally
{
Thread.currentThread().setContextClassLoader( old );
}
}
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
protected void processSources( String outputDirectory, Context context, List sources, String packageName )
throws Exception
{

View File

@ -1,5 +1,21 @@
package org.apache.maven.archetype.descriptor;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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 java.util.ArrayList;
import java.util.List;
@ -21,7 +37,7 @@ public ArchetypeDescriptor()
resources = new ArrayList();
testSources = new ArrayList();
testSources = new ArrayList();
testResources = new ArrayList();
}

View File

@ -1,5 +1,21 @@
package org.apache.maven.archetype.descriptor;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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 java.io.Reader;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;

View File

@ -1,8 +1,21 @@
/*
* Copyright (c) 2004 Your Corporation. All Rights Reserved.
*/
package org.apache.maven.archetype.descriptor;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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.
*/
/**
* Pass over the directory containing the sources of the archetype and create
* the appropriate descriptor.

View File

@ -1,5 +1,21 @@
package org.apache.maven.archetype;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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.codehaus.plexus.PlexusTestCase;
import org.apache.maven.artifact.repository.ArtifactRepository;
@ -34,7 +50,7 @@ public void testArchetype()
parameters.put( "version", "1.0-alpha-1-SNAPSHOT" );
parameters.put( "package", "org.apache.maven.quickstart" );
parameters.put( "outputDirectory",new File( getBasedir(), "target/archetype" ).getPath() );
// ----------------------------------------------------------------------
@ -45,7 +61,7 @@ public void testArchetype()
Properties mavenProperties = new Properties();
mavenProperties.load( new FileInputStream( mavenPropertiesFile ) );
mavenProperties.load( new FileInputStream( mavenPropertiesFile ) );
ArtifactRepository localRepository = new ArtifactRepository( "local", "file://" + mavenProperties.getProperty( "maven.repo.local" ) );
@ -55,6 +71,7 @@ public void testArchetype()
remoteRepositories.add( remoteRepository );
archetype.createArchetype( "quickstart", localRepository, remoteRepositories, parameters);
archetype.createArchetype( "maven", "maven-archetype-quickstart", "1.0-alpha-1-SNAPSHOT",
localRepository, remoteRepositories, parameters);
}
}

View File

@ -1,5 +1,21 @@
package org.apache.maven.archetype.descriptor;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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 junit.framework.TestCase;
import java.io.StringReader;

View File

@ -1,5 +1,21 @@
package org.apache.maven.plugin.archetype;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* 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
*
* 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.archetype.Archetype;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractPlugin;
@ -31,6 +47,33 @@
* description=""
*
* @parameter
* name="archetypeGroupId"
* type="String"
* required="true"
* validator=""
* expression="#archetypeGroupId"
* default="maven"
* description=""
*
* @parameter
* name="archetypeArtifactId"
* type="String"
* required="true"
* validator=""
* expression="#archetypeArtifactId"
* default="maven"
* description=""
*
* @parameter
* name="archetypeVersion"
* type="String"
* required="true"
* validator=""
* expression="#archetypeVersion"
* default="maven"
* description=""
*
* @parameter
* name="groupId"
* type="String"
* required="true"
@ -73,7 +116,10 @@ public void execute( PluginExecutionRequest request, PluginExecutionResponse res
throws Exception
{
// ----------------------------------------------------------------------
// archetypeId
// archetypeGroupId
// archetypeArtifactId
// archetypeVersion
//
// localRepository
// remoteRepository
// parameters
@ -91,12 +137,17 @@ public void execute( PluginExecutionRequest request, PluginExecutionResponse res
remoteRepositories.add( remoteRepository );
String archetypeId = (String) request.getParameter( "archetypeId" );
String archetypeGroupId = (String) request.getParameter( "archetypeGroupId" );
String archetypeArtifactId = (String) request.getParameter( "archetypeArtifactId" );
String archetypeVersion = (String) request.getParameter( "archetypeVersion" );
Archetype archetype = (Archetype) request.getParameter( "archetype" );
request.getParameters().put( "outputDirectory", System.getProperty( "user.dir" ) );
archetype.createArchetype( "quickstart", localRepository, remoteRepositories, request.getParameters() );
archetype.createArchetype( archetypeGroupId, archetypeArtifactId, archetypeVersion,
localRepository, remoteRepositories, request.getParameters() );
}
}