geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1033381 - in /geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard: destination.jsp plan.jsp
Date Wed, 10 Nov 2010 07:42:07 GMT
Author: rwonly
Date: Wed Nov 10 07:42:07 2010
New Revision: 1033381

URL: http://svn.apache.org/viewvc?rev=1033381&view=rev
Log:
GERONIMO-5167 refix to keep code consistent with 2.2/3.0

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

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp?rev=1033381&r1=1033380&r2=1033381&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
Wed Nov 10 07:42:07 2010
@@ -21,6 +21,22 @@
 <fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
+<!-- GERONIMO-5167: Work around for Activemq - the physical name can not be null in activemq
-->
+<script language="javascript">
+function checknullphysicalname(){
+    var jmsForm = document.getElementById("<portlet:namespace/>JMSForm"); 
+    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" && currentElement.value == ""){
+            currentElement.value = jmsForm.elements["destination.${data.currentDestinationID}.name"].value;
+            break;             
+        }
+        index++;
+    }
+}
+</script>
+
 <p><fmt:message key="jmswizard.destination.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
@@ -82,17 +98,7 @@
       <tr>
         <th><div align="right">${prop.name}:</div></th>
         <td>
-        <!-- GERONIMO-5167: Work around for Activemq - the physical name can not be null
in activemq -->
-        <c:choose>
-          <c:when test="${prop.name == 'PhysicalName'}">
-            <div id="non-null-input-div">
-              <input name="destination.${data.currentDestinationID}.instance-config-${status.index}"
type="text" size="20" value="${data.currentDestination.instanceProps[index] == null ? prop.defaultValue
: data.currentDestination.instanceProps[index]}" />
-            </div>
-          </c:when>
-          <c:otherwise>
-              <input name="destination.${data.currentDestinationID}.instance-config-${status.index}"
type="text" size="20" value="${data.currentDestination.instanceProps[index] == null ? prop.defaultValue
: data.currentDestination.instanceProps[index]}" />
-          </c:otherwise>
-        </c:choose>
+        <input name="destination.${data.currentDestinationID}.instance-config-${status.index}"
title="${prop.name}"  type="text" size="20" value="${data.currentDestination.instanceProps[index]
== null ? prop.defaultValue : data.currentDestination.instanceProps[index]}" />
         </td>
       </tr>
       <tr>
@@ -106,20 +112,12 @@
         <td></td>
         <td>
             <input type="hidden" name="nextAction" value="review" />
-            <input type="submit" value='<fmt:message key="jmswizard.common.next"/>'
onclick="javascript:checknullphysicalname('destination.${data.currentDestinationID}.name')"
/>
+            <input type="submit" value='<fmt:message key="jmswizard.common.next"/>'
onclick="javascript:checknullphysicalname()" />
         </td>
       </tr>
     </table>
 </form>
-<script language="javascript">
-function checknullphysicalname(destinationInputBoxName){
-    var physicalNameInput = document.getElementById("non-null-input-div").getElementsByTagName("input")[0];
-    if (physicalNameInput.value==""){
-        physicalNameInput.value=document.getElementById(destinationInputBoxName).value;
-    }
-}
-</script>
-    
+   
 <!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
 
 

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp?rev=1033381&r1=1033380&r2=1033381&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp
Wed Nov 10 07:42:07 2010
@@ -62,7 +62,7 @@
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
         <th valign="top" style="min-width: 140px"><div align="right"><fmt:message
key="jmswizard.plan.deploymentPlan" />:</div></th>
-        <td><textarea rows="30" cols="60" readonly>${deploymentPlan}</textarea></td>
+        <td><textarea rows="40" cols="120" readonly>${deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>



Mime
View raw message