Author: hboutemy
Date: Mon Feb 19 17:55:09 2018
New Revision: 1824796
URL: http://svn.apache.org/viewvc?rev=1824796&view=rev
Log:
[MARCHETYPES-52] reworked maven-archetype-simple to a real ArchetypeNG
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/maven/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.project
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.core.resources.prefs
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/pom.xml
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/main/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java
- copied, changed from r1824795,
maven/archetypes/trunk/maven-archetype-simple/src/main/java/archetype/App.java
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/archetype.properties
(with props)
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/goal.txt
(with props)
Removed:
maven/archetypes/trunk/maven-archetype-simple/src/main/archetype/
maven/archetypes/trunk/maven-archetype-simple/src/main/java/
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/app.properties
maven/archetypes/trunk/maven-archetype-simple/src/test/java/
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/test.properties
Modified:
maven/archetypes/trunk/maven-archetype-simple/pom.xml
Modified: maven/archetypes/trunk/maven-archetype-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/pom.xml?rev=1824796&r1=1824795&r2=1824796&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-simple/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-simple/pom.xml Mon Feb 19 17:55:09
2018
@@ -44,12 +44,11 @@ under the License.
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archetypes/trunk/maven-archetype-simple</developerConnection>
<url>http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple</url>
</scm>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- </dependencies>
</project>
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<archetype-descriptor
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd";
+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ name="maven-archetype-simple">
+ <fileSets>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/test/java</directory>
+ </fileSet>
+ <fileSet filtered="true">
+ <directory>src/site</directory>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.project
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.project?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.project
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.project
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,20 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>maven-${package}-simple</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.project
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.core.resources.prefs
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.core.resources.prefs?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.core.resources.prefs
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.core.resources.prefs
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.core.resources.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/pom.xml?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/pom.xml
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/pom.xml
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+
+ <name>${artifactId}</name>
+ <description>A simple ${artifactId}.</description>
+ <!-- FIXME change it to the project's website -->
+ <url>http://www.example.com</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java
(from r1824795,
maven/archetypes/trunk/maven-archetype-simple/src/main/java/archetype/App.java)
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java?p2=maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java&p1=maven/archetypes/trunk/maven-archetype-simple/src/main/java/archetype/App.java&r1=1824795&r2=1824796&rev=1824796&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/java/archetype/App.java
(original)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java
Mon Feb 19 17:55:09 2018
@@ -1,22 +1,4 @@
-package archetype;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+package ${package};
/**
* Hello world!
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 ref="parent" />
+ </body>
+</project>
\ No newline at end of file
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,38 @@
+package ${package};
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/archetype.properties
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/archetype.properties?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/archetype.properties
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/archetype.properties
Mon Feb 19 17:55:09 2018
@@ -0,0 +1,4 @@
+package=it.pkg
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=basic-simple
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/archetype.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/goal.txt
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/goal.txt?rev=1824796&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/goal.txt
(added)
+++
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/goal.txt
Mon Feb 19 17:55:09 2018
@@ -0,0 +1 @@
+verify site
\ No newline at end of file
Propchange:
maven/archetypes/trunk/maven-archetype-simple/src/test/resources/projects/it-basic/goal.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
