You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2005/06/20 01:23:21 UTC
svn commit: r191370 - in /portals/jetspeed-2/trunk:
components/registry/src/java/org/apache/jetspeed/om/impl/
portal/test/deployment/deploy/security-app/WEB-INF/
portal/test/testdata/deploy/ portal/test/testdata/deploy/security-roles/
portal/test/testd...
Author: shinsuke
Date: Sun Jun 19 16:23:20 2005
New Revision: 191370
URL: http://svn.apache.org/viewcvs?rev=191370&view=rev
Log:
fixed http://issues.apache.org/jira/browse/JS2-280
Modified:
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DescriptionSetImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java
portals/jetspeed-2/trunk/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml
portals/jetspeed-2/trunk/portal/test/testdata/deploy/portlet.xml
portals/jetspeed-2/trunk/portal/test/testdata/deploy/security-roles/portlet.xml
portals/jetspeed-2/trunk/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DescriptionSetImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DescriptionSetImpl.java?rev=191370&r1=191369&r2=191370&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DescriptionSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DescriptionSetImpl.java Sun Jun 19 16:23:20 2005
@@ -22,6 +22,7 @@
import java.util.Locale;
import org.apache.jetspeed.om.common.MutableDescriptionSet;
+import org.apache.jetspeed.util.JetspeedLocale;
import org.apache.pluto.om.common.Description;
/**
@@ -88,7 +89,11 @@
}
// set fall back if we have a Locale that only has
// language set.
- if (desc.getLocale().getLanguage().equals(arg0.getLanguage()))
+ else if (desc.getLocale().getLanguage().equals(arg0.getLanguage()))
+ {
+ fallBack = desc;
+ }
+ else if (fallBack == null && desc.getLocale().equals(JetspeedLocale.getDefaultLocale()))
{
fallBack = desc;
}
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java?rev=191370&r1=191369&r2=191370&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java Sun Jun 19 16:23:20 2005
@@ -23,6 +23,7 @@
import org.apache.jetspeed.om.common.MutableDisplayName;
import org.apache.jetspeed.om.common.MutableDisplayNameSet;
+import org.apache.jetspeed.util.JetspeedLocale;
import org.apache.pluto.om.common.DisplayName;
/**
* DisplayNameSetImpl
@@ -62,19 +63,22 @@
DisplayName fallBack = null;
Iterator searchItr = innerCollection.iterator();
- while(searchItr.hasNext())
+ while (searchItr.hasNext())
{
- DisplayName aDName = (DisplayName) searchItr.next();
- if(aDName.getLocale().equals(arg0))
- {
- return aDName;
- }
- else if(aDName.getLocale().getLanguage().equals(arg0.getLanguage()))
- {
- fallBack = aDName;
- }
-
- }
+ DisplayName aDName = (DisplayName) searchItr.next();
+ if (aDName.getLocale().equals(arg0))
+ {
+ return aDName;
+ }
+ else if (aDName.getLocale().getLanguage().equals(arg0.getLanguage()))
+ {
+ fallBack = aDName;
+ }
+ else if (fallBack == null && aDName.getLocale().equals(JetspeedLocale.getDefaultLocale()))
+ {
+ fallBack = aDName;
+ }
+ }
return fallBack;
}
Modified: portals/jetspeed-2/trunk/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml?rev=191370&r1=191369&r2=191370&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml Sun Jun 19 16:23:20 2005
@@ -18,8 +18,8 @@
<portlet id="TestPortlet">
<portlet-name>TestPortlet</portlet-name>
<portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
- <display-name lang="en">HelloWorld Portlet Wrapper</display-name>
- <description lang="en">This is a desciption of the HelloWorld portlet</description>
+ <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
+ <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
<expiration-cache>-1</expiration-cache>
<supports id="Minimal support">
<mime-type>text/html</mime-type>
Modified: portals/jetspeed-2/trunk/portal/test/testdata/deploy/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/test/testdata/deploy/portlet.xml?rev=191370&r1=191369&r2=191370&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/test/testdata/deploy/portlet.xml (original)
+++ portals/jetspeed-2/trunk/portal/test/testdata/deploy/portlet.xml Sun Jun 19 16:23:20 2005
@@ -17,14 +17,14 @@
<portlet-app id="TestRegistry" version="1.0">
<portlet id="HelloPortlet">
<init-param>
- <description lang="en">test init param</description>
- <name lang="en">hello</name>
- <value lang="en">Hello Portlet</value>
+ <description xml:lang="en">test init param</description>
+ <name>hello</name>
+ <value>Hello Portlet</value>
</init-param>
<portlet-name>HelloWorld Portlet</portlet-name>
<portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
- <display-name lang="en">HelloWorld Portlet Wrapper</display-name>
- <description lang="en">This is a desciption of the HelloWorld portlet</description>
+ <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
+ <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
<expiration-cache>-1</expiration-cache>
<supports id="Minimal support">
<mime-type>text/html</mime-type>
@@ -51,7 +51,7 @@
</preference>
</portlet-preferences>
<security-role-ref>
- <description lang="en">This is the admin role</description>
+ <description xml:lang="en">This is the admin role</description>
<role-name>admin</role-name>
<role-link>users/admin</role-link>
</security-role-ref>
Modified: portals/jetspeed-2/trunk/portal/test/testdata/deploy/security-roles/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/test/testdata/deploy/security-roles/portlet.xml?rev=191370&r1=191369&r2=191370&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/test/testdata/deploy/security-roles/portlet.xml (original)
+++ portals/jetspeed-2/trunk/portal/test/testdata/deploy/security-roles/portlet.xml Sun Jun 19 16:23:20 2005
@@ -18,8 +18,8 @@
<portlet id="TestPortlet">
<portlet-name>TestPortlet</portlet-name>
<portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
- <display-name lang="en">HelloWorld Portlet Wrapper</display-name>
- <description lang="en">This is a desciption of the HelloWorld portlet</description>
+ <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
+ <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
<expiration-cache>-1</expiration-cache>
<supports id="Minimal support">
<mime-type>text/html</mime-type>
@@ -46,12 +46,12 @@
</preference>
</portlet-preferences>
<security-role-ref>
- <description lang="en">This is the admin role</description>
+ <description xml:lang="en">This is the admin role</description>
<role-name>admin</role-name>
<role-link>users.admin</role-link>
</security-role-ref>
<security-role-ref>
- <description lang="en">This is the manager role</description>
+ <description xml:lang="en">This is the manager role</description>
<role-name>users.manager</role-name>
</security-role-ref>
</portlet>
Modified: portals/jetspeed-2/trunk/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml?rev=191370&r1=191369&r2=191370&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml Sun Jun 19 16:23:20 2005
@@ -18,8 +18,8 @@
<portlet id="TestPortlet">
<portlet-name>TestPortlet</portlet-name>
<portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
- <display-name lang="en">HelloWorld Portlet Wrapper</display-name>
- <description lang="en">This is a desciption of the HelloWorld portlet</description>
+ <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
+ <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
<expiration-cache>-1</expiration-cache>
<supports id="Minimal support">
<mime-type>text/html</mime-type>
@@ -46,12 +46,12 @@
</preference>
</portlet-preferences>
<security-role-ref>
- <description lang="en">This is the admin role</description>
+ <description xml:lang="en">This is the admin role</description>
<role-name>admin</role-name>
<role-link>users.admin</role-link>
</security-role-ref>
<security-role-ref>
- <description lang="en">This is the manager role</description>
+ <description xml:lang="en">This is the manager role</description>
<role-name>users.manager</role-name>
</security-role-ref>
</portlet>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org