Return-Path: 
 <commits-return-31264-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 91A8B10FB9
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed, 18 Sep 2013 11:36:41 +0000 (UTC)
Received: (qmail 35155 invoked by uid 500); 18 Sep 2013 11:36:40 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 35062 invoked by uid 500); 18 Sep 2013 11:36:35 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 35043 invoked by uid 99); 18 Sep 2013 11:36:34 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Sep 2013 11:36:34 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 679CF8293C3; Wed, 18 Sep 2013 11:36:34 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: hugo@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 18 Sep 2013 11:36:34 -0000
Message-Id: <7a393671dcc24f3d84405f036dd0bae6@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] git commit: updated refs/heads/nonoss-to-noredist to 86bef8b

Updated Branches:
  refs/heads/nonoss-to-noredist [created] 86bef8bfb


Rename nonoss to noredist to better reflect what the flag is used for.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13e8b59b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13e8b59b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13e8b59b

Branch: refs/heads/nonoss-to-noredist
Commit: 13e8b59bc2c40de9009457bbe01608b28dac1f5d
Parents: 62b0ad0
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Wed Sep 18 19:10:27 2013 +0800
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Wed Sep 18 19:36:08 2013 +0800

----------------------------------------------------------------------
 client/pom.xml                        | 22 +++++++++++-----------
 plugins/pom.xml                       | 12 ++++++------
 pom.xml                               |  2 +-
 services/console-proxy/server/pom.xml |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 119c96e..7ae1eb7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -472,18 +472,18 @@
             </configuration>
           </execution>
           <execution>
-            <id>process-nonoss</id>
+            <id>process-noredist</id>
             <phase>process-resources</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <target if="${nonoss}">
+              <target if="${noredist}">
                 <echo>test</echo>
                 <replaceregexp
                   file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
                   match="cloud-stack-components-specification=.*"
-                  replace="cloud-stack-components-specification=components-nonoss.xml"
+                  replace="cloud-stack-components-specification=components-noredist.xml"
                   byline="true" />
               </target>
             </configuration>
@@ -505,16 +505,16 @@
             </configuration>
           </execution>
           <execution>
-            <id>process-nonoss-spring-context</id>
+            <id>process-noredist-spring-context</id>
             <phase>process-resources</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <target if="${nonoss}">
+              <target if="${noredist}">
                 <replaceregexp
                   file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
-                  match="classpath:componentContext.xml" replace="classpath:nonossComponentContext.xml"
+                  match="classpath:componentContext.xml" replace="classpath:noredistComponentContext.xml"
                   byline="true" />
                 <copy overwrite="true"
                   todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
@@ -633,7 +633,7 @@
       <id>netapp</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -648,7 +648,7 @@
       <id>f5</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -663,7 +663,7 @@
       <id>netscaler</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -678,7 +678,7 @@
       <id>srx</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -693,7 +693,7 @@
       <id>vmware</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0812642..ff18e83 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -99,7 +99,7 @@
       <id>netapp</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -110,7 +110,7 @@
       <id>kvm</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -121,7 +121,7 @@
       <id>f5</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -132,7 +132,7 @@
       <id>netscaler</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -143,7 +143,7 @@
       <id>srx</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -154,7 +154,7 @@
       <id>vmware</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d9a30f..c2c7e30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -704,7 +704,7 @@
       <id>vmware</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/services/console-proxy/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 391c15a..7e101e8 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -204,7 +204,7 @@
       <id>vmware</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
         <dependencies>