[portal-commits] JBoss Portal SVN: r11028 - in branches/JBoss_Portal_Branch_2_7: core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin and 5 other directories.

Friday, 13 June 2008


Author: thomas.heute(a)jboss.com
Date: 2008-06-13 07:02:18 -0400 (Fri, 13 Jun 2008)
New Revision: 11028

Modified:
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/news/NewsPortlet.java
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/weather/WeatherPortlet.java
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_de.properties
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
Log:
More i18n
Use proxy settings
Add German title to the Samples user portlet


Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties	2008-06-13
11:02:18 UTC (rev 11028)
@@ -64,6 +64,7 @@
 CMS_EXPORTARCHIVE=Export Folder
 CMS_SECURE=Secure
 CMS_PREVIEW=Preview
+CMS_GO=Go
 
 CMS_CREATEFILEINDIR=Creating File in Directory
 CMS_FILENAME=FileName
@@ -113,7 +114,7 @@
 CMS_ERROR=Error
 CMS_PENDING_APPROVAL_QUEUE=Pending Approval Queue
 CMS_CONFIGURE_RESTRICTION=Configure security restrictions on node
-CMS_SELECT_ACTION=Select Action
+CMS_SELECT_ACTION=Select Action...
 CMS_BROWSING=Browsing
 CMS_CONTENT_NOT_FOUND=Content could not be found for the selected file
 CMS_INTRODUCTION=Introduction

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties	2008-06-13
11:02:18 UTC (rev 11028)
@@ -114,7 +114,7 @@
 CMS_ERROR=Fehler
 CMS_PENDING_APPROVAL_QUEUE=Zur Publikation freigegebene Artikel
 CMS_CONFIGURE_RESTRICTION=Sicherheitseinstellungen des Knotens konfigurieren
-CMS_SELECT_ACTION=W\u00e4hlen Sie eine Aktion
+CMS_SELECT_ACTION=W\u00e4hlen Sie eine Aktion...
 CMS_BROWSING=Suche
 CMS_CONTENT_NOT_FOUND=F\u00fcr die ausgew\u00e4hlte Datei konnte kein Inhalt gefunden
werden
 CMS_INTRODUCTION=Einf\u00fchrung

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties	2008-06-13
11:02:18 UTC (rev 11028)
@@ -109,7 +109,7 @@
 CMS_ERROR=Errore
 CMS_PENDING_APPROVAL_QUEUE=Coda in attesa di approvazione
 CMS_CONFIGURE_RESTRICTION=Configura le restrizioni di sicurezza sul nodo
-CMS_SELECT_ACTION=Seleziona l\'azione
+CMS_SELECT_ACTION=Seleziona l\'azione...
 CMS_BROWSING=Navigazione
 CMS_CONTENT_NOT_FOUND=Non ci sono contenuti per il file selezionato
 CMS_INTRODUCTION=Introduzione

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp	2008-06-13
11:02:18 UTC (rev 11028)
@@ -105,7 +105,7 @@
 
    <div class="menu">
       <select
onchange="window.open(this.options[this.selectedIndex].value,'_top')">
-         <option
value="">${n:i18n("CMS_SELECT_ACTION")}...</option>
+         <option
value="">${n:i18n("CMS_SELECT_ACTION")}</option>
          <option value="<portlet:renderURL>
                      <portlet:param name="op" value="<%=
CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
                      <portlet:param name="path" value="<%= sCurrPath
%>"/>
@@ -227,7 +227,7 @@
             <option value="<%= CMSAdminConstants.OP_CONFIRMMOVE
%>">${n:i18n("CMS_MOVE")}</option>
             <option value="<%= CMSAdminConstants.OP_CONFIRMDELETE
%>">${n:i18n("CMS_DELETE")}</option>
          </select>
-         <input type="submit" value="Go" name="Go"
class="portlet-form-button"/>
+         <input type="submit" value="Go"
name="${n:i18n("CMS_GO")}" class="portlet-form-button"/>
       </form>
    </td>
    <td>

Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml	2008-06-13
11:02:18 UTC (rev 11028)
@@ -56,7 +56,7 @@
 	
 	<hr/>
 	<h:form>
-		<p style="text-align: right; padding-right: 5px;"><h:commandLink
value="Create new role" action="createRole"
styleClass="actionCreateInstance"/></p>
+		<p style="text-align: right; padding-right: 5px;"><h:commandLink
value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}" action="createRole"
styleClass="actionCreateInstance"/></p>
 	</h:form>
 </ui:define>
 </ui:composition>

Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/news/NewsPortlet.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/news/NewsPortlet.java	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/news/NewsPortlet.java	2008-06-13
11:02:18 UTC (rev 11028)
@@ -24,6 +24,7 @@
 package org.jboss.portal.core.samples.news;
 
 import org.apache.log4j.Logger;
+import org.jboss.portal.common.net.URLTools;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -127,7 +128,7 @@
             newURL = request.getPreferences().getValue("RssXml", RSS_URL);
          }
 
-         xmlInputStream = new URL(newURL).openStream();
+         xmlInputStream = URLTools.getContentAsInputStream(new URL(newURL), 5000, 5000);
          if (xmlInputStream == null)
          {
             log.error(E_UNREADABLE);

Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/weather/WeatherPortlet.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/weather/WeatherPortlet.java	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/weather/WeatherPortlet.java	2008-06-13
11:02:18 UTC (rev 11028)
@@ -23,6 +23,7 @@
 package org.jboss.portal.core.samples.weather;
 
 import org.apache.log4j.Logger;
+import org.jboss.portal.common.net.URLTools;
 import org.w3c.dom.Document;
 
 import javax.portlet.ActionRequest;
@@ -118,7 +119,7 @@
             newZip = request.getPreferences().getValue("RssXml", RSS_URL_PREFIX
+ DEFAULT_ZIP);
          }
 
-         xmlInputStream = new URL(newZip).openStream();
+         xmlInputStream = URLTools.getContentAsInputStream(new URL(newZip), 5000, 5000);
          if (xmlInputStream == null)
          {
             log.error(E_UNREADABLE);

Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties	2008-06-13
11:02:18 UTC (rev 11028)
@@ -20,6 +20,8 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
 ################################################################################
+javax.portlet.title=Current users
+javax.portlet.keywords=sample,test
 
 NO_USERS_ONLINE=No online user
 ONE_USER_ONLINE_0=There is <b>

Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_de.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_de.properties	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_de.properties	2008-06-13
11:02:18 UTC (rev 11028)
@@ -20,6 +20,8 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
 ################################################################################
+javax.portlet.title=Momentan angemeldete Benutzer
+javax.portlet.keywords=beispiel,test
 
 NO_USERS_ONLINE=Keine Benutzer online
 ONE_USER_ONLINE_0=Es ist <b>

Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml	2008-06-13
10:37:23 UTC (rev 11027)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml	2008-06-13
11:02:18 UTC (rev 11028)
@@ -55,10 +55,6 @@
       <supported-locale>de</supported-locale>
       <supported-locale>ru</supported-locale>
       <resource-bundle>Resource</resource-bundle>
-      <portlet-info>
-         <title>Current users</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
       <portlet-preferences>
          <preference>
             <name>guestNumber</name>


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r11028 - in branches/JBoss_Portal_Branch_2_7: core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin and 5 other directories.