From 007d5e85e89e6de874e23b7cde14b74953473ac0 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Thu, 19 Oct 2006 20:42:51 +0000
Subject: [PATCH] o adding IT it0026

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@465800 13f79535-47bb-0310-9956-ffa450edef68
---
 .../test/resources/it0026/global-settings.xml | 17 +++++++++++++
 .../src/test/resources/it0026/pom.xml         | 25 +++++++++++++++++++
 .../java/org/apache/maven/it0023/Person.java  | 16 ++++++++++++
 .../test/resources/it0026/user-settings.xml   |  5 ++++
 4 files changed, 63 insertions(+)
 create mode 100644 maven-core-integration-tests/src/test/resources/it0026/global-settings.xml
 create mode 100644 maven-core-integration-tests/src/test/resources/it0026/pom.xml
 create mode 100644 maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java
 create mode 100644 maven-core-integration-tests/src/test/resources/it0026/user-settings.xml

diff --git a/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml b/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml
new file mode 100644
index 0000000000..ca69453c4e
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0026/global-settings.xml
@@ -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>
diff --git a/maven-core-integration-tests/src/test/resources/it0026/pom.xml b/maven-core-integration-tests/src/test/resources/it0026/pom.xml
new file mode 100644
index 0000000000..16c9093b6f
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0026/pom.xml
@@ -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>
diff --git a/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java b/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java
new file mode 100644
index 0000000000..b57f4308e2
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java
@@ -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;
+    }
+}
diff --git a/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml b/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml
new file mode 100644
index 0000000000..f09eb04a23
--- /dev/null
+++ b/maven-core-integration-tests/src/test/resources/it0026/user-settings.xml
@@ -0,0 +1,5 @@
+<settings>
+  <activeProfiles>
+    <activeProfile>test-profile</activeProfile>
+  </activeProfiles>
+</settings>