portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r771869 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/ java/org/apache/jetspeed/portlets/prm/ resources/org/apache/jetspeed/portlets/prm/resources/
Date Tue, 05 May 2009 16:04:21 GMT
Author: woonsan
Date: Tue May  5 16:04:21 2009
New Revision: 771869

URL: http://svn.apache.org/viewvc?rev=771869&view=rev
Log:
JS2-946: Removes utility method usage of AdminPortletWebPage in string resource handling.

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java Tue May  5 16:04:21 2009
@@ -28,6 +28,7 @@
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
 
 
 /**
@@ -92,6 +93,10 @@
         super(pageMap, parameters);
     }
 
+    /**
+     * Please use {@link StringResourceModel} instead.
+     * @deprecated
+     */
     public String messageSubstition(String resource, String[]keys, Object[]values)
     {
         HashMap<String, Object> vars  = new HashMap<String, Object>(keys.length);

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java Tue May  5 16:04:21 2009
@@ -49,6 +49,7 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.model.StringResourceModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -277,12 +278,12 @@
             ApplicationBean pab = (ApplicationBean) getDefaultModelObject();
             
             final JetspeedServiceLocator locator = ((AbstractAdminWebApplication) getApplication()).getServiceLocator();
-            PortletApplication pa = locator.getPortletRegistry().getPortletApplication(pab.getApplicationName());
             ApplicationServerManager asm = locator.getApplicationServerManager();
+            PortletApplication pa = locator.getPortletRegistry().getPortletApplication(pab.getApplicationName());
             
-            boolean isRunning = locator.getPortletFactory().isPortletApplicationRegistered(pa);
-            boolean isLocal = pa.getApplicationType() == PortletApplication.LOCAL;
-            boolean isAdmin = (pa.getContextPath().equals(((AbstractAdminWebApplication) getApplication()).getPortletRequest().getContextPath()));
+            boolean isRunning = (pa != null && locator.getPortletFactory().isPortletApplicationRegistered(pa));
+            boolean isLocal = (pa != null && pa.getApplicationType() == PortletApplication.LOCAL);
+            boolean isAdmin = ((pa != null) && (pa.getContextPath().equals(((AbstractAdminWebApplication) getApplication()).getPortletRequest().getContextPath())));
 
             get("start").setVisible(
                                     (asm != null && !isRunning) && !(isLocal || isAdmin)
@@ -340,10 +341,8 @@
                             }
                             else
                             {
-                                feed.info(messageSubstition(
-                                                            "pam.details.action.status.startOK",
-                                                            new String[] { "path" }, 
-                                                            new Object[] { pab.getPath() } ));
+                                StringResourceModel resModel = new StringResourceModel("pam.details.action.status.startOK", this, null, new Object [] { pab.getPath() } );
+                                feed.info(resModel.getString());
                                 auditActivity.logAdminRegistryActivity(
                                                                        ((AbstractAdminWebApplication) getApplication()).getUserPrincipalName(),
                                                                        ((AbstractAdminWebApplication) getApplication()).getIPAddress(),
@@ -354,9 +353,8 @@
                         }
                         catch (Exception e)
                         {
-                            feed.error(messageSubstition("pam.details.action.status.startFailure",
-                                                         new String[] { "path", "msg" },
-                                                         new Object[] { pab.getPath(), e.getMessage()} ));
+                            StringResourceModel resModel = new StringResourceModel("pam.details.action.status.startFailure", this, null, new Object [] { pab.getPath(), e.getMessage() } );
+                            feed.error(resModel.getString());
                         }
                     }
                 }
@@ -389,9 +387,8 @@
                             }
                             else
                             {
-                                feed.info(messageSubstition("pam.details.action.status.stopOK",
-                                                            new String[] { "path" }, 
-                                                            new Object[] { pab.getPath() } ));
+                                StringResourceModel resModel = new StringResourceModel("pam.details.action.status.stopOK", this, null, new Object [] { pab.getPath() } );
+                                feed.info(resModel.getString());
                                 
                                 auditActivity.logAdminRegistryActivity(
                                                                        ((AbstractAdminWebApplication) getApplication()).getUserPrincipalName(),
@@ -403,9 +400,8 @@
                         }
                         catch (Exception e)
                         {
-                            feed.error(messageSubstition("pam.details.action.status.stopFailure",
-                                                         new String[] { "path", "msg" }, 
-                                                         new Object[] { pab.getPath(), e.getMessage() } ));
+                            StringResourceModel resModel = new StringResourceModel("pam.details.action.status.stopFailure", this, null, new Object [] { pab.getPath(), e.getMessage() } );
+                            feed.error(resModel.getString());
                         }
                     }
                 }
@@ -438,10 +434,8 @@
                             } 
                             else
                             {
-                                feed.info(messageSubstition("pam.details.action.status.undeployOK",
-                                                            new String[] { "path" }, 
-                                                            new Object[] { pab.getPath()} ));
-
+                                StringResourceModel resModel = new StringResourceModel("pam.details.action.status.undeployOK", this, null, new Object [] { pab.getPath() } );
+                                feed.info(resModel.getString());
                                 auditActivity.logAdminRegistryActivity(
                                                                        ((AbstractAdminWebApplication) getApplication()).getUserPrincipalName(),
                                                                        ((AbstractAdminWebApplication) getApplication()).getIPAddress(),
@@ -452,9 +446,8 @@
                         } 
                         catch (Exception e)
                         {
-                            feed.error(messageSubstition("pam.details.action.status.undeployFailure",
-                                                         new String[] { "path", "msg" }, 
-                                                         new Object[] { pab.getPath(), e.getMessage() } ));
+                            StringResourceModel resModel = new StringResourceModel("pam.details.action.status.undeployFailure", this, null, new Object [] { pab.getPath(), e.getMessage() } );
+                            feed.error(resModel.getString());
                         }
                     }
                 }
