You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/10/19 22:42:52 UTC
svn commit: r465800 - in
/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026:
./ src/ src/main/ src/main/java/ src/main/java/org/
src/main/java/org/apache/ src/main/java/org/apache/maven/
src/main/java/org/apache/maven/it0023/
Author: jvanzyl
Date: Thu Oct 19 13:42:51 2006
New Revision: 465800
URL: http://svn.apache.org/viewvc?view=rev&rev=465800
Log:
o adding IT it0026
Added:
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml (with props)
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/pom.xml (with props)
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java (with props)
maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml (with props)
Added: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml?view=auto&rev=465800
==============================================================================
--- maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml (added)
+++ maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml Thu Oct 19 13:42:51 2006
@@ -0,0 +1,17 @@
+<settings>
+ <profiles>
+ <profile>
+ <id>test-profile</id>
+
+ <activation>
+ <property>
+ <name>includeProfile</name>
+ </property>
+ </activation>
+
+ <properties>
+ <test>test.txt</test>
+ </properties>
+ </profile>
+ </profiles>
+</settings>
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/pom.xml?view=auto&rev=465800
==============================================================================
--- maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/pom.xml (added)
+++ maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/pom.xml Thu Oct 19 13:42:51 2006
@@ -0,0 +1,25 @@
+<model>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.</groupId>
+ <artifactId>maven-it0023</artifactId>
+ <description>Test merging of global- and user-level settings.xml files.</description>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-core-it-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <pluginItem>${test}</pluginItem>
+ </configuration>
+ </plugin>
+ <!-- plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-projecthelp-plugin</artifactId>
+ <version>2.0-alpha-3-SNAPSHOT</version>
+ </plugin -->
+ </plugins>
+ </build>
+</model>
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java?view=auto&rev=465800
==============================================================================
--- maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java (added)
+++ maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java Thu Oct 19 13:42:51 2006
@@ -0,0 +1,16 @@
+package org.apache.maven.it0023;
+
+public class Person
+{
+ private String name;
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+}
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml?view=auto&rev=465800
==============================================================================
--- maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml (added)
+++ maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml Thu Oct 19 13:42:51 2006
@@ -0,0 +1,5 @@
+<settings>
+ <activeProfiles>
+ <activeProfile>test-profile</activeProfile>
+ </activeProfiles>
+</settings>
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"