JBoss Portal SVN: r10935 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: mputz
Date: 2008-06-06 10:02:22 -0400 (Fri, 06 Jun 2008)
New Revision: 10935
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
Log:
Fix for JBPORTAL-2032
fixes the incorrect handling of portlet definitions with special characters in the name
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2008-06-06 13:23:18 UTC (rev 10934)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2008-06-06 14:02:22 UTC (rev 10935)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui;
+import org.apache.commons.lang.StringEscapeUtils;
+
import org.jboss.logging.Logger;
import org.jboss.portal.Mode;
import org.jboss.portal.common.i18n.LocalizedString;
@@ -363,7 +365,7 @@
public String selectPortlet()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- selectedPortletId = (String)ctx.getExternalContext().getRequestParameterMap().get("id");
+ selectedPortletId = StringEscapeUtils.unescapeHtml( (String)ctx.getExternalContext().getRequestParameterMap().get("id") );
selectedPlugin = (String)ctx.getExternalContext().getRequestParameterMap().get("plugin");
selectedFrom = 0;
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10934 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: resources/portal-identity-war/WEB-INF/jsf/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mputz
Date: 2008-06-06 09:23:18 -0400 (Fri, 06 Jun 2008)
New Revision: 10934
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
Log:
fix for JBPORTAL-2013
fixes the defect that the role admin portlet doesn't work properly for roles with umlauts / special characters
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java 2008-06-06 13:18:59 UTC (rev 10933)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java 2008-06-06 13:23:18 UTC (rev 10934)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.jboss.portal.core.identity.ui;
+import org.jboss.portal.common.text.FastURLEncoder;
import org.jboss.portal.identity.Role;
/**
@@ -88,4 +89,9 @@
{
return name.replace("\\", "\\\\");
}
+
+ public String getUTF8RoleName()
+ {
+ return FastURLEncoder.getUTF8Instance().encode(getEscapedName());
+ }
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2008-06-06 13:18:59 UTC (rev 10933)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2008-06-06 13:23:18 UTC (rev 10934)
@@ -39,15 +39,15 @@
</f:facet>
<h:commandLink action="#{editrolemgr.editRole}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}" styleClass="actionRename"/>
- <f:param name="currentRole" value="#{role.escapedName}"/>
+ <f:param name="currentRole" value="#{role.UTF8RoleName}"/>
</h:commandLink>
| <h:commandLink action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
- <f:param name="currentRole" value="#{role.escapedName}"/>
+ <f:param name="currentRole" value="#{role.UTF8RoleName}"/>
</h:commandLink>
| <h:commandLink action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
- <f:param name="currentRole" value="#{role.escapedName}"/>
+ <f:param name="currentRole" value="#{role.UTF8RoleName}"/>
</h:commandLink>
</h:column>
</h:dataTable>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10933 - in branches/JBoss_Portal_Branch_2_6/core-admin: src/main/org/jboss/portal/core/admin/ui and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mputz
Date: 2008-06-06 09:18:59 -0400 (Fri, 06 Jun 2008)
New Revision: 10933
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/build.xml
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
Log:
Fix for JBPORTAL-2032
fixes the incorrect handling of portlet instances with special characters in the name
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2008-06-06 04:04:43 UTC (rev 10932)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2008-06-06 13:18:59 UTC (rev 10933)
@@ -95,6 +95,7 @@
<path refid="jboss.cache.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
+ <path refid="apache.lang.classpath"/>
<path refid="apache.myfaces.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="sun.servlet.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-06-06 04:04:43 UTC (rev 10932)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-06-06 13:18:59 UTC (rev 10933)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui;
+import org.apache.commons.lang.StringEscapeUtils;
+
import org.jboss.portal.Mode;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.core.model.instance.Instance;
@@ -352,7 +354,7 @@
FacesContext ctx = FacesContext.getCurrentInstance();
ExternalContext ectx = ctx.getExternalContext();
Map params = ectx.getRequestParameterMap();
- selectedId = (String)params.get("id");
+ selectedId = StringEscapeUtils.unescapeHtml( (String)params.get("id") );
selectedPlugin = (String)params.get("plugin");
selectedPrefs = null;
}
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10932 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-06 00:04:43 -0400 (Fri, 06 Jun 2008)
New Revision: 10932
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
Log:
"operating systems" should be lowercase
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-06 01:18:16 UTC (rev 10931)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-06 04:04:43 UTC (rev 10932)
@@ -31,7 +31,7 @@
</sect1>
<sect1>
<title>Supported Operating Systems</title>
- <para>JBoss Portal is 100% pure Java, and therefore it is interoperable with most Operating Systems
+ <para>JBoss Portal is 100% pure Java, and therefore it is interoperable with most operating systems
capable of running a Java Virtual Machine (JVM), including Linux, <trademark class="registered">Windows</trademark>, <trademark class="registered">UNIX</trademark> operating systems, and Mac OS X.
</para>
</sect1>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10931 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-05 21:18:16 -0400 (Thu, 05 Jun 2008)
New Revision: 10931
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
Log:
finishing Sun trademark section
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-06 01:05:45 UTC (rev 10930)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-06 01:18:16 UTC (rev 10931)
@@ -1,16 +1,14 @@
<preface id="trademarks">
<title>Please Read: Important Trademark Information</title>
<para>
+ JavaServer, JSP, Java, Java runtime environment, JRE, J2EE, JVM, Javadoc, JavaScript, and J2SE are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. Red Hat, Inc. is independent of Sun Microsystems, Inc.
+ </para>
</preface>
-To do:
+<!--To do:
-JavaServer(TM) Page, JSP(TM), Java(TM), Java runtime environment(TM), JRE(TM), J2EE(TM), Java Virtual Machine (JVM(TM)), Javadoc(TM), JavaScript(TM), J2SE(TM),
-
-
-
Apache?
Linux?
@@ -29,4 +27,4 @@
-'Apache is a trademark of The Apache Software Foundation, and is used with permission.' This is not necessary in the case of all-inclusive attribution language such as, 'All marks are the properties of their respective owners.' Contact the ASF Public Relations Committee <prc(a)apache.org> with all inquiries regarding trademark issues
\ No newline at end of file
+'Apache is a trademark of The Apache Software Foundation, and is used with permission.' This is not necessary in the case of all-inclusive attribution language such as, 'All marks are the properties of their respective owners.' Contact the ASF Public Relations Committee <prc(a)apache.org> with all inquiries regarding trademark issues -->
\ No newline at end of file
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10930 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-05 21:05:45 -0400 (Thu, 05 Jun 2008)
New Revision: 10930
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/authentication.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ldap.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
fixing the case of certain Java trademarks
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/authentication.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/authentication.xml 2008-06-06 01:04:56 UTC (rev 10929)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/authentication.xml 2008-06-06 01:05:45 UTC (rev 10930)
@@ -16,7 +16,7 @@
To better understand authentication mechanisms in JBoss Portal please refer to
<link linkend="security.security_authentication">Security</link> chapter.
To learn more about JAAS look for proper documentation on
- <ulink url="http://java.sun.com/javase/6/docs/technotes/guides/security/">Java security</ulink> website.
+ <ulink url="http://java.sun.com/javase/6/docs/technotes/guides/security/">Java Security</ulink> website.
To learn more about security in JBoss Application Server please read
<ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossSX">JBossSX</ulink> documentation.
</para>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-06 01:04:56 UTC (rev 10929)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-06 01:05:45 UTC (rev 10930)
@@ -266,7 +266,7 @@
<para>JBoss Portal uses the JBoss Microkernel for the service infrastructure. The JBoss Microkernel provides injection of services into other services, otherwise known as wiring. Due to the Microkernel being JMX based, it is only possible to inject dynamic proxies that talk to the MBeanServer. The overhead at runtime is minimal since the Microkernel implementation is highly optimized; however, when it is used with Java 5, a noticeable bottleneck occurs due to the fact that the implementation of the JMX API classes, <emphasis>javax.management.*</emphasis>, provided by the Java Platform, perform synchronization. This does not occur under JDK 1.4, since those classes are implemented by JBoss MX.
</para>
<para>
- JBoss Portal services use a special kind of Model MBean called <emphasis>JBossServiceModelMBean</emphasis>, which allows the un-wrapping of injected dynamic proxies, and replaces them with plain old java object (POJO) services. This removes the bottleneck when using Java 5, and also provides a performance boost on JDK 1.4. By default this feature is enabled, but it is possible to disable. To do this on Linux systems, change into the <filename>$JBOSS_HOME/bin/</filename> directory and run the following command:
+ JBoss Portal services use a special kind of Model MBean called <emphasis>JBossServiceModelMBean</emphasis>, which allows the un-wrapping of injected dynamic proxies, and replaces them with Plain Old Java Object (POJO) services. This removes the bottleneck when using Java 5, and also provides a performance boost on JDK 1.4. By default this feature is enabled, but it is possible to disable. To do this on Linux systems, change into the <filename>$JBOSS_HOME/bin/</filename> directory and run the following command:
</para>
<para>
<screen>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ldap.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ldap.xml 2008-06-06 01:04:56 UTC (rev 10929)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ldap.xml 2008-06-06 01:05:45 UTC (rev 10930)
@@ -154,7 +154,7 @@
</config>
</datasource>]]></programlisting>
<para>
- Remember, as it is described in the <ulink url="http://java.sun.com/products/jndi/tutorial/ldap/connect/config.html">JNDI documentation</ulink>, these options are system properties, not environment properties, and as such, they affect all connection pooling requests in the Java runtime.
+ Remember, as it is described in the <ulink url="http://java.sun.com/products/jndi/tutorial/ldap/connect/config.html">JNDI documentation</ulink>, these options are system properties, not environment properties, and as such, they affect all connection pooling requests in the Java runtime environment.
</para>
</sect2>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2008-06-06 01:04:56 UTC (rev 10929)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2008-06-06 01:05:45 UTC (rev 10930)
@@ -305,13 +305,7 @@
<sect1 id="security.security_authentication">
<title>Authentication with JBoss Portal</title>
- <para>JBoss Portal relies on Java EE for the authentication of users. The Java EE authentication has its advantages
- and drawbacks. The main motivation for using Java EE security is the integration with the application server and the
- operational environment in which the portal is deployed. The servlet layer provides already the authentication functionality
- and obviously it is not a responsibility of the portal. Whenever a user is authenticated by the servlet layer
- its security identity is propagated throughout the call stack in the different layers of the Java EE stack. The weaknesses
- are the lack of an explicit logout mechanism and the lack of dynamicity in the mapping of URL as security resources. However
- JBoss Portal improves that behavior when it is possible to do so.</para>
+ <para>JBoss Portal relies on Java Platform, Enterprise Edition (Java EE) for the authentication of users. The Java EE authentication has its advantages and drawbacks. The main motivation for using Java EE security is the integration with the application server and the operational environment in which the portal is deployed. The servlet layer provides already the authentication functionality and obviously it is not a responsibility of the portal. Whenever a user is authenticated by the servlet layer its security identity is propagated throughout the call stack in the different layers of the Java EE stack. The weaknesses are the lack of an explicit logout mechanism and the lack of dynamicity in the mapping of URL as security resources. However JBoss Portal improves that behavior when it is possible to do so.</para>
<sect2>
<title>Authentication configuration</title>
<para>JBoss Portal can be seen before all as a web application and therefore inherits all the configuration mechanisms
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-06 01:04:56 UTC (rev 10929)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-06 01:05:45 UTC (rev 10930)
@@ -148,7 +148,7 @@
<sect3>
<title>Package Structure</title>
<para>
- Like other Java EE applications, portlets are packaged in WAR files. A typical portlet WAR file can include servlets, resource bundles, images, HTML, JSPs, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPortlet portlet:
+ Like other Java Platform, Enterprise Edition (Java EE) applications, portlets are packaged in WAR files. A typical portlet WAR file can include servlets, resource bundles, images, HTML, JSPs, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPortlet portlet:
</para>
<para>
<mediaobject>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10929 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-05 21:04:56 -0400 (Thu, 05 Jun 2008)
New Revision: 10929
Added:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
Log:
adding a new page. Work in progress. Have not committed
new master file to include yet...
Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-06 01:04:56 UTC (rev 10929)
@@ -0,0 +1,32 @@
+<preface id="trademarks">
+ <title>Please Read: Important Trademark Information</title>
+ <para>
+
+</preface>
+
+
+To do:
+
+JavaServer(TM) Page, JSP(TM), Java(TM), Java runtime environment(TM), JRE(TM), J2EE(TM), Java Virtual Machine (JVM(TM)), Javadoc(TM), JavaScript(TM), J2SE(TM),
+
+
+
+Apache?
+
+Linux?
+
+
+All the sun stuff
+
+Oracle covered...(but check)
+
+Microsoft?
+
+
+Mail them first (see Apache Jackrabbit)
+
+
+
+
+
+'Apache is a trademark of The Apache Software Foundation, and is used with permission.' This is not necessary in the case of all-inclusive attribution language such as, 'All marks are the properties of their respective owners.' Contact the ASF Public Relations Committee <prc(a)apache.org> with all inquiries regarding trademark issues
\ No newline at end of file
Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
___________________________________________________________________
Name: svn:executable
+ *
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10928 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF: jsf/consumers and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-05 07:52:50 -0400 (Thu, 05 Jun 2008)
New Revision: 10928
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Log:
- More i18n and l10n. Still need to i18n bean messages.
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-05 11:52:34 UTC (rev 10927)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-05 11:52:50 UTC (rev 10928)
@@ -33,3 +33,63 @@
path_consumers_active = active
path_consumers_inactive = inactive
path_consumers_refreshNeeded = (refresh needed)
+
+confirm_delete_consumer_title = Delete ''{0}'' consumer?
+confirm_delete_consumer_message = You are about to delete the ''{0}'' consumer!
+confirm_detete_consumer_proceed = Are you sure you want to proceed?
+confirm_delete_consumer_submit = Delete consumer
+confirm_delete_consumer_cancel = Cancel
+
+confirm_delete_registration_title = Delete local registration for ''{0}'' consumer?
+confirm_delete_registration_message = You are about to delete the local registration information for the ''{0}'' consumer! \n\
+This is only needed if this consumer had previously registered with the remote producer and this producer \n\
+has been modified to not require registration anymore.<br/><br/> \n\
+Only erase local registration information if you experience errors with the producer due to this \n\
+particular situation. Erasing local registration when not required might lead to inability to work with \n\
+this producer anymore.
+confirm_delete_registration_proceed = Are you sure you want to proceed?
+confirm_delete_registration_submit = Erase local registration
+confirm_delete_registration_cancel = Cancel
+
+consumers_title = Manage Consumers
+consumers_create_title = Create a consumer named:
+consumers_create_submit = Create Consumer
+
+consumers_table_column_consumer = Consumer
+consumers_table_column_consumer_status = status:
+consumers_table_column_actions = Actions
+consumers_table_action_configure = Configure
+consumers_table_action_refresh = Refresh
+consumers_table_action_activate = Activate
+consumers_table_action_deactivate = Deactivate
+consumers_table_action_register = Register
+consumers_table_action_deregister = Deregister
+consumers_table_action_delete = Delete
+
+edit_consumer_producer = Producer id:
+edit_consumer_cache = Cache expiration:
+edit_consumer_cache_seconds = (seconds before expiration)
+edit_consumer_endpoint = Endpoint configuration:
+edit_consumer_endpoint_wsdl = Use WSDL?
+edit_consumer_endpoint_sd = Service Description URL:
+edit_consumer_endpoint_m = Markup URL:
+edit_consumer_endpoint_r = Registration URL:
+edit_consumer_endpoint_pm = Portlet Management URL:
+edit_consumer_registration = Registration information:
+edit_consumer_registration_current = Current registration information:
+edit_consumer_prop_name = Name
+edit_consumer_prop_desc = Description
+edit_consumer_prop_value = Value
+edit_consumer_registration_update_props = Update properties
+edit_consumer_registration_no_props = Registration is indicated as required without registration properties.
+edit_consumer_registration_modify = Modify registration
+edit_consumer_registration_modify_title = Modify the registration held with this producer
+edit_consumer_registration_expected = Expected registration information:
+edit_consumer_no_registration = Producer doesn't require registration.
+edit_consumer_registration_context = Registration context:
+edit_consumer_registration_context_handle = Handle:
+edit_consumer_registration_context_erase = Erase local registration
+edit_consumer_registration_context_erase_title = Erase local registration information (potentially dangerous!)
+edit_consumer_refresh = Refresh & Save
+edit_consumer_refresh_title = Save changes and refresh information from producer
+edit_consumer_cancel = Cancel
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-05 11:52:34 UTC (rev 10927)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-05 11:52:50 UTC (rev 10928)
@@ -33,3 +33,58 @@
path_consumers_active = actif
path_consumers_inactive = inactif
path_consumers_refreshNeeded = (rafra\u00eechissement requis)
+confirm_delete_consumer_cancel=Annuler
+confirm_delete_consumer_message=Vous \u00eates sur le point d'effacer le concommateur ''{0}''!
+confirm_delete_consumer_submit=Effacer consommateur
+confirm_delete_consumer_title=Voulez-vous r\u00e9ellement effacer le consommateur ''{0}''?
+confirm_detete_consumer_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
+confirm_delete_registration_cancel=Annuler
+confirm_delete_registration_message=Vous \u00eates sur le point d'effacer les informations locales d'enregistrement pour le consommateur ''{0}''! \n\
+Ceci n'est uniquement requis dans le cas o\u00f9 ce consommateur se serait enregistr\u00e9 aupr\u00e8s d'un producteur distant \n\
+qui aurait ensuite \u00e9t\u00e9 modifi\u00e9 pour ne plus requerir d'enregistrement.<br/><br/> \n\
+N'effacez les informations locales d'enregistrement que si vous rencontrez des probl\u00e8mes, sp\u00e9cifiques \u00e0 cette \n\
+situation, avec le producteur distant. Effacer les donn\u00e9es d'enregistrement quand ce n'est pas requis peut entra\u00eener \n\
+l'incapacit\u00e9 future d'acc\u00e9der \u00e0 ce producteur.
+confirm_delete_registration_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
+confirm_delete_registration_submit=Effacer enregistrement
+confirm_delete_registration_title=Voulez-vous r\u00e9ellement effacer l'enregistrement du consommateur ''{0}''?
+consumers_create_submit=Cr\u00e9er Consommateur
+consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9:
+consumers_table_action_activate=Activer
+consumers_table_action_configure=Configurer
+consumers_table_action_deactivate=D\u00e9sactiver
+consumers_table_action_delete=Effacer
+consumers_table_action_deregister=D\u00e9senregistrer
+consumers_table_action_refresh=Rafra\u00eechir
+consumers_table_action_register=Enregister
+consumers_table_column_actions=Actions
+consumers_table_column_consumer=Consommateur
+consumers_table_column_consumer_status=status:
+consumers_title=Gestion des Consommateurs
+edit_consumer_cache=Expiration du cache:
+edit_consumer_cache_seconds=(secondes avant expiration)
+edit_consumer_cancel=Annuler
+edit_consumer_endpoint=Configuration du endpoint:
+edit_consumer_endpoint_m=URL Markup:
+edit_consumer_endpoint_pm=URL Portlet Management:
+edit_consumer_endpoint_r=URL Registration:
+edit_consumer_endpoint_sd=URL Service Description:
+edit_consumer_endpoint_wsdl=Utiliser WSDL?
+edit_consumer_no_registration=Enregistrement non-requis par le producteur.
+edit_consumer_producer=Identifiant du producteur:
+edit_consumer_prop_desc=Description
+edit_consumer_prop_name=Nom
+edit_consumer_prop_value=Valeur
+edit_consumer_refresh=Rafra\u00eechir & Sauvegarder
+edit_consumer_refresh_title=Sauvegarde des changements et rafra\u00eechissement \u00e0 partir du producteur
+edit_consumer_registration=Information d'enregistrement:
+edit_consumer_registration_context=Contexte d'enregistrement:
+edit_consumer_registration_context_erase=Effacer enregistrement local
+edit_consumer_registration_context_erase_title=Effacer l'information locale d'enregistrement (potentiellement dangereux!)
+edit_consumer_registration_context_handle=Identifiant:
+edit_consumer_registration_current=Information actuelle d'enregistrement:
+edit_consumer_registration_expected=Information attendue d'enregistrement:
+edit_consumer_registration_modify=Modifier l'enregistrement
+edit_consumer_registration_modify_title=Modifier l'enregistrement avec ce producteur
+edit_consumer_registration_no_props=Enregistrement indiqu\u00e9 sans besoin de propri\u00e9t\u00e9s d'enregistrement
+edit_consumer_registration_update_props=Mettre les propri\u00e9t\u00e9s \u00e0 jour
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-05 11:52:50 UTC (rev 10928)
@@ -11,20 +11,26 @@
<div class="portlet-msg">
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
- <h3>Delete '#{consumersMgr.selectedConsumer.producerId}' consumer?</h3>
+ <h3>
+ <h:outputFormat value="#{i18n.confirm_delete_consumer_title}">
+ <f:param value="#{consumersMgr.selectedConsumer.producerId}"/>
+ </h:outputFormat>
+ </h3>
<p class="portlet-msg-alert">
- You are about to delete the '#{consumersMgr.selectedConsumer.producerId}' consumer!
+ <h:outputFormat value="#{i18n.confirm_delete_consumer_message}">
+ <f:param value="#{consumersMgr.selectedConsumer.producerId}"/>
+ </h:outputFormat>
</p>
- <p class="portlet-class">Are you sure you want to proceed?</p>
+ <p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p>
<h:form>
- <h:commandLink value="Delete consumer" action="#{consumersMgr.destroyConsumer}"
+ <h:commandLink value="#{i18n.confirm_delete_consumer_submit}" action="#{consumersMgr.destroyConsumer}"
styleClass="portlet-form-button portlet-section-buttonrow">
<f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
</h:commandLink>
- <h:commandButton value="Cancel" action="#{consumersMgr.listConsumers}"
+ <h:commandButton value="#{i18n.confirm_delete_consumer_cancel}" action="#{consumersMgr.listConsumers}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-06-05 11:52:50 UTC (rev 10928)
@@ -11,24 +11,24 @@
<div class="portlet-msg">
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
- <h3>Delete local registration for '#{consumer.id}' consumer?</h3>
+ <h3>
+ <h:outputFormat value="#{i18n.confirm_delete_registration_title">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
+ </h3>
<p class="portlet-msg-alert">
- You are about to delete the local registration information for the '#{consumer.id}' consumer!
- This is only needed if this consumer had previously registered with the remote producer and this producer
- has been modified to not require registration anymore.<br/><br/>
-
- Only erase local registration information if you experience errors with the producer due to this
- particular situation. Erasing local registration when not required might lead to inability to work with
- this producer anymore.
+ <h:outputFormat value="#{i18n.confirm_delete_registration_message">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
</p>
- <p class="portlet-class">Are you sure you want to proceed?</p>
+ <p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p>
<h:form>
- <h:commandButton value="Erase local registration" action="#{consumer.eraseLocalRegistration}"
+ <h:commandButton value="#{i18n.confirm_delete_registration_submit}" action="#{consumer.eraseLocalRegistration}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
- <h:commandButton value="Cancel" action="configureConsumer"
+ <h:commandButton value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-06-05 11:52:50 UTC (rev 10928)
@@ -4,16 +4,16 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core">
- <ui:param name="title" value="Manage Consumers"/>
+ <ui:param name="title" value="#{i18n.consumers_title}"/>
<ui:define name="content">
<!-- Consumer creation -->
<h:form styleClass="createObjectForm">
- <span class="portlet-font">Create a consumer named: </span>
+ <span class="portlet-font">#{i18n.consumers_create_title}</span>
<h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
required="true"/>
- <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer"
+ <h:commandButton action="#{consumersMgr.createConsumer}" value="#{i18n.consumers_create_submit}"
styleClass="portlet-form-button"/>
<h:message for="consumerName" errorClass="portlet-msg-error"/>
</h:form>
@@ -24,13 +24,14 @@
<table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
<thead class="portlet-section-header">
<tr>
- <th>Consumer
+ <th>#{i18n.consumers_table_column_consumer}
<div style="font-size: 90%; display:inline; font-weight: normal;">
- [status: <span class="active">active</span>, <span class="inactive">inactive</span>,
- <span class="needsRefresh">needs refresh</span>]
+ [#{i18n.consumers_table_column_consumer_status} <span class="active">#{i18n.path_consumers_active}</span>,
+ <span class="inactive">#{i18n.path_consumers_inactive}</span>,
+ <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>]
</div>
</th>
- <th>Actions</th>
+ <th>#{i18n.consumers_table_column_actions}</th>
</tr>
</thead>
<tbody>
@@ -39,34 +40,34 @@
<tr>
<td
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'})
- #{consumer.refreshNeeded ? '(refresh needed)' : ''}"/>
+ <h:outputText value="#{consumer.producerId} (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
</td>
<td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
<h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure">
<f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Configure"/>
+ <h:outputText value="#{i18n.consumers_table_action_configure}"/>
</h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"
styleClass="actionRefresh">
<f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Refresh"/>
+ <h:outputText value="#{i18n.consumers_table_action_refresh}"/>
</h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"
styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}">
<f:param name="id" value="#{consumer.producerId}"/>
<f:param name="activate" value="#{!consumer.active}"/>
- <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/>
+ <h:outputText value="#{consumer.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}"/>
</h:commandLink>
<c:if
test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
| <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}">
<f:param name="id" value="#{consumer.producerId}"/>
<f:param name="register" value="#{!consumer.producerInfo.registered}"/>
- <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/>
+ <h:outputText value="#{consumer.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}"/>
</h:commandLink>
</c:if> | <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete"
actionListener="#{consumersMgr.selectConsumer}">
<f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Delete"/>
+ <h:outputText value="#{i18n.consumers_table_action_delete}"/>
</h:commandLink>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-06-05 11:52:50 UTC (rev 10928)
@@ -12,24 +12,24 @@
<h:form>
<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}">
<tr>
- <th>Producer id:</th>
+ <th>#{i18n.edit_consumer_producer}</th>
<td>
<h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/>
</td>
</tr>
<tr>
- <th>Cache expiration:</th>
+ <th>#{i18n.edit_consumer_cache}</th>
<td>
- <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message
- styleClass="portlet-msg-error"
- for="cache"/>
+ <h:inputText id="cache" value="#{consumer.cache}"/> #{i18n.edit_consumer_cache_seconds}
+ <h:message styleClass="portlet-msg-error" for="cache"/>
</td>
</tr>
<tr>
- <th>Endpoint configuration:</th>
+ <th>#{i18n.edit_consumer_endpoint}</th>
<td>
<h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()"
- valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>Use WSDL?
+ valueChangeListener="#{consumer.useWSDLListener}"
+ immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl}
<h:message styleClass="portlet-msg-error" for="useWSDL"/>
<c:choose>
<c:when test="#{consumer.useWSDL}">
@@ -40,32 +40,32 @@
<c:otherwise>
<table border="0" class='portlet-table-body'>
<tr>
- <th>Service Description URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_sd}</th>
<td>
<h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message
- styleClass="portlet-msg-error" for="sd"/>
+ styleClass="portlet-msg-error" for="sd"/>
</td>
</tr>
<tr>
- <th>Markup URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_m}</th>
<td>
<h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message
- styleClass="portlet-msg-error" for="m"/>
+ styleClass="portlet-msg-error" for="m"/>
</td>
</tr>
<tr>
- <th>Registration URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_r}</th>
<td>
<h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message
- styleClass="portlet-msg-error"
- for="r"/>
+ styleClass="portlet-msg-error"
+ for="r"/>
</td>
</tr>
<tr>
- <th>Portlet Management URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_pm}</th>
<td>
<h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message
- styleClass="portlet-msg-error" for="pm"/>
+ styleClass="portlet-msg-error" for="pm"/>
</td>
</tr>
</table>
@@ -75,19 +75,19 @@
</tr>
<c:if test="#{consumer.localInfoPresent}">
<tr>
- <th>Registration information:</th>
+ <th>#{i18n.edit_consumer_registration}</th>
<td>
<c:choose>
<c:when test="#{consumer.localInfoPresent}">
- <h3 class="portlet-area-header">Current registration information:</h3>
+ <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
<c:when test="#{!empty consumer.producerInfo.registrationInfo.registrationProperties}">
<table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
<tr>
- <th class="nameColumn">Name</th>
- <th class="descColumn">Description</th>
- <th>Value</th>
+ <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
+ <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
+ <th>#{i18n.edit_consumer_prop_value}</th>
</tr>
<c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}"
var="prop">
@@ -104,17 +104,18 @@
</tr>
</c:forEach>
</table>
- <h:commandLink action="#{consumer.update}" value="Update properties"
+ <h:commandLink action="#{consumer.update}"
+ value="#{i18n.edit_consumer_registration_update_props}"
rendered="#{consumer.registered}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</c:when>
<c:otherwise>
- Registration is indicated as required without registration properties.
+ #{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
+ <h:commandLink action="#{consumer.modifyRegistration}" value="#{i18n.edit_consumer_registration_modify}"
rendered="#{consumer.registrationLocallyModified}"
- title="Modify the registration held with this Producer"
+ title="#{i18n.edit_consumer_registration_modify_title}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
<br style="clear:both;"/>
</h:panelGroup>
@@ -122,15 +123,15 @@
<br/>
<c:if test="#{consumer.registrationModified}">
- <h3 class="portlet-area-header">Expected registration information:</h3>
+ <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
<c:when test="#{!empty consumer.expectedRegistrationInfo.registrationProperties}">
<table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
<tr>
- <th class="nameColumn">Name</th>
- <th class="descColumn">Description</th>
- <th>Value</th>
+ <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
+ <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
+ <th>#{i18n.edit_consumer_prop_value}</th>
</tr>
<c:forEach items="#{consumer.expectedRegistrationInfo.registrationProperties}" var="prop">
<tr title="#{prop.description.label.value}">
@@ -146,29 +147,30 @@
</table>
</c:when>
<c:otherwise>
- Registration is indicated as required without registration properties.
+ #{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
- title="Modify the registration held with this Producer"
- styleClass="portlet-form-button portlet-section-buttonrow"/>
+ <h:commandLink action="#{consumer.modifyRegistration}"
+ value="#{i18n.edit_consumer_registration_modify}"
+ title="#{i18n.edit_consumer_registration_modify_title}"
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
<br style="clear:both;"/>
</h:panelGroup>
</c:if>
</c:when>
<c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}">
- Producer doesn't require registration.
+ #{i18n.edit_consumer_no_registration}
</c:when>
</c:choose>
</td>
</tr>
<c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}">
<tr>
- <th>Registration context:</th>
+ <th>#{i18n.edit_consumer_registration_context}</th>
<td id="handle">
- Handle: <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <h:commandLink action="confirmEraseRegistration" value="Erase local registration"
- title="Erase local registration information (potentially dangerous!)"
+ #{i18n.edit_consumer_registration_context_handle} <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
+ <h:commandLink action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}"
+ title="#{i18n.edit_consumer_registration_context_erase_title}"
styleClass="portlet-form-button"/>
</td>
</tr>
@@ -177,10 +179,10 @@
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <h:commandButton action="#{consumer.refreshConsumer}" value="Refresh & Save"
- title="Save changes and refresh information from Producer"
+ <h:commandButton action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}"
+ title="#{i18n.edit_consumer_refresh_title}"
styleClass="portlet-form-button"/>
- <h:commandLink action="#{consumersMgr.listConsumers}" value="Cancel" immediate="true"
+ <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true"
styleClass="portlet-form-button"/>
</td>
</tr>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10927 - in branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF: jsf/consumers and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-05 07:52:34 -0400 (Thu, 05 Jun 2008)
New Revision: 10927
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Log:
- More i18n and l10n. Still need to i18n bean messages.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-05 01:57:14 UTC (rev 10926)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-05 11:52:34 UTC (rev 10927)
@@ -33,3 +33,63 @@
path_consumers_active = active
path_consumers_inactive = inactive
path_consumers_refreshNeeded = (refresh needed)
+
+confirm_delete_consumer_title = Delete ''{0}'' consumer?
+confirm_delete_consumer_message = You are about to delete the ''{0}'' consumer!
+confirm_detete_consumer_proceed = Are you sure you want to proceed?
+confirm_delete_consumer_submit = Delete consumer
+confirm_delete_consumer_cancel = Cancel
+
+confirm_delete_registration_title = Delete local registration for ''{0}'' consumer?
+confirm_delete_registration_message = You are about to delete the local registration information for the ''{0}'' consumer! \n\
+This is only needed if this consumer had previously registered with the remote producer and this producer \n\
+has been modified to not require registration anymore.<br/><br/> \n\
+Only erase local registration information if you experience errors with the producer due to this \n\
+particular situation. Erasing local registration when not required might lead to inability to work with \n\
+this producer anymore.
+confirm_delete_registration_proceed = Are you sure you want to proceed?
+confirm_delete_registration_submit = Erase local registration
+confirm_delete_registration_cancel = Cancel
+
+consumers_title = Manage Consumers
+consumers_create_title = Create a consumer named:
+consumers_create_submit = Create Consumer
+
+consumers_table_column_consumer = Consumer
+consumers_table_column_consumer_status = status:
+consumers_table_column_actions = Actions
+consumers_table_action_configure = Configure
+consumers_table_action_refresh = Refresh
+consumers_table_action_activate = Activate
+consumers_table_action_deactivate = Deactivate
+consumers_table_action_register = Register
+consumers_table_action_deregister = Deregister
+consumers_table_action_delete = Delete
+
+edit_consumer_producer = Producer id:
+edit_consumer_cache = Cache expiration:
+edit_consumer_cache_seconds = (seconds before expiration)
+edit_consumer_endpoint = Endpoint configuration:
+edit_consumer_endpoint_wsdl = Use WSDL?
+edit_consumer_endpoint_sd = Service Description URL:
+edit_consumer_endpoint_m = Markup URL:
+edit_consumer_endpoint_r = Registration URL:
+edit_consumer_endpoint_pm = Portlet Management URL:
+edit_consumer_registration = Registration information:
+edit_consumer_registration_current = Current registration information:
+edit_consumer_prop_name = Name
+edit_consumer_prop_desc = Description
+edit_consumer_prop_value = Value
+edit_consumer_registration_update_props = Update properties
+edit_consumer_registration_no_props = Registration is indicated as required without registration properties.
+edit_consumer_registration_modify = Modify registration
+edit_consumer_registration_modify_title = Modify the registration held with this producer
+edit_consumer_registration_expected = Expected registration information:
+edit_consumer_no_registration = Producer doesn't require registration.
+edit_consumer_registration_context = Registration context:
+edit_consumer_registration_context_handle = Handle:
+edit_consumer_registration_context_erase = Erase local registration
+edit_consumer_registration_context_erase_title = Erase local registration information (potentially dangerous!)
+edit_consumer_refresh = Refresh & Save
+edit_consumer_refresh_title = Save changes and refresh information from producer
+edit_consumer_cancel = Cancel
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-05 01:57:14 UTC (rev 10926)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-05 11:52:34 UTC (rev 10927)
@@ -33,3 +33,58 @@
path_consumers_active = actif
path_consumers_inactive = inactif
path_consumers_refreshNeeded = (rafra\u00eechissement requis)
+confirm_delete_consumer_cancel=Annuler
+confirm_delete_consumer_message=Vous \u00eates sur le point d'effacer le concommateur ''{0}''!
+confirm_delete_consumer_submit=Effacer consommateur
+confirm_delete_consumer_title=Voulez-vous r\u00e9ellement effacer le consommateur ''{0}''?
+confirm_detete_consumer_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
+confirm_delete_registration_cancel=Annuler
+confirm_delete_registration_message=Vous \u00eates sur le point d'effacer les informations locales d'enregistrement pour le consommateur ''{0}''! \n\
+Ceci n'est uniquement requis dans le cas o\u00f9 ce consommateur se serait enregistr\u00e9 aupr\u00e8s d'un producteur distant \n\
+qui aurait ensuite \u00e9t\u00e9 modifi\u00e9 pour ne plus requerir d'enregistrement.<br/><br/> \n\
+N'effacez les informations locales d'enregistrement que si vous rencontrez des probl\u00e8mes, sp\u00e9cifiques \u00e0 cette \n\
+situation, avec le producteur distant. Effacer les donn\u00e9es d'enregistrement quand ce n'est pas requis peut entra\u00eener \n\
+l'incapacit\u00e9 future d'acc\u00e9der \u00e0 ce producteur.
+confirm_delete_registration_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
+confirm_delete_registration_submit=Effacer enregistrement
+confirm_delete_registration_title=Voulez-vous r\u00e9ellement effacer l'enregistrement du consommateur ''{0}''?
+consumers_create_submit=Cr\u00e9er Consommateur
+consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9:
+consumers_table_action_activate=Activer
+consumers_table_action_configure=Configurer
+consumers_table_action_deactivate=D\u00e9sactiver
+consumers_table_action_delete=Effacer
+consumers_table_action_deregister=D\u00e9senregistrer
+consumers_table_action_refresh=Rafra\u00eechir
+consumers_table_action_register=Enregister
+consumers_table_column_actions=Actions
+consumers_table_column_consumer=Consommateur
+consumers_table_column_consumer_status=status:
+consumers_title=Gestion des Consommateurs
+edit_consumer_cache=Expiration du cache:
+edit_consumer_cache_seconds=(secondes avant expiration)
+edit_consumer_cancel=Annuler
+edit_consumer_endpoint=Configuration du endpoint:
+edit_consumer_endpoint_m=URL Markup:
+edit_consumer_endpoint_pm=URL Portlet Management:
+edit_consumer_endpoint_r=URL Registration:
+edit_consumer_endpoint_sd=URL Service Description:
+edit_consumer_endpoint_wsdl=Utiliser WSDL?
+edit_consumer_no_registration=Enregistrement non-requis par le producteur.
+edit_consumer_producer=Identifiant du producteur:
+edit_consumer_prop_desc=Description
+edit_consumer_prop_name=Nom
+edit_consumer_prop_value=Valeur
+edit_consumer_refresh=Rafra\u00eechir & Sauvegarder
+edit_consumer_refresh_title=Sauvegarde des changements et rafra\u00eechissement \u00e0 partir du producteur
+edit_consumer_registration=Information d'enregistrement:
+edit_consumer_registration_context=Contexte d'enregistrement:
+edit_consumer_registration_context_erase=Effacer enregistrement local
+edit_consumer_registration_context_erase_title=Effacer l'information locale d'enregistrement (potentiellement dangereux!)
+edit_consumer_registration_context_handle=Identifiant:
+edit_consumer_registration_current=Information actuelle d'enregistrement:
+edit_consumer_registration_expected=Information attendue d'enregistrement:
+edit_consumer_registration_modify=Modifier l'enregistrement
+edit_consumer_registration_modify_title=Modifier l'enregistrement avec ce producteur
+edit_consumer_registration_no_props=Enregistrement indiqu\u00e9 sans besoin de propri\u00e9t\u00e9s d'enregistrement
+edit_consumer_registration_update_props=Mettre les propri\u00e9t\u00e9s \u00e0 jour
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-05 01:57:14 UTC (rev 10926)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
@@ -11,20 +11,26 @@
<div class="portlet-msg">
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
- <h3>Delete '#{consumersMgr.selectedConsumer.producerId}' consumer?</h3>
+ <h3>
+ <h:outputFormat value="#{i18n.confirm_delete_consumer_title}">
+ <f:param value="#{consumersMgr.selectedConsumer.producerId}"/>
+ </h:outputFormat>
+ </h3>
<p class="portlet-msg-alert">
- You are about to delete the '#{consumersMgr.selectedConsumer.producerId}' consumer!
+ <h:outputFormat value="#{i18n.confirm_delete_consumer_message}">
+ <f:param value="#{consumersMgr.selectedConsumer.producerId}"/>
+ </h:outputFormat>
</p>
- <p class="portlet-class">Are you sure you want to proceed?</p>
+ <p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p>
<h:form>
- <h:commandLink value="Delete consumer" action="#{consumersMgr.destroyConsumer}"
+ <h:commandLink value="#{i18n.confirm_delete_consumer_submit}" action="#{consumersMgr.destroyConsumer}"
styleClass="portlet-form-button portlet-section-buttonrow">
<f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
</h:commandLink>
- <h:commandButton value="Cancel" action="#{consumersMgr.listConsumers}"
+ <h:commandButton value="#{i18n.confirm_delete_consumer_cancel}" action="#{consumersMgr.listConsumers}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
@@ -32,4 +38,4 @@
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-06-05 01:57:14 UTC (rev 10926)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
@@ -11,24 +11,25 @@
<div class="portlet-msg">
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
- <h3>Delete local registration for '#{consumer.id}' consumer?</h3>
+ <h3>
+ <h:outputFormat value="#{i18n.confirm_delete_registration_title">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
+ </h3>
<p class="portlet-msg-alert">
- You are about to delete the local registration information for the '#{consumer.id}' consumer!
- This is only needed if this consumer had previously registered with the remote producer and this producer
- has been modified to not require registration anymore.<br/><br/>
-
- Only erase local registration information if you experience errors with the producer due to this
- particular situation. Erasing local registration when not required might lead to inability to work with
- this producer anymore.
+ <h:outputFormat value="#{i18n.confirm_delete_registration_message">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
</p>
- <p class="portlet-class">Are you sure you want to proceed?</p>
+ <p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p>
<h:form>
- <h:commandButton value="Erase local registration" action="#{consumer.eraseLocalRegistration}"
+ <h:commandButton value="#{i18n.confirm_delete_registration_submit}"
+ action="#{consumer.eraseLocalRegistration}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
- <h:commandButton value="Cancel" action="configureConsumer"
+ <h:commandButton value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
@@ -36,4 +37,4 @@
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-06-05 01:57:14 UTC (rev 10926)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
@@ -4,16 +4,16 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core">
- <ui:param name="title" value="Manage Consumers"/>
+ <ui:param name="title" value="#{i18n.consumers_title}"/>
<ui:define name="content">
<!-- Consumer creation -->
<h:form styleClass="createObjectForm">
- <span class="portlet-font">Create a consumer named: </span>
+ <span class="portlet-font">#{i18n.consumers_create_title}</span>
<h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
required="true"/>
- <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer"
+ <h:commandButton action="#{consumersMgr.createConsumer}" value="#{i18n.consumers_create_submit}"
styleClass="portlet-form-button"/>
<h:message for="consumerName" errorClass="portlet-msg-error"/>
</h:form>
@@ -24,13 +24,15 @@
<table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
<thead class="portlet-section-header">
<tr>
- <th>Consumer
+ <th>#{i18n.consumers_table_column_consumer}
<div style="font-size: 90%; display:inline; font-weight: normal;">
- [status: <span class="active">active</span>, <span class="inactive">inactive</span>,
- <span class="needsRefresh">needs refresh</span>]
+ [#{i18n.consumers_table_column_consumer_status} <span
+ class="active">#{i18n.path_consumers_active}</span>,
+ <span class="inactive">#{i18n.path_consumers_inactive}</span>,
+ <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>]
</div>
</th>
- <th>Actions</th>
+ <th>#{i18n.consumers_table_column_actions}</th>
</tr>
</thead>
<tbody>
@@ -38,35 +40,38 @@
<c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status">
<tr>
<td
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'})
- #{consumer.refreshNeeded ? '(refresh needed)' : ''}"/>
+ class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
+ <h:outputText value="#{consumer.producerId} (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
</td>
<td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
<h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure">
<f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Configure"/>
+ <h:outputText value="#{i18n.consumers_table_action_configure}"/>
</h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"
styleClass="actionRefresh">
<f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Refresh"/>
+ <h:outputText value="#{i18n.consumers_table_action_refresh}"/>
</h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"
styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}">
<f:param name="id" value="#{consumer.producerId}"/>
<f:param name="activate" value="#{!consumer.active}"/>
- <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/>
+ <h:outputText
+ value="#{consumer.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}"/>
</h:commandLink>
<c:if
- test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
- | <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}">
+ test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
+ | <h:commandLink action="#{consumersMgr.registerConsumer}"
+ styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}">
<f:param name="id" value="#{consumer.producerId}"/>
<f:param name="register" value="#{!consumer.producerInfo.registered}"/>
- <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/>
+ <h:outputText
+ value="#{consumer.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}"/>
</h:commandLink>
</c:if> | <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete"
actionListener="#{consumersMgr.selectConsumer}">
<f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Delete"/>
+ <h:outputText value="#{i18n.consumers_table_action_delete}"/>
</h:commandLink>
</td>
</tr>
@@ -75,4 +80,4 @@
</tbody>
</table>
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-06-05 01:57:14 UTC (rev 10926)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-06-05 11:52:34 UTC (rev 10927)
@@ -12,24 +12,24 @@
<h:form>
<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}">
<tr>
- <th>Producer id:</th>
+ <th>#{i18n.edit_consumer_producer}</th>
<td>
<h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/>
</td>
</tr>
<tr>
- <th>Cache expiration:</th>
+ <th>#{i18n.edit_consumer_cache}</th>
<td>
- <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message
- styleClass="portlet-msg-error"
- for="cache"/>
+ <h:inputText id="cache" value="#{consumer.cache}"/> #{i18n.edit_consumer_cache_seconds}
+ <h:message styleClass="portlet-msg-error" for="cache"/>
</td>
</tr>
<tr>
- <th>Endpoint configuration:</th>
+ <th>#{i18n.edit_consumer_endpoint}</th>
<td>
<h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()"
- valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>Use WSDL?
+ valueChangeListener="#{consumer.useWSDLListener}"
+ immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl}
<h:message styleClass="portlet-msg-error" for="useWSDL"/>
<c:choose>
<c:when test="#{consumer.useWSDL}">
@@ -40,32 +40,32 @@
<c:otherwise>
<table border="0" class='portlet-table-body'>
<tr>
- <th>Service Description URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_sd}</th>
<td>
<h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message
- styleClass="portlet-msg-error" for="sd"/>
+ styleClass="portlet-msg-error" for="sd"/>
</td>
</tr>
<tr>
- <th>Markup URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_m}</th>
<td>
<h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message
- styleClass="portlet-msg-error" for="m"/>
+ styleClass="portlet-msg-error" for="m"/>
</td>
</tr>
<tr>
- <th>Registration URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_r}</th>
<td>
<h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message
- styleClass="portlet-msg-error"
- for="r"/>
+ styleClass="portlet-msg-error"
+ for="r"/>
</td>
</tr>
<tr>
- <th>Portlet Management URL:</th>
+ <th>#{i18n.edit_consumer_endpoint_pm}</th>
<td>
<h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message
- styleClass="portlet-msg-error" for="pm"/>
+ styleClass="portlet-msg-error" for="pm"/>
</td>
</tr>
</table>
@@ -74,117 +74,120 @@
</td>
</tr>
<c:if test="#{consumer.localInfoPresent}">
- <tr>
- <th>Registration information:</th>
- <td>
- <c:choose>
- <c:when test="#{consumer.localInfoPresent}">
- <h3 class="portlet-area-header">Current registration information:</h3>
+<tr>
+ <th>#{i18n.edit_consumer_registration}</th>
+ <td>
+ <c:choose>
+ <c:when test="#{consumer.localInfoPresent}">
+ <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3>
+ <h:panelGroup styleClass="portlet-area-body">
+ <c:choose>
+ <c:when test="#{!empty consumer.producerInfo.registrationInfo.registrationProperties}">
+ <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
+ <tr>
+ <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
+ <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
+ <th>#{i18n.edit_consumer_prop_value}</th>
+ </tr>
+ <c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}"
+ var="prop">
+ <tr title="#{prop.description.label.value}">
+ <td>#{prop.name}</td>
+ <td>#{prop.description.label.value}</td>
+ <td>
+ <h:inputText value="#{prop.value}" size="50"
+ valueChangeListener="#{consumer.regPropListener}"
+ disabled="#{consumer.registrationModified}"/>
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
+ rendered="#{prop.determinedInvalid}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ <h:commandLink action="#{consumer.update}"
+ value="#{i18n.edit_consumer_registration_update_props}"
+ rendered="#{consumer.registered}"
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
+ </c:when>
+ <c:otherwise>
+ #{i18n.edit_consumer_registration_no_props}
+ </c:otherwise>
+ </c:choose>
+ <h:commandLink action="#{consumer.modifyRegistration}" value="#{i18n.edit_consumer_registration_modify}"
+ rendered="#{consumer.registrationLocallyModified}"
+ title="#{i18n.edit_consumer_registration_modify_title}"
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
+ <br style="clear:both;"/>
+ </h:panelGroup>
+
+ <br/>
+
+ <c:if test="#{consumer.registrationModified}">
+ <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
- <c:when test="#{!empty consumer.producerInfo.registrationInfo.registrationProperties}">
+ <c:when test="#{!empty consumer.expectedRegistrationInfo.registrationProperties}">
<table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
<tr>
- <th class="nameColumn">Name</th>
- <th class="descColumn">Description</th>
- <th>Value</th>
+ <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
+ <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
+ <th>#{i18n.edit_consumer_prop_value}</th>
</tr>
- <c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}"
- var="prop">
+ <c:forEach items="#{consumer.expectedRegistrationInfo.registrationProperties}" var="prop">
<tr title="#{prop.description.label.value}">
<td>#{prop.name}</td>
<td>#{prop.description.label.value}</td>
<td>
- <h:inputText value="#{prop.value}" size="50"
- valueChangeListener="#{consumer.regPropListener}"
- disabled="#{consumer.registrationModified}"/>
+ <h:inputText value="#{prop.value}" size="50"/>
<h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
rendered="#{prop.determinedInvalid}"/>
</td>
</tr>
</c:forEach>
</table>
- <h:commandLink action="#{consumer.update}" value="Update properties"
- rendered="#{consumer.registered}"
- styleClass="portlet-form-button portlet-section-buttonrow"/>
</c:when>
<c:otherwise>
- Registration is indicated as required without registration properties.
+ #{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
- rendered="#{consumer.registrationLocallyModified}"
- title="Modify the registration held with this Producer"
+ <h:commandLink action="#{consumer.modifyRegistration}"
+ value="#{i18n.edit_consumer_registration_modify}"
+ title="#{i18n.edit_consumer_registration_modify_title}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
<br style="clear:both;"/>
</h:panelGroup>
-
- <br/>
-
- <c:if test="#{consumer.registrationModified}">
- <h3 class="portlet-area-header">Expected registration information:</h3>
- <h:panelGroup styleClass="portlet-area-body">
- <c:choose>
- <c:when test="#{!empty consumer.expectedRegistrationInfo.registrationProperties}">
- <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
- <tr>
- <th class="nameColumn">Name</th>
- <th class="descColumn">Description</th>
- <th>Value</th>
- </tr>
- <c:forEach items="#{consumer.expectedRegistrationInfo.registrationProperties}" var="prop">
- <tr title="#{prop.description.label.value}">
- <td>#{prop.name}</td>
- <td>#{prop.description.label.value}</td>
- <td>
- <h:inputText value="#{prop.value}" size="50"/>
- <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
- rendered="#{prop.determinedInvalid}"/>
- </td>
- </tr>
- </c:forEach>
- </table>
- </c:when>
- <c:otherwise>
- Registration is indicated as required without registration properties.
- </c:otherwise>
- </c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
- title="Modify the registration held with this Producer"
- styleClass="portlet-form-button portlet-section-buttonrow"/>
- <br style="clear:both;"/>
- </h:panelGroup>
- </c:if>
- </c:when>
- <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}">
- Producer doesn't require registration.
- </c:when>
- </c:choose>
+ </c:if>
+ </c:when>
+ <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}">
+ #{i18n.edit_consumer_no_registration}
+ </c:when>
+ </c:choose>
+ </td>
+</tr>
+<c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}">
+ <tr>
+ <th>#{i18n.edit_consumer_registration_context}</th>
+ <td id="handle">
+ #{i18n.edit_consumer_registration_context_handle} <h:outputText
+ value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
+ <h:commandLink action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}"
+ title="#{i18n.edit_consumer_registration_context_erase_title}"
+ styleClass="portlet-form-button"/>
</td>
</tr>
- <c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}">
- <tr>
- <th>Registration context:</th>
- <td id="handle">
- Handle: <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <h:commandLink action="confirmEraseRegistration" value="Erase local registration"
- title="Erase local registration information (potentially dangerous!)"
- styleClass="portlet-form-button"/>
- </td>
- </tr>
- </c:if>
</c:if>
+</c:if>
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <h:commandButton action="#{consumer.refreshConsumer}" value="Refresh & Save"
- title="Save changes and refresh information from Producer"
+ <h:commandButton action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}"
+ title="#{i18n.edit_consumer_refresh_title}"
styleClass="portlet-form-button"/>
- <h:commandLink action="#{consumersMgr.listConsumers}" value="Cancel" immediate="true"
+ <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true"
styleClass="portlet-form-button"/>
</td>
</tr>
</table>
</h:form>
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10926 - in modules/portlet/trunk/portal: src/main/resources/simple-portal-war/WEB-INF/tags/portal and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-06-04 21:57:14 -0400 (Wed, 04 Jun 2008)
New Revision: 10926
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp
Modified:
modules/portlet/trunk/portal/pom.xml
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
Log:
Layout enhancements and ui for JSR-301 demo
Modified: modules/portlet/trunk/portal/pom.xml
===================================================================
--- modules/portlet/trunk/portal/pom.xml 2008-06-04 20:10:25 UTC (rev 10925)
+++ modules/portlet/trunk/portal/pom.xml 2008-06-05 01:57:14 UTC (rev 10926)
@@ -25,6 +25,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.0.Beta12</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-portlet</artifactId>
<version>${project.version}</version>
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1and3columns.tag 2008-06-05 01:57:14 UTC (rev 10926)
@@ -0,0 +1,17 @@
+<%@ tag body-content="scriptless" %>
+<%@ attribute name="leftcol" fragment="true" required="false" %>
+<%@ attribute name="rightcol" fragment="true" required="false" %>
+
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+
+ <div class="quarter-width float-left">
+ <jsp:invoke fragment="leftcol"/>
+ </div>
+ <div class="three-quarter-width float-left">
+ <jsp:invoke fragment="rightcol"/>
+ </div>
+
+
+
+
+
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/1column.tag 2008-06-05 01:57:14 UTC (rev 10926)
@@ -0,0 +1,13 @@
+<%@ tag body-content="scriptless" %>
+<%@ attribute name="leftcol" fragment="true" required="false" %>
+<%@ attribute name="rightcol" fragment="true" required="false" %>
+
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+
+ <div class="full-width float-left">
+ <jsp:invoke fragment="leftcol"/>
+ </div>
+
+
+
+
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-06-04 20:10:25 UTC (rev 10925)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-06-05 01:57:14 UTC (rev 10926)
@@ -2,12 +2,13 @@
<%@ attribute name="name" rtexprvalue="true" required="true" %>
<%@ attribute name="applicationName" rtexprvalue="true" required="true" %>
<%@ attribute name="id" rtexprvalue="true" required="false" %>
+<%@ attribute name="style" rtexprvalue="true" required="false" %>
<%@ attribute name="content" fragment="true" required="false" %>
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<portal:portlet name="${name}" applicationName="${applicationName}" errorPage="/WEB-INF/jsp/error.jsp">
- <div class="portlet" id="${!empty id ? id : name}">
+ <div class="portlet" id="${!empty id ? id : name}" style="${style}">
<div class="portlet-frame">
<div class="header full-width">
<div class="header-layer full-width">
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/jsr-301.jsp 2008-06-05 01:57:14 UTC (rev 10926)
@@ -0,0 +1,18 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<%@ include file="/layouts/header.jsp" %>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/debugger.css" type="text/css"/>
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/debugger.js"></script>
+<portal:page>
+
+ <xportal:1column>
+ <jsp:attribute name="leftcol">
+ <xportal:portlet name="riPortlet" applicationName="JSFRIPortlet" style="width:800px"/>
+ </jsp:attribute>
+ </xportal:1column>
+</portal:page>
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-06-04 20:10:25 UTC (rev 10925)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-06-05 01:57:14 UTC (rev 10926)
@@ -32,6 +32,9 @@
<li>
<a href="${pageContext.request.contextPath}/demo/demo4.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo4.jsp' ? 'selected' : ''}">Demo4</a>
</li>
+ <li>
+ <a href="${pageContext.request.contextPath}/demo/jsr-301.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'jsr-301.jsp' ? 'selected' : ''}">JSR-301 Demo</a>
+ </li>
</ul>
<br class="clear"/>
</div>
17 years, 11 months
- 1
- 0