@@ -481,9 +474,8 @@
                         try
                         {
                             pam.unregisterPortletApplication(pa.getName());
-                            feed.info(messageSubstition("pam.details.action.status.deleteOK",
-                                                        new String[] { "path" }, 
-                                                        new Object[] { pab.getPath() } ));
+                            StringResourceModel resModel = new StringResourceModel("pam.details.action.status.deleteOK", this, null, new Object [] { pab.getPath() } );
+                            feed.info(resModel.getString());
                             auditActivity.logAdminRegistryActivity(
                                                                    ((AbstractAdminWebApplication) getApplication()).getUserPrincipalName(),
                                                                    ((AbstractAdminWebApplication) getApplication()).getIPAddress(),
@@ -493,9 +485,8 @@
                         }
                         catch (Exception e)
                         {
-                            feed.error(messageSubstition("pam.details.action.status.deleteFailure",
-                                                         new String[] { "path", "msg" }, 
-                                                         new Object[] { pab.getPath(), e.getMessage()} ));
+                            StringResourceModel resModel = new StringResourceModel("pam.details.action.status.deleteFailure", this, null, new Object [] { pab.getPath(), e.getMessage() } );
+                            feed.error(resModel.getString());
                         }
                     }
                 }
@@ -516,16 +507,14 @@
     {
         if (pa == null)
         {
-            feedback.error(messageSubstition("pam.details.action.status.serverReadyFailure", 
-                                             new String[] { "path", "operation" }, 
-                                             new Object[] { pab.getPath(), operation } ));
+            StringResourceModel resModel = new StringResourceModel("pam.details.action.status.serverReadyFailure", this, null, new Object [] { pab.getPath(), operation } );
+            feedback.error(resModel.getString());
             return false;
         } 
         else if (asm == null || !asm.isConnected())
         {
-            feedback.error(messageSubstition("pam.details.action.status.serverNotAvailable", 
-                                             new String[] { "path", "operation" }, 
-                                             new Object[] { pab.getPath(), operation }));
+            StringResourceModel resModel = new StringResourceModel("pam.details.action.status.serverNotAvailable", this, null, new Object [] { pab.getPath(), operation } );
+            feedback.error(resModel.getString());
             return false;
         }
         

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties Tue May  5 16:04:21 2009
@@ -127,17 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties Tue May  5 16:04:21 2009
@@ -125,17 +125,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties Tue May  5 16:04:21 2009
@@ -127,18 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:
-

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties Tue May  5 16:04:21 2009
@@ -127,18 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:
-

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties Tue May  5 16:04:21 2009
@@ -127,18 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:
-

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties Tue May  5 16:04:21 2009
@@ -127,17 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties Tue May  5 16:04:21 2009
@@ -126,18 +126,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:
-

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties Tue May  5 16:04:21 2009
@@ -129,18 +129,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:
-

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties Tue May  5 16:04:21 2009
@@ -127,18 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:
-

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties Tue May  5 16:04:21 2009
@@ -127,17 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties?rev=771869&r1=771868&r2=771869&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties Tue May  5 16:04:21 2009
@@ -127,17 +127,17 @@
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
-pam.details.action.status.startOK = Started portlet application successful: ${path}
-pam.details.action.status.stopOK = Stopped portlet application successful: ${path}
-pam.details.action.status.startFailure = Failed to start application : ${path} , message: ${msg} 
-pam.details.action.status.stopFailure = Failed to stop application : ${path} , message: ${msg}
+pam.details.action.status.startOK = Started portlet application successful: {0}
+pam.details.action.status.stopOK = Stopped portlet application successful: {0}
+pam.details.action.status.startFailure = Failed to start application : {0} , message: {1} 
+pam.details.action.status.stopFailure = Failed to stop application : {0} , message: {1}
 pam.details.action.status.appServerNotConfigured = The App Server does not seem to be configured for remote application lifecycle management
-pam.details.action.status.undeployOK = Undeployed portlet application successful: ${path}
-pam.details.action.status.undeployFailure = Failed to undeploy application : ${path} , message: ${msg}
-pam.details.action.status.deleteFailure = Cannot delete application ${path} from the registry, error: ${msg}
-pam.details.action.status.deleteOK = Portlet application removal from registry was successful: ${path}
-pam.details.action.status.serverReadyFailure = Failed to ${operation} application: ${path}. Portlet Application was not found in registry
-pam.details.action.status.serverNotAvailable = Failed to ${operation} application: ${path}. Connection to Application Server is not available. 
+pam.details.action.status.undeployOK = Undeployed portlet application successful: {0}
+pam.details.action.status.undeployFailure = Failed to undeploy application : {0} , message: {1}
+pam.details.action.status.deleteFailure = Cannot delete application {0} from the registry, error: {1}
+pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
+pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
+pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
 pam.details.message.rowsDisplayed = No. of Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message