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 rw...@apache.org on 2009/10/21 21:58:39 UTC
svn commit: r828167 - in
/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components:
page-manager/src/test/ serializer/src/java/org/apache/jetspeed/serializer/
serializer/src/java/org/apache/jetspeed/serializer/objects/
Author: rwatler
Date: Wed Oct 21 19:58:39 2009
New Revision: 828167
URL: http://svn.apache.org/viewvc?rev=828167&view=rev
Log:
java 1.4 compatability
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSSOSite.java
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml?rev=828167&r1=828166&r2=828167&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/page-manager/src/test/database-page-manager-base.xml Wed Oct 21 19:58:39 2009
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,9 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<beans>
<!-- Page Manager Caches -->
<bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java?rev=828167&r1=828166&r2=828167&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java Wed Oct 21 19:58:39 2009
@@ -1938,12 +1938,12 @@
String rupPrincipalName = null;
String rupName = null;
String [] names = null;
- if (rupPath.startsWith("/sso/") && rupPath.contains("/user/"))
+ if (rupPath.startsWith("/sso/") && (rupPath.indexOf("/user/") != -1))
{
rupPrincipalType = "user";
names = rupPath.replaceAll("^/sso/[0-9]+/user/", "").split("/");
}
- else if (rupPath.startsWith("/sso/") && rupPath.contains("/group/"))
+ else if (rupPath.startsWith("/sso/") && (rupPath.indexOf("/group/") != -1))
{
rupPrincipalType = "group";
names = rupPath.replaceAll("^/sso/[0-9]+/group/", "").split("/");
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSSOSite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSSOSite.java?rev=828167&r1=828166&r2=828167&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSSOSite.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSSOSite.java Wed Oct 21 19:58:39 2009
@@ -199,11 +199,11 @@
g.setName(StringEscapeUtils.unescapeHtml(xml.getAttribute("name", (String)null)));
g.setSiteURL(StringEscapeUtils.unescapeHtml(xml.getAttribute("siteURL", (String)null)));
- g.setAllowUserSet(Boolean.parseBoolean(StringEscapeUtils.unescapeHtml(xml.getAttribute("allowUserSet", "false"))));
- g.setCertificateRequired(Boolean.parseBoolean(StringEscapeUtils.unescapeHtml(xml.getAttribute("certificateRequired", "false"))));
- g.setChallengeResponseAuthentication(Boolean.parseBoolean(StringEscapeUtils.unescapeHtml(xml.getAttribute("challengeResponseAuthentication", "false"))));
+ g.setAllowUserSet(Boolean.valueOf(StringEscapeUtils.unescapeHtml(xml.getAttribute("allowUserSet", "false"))).booleanValue());
+ g.setCertificateRequired(Boolean.valueOf(StringEscapeUtils.unescapeHtml(xml.getAttribute("certificateRequired", "false"))).booleanValue());
+ g.setChallengeResponseAuthentication(Boolean.valueOf(StringEscapeUtils.unescapeHtml(xml.getAttribute("challengeResponseAuthentication", "false"))).booleanValue());
g.setRealm(StringEscapeUtils.unescapeHtml(xml.getAttribute("realm", (String)null)));
- g.setFormAuthentication(Boolean.parseBoolean(StringEscapeUtils.unescapeHtml(xml.getAttribute("formAuthentication", "false"))));
+ g.setFormAuthentication(Boolean.valueOf(StringEscapeUtils.unescapeHtml(xml.getAttribute("formAuthentication", "false"))).booleanValue());
g.setFormUserField(StringEscapeUtils.unescapeHtml(xml.getAttribute("formUserField", (String)null)));
g.setFormPwdField(StringEscapeUtils.unescapeHtml(xml.getAttribute("formPwdField", (String)null)));
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org