Add new testing module final.
These tests:
- maven-archetype-plugin/src/it/create-from-project
- DefaultArchetypeCreatorTest.java
- ArchetyperRoundtripTest.java
- ArchetyperRoundtripWithProxyTest.java
- RoundtripMultiModuleTest.java
require the presence of
org.apache.maven.plugins:maven-archetype-plugin:${project.version}.
That's why we can't keep them in the archetype-common or maven-archetype-plugin
modules, and thus
the reason to introduce a new module in the archetype-testing module. The new
module archetype-final
depends on both archetype-common and maven-archetype-plugin so it gets executed
last and contains
tests that require everything else to be built before that.
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/8e0fe06a
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/8e0fe06a
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/8e0fe06a
Branch: refs/heads/master
Commit: 8e0fe06a406246f5a5a3b0aeeaa36c09f305b3ac
Parents: 83e76a5
Author: Petar Tahchiev <[email protected]>
Authored: Mon Aug 15 11:21:45 2016 +0300
Committer: Petar Tahchiev <[email protected]>
Committed: Mon Aug 15 11:21:45 2016 +0300
----------------------------------------------------------------------
archetype-common/pom.xml | 29 +-
.../creator/DefaultArchetypeCreatorTest.java | 498 -------------------
.../archetype/test/ArchetyperRoundtripTest.java | 245 ---------
.../test/ArchetyperRoundtripWithProxyTest.java | 246 ---------
.../test/RoundtripMultiModuleTest.java | 317 ------------
.../archetype.properties.sample | 8 -
.../change-file-with-property/pom.xml.sample | 34 --
.../src/main/java/App.java | 4 -
.../create-1/archetype.properties.sample | 8 -
.../resources/projects/create-1/pom.xml.sample | 34 --
.../src/main/java/archetype/subfolder1/App.java | 2 -
.../src/main/java/archetype/subfolder2/App.java | 1 -
.../src/main/resources/log4j.properties | 1 -
.../create-1/src/main/webapp/WEB-INF/web.xml | 3 -
.../projects/create-1/src/site/site.xml | 3 -
.../src/test/java/archetype/test/AppTest.java | 1 -
.../src/test/resources/log4j.properties | 1 -
.../create-2/archetype.properties.sample | 8 -
.../resources/projects/create-2/pom.xml.sample | 37 --
.../apache/maven/archetype/subfolder1/App.java | 2 -
.../apache/maven/archetype/subfolder2/App.java | 1 -
.../src/it-test/resources/log4j.properties | 1 -
.../apache/maven/archetype/subfolder1/App.java | 2 -
.../apache/maven/archetype/subfolder2/App.java | 1 -
.../src/main/resources/log4j.properties | 1 -
.../create-2/src/main/webapp/WEB-INF/web.xml | 3 -
.../projects/create-2/src/site/site.xml | 3 -
.../apache/maven/archetype/test/AppTest.java | 1 -
.../src/test/resources/log4j.properties | 1 -
.../projects/create-2/subModule/pom.xml | 37 --
.../test/resources/projects/create-3/.classpath | 2 -
.../projects/create-3/application/pom.xml | 31 --
.../application/src/it-test/java/ItTestAll.java | 2 -
.../apache/maven/archetype/test/ItTest1.java | 3 -
.../src/it-test/resources/ItTest1Result.txt | 3 -
.../application/src/main/java/Main.java | 2 -
.../archetype/test/application/Application.java | 3 -
.../test/application/audios/Application.ogg | 1 -
.../test/application/images/Application.png | 1 -
.../src/main/resources/META-INF/MANIFEST.MF | 2 -
.../src/main/resources/log4j.properties | 2 -
.../archetype/test/application/some/Gro.groovy | 2 -
.../application/src/main/resources/splash.png | 1 -
.../application/src/test/java/TestAll.java | 2 -
.../test/application/ApplicationTest.java | 3 -
.../create-3/archetype.properties.sample | 10 -
.../resources/projects/create-3/libs/pom.xml | 35 --
.../projects/create-3/libs/prj-a/pom.xml | 31 --
.../libs/prj-a/src/main/mdo/descriptor.xml | 2 -
.../projects/create-3/libs/prj-b/pom.xml | 31 --
.../maven/archetype/test/com/Component.java | 3 -
.../maven/archetype/test/com/package.html | 2 -
.../archetype/test/common/ComponentTest.java | 3 -
.../resources/projects/create-3/pom.xml.sample | 31 --
.../resources/projects/create-3/profiles.xml | 4 -
.../projects/create-3/src/site/apt/index.apt | 2 -
.../create-3/src/site/resources/site.png | 1 -
.../projects/create-3/src/site/site.xml | 2 -
.../create-4/archetype.properties.sample | 8 -
.../resources/projects/create-4/pom.xml.sample | 39 --
.../projects/create-4/subModuleEAR/pom.xml | 65 ---
.../projects/create-4/subModuleWar/pom.xml | 38 --
.../create-5/archetype.properties.sample | 2 -
.../test/resources/projects/create-5/dummy.file | 0
.../resources/projects/create-5/pom.xml.sample | 46 --
.../exclude-patterns/.toexclude/dummy.file | 34 --
.../archetype.properties.sample | 9 -
.../exclude-patterns/nottoexclude/dummy.file | 0
.../projects/exclude-patterns/pom.xml.sample | 34 --
.../archetype.properties.sample | 8 -
.../pom.xml.sample | 34 --
.../src/main/csharp/filewithnoextension | 0
.../projects/roundtrip-1-project/pom.xml | 38 --
.../main/java/org/apache/maven/test/App.java | 31 --
.../java/org/apache/maven/test/AppTest.java | 38 --
.../projects/roundtrip-2-project/pom.xml | 38 --
.../main/java/org/apache/maven/test/App.java | 13 -
.../java/org/apache/maven/test/AppTest.java | 38 --
.../projects/roundtrip-multi/.checkstyle | 1 -
.../projects/roundtrip-multi/.classpath | 2 -
.../resources/projects/roundtrip-multi/pom.xml | 18 -
.../roundtrip-multi/proficio-api/.checkstyle | 1 -
.../roundtrip-multi/proficio-api/.classpath | 2 -
.../roundtrip-multi/proficio-api/pom.xml | 21 -
.../main/java/com/company/proficio/api/Api.java | 0
.../roundtrip-multi/proficio-cli/.checkstyle | 1 -
.../roundtrip-multi/proficio-cli/.classpath | 2 -
.../roundtrip-multi/proficio-cli/pom.xml | 31 --
.../main/java/com/company/proficio/cli/Cli.java | 0
.../roundtrip-multi/proficio-core/.checkstyle | 1 -
.../roundtrip-multi/proficio-core/.classpath | 2 -
.../roundtrip-multi/proficio-core/pom.xml | 21 -
.../java/com/company/proficio/core/Core.java | 0
.../roundtrip-multi/proficio-model/.checkstyle | 1 -
.../roundtrip-multi/proficio-model/.classpath | 2 -
.../roundtrip-multi/proficio-model/pom.xml | 13 -
.../java/org/company/proficio/model/Model.java | 0
.../roundtrip-multi/proficio-stores/pom.xml | 19 -
.../proficio-store-memory/.checkstyle | 1 -
.../proficio-store-memory/.classpath | 2 -
.../proficio-store-memory/pom.xml | 21 -
.../company/proficio/store/memory/Memory.java | 0
.../proficio-store-xstream/.checkstyle | 1 -
.../proficio-store-xstream/.classpath | 2 -
.../proficio-store-xstream/pom.xml | 21 -
.../company/proficio/store/xstream/XStream.java | 0
.../projects/roundtrip-multi/src/site/site.xml | 0
archetype-testing/archetype-final/pom.xml | 180 +++++++
.../it/create-from-project/archetype.properties | 1 +
.../it/create-from-project/invoker.properties | 1 +
.../src/it/create-from-project/pom.xml | 30 ++
.../src/main/java/foo/bar/App.java | 32 ++
.../src/it/create-from-project/verify.bsh | 38 ++
.../archetype-final/src/it/settings.xml | 55 ++
.../META-INF/maven/archetype-metadata.xml | 92 ++++
.../META-INF/maven/archetypes/basic/pom.xml | 27 +
.../basic-1.0/archetype-resources/pom.xml | 43 ++
.../archetype-resources/src/main/c/App.c | 12 +
.../archetype-resources/src/main/java/App.java | 12 +
.../src/main/java/inner/package/App2.java | 12 +
.../archetype-resources/src/main/mdo/App.mdo | 12 +
.../src/main/resources/App.properties | 12 +
.../main/resources/inner/dir/App2.properties | 12 +
.../archetype-resources/src/test/c/AppTest.c | 12 +
.../src/test/java/AppTest.java | 12 +
.../src/test/mdo/AppTest.mdo | 12 +
.../src/test/resources/AppTest.properties | 12 +
.../META-INF/maven/archetype-metadata.xml | 121 +++++
.../META-INF/maven/archetypes/fileset/pom.xml | 27 +
.../fileset-1.0/archetype-resources/pom.xml | 38 ++
.../archetype-resources/profiles.xml | 13 +
.../archetype-resources/src/main/java/App.java | 13 +
.../archetype-resources/src/main/java/App.ogg | 13 +
.../src/main/java/inner/package/App2.java | 13 +
.../src/main/resources/App.properties | 13 +
.../src/main/resources/__artifactId__/touch.txt | 13 +
.../resources/__rootArtifactId__/touch_root.txt | 13 +
.../src/main/resources/some-dir/App.png | 13 +
.../archetype-resources/src/site/apt/usage.apt | 13 +
.../archetype-resources/src/site/site.xml | 13 +
.../archetype-resources/subproject/pom.xml | 44 ++
.../subproject/src/main/java/App.java | 13 +
.../subproject/subsubproject/pom.xml | 40 ++
.../subsubproject/src/main/java/App.java | 13 +
...aryProperty-__property-with-default-1__.java | 14 +
...-property__-__property-with-default-2__.java | 14 +
...me__rootArtifactId__Class__artifactId__.java | 14 +
.../META-INF/archetype-post-generate.groovy | 10 +
.../META-INF/maven/archetype-metadata.xml | 121 +++++
.../archetypes/fileset_with_postscript/pom.xml | 27 +
.../archetype-resources/pom.xml | 38 ++
.../archetype-resources/profiles.xml | 13 +
.../archetype-resources/src/main/java/App.java | 13 +
.../archetype-resources/src/main/java/App.ogg | 13 +
.../src/main/java/ToDelete.java | 1 +
.../src/main/java/inner/package/App2.java | 13 +
.../src/main/resources/App.properties | 13 +
.../src/main/resources/__artifactId__/touch.txt | 13 +
.../resources/__rootArtifactId__/touch_root.txt | 13 +
.../src/main/resources/some-dir/App.png | 13 +
.../archetype-resources/src/site/apt/usage.apt | 13 +
.../archetype-resources/src/site/site.xml | 13 +
.../archetype-resources/subproject/pom.xml | 44 ++
.../subproject/src/main/java/App.java | 13 +
.../subproject/subsubproject/pom.xml | 40 ++
.../subsubproject/src/main/java/App.java | 13 +
...aryProperty-__property-with-default-1__.java | 14 +
...-property__-__property-with-default-2__.java | 14 +
...me__rootArtifactId__Class__artifactId__.java | 14 +
.../archetypes/old-1.0/META-INF/archetype.xml | 31 ++
.../META-INF/maven/archetypes/old/pom.xml | 27 +
.../old-1.0/archetype-resources/pom.xml | 39 ++
.../archetype-resources/src/main/java/App.java | 4 +
.../src/main/resources/App.properties | 4 +
.../archetype-resources/src/site/site.xml | 4 +
.../META-INF/maven/archetype-metadata.xml | 37 ++
.../META-INF/maven/archetypes/partial/pom.xml | 27 +
.../partial-1.0/archetype-resources/pom.xml | 61 +++
.../archetype-resources/src/main/java/App.java | 4 +
.../src/test/java/AppTest.java | 4 +
.../META-INF/maven/archetype-metadata.xml | 55 ++
.../META-INF/maven/archetypes/site/pom.xml | 27 +
.../site-1.0/archetype-resources/pom.xml | 33 ++
.../archetype-resources/src/site/apt/test.apt | 12 +
.../archetype-resources/src/site/site.xml | 12 +
.../creator/DefaultArchetypeCreatorTest.java | 498 +++++++++++++++++++
.../archetype/test/ArchetyperRoundtripTest.java | 245 +++++++++
.../test/ArchetyperRoundtripWithProxyTest.java | 246 +++++++++
.../test/RoundtripMultiModuleTest.java | 317 ++++++++++++
.../archetype.properties.sample | 8 +
.../change-file-with-property/pom.xml.sample | 34 ++
.../src/main/java/App.java | 4 +
.../create-1/archetype.properties.sample | 8 +
.../resources/projects/create-1/pom.xml.sample | 34 ++
.../src/main/java/archetype/subfolder1/App.java | 2 +
.../src/main/java/archetype/subfolder2/App.java | 1 +
.../src/main/resources/log4j.properties | 1 +
.../create-1/src/main/webapp/WEB-INF/web.xml | 3 +
.../projects/create-1/src/site/site.xml | 3 +
.../src/test/java/archetype/test/AppTest.java | 1 +
.../src/test/resources/log4j.properties | 1 +
.../create-2/archetype.properties.sample | 8 +
.../resources/projects/create-2/pom.xml.sample | 37 ++
.../apache/maven/archetype/subfolder1/App.java | 2 +
.../apache/maven/archetype/subfolder2/App.java | 1 +
.../src/it-test/resources/log4j.properties | 1 +
.../apache/maven/archetype/subfolder1/App.java | 2 +
.../apache/maven/archetype/subfolder2/App.java | 1 +
.../src/main/resources/log4j.properties | 1 +
.../create-2/src/main/webapp/WEB-INF/web.xml | 3 +
.../projects/create-2/src/site/site.xml | 3 +
.../apache/maven/archetype/test/AppTest.java | 1 +
.../src/test/resources/log4j.properties | 1 +
.../projects/create-2/subModule/pom.xml | 37 ++
.../test/resources/projects/create-3/.classpath | 2 +
.../projects/create-3/application/pom.xml | 31 ++
.../application/src/it-test/java/ItTestAll.java | 2 +
.../apache/maven/archetype/test/ItTest1.java | 3 +
.../src/it-test/resources/ItTest1Result.txt | 3 +
.../application/src/main/java/Main.java | 2 +
.../archetype/test/application/Application.java | 3 +
.../test/application/audios/Application.ogg | 1 +
.../test/application/images/Application.png | 1 +
.../src/main/resources/META-INF/MANIFEST.MF | 2 +
.../src/main/resources/log4j.properties | 2 +
.../archetype/test/application/some/Gro.groovy | 2 +
.../application/src/main/resources/splash.png | 1 +
.../application/src/test/java/TestAll.java | 2 +
.../test/application/ApplicationTest.java | 3 +
.../create-3/archetype.properties.sample | 10 +
.../resources/projects/create-3/libs/pom.xml | 35 ++
.../projects/create-3/libs/prj-a/pom.xml | 31 ++
.../libs/prj-a/src/main/mdo/descriptor.xml | 2 +
.../projects/create-3/libs/prj-b/pom.xml | 31 ++
.../maven/archetype/test/com/Component.java | 3 +
.../maven/archetype/test/com/package.html | 2 +
.../archetype/test/common/ComponentTest.java | 3 +
.../resources/projects/create-3/pom.xml.sample | 31 ++
.../resources/projects/create-3/profiles.xml | 4 +
.../projects/create-3/src/site/apt/index.apt | 2 +
.../create-3/src/site/resources/site.png | 1 +
.../projects/create-3/src/site/site.xml | 2 +
.../create-4/archetype.properties.sample | 8 +
.../resources/projects/create-4/pom.xml.sample | 39 ++
.../projects/create-4/subModuleEAR/pom.xml | 65 +++
.../projects/create-4/subModuleWar/pom.xml | 38 ++
.../create-5/archetype.properties.sample | 2 +
.../test/resources/projects/create-5/dummy.file | 0
.../resources/projects/create-5/pom.xml.sample | 46 ++
.../exclude-patterns/.toexclude/dummy.file | 34 ++
.../archetype.properties.sample | 9 +
.../exclude-patterns/nottoexclude/dummy.file | 0
.../projects/exclude-patterns/pom.xml.sample | 34 ++
.../archetype.properties.sample | 8 +
.../pom.xml.sample | 34 ++
.../src/main/csharp/filewithnoextension | 0
.../projects/roundtrip-1-project/pom.xml | 38 ++
.../main/java/org/apache/maven/test/App.java | 31 ++
.../java/org/apache/maven/test/AppTest.java | 38 ++
.../projects/roundtrip-2-project/pom.xml | 38 ++
.../main/java/org/apache/maven/test/App.java | 13 +
.../java/org/apache/maven/test/AppTest.java | 38 ++
.../projects/roundtrip-multi/.checkstyle | 1 +
.../projects/roundtrip-multi/.classpath | 2 +
.../resources/projects/roundtrip-multi/pom.xml | 18 +
.../roundtrip-multi/proficio-api/.checkstyle | 1 +
.../roundtrip-multi/proficio-api/.classpath | 2 +
.../roundtrip-multi/proficio-api/pom.xml | 21 +
.../main/java/com/company/proficio/api/Api.java | 0
.../roundtrip-multi/proficio-cli/.checkstyle | 1 +
.../roundtrip-multi/proficio-cli/.classpath | 2 +
.../roundtrip-multi/proficio-cli/pom.xml | 31 ++
.../main/java/com/company/proficio/cli/Cli.java | 0
.../roundtrip-multi/proficio-core/.checkstyle | 1 +
.../roundtrip-multi/proficio-core/.classpath | 2 +
.../roundtrip-multi/proficio-core/pom.xml | 21 +
.../java/com/company/proficio/core/Core.java | 0
.../roundtrip-multi/proficio-model/.checkstyle | 1 +
.../roundtrip-multi/proficio-model/.classpath | 2 +
.../roundtrip-multi/proficio-model/pom.xml | 13 +
.../java/org/company/proficio/model/Model.java | 0
.../roundtrip-multi/proficio-stores/pom.xml | 19 +
.../proficio-store-memory/.checkstyle | 1 +
.../proficio-store-memory/.classpath | 2 +
.../proficio-store-memory/pom.xml | 21 +
.../company/proficio/store/memory/Memory.java | 0
.../proficio-store-xstream/.checkstyle | 1 +
.../proficio-store-xstream/.classpath | 2 +
.../proficio-store-xstream/pom.xml | 21 +
.../company/proficio/store/xstream/XStream.java | 0
.../projects/roundtrip-multi/src/site/site.xml | 0
.../repositories/central/archetype-catalog.xml | 11 +
.../test/resources/repositories/central/dummy | 0
.../src/test/resources/repositories/local/dummy | 0
archetype-testing/pom.xml | 3 +-
.../it/create-from-project/archetype.properties | 1 -
.../it/create-from-project/invoker.properties | 1 -
.../src/it/create-from-project/pom.xml | 30 --
.../src/main/java/foo/bar/App.java | 32 --
.../src/it/create-from-project/verify.bsh | 38 --
300 files changed, 4381 insertions(+), 2551 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/pom.xml
----------------------------------------------------------------------
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 280e21c..c12124f 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -118,24 +118,7 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-api-container</artifactId>
- <version>${cargoVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-api-generic</artifactId>
- <version>${cargoVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-container-jetty</artifactId>
- <version>${cargoVersion}</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
@@ -143,16 +126,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
b/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
deleted file mode 100644
index 8e18b68..0000000
---
a/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
+++ /dev/null
@@ -1,498 +0,0 @@
-package org.apache.maven.archetype.creator;
-
-/*
- * 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.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.common.Constants;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.MavenProjectBuildingResult;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.PropertyUtils;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-public class DefaultArchetypeCreatorTest
- extends AbstractMojoTestCase
-{
- private List<String> filtereds;
-
- private List<String> languages;
-
- private DefaultArtifactRepository localRepository;
-
- protected void createFilesetArchetype( String project )
- throws Exception
- {
- System.out.println( ">>>>>> testCreateFilesetArchetype( \"" + project
+ "\" )" );
-
- MavenProjectBuilder builder = (MavenProjectBuilder) lookup(
MavenProjectBuilder.ROLE );
-
- File projectFile = getProjectFile( project );
-
- File projectFileSample = getProjectSampleFile( project );
-
- copy( projectFileSample, projectFile );
-
- FileUtils.deleteDirectory( new File( projectFile.getParentFile(),
"target" ) );
-
- File propertyFile = getPropertiesFile( project );
-
- File propertyFileSample = getPropertiesSampleFile( project );
-
- copy( propertyFileSample, propertyFile );
-
- Properties p = PropertyUtils.loadProperties( propertyFile );
-
- MavenProject mavenProject = null;
-
- {
- Object result = builder.buildWithDependencies( projectFile,
localRepository, null );
- if ( result instanceof MavenProject )
- { // Using Maven 2.0.x / x >= 7
- mavenProject = (MavenProject) result;
- }
- else if ( result instanceof MavenProjectBuildingResult )
- { // Using Maven 3
- mavenProject = ( (MavenProjectBuildingResult) result
).getProject();
- }
- else
- {
- fail( "Wrong result class" );
- }
- }
-
- FilesetArchetypeCreator instance =
- (FilesetArchetypeCreator) lookup(
ArchetypeCreator.class.getName(), "fileset" );
-
- languages = new ArrayList<String>();
- languages.add( "java" );
- languages.add( "aspectj" );
- languages.add( "csharp" );
- languages.add( "groovy" );
- languages.add( "resources" );
-
- filtereds = new ArrayList<String>();
- filtereds.add( "java" );
- filtereds.add( "xml" );
- filtereds.add( "txt" );
- filtereds.add( "groovy" );
- filtereds.add( "cs" );
- filtereds.add( "mdo" );
- filtereds.add( "aj" );
- filtereds.add( "jsp" );
- filtereds.add( "js" );
- filtereds.add( "gsp" );
- filtereds.add( "vm" );
- filtereds.add( "html" );
- filtereds.add( "xhtml" );
- filtereds.add( "properties" );
- filtereds.add( ".classpath" );
- filtereds.add( ".project" );
- filtereds.add( "MF" );
-
- ArchetypeCreationRequest request = new ArchetypeCreationRequest()
- .setProject( mavenProject )
- .setPackageName( p.getProperty( Constants.PACKAGE ) )
- .setProperties( p )
- .setLanguages( languages )
- .setFiltereds( filtereds )
- .setDefaultEncoding( "UTF-8" )
- .setPartialArchetype( false )
- .setPreserveCData( false )
- .setKeepParent( false )
- .setPostPhase( "verify" );
-
- ArchetypeCreationResult result = new ArchetypeCreationResult();
-
- instance.createArchetype( request, result );
-
- if ( result.getCause() != null )
- {
- throw result.getCause();
- }
-
- System.out.println( "<<<<<< testCreateFilesetArchetype( \"" + project
+ "\" )" );
- }
-
- public void testChangeJavaFilenameWhenCustomPropertyEqualsClassName()
- throws Exception
- {
- String project = "change-file-with-property";
-
- createFilesetArchetype( project );
-
- File template = getTemplateFile( project,
"src/main/java/__someProperty__.java" );
- assertExists( template );
- assertContent( template, "class ${someProperty}" );
- }
-
- public void testExcludePatternsMustExcludeDirectory()
- throws Exception
- {
- String project = "exclude-patterns";
-
- createFilesetArchetype( project );
-
- File template = getTemplateFile( project, ".toexclude/dummy.file");
- assertNotExists(template);
-
- File template1 = getTemplateFile( project, "nottoexclude/dummy.file" );
- assertExists(template1);
- }
-
- public void testIncludeFileWithNoExtension()
- throws Exception
- {
- String project = "include-file-with-no-extension";
-
- createFilesetArchetype( project );
-
- File template1 = getTemplateFile( project,
"src/main/csharp/filewithnoextension" );
- assertExists(template1);
- }
-
- public void testCreateFilesetArchetype1()
- throws Exception
- {
- String project = "create-1";
-
- createFilesetArchetype( project );
-
- File template = getTemplateFile( project,
"src/main/java/subfolder1/App.java" );
- assertExists( template );
- assertContent( template, "// ${someProperty}" );
- assertContent( template, "package ${package}.subfolder1;" );
- assertNotContent( template, "${packageInPathFormat}" );
- }
-
- public void testCreateFilesetArchetype2()
- throws Exception
- {
- String project = "create-2";
-
- createFilesetArchetype( project );
- }
-
- public void testCreateFilesetArchetype3()
- throws Exception
- {
- String project = "create-3";
-
- createFilesetArchetype( project );
-
- File template = getTemplateFile( project, "pom.xml" );
- assertExists( template );
- assertContent( template, "${groupId}" );
- assertContent( template, "${artifactId}" );
- assertContent( template, "${version}" );
- assertContent( template, "Maven archetype Test create-3" );
- assertContent( template, "<packaging>pom</packaging>" );
- assertNotContent( template, "<parent>" );
-
- template = getTemplateFile( project, "src/site/site.xml" );
- assertExists( template );
- assertContent( template, "<!-- ${packageInPathFormat}/test" );
- assertContent( template, "${someProperty} -->" );
-
- template = getTemplateFile( project, "src/site/resources/site.png" );
- assertExists( template );
- assertNotContent( template, "${someProperty}" );
-
- template = getTemplateFile( project, ".classpath" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
-
- template = getTemplateFile( project, "profiles.xml" );
- assertExists( template );
- assertContent( template, "<!-- ${packageInPathFormat}/test" );
- assertContent( template, "${someProperty} -->" );
-
- template = getTemplateFile( project, "libs/pom.xml" );
- assertExists( template );
- assertContent( template, "${groupId}" );
- assertContent( template, "${artifactId}" );
- assertContent( template, "${version}" );
- assertContent( template, "Maven archetype Test create-3-libraries" );
- assertContent( template, "<packaging>pom</packaging>" );
- assertContent( template, "<parent>" );
-
- template = getTemplateFile( project, "libs/prj-a/pom.xml" );
- assertExists( template );
- assertContent( template, "${groupId}" );
- assertContent( template, "${artifactId}" );
- assertContent( template, "${version}" );
- assertContent( template, "Maven archetype Test
create-3-libraries-project-a" );
- assertNotContent( template, "<packaging>pom</packaging>" );
- assertContent( template, "<parent>" );
-
- template = getTemplateFile( project,
"libs/prj-a/src/main/mdo/descriptor.xml" );
- assertExists( template );
- assertContent( template, "<!-- ${packageInPathFormat}/test" );
- assertContent( template, "${someProperty} -->" );
-
- template = getTemplateFile( project, "libs/prj-b/pom.xml" );
- assertExists( template );
- assertContent( template, "${groupId}" );
- assertContent( template, "${artifactId}" );
- assertContent( template, "${version}" );
- assertContent( template, "Maven archetype Test
create-3-libraries-project-b" );
- assertNotContent( template, "<packaging>pom</packaging>" );
- assertContent( template, "<parent>" );
-
- template = getTemplateFile( project,
"libs/prj-b/src/main/java/test/com/Component.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}" );
-
- template = getTemplateFile( project,
"libs/prj-b/src/main/java/test/com/package.html" );
- assertExists( template );
- assertContent( template, "<!-- ${packageInPathFormat}/test" );
- assertContent( template, "${someProperty} -->" );
-
- template = getTemplateFile( project,
"libs/prj-b/src/test/java/test/common/ComponentTest.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}" );
-
- template = getTemplateFile( project, "application/pom.xml" );
- assertExists( template );
- assertContent( template, "${groupId}" );
- assertContent( template, "${artifactId}" );
- assertContent( template, "${version}" );
- assertContent( template, "Maven archetype Test create-3-application" );
- assertNotContent( template, "<packaging>pom</packaging>" );
- assertContent( template, "<parent>" );
-
- template = getTemplateFile( project,
"application/src/main/java/Main.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertNotContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}/test" );
-
- template = getTemplateFile( project,
"application/src/main/java/test/application/Application.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}" );
-
- template = getTemplateFile( project,
"application/src/main/java/test/application/audios/Application.ogg" );
- assertExists( template );
- assertNotContent( template, "${someProperty}" );
-
- template = getTemplateFile( project,
"application/src/main/java/test/application/images/Application.png" );
- assertExists( template );
- assertNotContent( template, "${someProperty}" );
-
- template = getTemplateFile( project,
"application/src/main/resources/log4j.properties" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertNotContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}/test" );
-
- template = getTemplateFile( project,
"application/src/main/resources/META-INF/MANIFEST.MF" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertNotContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}/test" );
-
- template = getTemplateFile( project,
"application/src/main/resources/test/application/some/Gro.groovy" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertNotContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}/test" );
-
- template = getTemplateFile( project,
"application/src/main/resources/splash.png" );
- assertExists( template );
- assertNotContent( template, "${someProperty}" );
-
- template = getTemplateFile( project,
"application/src/test/java/TestAll.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertNotContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}/test" );
-
- template = getTemplateFile( project,
"application/src/test/java/test/application/ApplicationTest.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertContent( template, "package ${package}.test.application;" );
- assertContent( template, "${packageInPathFormat}/test/application" );
-
- template = getTemplateFile( project,
"application/src/it-test/java/test/ItTest1.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertContent( template, "package ${package}.test;" );
- assertContent( template, "${packageInPathFormat}/test" );
-
- template = getTemplateFile( project,
"application/src/it-test/java/ItTestAll.java" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertNotContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}/test" );
-
- template = getTemplateFile( project,
"application/src/it-test/resources/ItTest1Result.txt" );
- assertExists( template );
- assertContent( template, "${someProperty}" );
- assertNotContent( template, "${package}" );
- assertContent( template, "${packageInPathFormat}/test" );
- }
-
- public void testCreateFilesetArchetype4()
- throws Exception
- {
- String project = "create-4";
-
- createFilesetArchetype( project );
-
- File template = getTemplateFile( project, "pom.xml" );
- assertExists( template );
- assertContent( template, "Maven archetype Test create-4
${someProperty}" );
- assertContent( template, "<packaging>pom</packaging>" );
-
- File earTemplate = getTemplateFile( project, "subModuleEAR/pom.xml" );
- assertExists( earTemplate );
- assertContent( earTemplate, "${groupId}" );
- assertContent( earTemplate, "${artifactId}" );
- assertContent( earTemplate, "${version}" );
- assertContent( earTemplate, "Maven archetype Test
create-4-subModuleEAR" );
- assertContent( earTemplate, "<packaging>ear</packaging>" );
- assertContent( earTemplate, "<parent>" );
-
- File warTemplate = getTemplateFile( project, "subModuleWar/pom.xml" );
- assertExists( warTemplate );
- assertContent( warTemplate, "${groupId}" );
- assertContent( warTemplate, "${artifactId}" );
- assertContent( warTemplate, "${version}" );
- assertContent( warTemplate, "Maven archetype Test
create-4-subModuleWar ${someProperty}" );
- assertContent( warTemplate, "<packaging>war</packaging>" );
- assertContent( warTemplate, "<parent>" );
- }
-
- public void testCreateFilesetArchetype5()
- throws Exception
- {
- String project = "create-5";
-
- createFilesetArchetype( project );
-
- File template = getTemplateFile( project, "dummy.file" );
- assertExists( template );
- }
-
- protected void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
-
- localRepository = new DefaultArtifactRepository( "local",
- new File( getBasedir(), "target/test-classes/repositories/local"
).toURI().toString(),
- new DefaultRepositoryLayout() );
- }
-
- private void assertContent( File template, String content )
- throws FileNotFoundException, IOException
- {
- String templateContent = FileUtils.fileRead( template, "UTF-8" );
- assertTrue( "File " + template + " does not contain " + content,
- StringUtils.countMatches( templateContent, content ) > 0 );
- }
-
- private void assertExists( File file )
- {
- assertTrue( "File doesn't exist: " + file.getAbsolutePath(),
file.exists() );
- }
-
- private void assertNotContent( File template, String content )
- throws FileNotFoundException, IOException
- {
- String templateContent = FileUtils.fileRead( template, "UTF-8" );
- assertFalse( "File " + template + " contains " + content,
- StringUtils.countMatches( templateContent, content ) > 0
);
- }
-
- private void copy( File in, File out )
- throws IOException, FileNotFoundException
- {
- assertTrue( !out.exists() || out.delete() );
- assertFalse( out.exists() );
- FileUtils.copyFile( in, out );
- assertTrue( out.exists() );
- assertTrue( in.exists() );
- }
-
- private File getDescriptorFile( String project )
- {
- return getFile( project,
"target/generated-sources/archetype/src/main/resources/META-INF/maven/archetype.xml"
);
- }
-
- private void assertNotExists( File file )
- {
- assertFalse( "File exists: " + file.getAbsolutePath(), file.exists() );
- }
-
- private File getFile( String project, String file )
- {
- return new File( getBasedir(), "target/test-classes/projects/" +
project + "/" + file );
- }
-
- private File getProjectFile( String project )
- {
- return getFile( project, "pom.xml" );
- }
-
- private File getProjectSampleFile( String project )
- {
- return getFile( project, "pom.xml.sample" );
- }
-
- private File getPropertiesFile( String project )
- {
- return getFile( project, "archetype.properties" );
- }
-
- private File getPropertiesSampleFile( final String project )
- {
- return getFile( project, "archetype.properties.sample" );
- }
-
- private File getTemplateFile( String project, String template )
- {
- return getFile( project,
"target/generated-sources/archetype/src/main/resources/archetype-resources/"
- + template );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
deleted file mode 100644
index f6f9c55..0000000
---
a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.apache.maven.archetype.test;
-
-/*
- * 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.commons.io.IOUtils;
-import org.apache.maven.archetype.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-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.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-import java.util.Properties;
-
-/**
- * @author Jason van Zyl
- */
-public class ArchetyperRoundtripTest
- extends PlexusTestCase
-{
-
- public void testArchetyper()
- throws Exception
- {
-
- ArchetypeManager archetype = (ArchetypeManager) lookup(
ArchetypeManager.ROLE );
-
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager)
lookup( ArchetypeRegistryManager.ROLE );
-
- MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup(
MavenProjectBuilder.ROLE );
-
- ArtifactRepository localRepository = registryManager.createRepository(
new File( getBasedir(),
-
"target" + File.separator
-
+ "test-classes"
-
+ File.separator
-
+ "repositories"
-
+ File.separator
-
+ "local" ).toURI().toURL().toExternalForm(),
-
"local-repo" );
-
- ArtifactRepository centralRepository =
registryManager.createRepository( new File( getBasedir(),
-
"target" + File.separator
-
+ "test-classes"
-
+ File.separator
-
+ "repositories"
-
+ File.separator
-
+ "central" ).toURI().toURL().toExternalForm(),
-
"central-repo" );
-
- // (1) create a project from scratch
- // (2) create an archetype from the project
- // (3) create our own archetype catalog properties in memory
- // (4) create our own archetype catalog describing the archetype we
just created
- // (5) deploy the archetype we just created
- // (6) create a project form the archetype we just created
- //
------------------------------------------------------------------------
- //
- //
------------------------------------------------------------------------
- // (1) create a project from scratch
-// File sourceProject = new File( getBasedir( ),
"target/test-classes/projects/roundtrip-1-project" );
-
- File workingProject = new File( getBasedir(),
- "target" + File.separator +
"test-classes" + File.separator + "projects"
- + File.separator +
"roundtrip-1-project" );
- FileUtils.forceDelete( new File( workingProject, "target" ) );
-
- // (2) create an archetype from the project
- File pom = new File( workingProject, "pom.xml" );
-
- MavenProject project = projectBuilder.build( pom, localRepository,
null );
-
- Properties properties = new Properties();
- properties.setProperty( "someProperty", "someValue" );
- ArchetypeCreationRequest acr = new
ArchetypeCreationRequest().setProject( project ).
- setLocalRepository( localRepository ).setProperties( properties
).setPostPhase( "package" );
-
- ArchetypeCreationResult creationResult =
archetype.createArchetypeFromProject( acr );
-
- if ( creationResult.getCause() != null )
- {
- throw creationResult.getCause();
- }
-
- // (3) create our own archetype catalog properties in memory
- File catalogDirectory = new File( getBasedir(), "target" +
File.separator + "catalog" );
- catalogDirectory.mkdirs();
-
- File catalogFile = new File( catalogDirectory, "archetype-catalog.xml"
);
-
- // (5) install the archetype we just created
- File generatedArchetypeDirectory = new File( project.getBasedir(),
- "target" + File.separator
+ "generated-sources" + File.separator
- + "archetype" );
- File generatedArchetypePom = new File( generatedArchetypeDirectory,
"pom.xml" );
- MavenProject generatedArchetypeProject = projectBuilder.build(
generatedArchetypePom, localRepository, null );
- ModelInterpolator modelInterpolator = (ModelInterpolator)lookup(
ModelInterpolator.ROLE );
- Model generatedArchetypeModel = modelInterpolator.interpolate(
generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(),
new DefaultProjectBuilderConfiguration(), true );
-
- File archetypeDirectory =
- new File( generatedArchetypeDirectory, "src" + File.separator +
"main" + File.separator + "resources" );
-
- File archetypeArchive = archetype.archiveArchetype(
archetypeDirectory, new File(
- generatedArchetypeModel.getBuild().getDirectory() ),
-
generatedArchetypeModel.getBuild().getFinalName() );
-
- String baseName =
- StringUtils.replace( generatedArchetypeProject.getGroupId(), ".",
File.separator ) + File.separator
- + generatedArchetypeProject.getArtifactId() + File.separator +
generatedArchetypeProject.getVersion()
- + File.separator +
generatedArchetypeProject.getBuild().getFinalName();
- File archetypeInRepository = new File( centralRepository.getBasedir(),
baseName + ".jar" );
- File archetypePomInRepository = new File(
centralRepository.getBasedir(), baseName + ".pom" );
- archetypeInRepository.getParentFile().mkdirs();
- FileUtils.copyFile( archetypeArchive, archetypeInRepository );
- FileUtils.copyFile( generatedArchetypePom, archetypePomInRepository );
-
- // (4) create our own archetype catalog describing the archetype we
just created
- ArchetypeCatalog catalog = new ArchetypeCatalog();
- Archetype generatedArchetype = new Archetype();
- generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId()
);
- generatedArchetype.setArtifactId(
generatedArchetypeProject.getArtifactId() );
- generatedArchetype.setVersion( generatedArchetypeProject.getVersion()
);
- generatedArchetype.setRepository( "http://localhost:"; + port + "/repo"
);
- catalog.addArchetype( generatedArchetype );
-
- ArchetypeCatalogXpp3Writer catalogWriter = new
ArchetypeCatalogXpp3Writer();
- Writer writer = new FileWriter( catalogFile );
- catalogWriter.write( writer, catalog );
- IOUtils.closeQuietly( writer );
-
- // (6) create a project form the archetype we just created
- String outputDirectory = new File( getBasedir(),
- "target" + File.separator +
"test-classes" + File.separator + "projects"
- + File.separator +
"roundtrip-1-recreatedproject" ).getAbsolutePath();
- FileUtils.forceDelete( outputDirectory );
-
- ArchetypeGenerationRequest agr =
- new ArchetypeGenerationRequest().setArchetypeGroupId(
generatedArchetypeProject.getGroupId() ).
- setArchetypeArtifactId(
generatedArchetypeProject.getArtifactId() ).
- setArchetypeVersion( generatedArchetypeProject.getVersion() ).
- setGroupId( "com.mycompany" ).setArtifactId( "myapp"
).setVersion( "1.0-SNAPSHOT" ).
- setPackage( "com.mycompany.myapp" ).setProperties( properties
).
- setOutputDirectory( outputDirectory ).setLocalRepository(
localRepository ).
- setArchetypeRepository( "http://localhost:"; + port + "/repo/"
);
- ArchetypeGenerationResult generationResult =
archetype.generateProjectFromArchetype( agr );
-
- if ( generationResult.getCause() != null )
- {
- throw generationResult.getCause();
- }
-
- //ASSERT symbol_pound replacement (archetype-180 archetype-183)
- String content = FileUtils.fileRead(
- outputDirectory + File.separator + "myapp" + File.separator +
"src" + File.separator + "main"
- + File.separator + "java" + File.separator + "com" +
File.separator + "mycompany" + File.separator
- + "myapp" + File.separator + "App.java" );
- System.err.println( "content=" + content );
- assertTrue( content.indexOf( "//A #\\{some}" ) > 0 );
- assertTrue( content.indexOf( "//B #{some}" ) > 0 );
- assertTrue( content.indexOf( "//C #{some other}" ) > 0 );
- assertTrue( content.indexOf( "//D \\#{some other}" ) > 0 );
- assertTrue( content.indexOf( "//E #{}" ) > 0 );
- assertTrue( content.indexOf( "//F {some}" ) > 0 );
- assertTrue( content.indexOf( "//G ${someOtherProperty}" ) > 0 );
- assertTrue( content.indexOf( "//H ${someValue}" ) > 0 );
- assertTrue( content.indexOf( "/*" ) > 0 );
- assertTrue( content.indexOf( " A #\\{some}" ) > 0 );
- assertTrue( content.indexOf( " B #{some}" ) > 0 );
- assertTrue( content.indexOf( " C #{some other}" ) > 0 );
- assertTrue( content.indexOf( " D \\#{some other}" ) > 0 );
- assertTrue( content.indexOf( " E #{}" ) > 0 );
- assertTrue( content.indexOf( " F {some}" ) > 0 );
- assertTrue( content.indexOf( " G ${someOtherProperty}" ) > 0 );
- assertTrue( content.indexOf( " H ${someValue}" ) > 0 );
- //Assert symbol_dollar archetype-138
- }
-
- private Server server;
-
- int port;
-
- public void setUp()
- throws Exception
- {
- super.setUp();
- // Start Jetty
-
- System.setProperty( "org.apache.maven.archetype.repository.directory",
- getTestPath(
"target/test-classes/repositories/central" ) );
-
- server = new Server( 0 );
-
- WebAppContext webapp = new WebAppContext();
- webapp.setContextPath( "/repo" );
- webapp.setWar( "target/wars/archetype-repository.war" );
- server.setHandler( webapp );
-
- server.start();
-
- port = server.getConnectors()[0].getLocalPort();
-
- }
-
- public void tearDown()
- throws Exception
- {
- super.tearDown();
- // Stop Jetty
-
- server.stop();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
deleted file mode 100644
index a58b828..0000000
---
a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.apache.maven.archetype.test;
-
-/*
- * 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.commons.io.IOUtils;
-import org.apache.maven.archetype.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-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.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
-import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Properties;
-
-/**
- * @author Jason van Zyl
- */
-public class ArchetyperRoundtripWithProxyTest
- extends PlexusTestCase
-{
- Server proxyServer;
-
- int proxyPort;
-
- Server server;
-
- int port;
-
- public void testArchetyper()
- throws Exception
- {
- ArchetypeManager archetype = (ArchetypeManager) lookup(
ArchetypeManager.ROLE );
-
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager)
lookup( ArchetypeRegistryManager.ROLE );
-
- MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup(
MavenProjectBuilder.ROLE );
-
- ArtifactRepository localRepository = registryManager.createRepository(
new File( getBasedir(),
-
"target" + File.separator
-
+ "test-classes"
-
+ File.separator
-
+ "repositories"
-
+ File.separator
-
+ "local" ).toURI().toURL().toExternalForm(),
-
"local-repo" );
- ArtifactRepository centralRepository =
registryManager.createRepository( new File( getBasedir(),
-
"target" + File.separator
-
+ "test-classes"
-
+ File.separator
-
+ "repositories"
-
+ File.separator
-
+ "central" ).toURI().toURL().toExternalForm(),
-
"central-repo" );
-
- // (1) create a project from scratch
- // (2) create an archetype from the project
- // (3) create our own archetype catalog properties in memory
- // (4) create our own archetype catalog describing the archetype we
just created
- // (5) deploy the archetype we just created
- // (6) create a project form the archetype we just created
- //
------------------------------------------------------------------------
- //
- //
------------------------------------------------------------------------
- // (1) create a project from scratch
-// File sourceProject = new File( getBasedir( ),
"target/test-classes/projects/roundtrip-1-project" );
-
- File workingProject = new File( getBasedir(),
- "target" + File.separator +
"test-classes" + File.separator + "projects"
- + File.separator +
"roundtrip-2-project" );
- FileUtils.forceDelete( new File( workingProject, "target" ) );
-
- // (2) create an archetype from the project
- File pom = new File( workingProject, "pom.xml" );
-
- MavenProject project = projectBuilder.build( pom, localRepository,
null );
-
- ArchetypeCreationRequest acr = new
ArchetypeCreationRequest().setProject( project ).
- setLocalRepository( localRepository ).setPostPhase( "package" );
-
- ArchetypeCreationResult creationResult =
archetype.createArchetypeFromProject( acr );
-
- if ( creationResult.getCause() != null )
- {
- throw creationResult.getCause();
- }
-
- // (3) create our own archetype catalog properties in memory
- File catalogDirectory = new File( getBasedir(), "target" +
File.separator + "catalog" );
-
- File catalogFile = new File( catalogDirectory, "archetype-catalog.xml"
);
-
- File catalogProperties = new File( catalogDirectory,
"archetype-catalog.properties" );
-
- catalogDirectory.mkdirs();
-
- Properties p = new Properties();
- p.setProperty( "sources", "catalog" );
- p.setProperty( "catalog.file", catalogFile.getAbsolutePath() );
- OutputStream os = new FileOutputStream( catalogProperties );
- p.store( os, "Generated catalog properties" );
-
- // (5) install the archetype we just created
- File generatedArchetypeDirectory = new File( project.getBasedir(),
- "target" + File.separator
+ "generated-sources" + File.separator
- + "archetype" );
- File generatedArchetypePom = new File( generatedArchetypeDirectory,
"pom.xml" );
- MavenProject generatedArchetypeProject = projectBuilder.build(
generatedArchetypePom, localRepository, null );
- ModelInterpolator modelInterpolator = (ModelInterpolator)lookup(
ModelInterpolator.ROLE );
- Model generatedArchetypeModel = modelInterpolator.interpolate(
generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(),
new DefaultProjectBuilderConfiguration(), true );
-
- File archetypeDirectory =
- new File( generatedArchetypeDirectory, "src" + File.separator +
"main" + File.separator + "resources" );
-
- File archetypeArchive = archetype.archiveArchetype(
archetypeDirectory, new File(
- generatedArchetypeModel.getBuild().getDirectory() ),
-
generatedArchetypeModel.getBuild().getFinalName() );
-
- String baseName =
- StringUtils.replace( generatedArchetypeProject.getGroupId(), ".",
File.separator ) + File.separator
- + generatedArchetypeProject.getArtifactId() + File.separator +
generatedArchetypeProject.getVersion()
- + File.separator +
generatedArchetypeModel.getBuild().getFinalName();
- File archetypeInRepository = new File( centralRepository.getBasedir(),
baseName + ".jar" );
- File archetypePomInRepository = new File(
centralRepository.getBasedir(), baseName + ".pom" );
- archetypeInRepository.getParentFile().mkdirs();
- FileUtils.copyFile( archetypeArchive, archetypeInRepository );
- FileUtils.copyFile( generatedArchetypePom, archetypePomInRepository );
-
- // (4) create our own archetype catalog describing the archetype we
just created
- ArchetypeCatalog catalog = new ArchetypeCatalog();
- Archetype generatedArchetype = new Archetype();
- generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId()
);
- generatedArchetype.setArtifactId(
generatedArchetypeProject.getArtifactId() );
- generatedArchetype.setVersion( generatedArchetypeProject.getVersion()
);
- generatedArchetype.setRepository( "http://localhost:"; + port + "/repo"
);
- catalog.addArchetype( generatedArchetype );
-
- ArchetypeCatalogXpp3Writer catalogWriter = new
ArchetypeCatalogXpp3Writer();
- Writer writer = new FileWriter( catalogFile );
- catalogWriter.write( writer, catalog );
- IOUtils.closeQuietly( writer );
-
- // (6) create a project form the archetype we just created
- String outputDirectory = new File( getBasedir(),
- "target" + File.separator +
"test-classes" + File.separator + "projects"
- + File.separator +
"roundtrip-2-recreatedproject" ).getAbsolutePath();
- FileUtils.forceDelete( outputDirectory );
-
- WagonManager manager = (WagonManager) lookup(
WagonManager.class.getName() );
- manager.addProxy( "http", "localhost", proxyPort, null, null, null );
-
- ArchetypeGenerationRequest agr =
- new ArchetypeGenerationRequest().setArchetypeGroupId(
generatedArchetypeProject.getGroupId() ).
- setArchetypeArtifactId(
generatedArchetypeProject.getArtifactId() ).
- setArchetypeVersion( generatedArchetypeProject.getVersion() ).
- setGroupId( "com.mycompany" ).setArtifactId( "myapp"
).setVersion( "1.0-SNAPSHOT" ).
- setPackage( "com.mycompany.myapp" ).setOutputDirectory(
outputDirectory ).
- setLocalRepository( localRepository ).setArchetypeRepository(
"http://localhost:"; + port + "/repo" );
- ArchetypeGenerationResult generationResult =
archetype.generateProjectFromArchetype( agr );
-
- if ( generationResult.getCause() != null )
- {
- throw generationResult.getCause();
- }
-
- }
-
- public void setUp()
- throws Exception
- {
- super.setUp();
- // Start Proxy Jetty
-
- System.setProperty( "org.apache.maven.archetype.repository.directory",
- getTestPath(
"target/test-classes/repositories/central" ) );
-
- proxyServer = new Server( 0 );
-
- WebAppContext webappProxy = new WebAppContext();
- webappProxy.setContextPath( "/" );
- webappProxy.setWar( "target/wars/archetype-proxy.war" );
- proxyServer.setHandler( webappProxy );
-
- proxyServer.start();
-
- proxyPort = proxyServer.getConnectors()[0].getLocalPort();
-
- server = new Server( 0 );
-
- WebAppContext webapp = new WebAppContext();
- webapp.setContextPath( "/repo" );
- webapp.setWar( "target/wars/archetype-repository.war" );
- server.setHandler( webapp );
-
- server.start();
-
- port = server.getConnectors()[0].getLocalPort();
-
- }
-
- public void tearDown()
- throws Exception
- {
- super.tearDown();
- // Stop Jettys
-
- proxyServer.stop();
- server.stop();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
b/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
deleted file mode 100644
index fd66d35..0000000
---
a/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package org.apache.maven.archetype.test;
-
-/*
- * 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.commons.io.IOUtils;
-import org.apache.maven.archetype.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-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.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.model.Model;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Properties;
-
-/**
- * @author Jason van Zyl
- */
-public class RoundtripMultiModuleTest
- extends PlexusTestCase
-{
- public void testArchetyper()
- throws Exception
- {
-
- ArchetypeManager archetype = (ArchetypeManager) lookup(
ArchetypeManager.ROLE );
-
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager)
lookup( ArchetypeRegistryManager.ROLE );
-
- MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup(
MavenProjectBuilder.ROLE );
-
- ArtifactRepository localRepository = registryManager.createRepository(
new File( getBasedir(),
-
"target" + File.separator
-
+ "test-classes"
-
+ File.separator
-
+ "repositories"
-
+ File.separator
-
+ "local" ).toURI().toURL().toExternalForm(),
-
"local-repo" );
-
- ArtifactRepository centralRepository =
registryManager.createRepository( new File( getBasedir(),
-
"target" + File.separator
-
+ "test-classes"
-
+ File.separator
-
+ "repositories"
-
+ File.separator
-
+ "central" ).toURI().toURL().toExternalForm(),
-
"central-repo" );
-
- // (1) create a project from scratch
- // (2) create an archetype from the project
- // (3) create our own archetype catalog properties in memory
- // (4) create our own archetype catalog describing the archetype we
just created
- // (5) deploy the archetype we just created
- // (6) create a project form the archetype we just created
- //
------------------------------------------------------------------------
- //
- //
------------------------------------------------------------------------
- // (1) create a project from scratch
-// File sourceProject = new File( getBasedir( ),
"target/test-classes/projects/roundtrip-1-project" );
-
- File workingProject = new File( getBasedir(),
- "target" + File.separator +
"test-classes" + File.separator + "projects"
- + File.separator +
"roundtrip-multi" );
- FileUtils.forceDelete( new File( workingProject, "target" ) );
-
- // (2) create an archetype from the project
- File pom = new File( workingProject, "pom.xml" );
-
- MavenProject project = projectBuilder.build( pom, localRepository,
null );
-
- ModelInterpolator modelInterpolator = (ModelInterpolator)lookup(
ModelInterpolator.ROLE );
-
- ArchetypeCreationRequest acr =
- new ArchetypeCreationRequest().setProject( project
).setLocalRepository( localRepository ).setFiltereds(
- Constants.DEFAULT_FILTERED_EXTENSIONS ).setLanguages(
Constants.DEFAULT_LANGUAGES ).setPostPhase(
- "package" );
-
- ArchetypeCreationResult creationResult =
archetype.createArchetypeFromProject( acr );
-
- if ( creationResult.getCause() != null )
- {
- throw creationResult.getCause();
- }
- else
- {
- assertArchetypeCreated( workingProject );
- }
-
- // (3) create our own archetype catalog properties in memory
- File catalogDirectory = new File( getBasedir(), "target" +
File.separator + "catalog" );
-
- File catalogFile = new File( catalogDirectory, "archetype-catalog.xml"
);
-
- File catalogProperties = new File( catalogDirectory,
"archetype-catalog.properties" );
-
- catalogDirectory.mkdirs();
-
- Properties p = new Properties();
- p.setProperty( "sources", "catalog" );
- p.setProperty( "catalog.file", catalogFile.getAbsolutePath() );
- OutputStream os = new FileOutputStream( catalogProperties );
- p.store( os, "Generated catalog properties" );
-
- // (5) install the archetype we just created
- File generatedArchetypeDirectory = new File( project.getBasedir(),
- "target" + File.separator
+ "generated-sources" + File.separator
- + "archetype" );
- File generatedArchetypePom = new File( generatedArchetypeDirectory,
"pom.xml" );
- MavenProject generatedArchetypeProject = projectBuilder.build(
generatedArchetypePom, localRepository, null );
- Model generatedModel = modelInterpolator.interpolate(
generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(),
new DefaultProjectBuilderConfiguration(), true );
-
- File archetypeDirectory =
- new File( generatedArchetypeDirectory, "src" + File.separator +
"main" + File.separator + "resources" );
-
- File archetypeArchive = archetype.archiveArchetype( archetypeDirectory,
- new File( generatedModel.getBuild().getDirectory() ),
- generatedModel.getBuild().getFinalName() );
-
- String baseName =
- StringUtils.replace( generatedArchetypeProject.getGroupId(), ".",
File.separator ) + File.separator
- + generatedArchetypeProject.getArtifactId() + File.separator +
generatedArchetypeProject.getVersion()
- + File.separator + generatedModel.getBuild().getFinalName();
- File archetypeInRepository = new File( centralRepository.getBasedir(),
baseName + ".jar" );
- File archetypePomInRepository = new File(
centralRepository.getBasedir(), baseName + ".pom" );
- archetypeInRepository.getParentFile().mkdirs();
- FileUtils.copyFile( archetypeArchive, archetypeInRepository );
- FileUtils.copyFile( generatedArchetypePom, archetypePomInRepository );
-
- // (4) create our own archetype catalog describing the archetype we
just created
- ArchetypeCatalog catalog = new ArchetypeCatalog();
- Archetype generatedArchetype = new Archetype();
- generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId()
);
- generatedArchetype.setArtifactId(
generatedArchetypeProject.getArtifactId() );
- generatedArchetype.setVersion( generatedArchetypeProject.getVersion()
);
- generatedArchetype.setRepository( "http://localhost:"; + port + "/repo"
);
- catalog.addArchetype( generatedArchetype );
-
- ArchetypeCatalogXpp3Writer catalogWriter = new
ArchetypeCatalogXpp3Writer();
- Writer writer = new FileWriter( catalogFile );
- catalogWriter.write( writer, catalog );
- IOUtils.closeQuietly( writer );
-
- // (6) create a project form the archetype we just created
- String outputDirectory = new File( getBasedir(),
- "target" + File.separator +
"test-classes" + File.separator + "projects"
- + File.separator +
"roundtrip-multi-recreated" ).getAbsolutePath();
- FileUtils.forceDelete( outputDirectory );
-
- ArchetypeGenerationRequest agr = new
ArchetypeGenerationRequest().setArchetypeGroupId(
- generatedArchetypeProject.getGroupId() ).setArchetypeArtifactId(
- generatedArchetypeProject.getArtifactId() ).setArchetypeVersion(
- generatedArchetypeProject.getVersion() ).setGroupId(
"com.mycompany" ).setArtifactId( "myapp" ).setVersion(
- "1.0-SNAPSHOT" ).setPackage( "com.mycompany.myapp"
).setOutputDirectory(
- outputDirectory ).setLocalRepository( localRepository
).setArchetypeRepository(
- "http://localhost:"; + port + "/repo/" );
- ArchetypeGenerationResult generationResult =
archetype.generateProjectFromArchetype( agr );
-
- if ( generationResult.getCause() != null )
- {
- fail( generationResult.getCause().getMessage() );
- }
-
- String myapp = outputDirectory + File.separator + "myapp" +
File.separator;
- assertTrue( new File( myapp + "myapp-api", ".classpath" ).exists() );
- assertTrue( new File( myapp + "myapp-cli", ".classpath" ).exists() );
- assertTrue( new File( myapp + "myapp-core", ".classpath" ).exists() );
- assertTrue( new File( myapp + "myapp-model", ".classpath" ).exists() );
- assertTrue( new File( myapp + File.separator + "myapp-stores" +
File.separator + "myapp-store-memory",
- ".classpath" ).exists() );
- assertTrue(
- new File( myapp + "myapp-stores" + File.separator +
"myapp-store-xstream", ".classpath" ).exists() );
-
- assertTrue( new File( myapp + "myapp-api", ".checkstyle" ).exists() );
- assertTrue( new File( myapp + "myapp-cli", ".checkstyle" ).exists() );
- assertTrue( new File( myapp + "myapp-core", ".checkstyle" ).exists() );
- assertTrue( new File( myapp + "myapp-model", ".checkstyle" ).exists()
);
- assertTrue(
- new File( myapp + "myapp-stores" + File.separator +
"myapp-store-memory", ".checkstyle" ).exists() );
- assertTrue(
- new File( myapp + "myapp-stores" + File.separator +
"myapp-store-xstream", ".checkstyle" ).exists() );
-
- }
-
- private Server server;
-
- int port;
-
- public void setUp()
- throws Exception
- {
- super.setUp();
- // Start Jetty
-
- System.setProperty( "org.apache.maven.archetype.repository.directory",
- getTestPath(
"target/test-classes/repositories/central" ) );
-
- server = new Server( 0 );
-
- WebAppContext webapp = new WebAppContext();
- webapp.setContextPath( "/repo" );
- webapp.setWar( "target/wars/archetype-repository.war" );
- server.setHandler( webapp );
-
- server.start();
-
- port = server.getConnectors()[0].getLocalPort();
-
-
- }
-
- public void tearDown()
- throws Exception
- {
- super.tearDown();
- // Stop Jetty
-
- server.stop();
- }
-
- private void assertArchetypeCreated( File workingProject )
- {
- File archetypeSourcesDirectory = FileUtils.resolveFile(
workingProject, "target/generated-sources/archetype" );
- File archetypeResourcesDirectory =
- FileUtils.resolveFile( archetypeSourcesDirectory,
"src/main/resources/archetype-resources" );
- File archetypeMetadataDirectory =
- FileUtils.resolveFile( archetypeSourcesDirectory,
"src/main/resources/META-INF/maven" );
-
- Iterator i = org.apache.commons.io.FileUtils.iterateFiles(
archetypeSourcesDirectory, null, true );
- while ( i.hasNext() )
- {
- File f = (File) i.next();
- System.err.println( f.getPath() );
- }
-
- File api = FileUtils.resolveFile( archetypeResourcesDirectory,
"__rootArtifactId__-api" );
- assertExistDirectory( api );
- assertExistFile( FileUtils.resolveFile( api, "pom.xml" ) );
-
- File cli = FileUtils.resolveFile( archetypeResourcesDirectory,
"__rootArtifactId__-cli" );
- assertExistDirectory( cli );
- assertExistFile( FileUtils.resolveFile( cli, "pom.xml" ) );
-
- File core = FileUtils.resolveFile( archetypeResourcesDirectory,
"__rootArtifactId__-core" );
- assertExistDirectory( core );
- assertExistFile( FileUtils.resolveFile( core, "pom.xml" ) );
-
- File model = FileUtils.resolveFile( archetypeResourcesDirectory,
"__rootArtifactId__-model" );
- assertExistDirectory( model );
- assertExistFile( FileUtils.resolveFile( model, "pom.xml" ) );
-
- File stores = FileUtils.resolveFile( archetypeResourcesDirectory,
"__rootArtifactId__-stores" );
- assertExistDirectory( stores );
- assertExistFile( FileUtils.resolveFile( stores, "pom.xml" ) );
- assertExistDirectory( FileUtils.resolveFile( stores,
"__rootArtifactId__-store-memory" ) );
- assertExistFile(
- FileUtils.resolveFile( FileUtils.resolveFile( stores,
"__rootArtifactId__-store-memory" ), "pom.xml" ) );
- assertExistDirectory( FileUtils.resolveFile( stores,
"__rootArtifactId__-store-xstream" ) );
- assertExistFile(
- FileUtils.resolveFile( FileUtils.resolveFile( stores,
"__rootArtifactId__-store-xstream" ), "pom.xml" ) );
- assertExistFile( FileUtils.resolveFile( archetypeResourcesDirectory,
"pom.xml" ) );
-
- assertExistDirectory( archetypeMetadataDirectory );
- assertExistFile( FileUtils.resolveFile( archetypeMetadataDirectory,
"archetype-metadata.xml" ) );
- assertExistFile( FileUtils.resolveFile( archetypeSourcesDirectory,
"pom.xml" ) );
-
- }
-
- private void assertExistDirectory( File resolveFile )
- {
- assertTrue( "resolveFile " + resolveFile + " !exists",
resolveFile.exists() );
- assertTrue( "resolveFile " + resolveFile + " !isDirectory",
resolveFile.isDirectory() );
- }
-
- private void assertExistFile( File resolveFile )
- {
- assertTrue( "resolveFile " + resolveFile + " !exists",
resolveFile.exists() );
- assertTrue( "resolveFile " + resolveFile + " !isFile",
resolveFile.isFile() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/resources/projects/change-file-with-property/archetype.properties.sample
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/resources/projects/change-file-with-property/archetype.properties.sample
b/archetype-common/src/test/resources/projects/change-file-with-property/archetype.properties.sample
deleted file mode 100644
index a1e3fa2..0000000
---
a/archetype-common/src/test/resources/projects/change-file-with-property/archetype.properties.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-archetype.groupId=org.codehaus.mojo.archetypes
-archetype.artifactId=maven-archetype-test
-archetype.version=1.0
-groupId=org.apache.maven.archetype.test
-artifactId=change-file-with-property
-version=1.0-SNAPSHOT
-package=archetype
-someProperty=App
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/resources/projects/change-file-with-property/pom.xml.sample
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/resources/projects/change-file-with-property/pom.xml.sample
b/archetype-common/src/test/resources/projects/change-file-with-property/pom.xml.sample
deleted file mode 100644
index 6d2da67..0000000
---
a/archetype-common/src/test/resources/projects/change-file-with-property/pom.xml.sample
+++ /dev/null
@@ -1,34 +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>
-
- <groupId>org.apache.maven.archetype.test</groupId>
- <artifactId>change-file-with-property</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <name>Maven archetype Test Change File With Property</name>
- <packaging>pom</packaging>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/resources/projects/change-file-with-property/src/main/java/App.java
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/resources/projects/change-file-with-property/src/main/java/App.java
b/archetype-common/src/test/resources/projects/change-file-with-property/src/main/java/App.java
deleted file mode 100644
index 081fab9..0000000
---
a/archetype-common/src/test/resources/projects/change-file-with-property/src/main/java/App.java
+++ /dev/null
@@ -1,4 +0,0 @@
-class App
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8e0fe06a/archetype-common/src/test/resources/projects/create-1/archetype.properties.sample
----------------------------------------------------------------------
diff --git
a/archetype-common/src/test/resources/projects/create-1/archetype.properties.sample
b/archetype-common/src/test/resources/projects/create-1/archetype.properties.sample
deleted file mode 100644
index 8e43207..0000000
---
a/archetype-common/src/test/resources/projects/create-1/archetype.properties.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-archetype.groupId=org.codehaus.mojo.archetypes
-archetype.artifactId=maven-archetype-test
-archetype.version=1.0
-groupId=org.apache.maven.archetype.test
-artifactId=test-create-1
-version=1.0-SNAPSHOT
-package=archetype
-someProperty=A String to search for
\ No newline at end of file
