From f8bbd88a42ab64bf10d0ca2681c246810a4d2be0 Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <tsp@apache.org>
Date: Wed, 10 Apr 2013 16:15:50 +0530
Subject: [PATCH] maven+marvin: Fix up the activation property

activation property marvin.config will attempt to deploy a zone again on
running the marvin.test profile. This is unnecessary as marvin.setup
already finishes deploying a zone.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
---
 setup/dev/basic.cfg  |  6 +++---
 setup/dev/local.cfg  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 tools/marvin/pom.xml | 18 ++++--------------
 3 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 setup/dev/local.cfg

diff --git a/setup/dev/basic.cfg b/setup/dev/basic.cfg
index fb99b8b5498..3f56a3ce980 100644
--- a/setup/dev/basic.cfg
+++ b/setup/dev/basic.cfg
@@ -57,7 +57,7 @@
                             "startip": "60.147.41.2",
                             "endip": "60.147.41.254",
                             "netmask": "255.255.255.0",
-                            "gateway": "60.147.40.1"
+                            "gateway": "60.147.41.1"
                         }
                     ],
                     "netmask": "255.255.255.0",
@@ -102,11 +102,11 @@
     "logger": [
         {
             "name": "TestClient",
-            "file": "/var/log/testclient.log"
+            "file": "/tmp/testclient.log"
         },
         {
             "name": "TestCase",
-            "file": "/var/log/testcase.log"
+            "file": "/tmp/testcase.log"
         }
     ],
     "globalConfig": [
diff --git a/setup/dev/local.cfg b/setup/dev/local.cfg
new file mode 100644
index 00000000000..ce956a54e63
--- /dev/null
+++ b/setup/dev/local.cfg
@@ -0,0 +1,44 @@
+# 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.
+
+{
+    "dbSvr": {
+        "dbSvr": "localhost",
+        "passwd": "cloud",
+        "db": "cloud",
+        "port": 3306,
+        "user": "cloud"
+    },
+    "logger": [
+        {
+            "name": "TestClient",
+            "file": "/tmp/testclient.log"
+        },
+        {
+            "name": "TestCase",
+            "file": "/tmp/testcase.log"
+        }
+    ],
+    "mgtSvr": [
+        {
+            "mgtSvrIp": "localhost",
+            "passwd": "password",
+            "user": "root",
+            "port": 8096
+        }
+    ]
+}
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
index ce6ce388125..c0505664486 100644
--- a/tools/marvin/pom.xml
+++ b/tools/marvin/pom.xml
@@ -157,12 +157,7 @@
       <id>marvin.setup</id>
       <properties>
         <marvin.config>${user.dir}/setup/dev/advanced.cfg</marvin.config>
-     </properties>
-      <activation>
-        <property>
-          <name>marvin.config</name>
-        </property>
-      </activation>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -182,7 +177,7 @@
                   <arguments>
                     <argument>deployAndRun.py</argument>
                     <argument>-c</argument>
-                    <argument>${marvin.config}</argument>
+                    <argument>${user.dir}/${marvin.config}</argument>
                     <argument>-t</argument>
                     <argument>/tmp/t.log</argument>
                     <argument>-r</argument>
@@ -200,15 +195,10 @@
     <profile>
       <id>marvin.test</id>
       <properties>
-        <marvin.config>${user.dir}/setup/dev/advanced.cfg</marvin.config>
         <tag>simulator</tag>
         <test>test/integration/smoke</test>
+        <marvin.config>${user.dir}/setup/dev/advanced.cfg</marvin.config>
       </properties>
-      <activation>
-        <property>
-          <name>marvin.config</name>
-        </property>
-      </activation>
       <build>
         <plugins>
           <plugin>
@@ -228,7 +218,7 @@
                   <arguments>
                     <argument>--with-marvin</argument>
                     <argument>--marvin-config</argument>
-                    <argument>${marvin.config}</argument>
+                    <argument>${user.dir}/${marvin.config}</argument>
                     <argument>--load</argument>
                     <argument>-a</argument>
                     <argument>tags=${tag}</argument>