geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r703504 - in /geronimo/server/trunk/plugins/console/plugin-portlets/src/main: resources/pluginportlets.properties resources/pluginportlets_zh.properties webapp/WEB-INF/view/car/assemblylist.jsp webapp/WEB-INF/view/car/viewForDownload.jsp
Date Fri, 10 Oct 2008 15:45:16 GMT
Author: linsun
Date: Fri Oct 10 08:45:16 2008
New Revision: 703504

URL: http://svn.apache.org/viewvc?rev=703504&view=rev
Log:
select framework plugin group by default related to GERONIMO-4226

Modified:
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties?rev=703504&r1=703503&r2=703504&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
Fri Oct 10 08:45:16 2008
@@ -114,10 +114,10 @@
 car.results.title                             = The plugin {0} has been installed.
 car.results.titles                            = The following plugin(s) have been installed:
 car.viewForDownload.author                    = Author
+car.viewForDownload.category                  = Category
 car.viewForDownload.dependencies              = Dependencies
 car.viewForDownload.description               = Description
 car.viewForDownload.geronimoVersions          = Geronimo-Versions
-car.viewForDownload.group                     = Group
 car.viewForDownload.installable               = Installable
 car.viewForDownload.jvmVersions               = JVM Versions
 car.viewForDownload.license                   = License

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties?rev=703504&r1=703503&r2=703504&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
Fri Oct 10 08:45:16 2008
@@ -112,10 +112,10 @@
 car.results.filesProcessed                    = \u6587\u4EF6\u5DF2\u5904\u7406
 car.results.title                             = \u5DF2\u7ECF\u5B89\u88C5\u4E86\u63D2\u4EF6{0}\u3002
 car.viewForDownload.author                    = \u4F5C\u8005
+car.viewForDownload.category                  = Category
 car.viewForDownload.dependencies              = \u4F9D\u8D56
 car.viewForDownload.description               = \u63CF\u8FF0
 car.viewForDownload.geronimoVersions          = Geronimo\u7248\u672C
-car.viewForDownload.group                     = Group
 car.viewForDownload.installable               = \u53EF\u5B89\u88C5\u7684
 car.viewForDownload.jvmVersions               = JVM\u7248\u672C
 car.viewForDownload.license                   = \u8BB8\u53EF\u8BC1

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp?rev=703504&r1=703503&r2=703504&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
Fri Oct 10 08:45:16 2008
@@ -121,7 +121,7 @@
 <c:forEach var="plugin" items="${plugins}" varStatus="status">
 <c:set var="style" value="${status.index % 2 == 0 ? 'MediumBackground' : 'LightBackground'}"/>
 <c:set var="artifact" value="${plugin.pluginArtifact.moduleId}"/>
-<c:if test="${artifact.artifactId eq 'geronimo-boilerplate'}">
+<c:if test="${plugin.isPluginGroup && artifact.artifactId eq 'framework'}">
 <tr>
   <td class="${style}">
     <input type="checkbox" name="plugin" title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"
value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}" CHECKED/>
@@ -155,7 +155,10 @@
 <c:if test="${plugin.isPluginGroup}">
 <tr>
   <td class="${style}">
-    <input type="checkbox" name="plugin" title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"
value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
+    <input type="checkbox" name="plugin" 
+           title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"

+           value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"
+           <c:if test="${artifact.artifactId eq 'framework'}">CHECKED</c:if>/>
   </td>
   <td class="${style}">
     <a href='<portlet:actionURL>
@@ -220,7 +223,9 @@
 <c:if test="${!plugin.isSystemPlugin}">
 <tr>
   <td class="${style}">
-    <input type="checkbox" name="plugin" title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"
value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
+    <input type="checkbox" name="plugin" 
+           title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"

+           value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
   </td>
   <td class="${style}">
     <a href='<portlet:actionURL>
@@ -252,9 +257,12 @@
 <c:set var="artifact" value="${plugin.pluginArtifact.moduleId}"/>
 <c:if test="${plugin.isSystemPlugin}">
 <tr>
-    <td class="${style}">
-        <input type="checkbox" name="plugin" title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"
value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>
-    </td>
+  <td class="${style}">
+    <input type="checkbox" name="plugin" 
+           title="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"

+           value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"
+           <c:if test="${plugin.isPluginGroup && artifact.artifactId eq 'framework'}">CHECKED</c:if>/>
+  </td>
   <td class="${style}">
     <a href='<portlet:actionURL>
       <portlet:param name="configId" value="${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}"/>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp?rev=703504&r1=703503&r2=703504&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
Fri Oct 10 08:45:16 2008
@@ -34,7 +34,7 @@
     <td>${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}</td>
   </tr>
   <tr>
-    <th align="right" valign="top"><fmt:message key="car.viewForDownload.group"
/>:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.category"
/>:</th>
     <td>${plugin.category}</td>
   </tr>
   <tr>



Mime
View raw message