You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/01/30 14:43:33 UTC
maven-archetype git commit: [ARCHETYPE-433] Remove unused archetype
registry stuff
Repository: maven-archetype
Updated Branches:
refs/heads/master cc7f9bc43 -> e81651025
[ARCHETYPE-433] Remove unused archetype registry stuff
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/e8165102
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/e8165102
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/e8165102
Branch: refs/heads/master
Commit: e816510255bf0f5b6bb006854f051c56195c6de6
Parents: cc7f9bc
Author: rfscholte <rf...@apache.org>
Authored: Mon Jan 30 15:43:04 2017 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Mon Jan 30 15:43:04 2017 +0100
----------------------------------------------------------------------
archetype-common/pom.xml | 4 -
.../archetype/ArchetypeCreationRequest.java | 14 --
.../common/ArchetypeRegistryManager.java | 53 -----
.../common/DefaultArchetypeRegistryManager.java | 205 -------------------
.../generator/DefaultArchetypeGenerator.java | 34 ++-
.../archetype/test/ArchetypeGenerationTest.java | 25 ++-
...ternalCatalogArchetypesVerificationTest.java | 25 ++-
archetype-models/archetype-registry/pom.xml | 59 ------
.../src/main/mdo/archetype-registry.mdo | 60 ------
.../archetype-registry/src/site/apt/index.apt | 39 ----
.../archetype-registry/src/site/site.xml | 37 ----
archetype-models/pom.xml | 1 -
.../archetype/test/ArchetyperRoundtripIT.java | 27 ++-
.../test/ArchetyperRoundtripWithProxyIT.java | 27 ++-
.../archetype/test/RoundtripMultiModuleIT.java | 27 ++-
.../mojos/CreateArchetypeFromProjectMojo.java | 9 +-
.../DefaultArchetypeGenerationConfigurator.java | 35 +++-
17 files changed, 171 insertions(+), 510 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/pom.xml
----------------------------------------------------------------------
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 0c9c7cb..486dc6a 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -57,10 +57,6 @@
<artifactId>archetype-descriptor</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-registry</artifactId>
- </dependency>
- <dependency>
<groupId>net.sourceforge.jchardet</groupId>
<artifactId>jchardet</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
index 2617da5..e85e6a8 100644
--- a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
+++ b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
@@ -48,8 +48,6 @@ public class ArchetypeCreationRequest
private boolean partialArchetype = false;
- private File archetypeRegistryFile;
-
private String packageName;
private Properties properties;
@@ -178,18 +176,6 @@ public class ArchetypeCreationRequest
return this;
}
- public File getArchetypeRegistryFile()
- {
- return archetypeRegistryFile;
- }
-
- public ArchetypeCreationRequest setArchetypeRegistryFile( File archetypeRegistryFile )
- {
- this.archetypeRegistryFile = archetypeRegistryFile;
-
- return this;
- }
-
public Properties getProperties()
{
return properties;
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
deleted file mode 100644
index e178f09..0000000
--- a/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.archetype.common;
-
-/*
- * 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.archetype.registry.ArchetypeRegistry;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.List;
-
-public interface ArchetypeRegistryManager
-{
- String ROLE = ArchetypeRegistryManager.class.getName();
-
- List<String> getFilteredExtensions( String archetypeFilteredExtentions, File archetypeRegistryFile )
- throws IOException;
-
- List<String> getLanguages( String archetypeLanguages, File archetypeRegistryFile )
- throws IOException;
-
- ArchetypeRegistry readArchetypeRegistry( Reader reader )
- throws IOException, XmlPullParserException;
-
- ArchetypeRegistry readArchetypeRegistry( File archetypeRegistryFile )
- throws IOException, XmlPullParserException;
-
- void writeArchetypeRegistry( File archetypeRegistryFile, ArchetypeRegistry archetypeRegistry )
- throws IOException;
-
- ArchetypeRegistry getDefaultArchetypeRegistry();
-
- ArtifactRepository createRepository( String url, String repositoryId );
-}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
deleted file mode 100644
index 14a2944..0000000
--- a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.apache.maven.archetype.common;
-
-/*
- * 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 java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-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;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.WriterFactory;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-@Component( role = ArchetypeRegistryManager.class )
-public class DefaultArchetypeRegistryManager
- extends AbstractLogEnabled
- implements ArchetypeRegistryManager
-{
-
- /**
- * Determines whether the layout is legacy or not.
- */
- @Requirement
- private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
-
- public List<String> getFilteredExtensions( String archetypeFilteredExtentions, File archetypeRegistryFile )
- throws IOException
- {
- List<String> filteredExtensions = new ArrayList<String>();
-
- if ( StringUtils.isNotEmpty( archetypeFilteredExtentions ) )
- {
- filteredExtensions.addAll( Arrays.asList( StringUtils.split( archetypeFilteredExtentions, "," ) ) );
- }
-
- try
- {
- ArchetypeRegistry registry = readArchetypeRegistry( archetypeRegistryFile );
-
- filteredExtensions.addAll( registry.getFilteredExtensions() );
- }
- catch ( IOException e )
- {
- getLogger().warn( "Cannot read ~/.m2/archetype.xml" );
- }
- catch ( XmlPullParserException e )
- {
- getLogger().warn( "Cannot read ~/.m2/archetype.xml" );
- }
-
- if ( filteredExtensions.isEmpty() )
- {
- filteredExtensions.addAll( Constants.DEFAULT_FILTERED_EXTENSIONS );
- }
-
- return filteredExtensions;
- }
-
- public List<String> getLanguages( String archetypeLanguages, File archetypeRegistryFile )
- throws IOException
- {
- List<String> languages = new ArrayList<String>();
-
- if ( StringUtils.isNotEmpty( archetypeLanguages ) )
- {
- languages.addAll( Arrays.asList( StringUtils.split( archetypeLanguages, "," ) ) );
- }
-
- try
- {
- ArchetypeRegistry registry = readArchetypeRegistry( archetypeRegistryFile );
-
- languages.addAll( registry.getLanguages() );
- }
- catch ( IOException e )
- {
- getLogger().warn( "Can not read ~/.m2/archetype.xml" );
- }
- catch ( XmlPullParserException e )
- {
- getLogger().warn( "Can not read ~/.m2/archetype.xml" );
- }
-
- if ( languages.isEmpty() )
- {
- languages.addAll( Constants.DEFAULT_LANGUAGES );
- }
-
- return languages;
- }
-
- public ArchetypeRegistry readArchetypeRegistry( File archetypeRegistryFile )
- throws IOException, XmlPullParserException
- {
- if ( !archetypeRegistryFile.exists() )
- {
- return getDefaultArchetypeRegistry();
- }
- else
- {
- return readArchetypeRegistry( ReaderFactory.newXmlReader( archetypeRegistryFile ) );
- }
- }
-
- public ArchetypeRegistry readArchetypeRegistry( Reader reader )
- throws IOException, XmlPullParserException
- {
- ArchetypeRegistryXpp3Reader xpp3Reader = new ArchetypeRegistryXpp3Reader();
-
- try
- {
- return xpp3Reader.read( reader );
- }
- finally
- {
- IOUtil.close( reader );
- }
- }
-
- public void writeArchetypeRegistry( File archetypeRegistryFile, ArchetypeRegistry archetypeRegistry )
- throws IOException
- {
- ArchetypeRegistryXpp3Writer writer = new ArchetypeRegistryXpp3Writer();
- Writer out = WriterFactory.newXmlWriter( archetypeRegistryFile );
-
- try
- {
- writer.write( out, archetypeRegistry );
- }
- finally
- {
- IOUtil.close( out );
- }
- }
-
- /**
- * Code stealed from MavenArchetypeMojo
- * (org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha4).
- */
- public ArtifactRepository createRepository( String url, String repositoryId )
- {
-
-
- // snapshots vs releases
- // offline = to turning the update policy off
-
- // TODO: we'll need to allow finer grained creation of repositories but this will do for now
-
- String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
-
- String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
-
- ArtifactRepositoryPolicy snapshotsPolicy =
- new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-
- ArtifactRepositoryPolicy releasesPolicy =
- new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-
- return new MavenArtifactRepository( repositoryId, url, defaultArtifactRepositoryLayout, snapshotsPolicy,
- releasesPolicy );
- }
-
- public ArchetypeRegistry getDefaultArchetypeRegistry()
- {
- ArchetypeRegistry registry = new ArchetypeRegistry();
-
- registry.getLanguages().addAll( Constants.DEFAULT_LANGUAGES );
-
- registry.getFilteredExtensions().addAll( Constants.DEFAULT_FILTERED_EXTENSIONS );
-
- return registry;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
index 9d60978..fba7e5e 100644
--- a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
+++ b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
@@ -23,12 +23,14 @@ import org.apache.maven.archetype.old.OldArchetype;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
import org.apache.maven.archetype.common.ArchetypeArtifactManager;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.archetype.exception.ArchetypeException;
import org.apache.maven.archetype.exception.ArchetypeGenerationFailure;
import org.apache.maven.archetype.exception.ArchetypeNotDefined;
import org.apache.maven.archetype.exception.UnknownArchetype;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -46,8 +48,11 @@ public class DefaultArchetypeGenerator
extends AbstractLogEnabled
implements ArchetypeGenerator
{
+ /**
+ * Determines whether the layout is legacy or not.
+ */
@Requirement
- private ArchetypeRegistryManager archetypeRegistryManager;
+ private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
@Requirement
private ArchetypeArtifactManager archetypeArtifactManager;
@@ -72,7 +77,7 @@ public class DefaultArchetypeGenerator
if ( request != null && request.getArchetypeRepository() != null )
{
remoteRepo =
- archetypeRegistryManager.createRepository( request.getArchetypeRepository(),
+ createRepository( request.getArchetypeRepository(),
request.getArchetypeArtifactId() + "-repo" );
repos.add( remoteRepo );
@@ -186,4 +191,27 @@ public class DefaultArchetypeGenerator
result.setCause( ex );
}
}
+
+ private ArtifactRepository createRepository( String url, String repositoryId )
+ {
+
+
+ // snapshots vs releases
+ // offline = to turning the update policy off
+
+ // TODO: we'll need to allow finer grained creation of repositories but this will do for now
+
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ return new MavenArtifactRepository( repositoryId, url, defaultArtifactRepositoryLayout, snapshotsPolicy,
+ releasesPolicy );
+ }
}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
index 24a9aa8..f92c4da 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
@@ -22,8 +22,10 @@ package org.apache.maven.archetype.test;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
@@ -49,9 +51,7 @@ public class ArchetypeGenerationTest
// In the embedder the localRepository will be retrieved from the embedder itself and users won't
// have to go through this muck.
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
-
- ArtifactRepository localRepository = registryManager.createRepository(
+ ArtifactRepository localRepository = createRepository(
new File( getBasedir(), "target/test-classes/repositories/local" )
.toURI().toURL().toExternalForm(), "local-repo" );
@@ -113,5 +113,22 @@ public class ArchetypeGenerationTest
fail( result.getCause().getMessage() );
}
}
+
+ private ArtifactRepository createRepository( String url, String repositoryId )
+ {
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
+ releasesPolicy );
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
index a40e4cc..ee88487 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
@@ -26,8 +26,10 @@ import org.apache.maven.archetype.ArchetypeGenerationResult;
import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
@@ -47,9 +49,7 @@ public class InternalCatalogArchetypesVerificationTest
public void testInternalCatalog()
throws Exception
{
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
-
- ArtifactRepository localRepository = registryManager.createRepository( new File( getBasedir(),
+ ArtifactRepository localRepository = createRepository( new File( getBasedir(),
"target/test-classes/repositories/local" ).toURI().toURL().toExternalForm(),
"local-repo");
@@ -99,4 +99,21 @@ public class InternalCatalogArchetypesVerificationTest
count++;
}
}
+
+ private ArtifactRepository createRepository( String url, String repositoryId )
+ {
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
+ releasesPolicy );
+ }
+
}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-models/archetype-registry/pom.xml
----------------------------------------------------------------------
diff --git a/archetype-models/archetype-registry/pom.xml b/archetype-models/archetype-registry/pom.xml
deleted file mode 100644
index 6117b27..0000000
--- a/archetype-models/archetype-registry/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
--->
-
-<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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-models</artifactId>
- <version>2.5-SNAPSHOT</version>
- </parent>
-
- <artifactId>archetype-registry</artifactId>
- <packaging>jar</packaging>
-
- <name>Maven Archetype Registry Model</name>
- <description>Core Archetype Registry Model.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <models>
- <model>src/main/mdo/archetype-registry.mdo</model>
- </models>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-models/archetype-registry/src/main/mdo/archetype-registry.mdo
----------------------------------------------------------------------
diff --git a/archetype-models/archetype-registry/src/main/mdo/archetype-registry.mdo b/archetype-models/archetype-registry/src/main/mdo/archetype-registry.mdo
deleted file mode 100644
index 9deceb6..0000000
--- a/archetype-models/archetype-registry/src/main/mdo/archetype-registry.mdo
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
- xml.namespace="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-registry/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/archetype-registry-${version}.xsd">
- <id>archetype-registry</id>
- <name>ArchetypeRegistry</name>
- <description>
- <![CDATA[
- <p>This is a reference for the Archetype Registry descriptor.</p>
- <p>The registry is stored in <code>~/.m2/archetype.xml</code> file.</p>]]>
- </description>
-
- <defaults>
- <default>
- <key>package</key>
- <value>org.apache.maven.archetype.registry</value>
- </default>
- </defaults>
-
- <classes>
- <class rootElement="true" xml.tagName="archetype-registry">
- <name>ArchetypeRegistry</name>
- <fields>
- <field>
- <name>Languages</name>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- <field>
- <name>FilteredExtensions</name>
- <association>
- <type>String</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
- </fields>
- </class>
- </classes>
-</model>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-models/archetype-registry/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/archetype-models/archetype-registry/src/site/apt/index.apt b/archetype-models/archetype-registry/src/site/apt/index.apt
deleted file mode 100644
index 0985922..0000000
--- a/archetype-models/archetype-registry/src/site/apt/index.apt
+++ /dev/null
@@ -1,39 +0,0 @@
- -----
- Maven Archetype Registry Descriptor Model
- -----
- Herv� Boutemy
- -----
- 2011-08-21
- -----
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/guides/mini/guide-apt-format.html
-
-Maven Archetype Registry Descriptor Model
-
- This is strictly the model for Maven Archetype Registry Descriptor.
-
- The following are generated from this model:
-
- * {{{./apidocs/index.html}Java sources}} with Reader and Writers for the Xpp3 XML parser
-
- * A {{{./archetype-registry.html}Descriptor Reference}}
-
- * An XSD referenced in the {{{./archetype-registry.html}Descriptor Reference}}.
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-models/archetype-registry/src/site/site.xml
----------------------------------------------------------------------
diff --git a/archetype-models/archetype-registry/src/site/site.xml b/archetype-models/archetype-registry/src/site/site.xml
deleted file mode 100644
index 5bba62c..0000000
--- a/archetype-models/archetype-registry/src/site/site.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
- <body>
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- <item name="Archetype Registry Reference" href="archetype-registry.html"/>
- <item name="JavaDocs" href="apidocs/index.html"/>
- <item name="Source Xref" href="xref/index.html"/>
- <!--item name="FAQ" href="faq.html"/-->
- </menu>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
- </body>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-models/pom.xml
----------------------------------------------------------------------
diff --git a/archetype-models/pom.xml b/archetype-models/pom.xml
index 440a739..c856060 100644
--- a/archetype-models/pom.xml
+++ b/archetype-models/pom.xml
@@ -27,7 +27,6 @@
<modules>
<module>archetype-catalog</module>
<module>archetype-descriptor</module>
- <module>archetype-registry</module>
</modules>
<build>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
----------------------------------------------------------------------
diff --git a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
index 12ff295..e46afaf 100644
--- a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
+++ b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
@@ -33,10 +33,11 @@ import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Model;
-import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
@@ -65,11 +66,9 @@ public class ArchetyperRoundtripIT
ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
-
ProjectBuilder projectBuilder = lookup( ProjectBuilder.class );
- ArtifactRepository localRepository = registryManager.createRepository( new File( getBasedir(),
+ ArtifactRepository localRepository = createRepository( new File( getBasedir(),
"target" + File.separator
+ "test-classes"
+ File.separator
@@ -78,7 +77,7 @@ public class ArchetyperRoundtripIT
+ "local" ).toURI().toURL().toExternalForm(),
"local-repo" );
- ArtifactRepository centralRepository = registryManager.createRepository( new File( getBasedir(),
+ ArtifactRepository centralRepository = createRepository( new File( getBasedir(),
"target" + File.separator
+ "test-classes"
+ File.separator
@@ -257,4 +256,20 @@ public class ArchetyperRoundtripIT
server.stop();
}
+
+ private ArtifactRepository createRepository( String url, String repositoryId )
+ {
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
+ releasesPolicy );
+ }
}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
----------------------------------------------------------------------
diff --git a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
index 73b9411..73ee616 100644
--- a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
+++ b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
@@ -35,8 +35,10 @@ import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Model;
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -71,11 +73,9 @@ public class ArchetyperRoundtripWithProxyIT
{
ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
-
ProjectBuilder projectBuilder = lookup( ProjectBuilder.class );
- ArtifactRepository localRepository = registryManager.createRepository( new File( getBasedir(),
+ ArtifactRepository localRepository = createRepository( new File( getBasedir(),
"target" + File.separator
+ "test-classes"
+ File.separator
@@ -83,7 +83,7 @@ public class ArchetyperRoundtripWithProxyIT
+ File.separator
+ "local" ).toURI().toURL().toExternalForm(),
"local-repo" );
- ArtifactRepository centralRepository = registryManager.createRepository( new File( getBasedir(),
+ ArtifactRepository centralRepository = createRepository( new File( getBasedir(),
"target" + File.separator
+ "test-classes"
+ File.separator
@@ -254,4 +254,21 @@ public class ArchetyperRoundtripWithProxyIT
proxyServer.stop();
server.stop();
}
+
+ private ArtifactRepository createRepository( String url, String repositoryId )
+ {
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
+ releasesPolicy );
+ }
+
}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java
----------------------------------------------------------------------
diff --git a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java
index 0ede00a..d777518 100644
--- a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java
+++ b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java
@@ -36,9 +36,11 @@ import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.archetype.common.Constants;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Model;
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -66,11 +68,9 @@ public class RoundtripMultiModuleIT
ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
-
ProjectBuilder projectBuilder = lookup( ProjectBuilder.class );
- ArtifactRepository localRepository = registryManager.createRepository( new File( getBasedir(),
+ ArtifactRepository localRepository = createRepository( new File( getBasedir(),
"target" + File.separator
+ "test-classes"
+ File.separator
@@ -79,7 +79,7 @@ public class RoundtripMultiModuleIT
+ "local" ).toURI().toURL().toExternalForm(),
"local-repo" );
- ArtifactRepository centralRepository = registryManager.createRepository( new File( getBasedir(),
+ ArtifactRepository centralRepository = createRepository( new File( getBasedir(),
"target" + File.separator
+ "test-classes"
+ File.separator
@@ -324,4 +324,21 @@ public class RoundtripMultiModuleIT
assertTrue( "resolveFile " + resolveFile + " !exists", resolveFile.exists() );
assertTrue( "resolveFile " + resolveFile + " !isFile", resolveFile.isFile() );
}
+
+ private ArtifactRepository createRepository( String url, String repositoryId )
+ {
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
+ releasesPolicy );
+ }
+
}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
----------------------------------------------------------------------
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
index a0b6076..e57726f 100644
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
@@ -128,12 +128,6 @@ public class CreateArchetypeFromProjectMojo
private String archetypeLanguages;
/**
- * The location of the registry file.
- */
- @Parameter( defaultValue = "${user.home}/.m2/archetype.xml" )
- private File archetypeRegistryFile;
-
- /**
* Velocity templates encoding.
*/
@Parameter( property = "archetype.encoding", defaultValue = "UTF-8" )
@@ -256,8 +250,7 @@ public class CreateArchetypeFromProjectMojo
/* Should be refactored to use some ant patterns */.setFiltereds( filtereds )
/* 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 ).setPostPhase(
archetypePostPhase ).setOutputDirectory( outputDirectory );
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
----------------------------------------------------------------------
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
index 5b3ef04..7abd59f 100644
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
@@ -21,7 +21,6 @@ package org.apache.maven.archetype.ui.generation;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.common.ArchetypeArtifactManager;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.archetype.common.Constants;
import org.apache.maven.archetype.exception.ArchetypeGenerationConfigurationFailure;
import org.apache.maven.archetype.exception.ArchetypeNotConfigured;
@@ -32,6 +31,9 @@ import org.apache.maven.archetype.ui.ArchetypeConfiguration;
import org.apache.maven.archetype.ui.ArchetypeDefinition;
import org.apache.maven.archetype.ui.ArchetypeFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.context.Context;
@@ -68,8 +70,11 @@ public class DefaultArchetypeGenerationConfigurator
@Requirement
private ArchetypeGenerationQueryer archetypeGenerationQueryer;
+ /**
+ * Determines whether the layout is legacy or not.
+ */
@Requirement
- private ArchetypeRegistryManager archetypeRegistryManager;
+ private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
public void setArchetypeArtifactManager( ArchetypeArtifactManager archetypeArtifactManager )
{
@@ -104,7 +109,7 @@ public class DefaultArchetypeGenerationConfigurator
}
if ( request.getArchetypeRepository() != null )
{
- archetypeRepository = archetypeRegistryManager.createRepository( request.getArchetypeRepository(),
+ archetypeRepository = createRepository( request.getArchetypeRepository(),
ad.getArtifactId() + "-repo" );
repositories.add( archetypeRepository );
}
@@ -433,4 +438,28 @@ public class DefaultArchetypeGenerationConfigurator
return left.compareTo( right );
}
}
+
+ private ArtifactRepository createRepository( String url, String repositoryId )
+ {
+
+
+ // snapshots vs releases
+ // offline = to turning the update policy off
+
+ // TODO: we'll need to allow finer grained creation of repositories but this will do for now
+
+ String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+
+ String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
+
+ return new MavenArtifactRepository( repositoryId, url, defaultArtifactRepositoryLayout, snapshotsPolicy,
+ releasesPolicy );
+ }
+
}