Author: olamy
Date: Sat Oct 29 22:56:05 2011
New Revision: 1195066
URL: http://svn.apache.org/viewvc?rev=1195066&view=rev
Log:
fix some resources, package is now dynamic
Added:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
(with props)
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
(contents, props changed)
- copied, changed from r1190460,
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
(contents, props changed)
- copied, changed from r1190460,
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java
Removed:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype.xml
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java
Modified:
archiva/sandbox/trunk/archiva-consumer-archetype/pom.xml
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt
Modified: archiva/sandbox/trunk/archiva-consumer-archetype/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-archetype/pom.xml?rev=1195066&r1=1195065&r2=1195066&view=diff
==============================================================================
--- archiva/sandbox/trunk/archiva-consumer-archetype/pom.xml (original)
+++ archiva/sandbox/trunk/archiva-consumer-archetype/pom.xml Sat Oct 29
22:56:05 2011
@@ -34,20 +34,18 @@
<description>Simple archetype to create archiva consumers</description>
<build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.1</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <id>archetype-it-tests</id>
- <phase>integration-test</phase>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Added:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1195066&view=auto
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
(added)
+++
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
Sat Oct 29 22:56:05 2011
@@ -0,0 +1,13 @@
+<archetype-descriptor
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
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";
+ name="archiva-consumer-archetype" partial="false">
+
+ <fileSets>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/test/java</directory>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
\ No newline at end of file
Propchange:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
(from r1190460,
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java)
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java?p2=archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java&p1=archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java&r1=1190460&r2=1195066&rev=1195066&view=diff
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/consumer/SimpleArtifactConsumer.java
(original)
+++
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
Sat Oct 29 22:56:05 2011
@@ -1,4 +1,4 @@
-package org.example.consumer;
+package $package;
import java.util.ArrayList;
import java.util.List;
Propchange:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
(from r1190460,
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java)
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java?p2=archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java&p1=archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java&r1=1190460&r2=1195066&rev=1195066&view=diff
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/consumer/SimpleArtifactConsumerTest.java
(original)
+++
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
Sat Oct 29 22:56:05 2011
@@ -1,4 +1,4 @@
-package org.example.consumer;
+package $package;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/sandbox/trunk/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties?rev=1195066&r1=1195065&r2=1195066&view=diff
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
(original)
+++
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
Sat Oct 29 22:56:05 2011
@@ -1,3 +1,4 @@
groupId=org.apache.archiva.consumer.its.compile
artifactId=simple-consumer-compile
-version=1.0-SNAPSHOT
\ No newline at end of file
+version=1.0-SNAPSHOT
+package=org.apache.archiva.consumer.its
\ No newline at end of file
Modified:
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt?rev=1195066&r1=1195065&r2=1195066&view=diff
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt
(original)
+++
archiva/sandbox/trunk/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt
Sat Oct 29 22:56:05 2011
@@ -1 +1 @@
-test
\ No newline at end of file
+verify
\ No newline at end of file
