Author: thomas.heute(a)jboss.com Date: 2008-05-20 10:03:27 -0400 (Tue, 20 May 2008) New Revision: 10781 Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml branches/JBoss_Portal_Branch_2_7/core-cms/.classpath branches/JBoss_Portal_Branch_2_7/core-identity/.classpath branches/JBoss_Portal_Branch_2_7/core-samples/.classpath branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/CharsetPortlet.java branches/JBoss_Portal_Branch_2_7/core-search/.classpath branches/JBoss_Portal_Branch_2_7/core/.classpath branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossPortlet.java branches/JBoss_Portal_Branch_2_7/faces/.classpath branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath branches/JBoss_Portal_Branch_2_7/widget/.classpath branches/JBoss_Portal_Branch_2_7/wsrp/.classpath Log: - Update Eclipse classpath - Removed dependency on obselete 'format' module Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-05-20 14:03:27 UTC (rev 10781) @@ -119,7 +119,6 @@ <module name="portlet-server"/> <module name="theme"/> <module name="cms"/> - <module name="format"/> <module name="core"/> <module name="core-cms"/> <module name="core-management"/> @@ -139,7 +138,7 @@ <group name="portal"> <include - modules="api, jems, server, security, search, format, portlet-server, faces, theme, workflow, registration, core, cms, wsrp, core-admin, core-management, core-identity, core-cms, core-samples, widget"/> + modules="api, jems, server, security, search, portlet-server, faces, theme, workflow, registration, core, cms, wsrp, core-admin, core-management, core-identity, core-cms, core-samples, widget"/> </group> <group name="cms"> @@ -155,7 +154,7 @@ </group> <group name="core"> - <include modules="api, jems, server, security, portlet-server, theme, registration, format, core"/> + <include modules="api, jems, server, security, portlet-server, theme, registration, core"/> </group> </moduleconfig> @@ -367,12 +366,6 @@ <packageset dir="../faces/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> - <packageset dir="../format/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../format/output/gen/classes"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> <packageset dir="../theme/src/main"> <exclude name="org/jboss/portal/test/**"/> </packageset> Modified: branches/JBoss_Portal_Branch_2_7/core/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -37,7 +37,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/security"/> <classpathentry combineaccessrules="false" kind="src" path="/cms"/> <classpathentry combineaccessrules="false" kind="src" path="/theme"/> - <classpathentry combineaccessrules="false" kind="src" path="/format"/> <classpathentry combineaccessrules="false" kind="src" path="/registration"/> <classpathentry combineaccessrules="false" kind="src" path="/workflow"/> <classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/> Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossPortlet.java 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossPortlet.java 2008-05-20 14:03:27 UTC (rev 10781) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portlet; -import org.jboss.portal.format.util.EntityTable; - import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; @@ -37,6 +35,10 @@ import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.WindowState; + +import org.jboss.portal.common.text.CharBuffer; +import org.jboss.portal.common.text.EntityEncoder; + import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.InvocationTargetException; @@ -309,13 +311,19 @@ String[] values = (String[])entry.getValue(); // Perform HTML entity replacement - name = EntityTable.FULL.convertEntities(name); + CharBuffer nameBuffer = new CharBuffer(); + EntityEncoder.FULL.encode(name, nameBuffer); + name = nameBuffer.asString(); + + CharBuffer valueBuffer = new CharBuffer(); for (int j = 0; j < values.length; j++) { String value = values[j]; if (value != null) { - values[j] = EntityTable.FULL.convertEntities(value); + valueBuffer.reset(); + EntityEncoder.FULL.encode(value, valueBuffer); + values[j] = valueBuffer.asString(); } } Modified: branches/JBoss_Portal_Branch_2_7/core-cms/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/core-cms/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -25,7 +25,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="output" path="bin"/> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/core-identity/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -5,7 +5,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> <classpathentry combineaccessrules="false" kind="src" path="/faces"/> - <classpathentry combineaccessrules="false" kind="src" path="/format"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <classpathentry combineaccessrules="false" kind="src" path="/security"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/core-samples/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -4,7 +4,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> - <classpathentry combineaccessrules="false" kind="src" path="/format"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> <classpathentry combineaccessrules="false" kind="src" path="/theme"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/CharsetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/CharsetPortlet.java 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/CharsetPortlet.java 2008-05-20 14:03:27 UTC (rev 10781) @@ -23,7 +23,7 @@ package org.jboss.portal.core.samples.basic; import org.apache.log4j.Logger; -import org.jboss.portal.format.util.EntityTable; +import org.jboss.portal.common.text.EntityEncoder; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -148,7 +148,7 @@ if (useChar(c)) { text.append(c); - String s = EntityTable.FULL.lookup(c); + String s = EntityEncoder.FULL.lookup(c); if (s == null) { escapedText.append(c); Modified: branches/JBoss_Portal_Branch_2_7/core-search/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-search/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/core-search/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -16,6 +16,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_7/faces/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/faces/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -14,8 +14,8 @@ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar" sourcepath="/module-portlet"/> + <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -16,8 +16,8 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/module-web"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_7/widget/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/widget/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -6,7 +6,7 @@ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> + <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_7/wsrp/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/.classpath 2008-05-20 13:17:02 UTC (rev 10780) +++ branches/JBoss_Portal_Branch_2_7/wsrp/.classpath 2008-05-20 14:03:27 UTC (rev 10781) @@ -32,9 +32,9 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-fileupload/lib/commons-fileupload.jar"/> <classpathentry kind="lib" path="/tools/lib/xercesImpl.jar"/> + <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath>