You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/01/16 21:49:37 UTC

svn commit: r612567 - in /geronimo/server/trunk/plugins/console/plugin-portlets/src/main: java/org/apache/geronimo/console/car/AddRepositoryHandler.java resources/pluginportlets.properties resources/pluginportlets_zh.properties

Author: gawor
Date: Wed Jan 16 12:49:35 2008
New Revision: 612567

URL: http://svn.apache.org/viewvc?rev=612567&view=rev
Log:
update geronimo server maven repo link, catch unknonwn host exceptions.

Modified:
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java
    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

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java?rev=612567&r1=612566&r2=612567&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java Wed Jan 16 12:49:35 2008
@@ -32,6 +32,7 @@
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.UnknownHostException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
@@ -117,6 +118,9 @@
                     con.connect();
                 } catch (ConnectException e) {
                     response.setRenderParameter("repoError", "Unable to connect to "+url+" ("+e.getMessage()+")");
+                    return false;
+                } catch (UnknownHostException e) {
+                    response.setRenderParameter("repoError", "Unknown host: " + url.getHost());
                     return false;
                 }
                 int result = con.getResponseCode();

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=612567&r1=612566&r2=612567&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 Wed Jan 16 12:49:35 2008
@@ -19,7 +19,7 @@
 ajax.progressbar.processing = Processing...
 
 car.addRepository.currentlyPluginRepositories = The currently available plugin repositories are
-car.addRepository.downloadRunningCongfig      = You can also download running configurations from another Geronimo server just as if you're browsing and installing third-party plugins. If you want to point to a remote Geronimo server, enter a URL such as <tt>http://geronimo-server:8080/console-standard/maven-repo/</tt>
+car.addRepository.downloadRunningCongfig      = You can also download running configurations from another Geronimo server just as if you're browsing and installing third-party plugins. If you want to point to a remote Geronimo server, enter a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt>
 car.addRepository.howToAddPluginRepositories  = To add a new plugin repository to this list, enter the URL to the repository. The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository.
 car.addRepository.title                       = Add Plugin Repository
 car.common.addRepository                      = Add Repository
@@ -63,7 +63,7 @@
 car.index.createGeronimoPluginExp             = Choose a configuration in the current Geronimo server to export as a Geronimo plugin.  The configuration will be saved as a CAR file to your local filesystem.<i>Note: at present, you must manually add a <tt>META-INF/geronimo-plugin.xml</tt> file to the CAR  after you export it in order for it to be a valid plugin.</i>
 car.index.optionalAuthentication              = Optional Authentication
 car.index.removePluginsExp                    = To remove a plugin, use the categories under <b>Applications</b> to locate the plugin module and uninstall it.
-car.index.summary                             = <p>This portlet lets you install or create Geronimo plugins. This can be used to install new features into a Geronimo server at runtime.</p> <h2>Install Geronimo Plugins</h2> <p>Choose a remote repository to inspect for available Geronimo plugins.  The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository.</p> <p>You can also download running configurations from another Geronimo server  just as if you're browsing and installing third-party plugins.  If you want to point to a remote Geronimo server,  enter a URL such as <tt>http://geronimo-server:8080/console-standard/maven-repo/</tt>  and the enter the administrator username and password in the optional authentication fields.</p>
+car.index.summary                             = <p>This portlet lets you install or create Geronimo plugins. This can be used to install new features into a Geronimo server at runtime.</p> <h2>Install Geronimo Plugins</h2> <p>Choose a remote repository to inspect for available Geronimo plugins.  The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository.</p> <p>You can also download running configurations from another Geronimo server  just as if you're browsing and installing third-party plugins.  If you want to point to a remote Geronimo server,  enter a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt>  and the enter the administrator username and password in the optional authentication fields.</p>
 car.index.updateRepositoryList                = Update Repository List
 car.list.noPlugins                            = No plugins are listed at this repository.
 car.list.pluginRepo                           = Plugins listed at 

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=612567&r1=612566&r2=612567&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 Wed Jan 16 12:49:35 2008
@@ -19,7 +19,7 @@
 ajax.progressbar.processing = \u5904\u7406\u4E2D...
 
 car.addRepository.currentlyPluginRepositories = \u5F53\u524D\u53EF\u7528\u7684\u63D2\u4EF6\u4ED3\u5E93\u6709
-car.addRepository.downloadRunningCongfig      = \u4F60\u4E5F\u53EF\u4EE5\u5C31\u50CF\u6D4F\u89C8\u5E76\u5B89\u88C5\u7B2C\u4E09\u65B9\u63D2\u4EF6\u4E00\u6837\u4ECE\u53E6\u4E00\u4E2AGeronimo\u670D\u52A1\u5668\u4E2D\u4E0B\u8F7D\u8FD0\u884C\u65F6\u7684\u914D\u7F6E\uFF0C\u5982\u679C\u4F60\u8981\u6307\u5411\u8FDC\u7A0BGeronimo\u670D\u52A1\u5668\uFF0C\u5728\u4E0B\u9762\u8F93\u5165\u7C7B\u4F3C<tt>http://geronimo-server:8080/console-standard/maven-repo/</tt>\u7684URL
+car.addRepository.downloadRunningCongfig      = \u4F60\u4E5F\u53EF\u4EE5\u5C31\u50CF\u6D4F\u89C8\u5E76\u5B89\u88C5\u7B2C\u4E09\u65B9\u63D2\u4EF6\u4E00\u6837\u4ECE\u53E6\u4E00\u4E2AGeronimo\u670D\u52A1\u5668\u4E2D\u4E0B\u8F7D\u8FD0\u884C\u65F6\u7684\u914D\u7F6E\uFF0C\u5982\u679C\u4F60\u8981\u6307\u5411\u8FDC\u7A0BGeronimo\u670D\u52A1\u5668\uFF0C\u5728\u4E0B\u9762\u8F93\u5165\u7C7B\u4F3C<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>\u7684URL
 car.addRepository.howToAddPluginRepositories  = \u8981\u6DFB\u52A0\u4E00\u4E2A\u65B0\u7684\u63D2\u4EF6\u4ED3\u5E93\u5230\u5217\u8868\u4E2D\uFF0C\u5728\u4E0B\u9762\u7684\u6587\u672C\u6846\u4E2D\u8F93\u5165\u4ED3\u5E93\u7684URL\u3002\u4ED3\u5E93\u7684\u9876\u5C42\u76EE\u5F55\u4E2D\u5FC5\u987B\u6709\u4E00\u4E2A<tt>geronimo-plugins.xml</tt>\u6587\u4EF6\uFF0C\u6587\u4EF6\u4E2D\u5217\u51FA\u4E86\u8BE5\u5B58\u4ED3\u4E2D\u53EF\u7528\u7684\u63D2\u4EF6\u3002
 car.addRepository.title                       = \u6DFB\u52A0\u63D2\u4EF6\u4ED3\u5E93
 car.common.addRepository                      = \u6DFB\u52A0\u63D2\u4EF6\u4ED3\u5E93
@@ -63,7 +63,7 @@
 car.index.createGeronimoPluginExp             = \u5728\u5F53\u524DGeronimo\u670D\u52A1\u5668\u4E2D\u9009\u62E9\u8981\u4F5C\u4E3AGeronimo\u63D2\u4EF6\u5BFC\u51FA\u7684\u914D\u7F6E\u3002\u8FD9\u4E2A\u914D\u7F6E\u5C06\u4EE5CAR\u6587\u4EF6\u7684\u5F62\u5F0F\u4FDD\u5B58\u5230\u4F60\u672C\u5730\u7CFB\u7EDF\u4E2D\u3002<i>\u6CE8\u610F\uFF1A\u5728\u4F60\u5C06\u5B83\u5BFC\u51FA\u540E\uFF0C\u76EE\u524D\u8981\u4F7F\u5B83\u5F53\u4F5C\u4E00\u4E2A\u6709\u6548\u7684\u63D2\u4EF6\uFF0C\u4F60\u5FC5\u987B\u624B\u52A8\u5730\u6DFB\u52A0<tt>META-INF/geronimo-plugin.xml</tt>\u6587\u4EF6\u5230CAR\u4E2D\u3002</i>
 car.index.optionalAuthentication              = \u53EF\u9009\u9A8C\u8BC1\u4FE1\u606F
 car.index.removePluginsExp                    = \u4E3A\u4E86\u5220\u9664\u4E00\u4E2A\u63D2\u4EF6\uFF0C\u5728\u53F3\u8FB9\u5BFC\u822A\u9762\u677F\u7684<b>\u5E94\u7528\u7A0B\u5E8F</b>\u4E0B\u76F8\u5E94\u7684\u7C7B\u522B\u4E2D\u627E\u5230\u63D2\u4EF6\u7684\u6A21\u5757\uFF0C\u5E76\u5378\u8F7D\u5B83\u3002
-car.index.summary                             = <p>\u8FD9\u4E2Aportlet\u8BA9\u4F60\u5B89\u88C5\u6216\u8005\u521B\u5EFAGeronimo\u63D2\u4EF6\u3002\u8FD9\u53EF\u4EE5\u7528\u4E8E\u5728\u8FD0\u884C\u65F6\u5B89\u88C5\u65B0\u7684features\u5230\u4F60\u7684Geronimo\u670D\u52A1\u5668\u4E2D\u3002</p> <h2>\u5B89\u88C5Geronimo\u63D2\u4EF6</h2><p>\u9009\u62E9\u4E00\u4E2A\u8FDC\u7A0B\u7684\u4ED3\u5E93\u6765\u67E5\u770B\u53EF\u7528\u7684Geronimo\u63D2\u4EF6\u3002\u4ED3\u5E93\u7684\u6839\u76EE\u5F55\u4E0B\u5E94\u5F53\u6709\u4E00\u4E2A<tt>geronimo-plugins.xml</tt>\u6587\u4EF6\uFF0C\u8FD9\u4E2A\u6587\u4EF6\u7528\u4E8E\u5217\u51FA\u5728\u4ED3\u5E93\u4E2D\u53EF\u7528\u7684\u63D2\u4EF6\u3002</p> <p>\u4F60\u4E5F\u53EF\u4EE5\u5C31\u50CF\u6D4F\u89C8\u5E76\u5B89\u88C5\u7B2C\u4E09\u65B9\u63D2\u4EF6\u4E00\u6837\u4ECE\u53E6\u4E00\u4E2AGeronimo\u670D\u52A1\u5668\u4E2D\u4E0B\u8F7D\u8FD0\u884C\u65F6\u7684\u914D\u7F6E\uFF0C\u5982\u679C\u4F60\u8981\u6307\u5411\u8FDC\u7A0B\u7684Geronimo\u670D\u52A1\u5668\uFF0
 C\u8F93\u5165\u50CF<tt>http://geronimo-server:8080/console-standard/maven-repo/</tt>\u7684URL\uFF0C\u4EE5\u53CA\u8F93\u5165\u7528\u6237\u540D\u548C\u5BC6\u7801\u5230\u53EF\u9009\u7684\u4E0E\u9A8C\u8BC1\u6709\u5173\u7684\u5B57\u6BB5\u4E2D\u3002
+car.index.summary                             = <p>\u8FD9\u4E2Aportlet\u8BA9\u4F60\u5B89\u88C5\u6216\u8005\u521B\u5EFAGeronimo\u63D2\u4EF6\u3002\u8FD9\u53EF\u4EE5\u7528\u4E8E\u5728\u8FD0\u884C\u65F6\u5B89\u88C5\u65B0\u7684features\u5230\u4F60\u7684Geronimo\u670D\u52A1\u5668\u4E2D\u3002</p> <h2>\u5B89\u88C5Geronimo\u63D2\u4EF6</h2><p>\u9009\u62E9\u4E00\u4E2A\u8FDC\u7A0B\u7684\u4ED3\u5E93\u6765\u67E5\u770B\u53EF\u7528\u7684Geronimo\u63D2\u4EF6\u3002\u4ED3\u5E93\u7684\u6839\u76EE\u5F55\u4E0B\u5E94\u5F53\u6709\u4E00\u4E2A<tt>geronimo-plugins.xml</tt>\u6587\u4EF6\uFF0C\u8FD9\u4E2A\u6587\u4EF6\u7528\u4E8E\u5217\u51FA\u5728\u4ED3\u5E93\u4E2D\u53EF\u7528\u7684\u63D2\u4EF6\u3002</p> <p>\u4F60\u4E5F\u53EF\u4EE5\u5C31\u50CF\u6D4F\u89C8\u5E76\u5B89\u88C5\u7B2C\u4E09\u65B9\u63D2\u4EF6\u4E00\u6837\u4ECE\u53E6\u4E00\u4E2AGeronimo\u670D\u52A1\u5668\u4E2D\u4E0B\u8F7D\u8FD0\u884C\u65F6\u7684\u914D\u7F6E\uFF0C\u5982\u679C\u4F60\u8981\u6307\u5411\u8FDC\u7A0B\u7684Geronimo\u670D\u52A1\u5668\uFF0
 C\u8F93\u5165\u50CF<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>\u7684URL\uFF0C\u4EE5\u53CA\u8F93\u5165\u7528\u6237\u540D\u548C\u5BC6\u7801\u5230\u53EF\u9009\u7684\u4E0E\u9A8C\u8BC1\u6709\u5173\u7684\u5B57\u6BB5\u4E2D\u3002
 car.index.updateRepositoryList                = \u66F4\u65B0\u5B58\u50A8\u5E93\u5217\u8868
 car.list.noPlugins                            = \u6B64\u7AD9\u70B9\u4E0B\u6CA1\u6709Plugin.
 car.list.pluginRepo                           = Plugins\u4F4D\u4E8E