geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r883582 - in /geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main: i18n-resources/ java/org/apache/geronimo/console/repository/ webapp/WEB-INF/view/repository/
Date Tue, 24 Nov 2009 04:58:36 GMT
Author: xuhaihong
Date: Tue Nov 24 04:58:33 2009
New Revision: 883582

URL: http://svn.apache.org/viewvc?rev=883582&view=rev
Log:
Add help messages to repository portlet

Modified:
    geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
    geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
    geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
    geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
    geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp

Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties?rev=883582&r1=883581&r2=883582&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
(original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
Tue Nov 24 04:58:33 2009
@@ -1,4 +1,4 @@
-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
 #=====================================================================
 #  Licensed to the Apache Software Foundation (ASF) under one or more
 #  contributor license agreements.  See the NOTICE file distributed with
@@ -388,6 +388,8 @@
 repository.normal.currentRepositoryEntries = Current Repository Entries
 repository.normal.emptyText                = The focussed field must not be empty.
 repository.normal.invalidChar              = The focussed field contains invalid characters
+repository.normal.replacedName             = Replaced component name
+repository.normal.replacedNameDescription  = Specify an existing component name to be replaced
during runtime, the component name should be like groupId/artifactId/Version/Type. Otherwise,
leave the field blank.
 repository.normal.title                    = Add Archive to Repository
 repository.normal.toViewUsage              = Click on an entry to view usage.
 repository.usage.content                   = To use <b>{0}</b> in an application
or a module, add a dependency element under dependencies in environment element in it's deployment
plan as shown below:

Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties?rev=883582&r1=883581&r2=883582&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
(original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
Tue Nov 24 04:58:33 2009
@@ -397,6 +397,8 @@
 repository.normal.currentRepositoryEntries = 現在のリポジトリー・エントリー
 repository.normal.emptyText                = フォーカスされている項目は空欄にできません。
 repository.normal.invalidChar              = フォーカスされている項目に無効な文字が含まれています。
+repository.normal.replacedName             = Replaced component name
+repository.normal.replacedNameDescription  = Specify an existing component name to be replaced
during runtime, the component name should be like groupId/artifactId/Version/Type. Otherwise,
leave the field blank.
 repository.normal.title                    = アーカイブをリポジトリーに追加
 repository.normal.toViewUsage              = 使用方法を表示するには、エントリーをクリックしてください。
 repository.usage.content                   = <b>{0}</b> をアプリケーションやモジュール内で使用するには、以下のようにデプロイメント・プランの
dependencies 要素配下に dependency 要素を追加してください。

Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties?rev=883582&r1=883581&r2=883582&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
(original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
Tue Nov 24 04:58:33 2009
@@ -388,6 +388,8 @@
 repository.normal.currentRepositoryEntries = 当前存储库下条目
 repository.normal.emptyText                = 焦点所在字段不能为空。
 repository.normal.invalidChar              = 焦点所在字段包含非法字符。
+repository.normal.replacedName             = 被替换组件名
+repository.normal.replacedNameDescription  = 输入在运行时会被新加入组件替换掉的组件名称,要被替换掉的组件必须已存在于系统存储库中,并且所需输入的名称格式必须为
groupId/artifactId/Version/Type。如果不需要进行替换,保留该字段为空。
 repository.normal.title                    = 添加档案到存储库
 repository.normal.toViewUsage              = 点击每个条目来查看用法。
 repository.usage.content                   = 要在一个应用程序或模块中使用<b>{0}</b>,请在部署计划中的environment元素中的dependencies小节中添加一个dependency元素,如下所示:

Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java?rev=883582&r1=883581&r2=883582&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
(original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
Tue Nov 24 04:58:33 2009
@@ -196,7 +196,7 @@
                         }
                     }
                 }
-                if (jarName != null) {
+                if (jarName != null && jarName.length() > 0) {
                     ExplicitDefaultArtifactResolver instance = KernelRegistry.getSingleKernel().getGBean(ExplicitDefaultArtifactResolver.class);
                     Properties set = new Properties();
                     set.put(jarName, group + "/" + artifact + "/" + version + "/" + fileType);

Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp?rev=883582&r1=883581&r2=883582&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
(original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
Tue Nov 24 04:58:33 2009
@@ -122,34 +122,38 @@
   <td align="center">
   <form onsubmit="return <portlet:namespace/>validateForm();" enctype="multipart/form-data"
name="<portlet:namespace/>fileSelect" method="POST" action="<portlet:actionURL/>">
   <input type="hidden" value="deploy" name="action"/>
-  <table>
+  <table width="80%">
     <tr>
-      <th colspan="2"><fmt:message key="repository.normal.addArchiveToRepository"/></th>
+      <th colspan="2" align="center"><fmt:message key="repository.normal.addArchiveToRepository"/></th>
     </tr>
     <tr>
-      <td><label for="<portlet:namespace/>local"><fmt:message key="consolebase.common.file"/></label></td>
-      <td><input name="local" id="<portlet:namespace/>local" onchange="<portlet:namespace/>parse(value);"
type="file">&nbsp;&nbsp;&nbsp;</td>
+      <td align="right" width="40%"><label for="<portlet:namespace/>local"><fmt:message
key="consolebase.common.file"/></label></td>
+      <td align="left" width="60%"><input name="local" id="<portlet:namespace/>local"
onchange="<portlet:namespace/>parse(value);" type="file">&nbsp;&nbsp;&nbsp;</td>
     </tr>
     <tr>
-      <td><label for="<portlet:namespace/>group"><fmt:message key="consolebase.common.group"/></label>:</td>
-      <td><input type="text" name="group" id="<portlet:namespace/>group" value="${group}"/></td>
+      <td align="right" width="40%"><label for="<portlet:namespace/>group"><fmt:message
key="consolebase.common.group"/></label>:</td>
+      <td align="left" width="60%"><input type="text" name="group" id="<portlet:namespace/>group"
value="${group}"/></td>
     </tr>
     <tr>
-      <td><label for="<portlet:namespace/>artifact"><fmt:message key="repository.normal.artifact"/></label>:</td>
-      <td><input type="text" name="artifact" id="<portlet:namespace/>artifact"
value="${artifact}"/></td>
+      <td align="right" width="40%"><label for="<portlet:namespace/>artifact"><fmt:message
key="repository.normal.artifact"/></label>:</td>
+      <td align="left" width="60%"><input type="text" name="artifact" id="<portlet:namespace/>artifact"
value="${artifact}"/></td>
     </tr>
     <tr>
-      <td><label for="<portlet:namespace/>version"><fmt:message key="consolebase.common.version"/></label>:</td>
-      <td><input type="text" name="version" id="<portlet:namespace/>version"
value="${version}"/></td>
+      <td align="right" width="40%"><label for="<portlet:namespace/>version"><fmt:message
key="consolebase.common.version"/></label>:</td>
+      <td align="left" width="60%"><input type="text" name="version" id="<portlet:namespace/>version"
value="${version}"/></td>
     </tr>
     <tr>
-      <td><label for="<portlet:namespace/>fileType"><fmt:message key="consolebase.common.type"/></label>:</td>
-      <td><input type="text" name="fileType" id="<portlet:namespace/>fileType"
value="${fileType}"/></td>
+      <td align="right" width="40%"><label for="<portlet:namespace/>fileType"><fmt:message
key="consolebase.common.type"/></label>:</td>
+      <td align="left" width="60%"><input type="text" name="fileType" id="<portlet:namespace/>fileType"
value="${fileType}"/></td>
     </tr>
     <tr>
-      <td><label for="<portlet:namespace/>jarName"><fmt:message key="consolebase.common.name"/></label>:</td>
-      <td><input type="text" name="jarName" id="<portlet:namespace/>jarName"
value="${jarName}"/></td>
+      <td align="right" width="40%"><label for="<portlet:namespace/>jarName"><fmt:message
key="repository.normal.replacedName"/></label>:</td>
+      <td align="left" width="60%"><input type="text" name="jarName" id="<portlet:namespace/>jarName"
value="${jarName}"/></td>
     </tr>
+    <tr>
+      <td align="right" width="40%">&nbsp;</td>
+      <td align="left" width="60%"><fmt:message key="repository.normal.replacedNameDescription"/></td>
+    </tr>    
     <tr><td colspan="2"><font size="-2">&nbsp;</font></td></tr>
     <tr>
       <td colspan="2" align="center"><input type="submit" value='<fmt:message
key="consolebase.common.install"/>' /></td>



Mime
View raw message