From 1260ced4f56d4c1bece906173e4a1989feb70670 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Sat, 27 Sep 2008 14:52:28 +0000
Subject: [PATCH] o collapsing all the profile code into maven-project, now
 it's all in one place

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699659 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     |  2 +-
 maven-core/pom.xml                            |  4 --
 maven-profile/pom.xml                         | 59 -------------------
 .../resources/META-INF/plexus/components.xml  | 31 ----------
 maven-profile/src/site/site.xml               |  6 --
 maven-project/pom.xml                         | 16 +++--
 .../maven/profiles/AlwaysOnActivation.java    |  0
 .../profiles/DefaultMavenProfilesBuilder.java |  0
 .../maven/profiles/MavenProfilesBuilder.java  |  0
 .../profiles/ProfilesConversionUtils.java     |  0
 .../src/main/mdo/profiles.mdo                 |  0
 .../resources/META-INF/plexus/components.xml  |  6 ++
 pom.xml                                       |  1 -
 13 files changed, 19 insertions(+), 106 deletions(-)
 delete mode 100644 maven-profile/pom.xml
 delete mode 100644 maven-profile/src/main/resources/META-INF/plexus/components.xml
 delete mode 100644 maven-profile/src/site/site.xml
 rename {maven-profile => maven-project}/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java (100%)
 rename {maven-profile => maven-project}/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (100%)
 rename {maven-profile => maven-project}/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java (100%)
 rename {maven-profile => maven-project}/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java (100%)
 rename {maven-profile => maven-project}/src/main/mdo/profiles.mdo (100%)

diff --git a/build.xml b/build.xml
index 2524a1fc39..db412f7bb0 100644
--- a/build.xml
+++ b/build.xml
@@ -119,7 +119,7 @@ TODO:
     <modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
     <modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
     <modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
-    <modello file="maven-profile/src/main/mdo/profiles.mdo"/>
+    <modello file="maven-project/src/main/mdo/profiles.mdo"/>
     <modello file="maven-core/src/main/mdo/settings.mdo"/>
     <modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
   </target>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index b7413b1e0e..5c5bd6077c 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -43,10 +43,6 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-reporting-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-profile</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
diff --git a/maven-profile/pom.xml b/maven-profile/pom.xml
deleted file mode 100644
index 9af0d1448f..0000000000
--- a/maven-profile/pom.xml
+++ /dev/null
@@ -1,59 +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/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>3.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-profile</artifactId>
-  <name>Maven Profile Model</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/profiles.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <!-- Generate model code -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/maven-profile/src/main/resources/META-INF/plexus/components.xml b/maven-profile/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index fb7ec4049a..0000000000
--- a/maven-profile/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-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.
--->
-<component-set>
-  <components>
-<!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
-      <implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
-    </component>
-  </components>
-</component-set>
diff --git a/maven-profile/src/site/site.xml b/maven-profile/src/site/site.xml
deleted file mode 100644
index 15f431a9c0..0000000000
--- a/maven-profile/src/site/site.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
-  <body>
-    <menu ref="parent"/>
-    <menu ref="reports"/>
-  </body>
-</project>
\ No newline at end of file
diff --git a/maven-project/pom.xml b/maven-project/pom.xml
index 865fe3a186..f13b7f5dfb 100644
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@@ -36,10 +36,6 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-workspace</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-profile</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
@@ -78,4 +74,16 @@ under the License.
       <artifactId>maven-shared-model</artifactId>
     </dependency> 
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <configuration>
+          <version>1.0.0</version>
+          <model>src/main/mdo/profiles.mdo</model>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>  
 </project>
diff --git a/maven-profile/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java b/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
similarity index 100%
rename from maven-profile/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
rename to maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
diff --git a/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java b/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
similarity index 100%
rename from maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
rename to maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
diff --git a/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java b/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
similarity index 100%
rename from maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
rename to maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
diff --git a/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
similarity index 100%
rename from maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
rename to maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
diff --git a/maven-profile/src/main/mdo/profiles.mdo b/maven-project/src/main/mdo/profiles.mdo
similarity index 100%
rename from maven-profile/src/main/mdo/profiles.mdo
rename to maven-project/src/main/mdo/profiles.mdo
diff --git a/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-project/src/main/resources/META-INF/plexus/components.xml
index 57ec63e0e8..1572663e15 100644
--- a/maven-project/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-project/src/main/resources/META-INF/plexus/components.xml
@@ -19,6 +19,12 @@ under the License.
 
 <component-set>
   <components>
+
+    <component>
+      <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
+      <implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
+    </component>  
+  
     <component>
       <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
       <role-hint>default</role-hint>
diff --git a/pom.xml b/pom.xml
index 089636aea3..4f7d7e1ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,6 @@
     <module>maven-lifecycle</module>
     <module>maven-model</module>
     <module>maven-plugin-api</module>
-    <module>maven-profile</module>
     <module>maven-project</module>
     <module>maven-reporting-api</module>
     <module>maven-embedder</module>