Return-Path: 
 <scm-return-38616-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 8962 invoked from network); 23 Sep 2009 13:50:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 23 Sep 2009 13:50:57 -0000
Received: (qmail 95723 invoked by uid 500); 23 Sep 2009 13:50:57 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 95662 invoked by uid 500); 23 Sep 2009 13:50:57 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 95653 invoked by uid 99); 23 Sep 2009 13:50:57 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 13:50:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 13:50:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 600F623888E4; Wed, 23 Sep 2009 13:50:33 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r818105 - in
 /geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard:
 destination.jsp plan.jsp
Date: Wed, 23 Sep 2009 13:50:33 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090923135033.600F623888E4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xuhaihong
Date: Wed Sep 23 13:50:33 2009
New Revision: 818105

URL: http://svn.apache.org/viewvc?rev=818105&view=rev
Log:
GERONIMO-4891 Null destination error when browsing a new created jms resource group.

Modified:
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp?rev=818105&r1=818104&r2=818105&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp Wed Sep 23 13:50:33 2009
@@ -29,6 +29,16 @@
         addErrorMessage("<portlet:namespace/>", '<fmt:message key="jmswizard.common.emptyText"/>');
         return false;    
     }
+    var jmsForm = document.getElementById(<portlet:namespace/>formName); 
+    var index = 0;
+    while(jmsForm.elements["destination.${data.currentDestinationID}.instance-config-" + index]){
+        var currentElement = jmsForm.elements["destination.${data.currentDestinationID}.instance-config-" + index];
+        if(currentElement.title == "PhysicalName" && isEmptyString(currentElement.value)){
+            currentElement.value = jmsForm.elements["destination.${data.currentDestinationID}.name"].value;
+            break;             
+        }
+        index++;
+    }
     return true;
 }
 </script>

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp?rev=818105&r1=818104&r2=818105&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp Wed Sep 23 13:50:33 2009
@@ -62,7 +62,7 @@
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
         <th valign="top" style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>deploymentPlan"><fmt:message key="jmswizard.plan.deploymentPlan" />:</label></div></th>
-        <td><textarea rows="30" cols="60" id="<portlet:namespace/>deploymentPlan" readonly>${deploymentPlan}</textarea></td>
+        <td><textarea rows="40" cols="120" id="<portlet:namespace/>deploymentPlan" readonly>${deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>