gatein SVN: r436 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-10-28 04:48:06 -0400 (Wed, 28 Oct 2009)
New Revision: 436
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
Log:
PORTAL-3633, GTNPORTAL-79: Can not change tab title of TabbedDashboard in IE7
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2009-10-28 08:45:50 UTC (rev 435)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2009-10-28 08:48:06 UTC (rev 436)
@@ -23,7 +23,7 @@
renameTabLabel : function(e){
if(!e){
- e = windwow.event;
+ e = window.event;
}
var keyNum = e.keyCode;
15 years, 2 months
- 1
- 0
gatein SVN: r435 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-10-28 04:45:50 -0400 (Wed, 28 Oct 2009)
New Revision: 435
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java
Log:
GTNPORTAL-120 Improve performance in case switching between portals
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2009-10-27 18:43:02 UTC (rev 434)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2009-10-28 08:45:50 UTC (rev 435)
@@ -47,8 +47,9 @@
protected static Log log = ExoLogger.getLogger("portal:PortalStateManager");
- private ConcurrentMap<String, PortalApplicationState> uiApplications =
- new ConcurrentHashMap<String, PortalApplicationState>();
+ /** ConcurrentMap<SessionId, HashMap<PortalName, PortalApplicationState>> **/
+ private ConcurrentMap<String, HashMap<String, PortalApplicationState>> uiApplications =
+ new ConcurrentHashMap<String, HashMap<String, PortalApplicationState>>();
/**
* This method is used to restore the UI component tree either the current request targets a portlet
@@ -66,14 +67,14 @@
/*
* If the request context is of type PortletRequestContext, we extract the parent context which will
* allow to get access to the PortalApplicationState object thanks to the session id used as the key for the
- * syncronised Map uiApplications
+ * synchronize Map uiApplications
*/
if (context instanceof PortletRequestContext)
{
- WebuiRequestContext preqContext = (WebuiRequestContext)context.getParentAppRequestContext();
- PortalApplicationState state = uiApplications.get(preqContext.getSessionId());
+ WebuiRequestContext preqContext = (WebuiRequestContext)context.getParentAppRequestContext();
PortletRequestContext pcontext = (PortletRequestContext)context;
String key = pcontext.getApplication().getApplicationId() + "/" + pcontext.getWindowId();
+ PortalApplicationState state = getApplicationState(preqContext);
UIApplication uiApplication = state.get(key);
if (uiApplication != null)
return uiApplication;
@@ -86,11 +87,10 @@
}
PortalRequestContext pcontext = (PortalRequestContext)context;
- PortalApplicationState state = uiApplications.get(pcontext.getSessionId());
+ PortalApplicationState state = getApplicationState(pcontext);
if (state != null)
{
- if ((!(Safe.equals(pcontext.getRemoteUser(), state.getUserName())))
- || (!pcontext.getPortalOwner().equals(state.getUIPortalApplication().getOwner())))
+ if (!Safe.equals(pcontext.getRemoteUser(), state.getUserName()))
{
clearSession(pcontext.getRequest().getSession());
state = null;
@@ -119,7 +119,7 @@
pcontext.setAttribute(UserPortalConfig.class, config);
UIPortalApplication uiApplication = (UIPortalApplication)app.createUIComponent(type, null, null, context);
state = new PortalApplicationState(uiApplication, pcontext.getRemoteUser());
- uiApplications.put(context.getSessionId(), state);
+ cacheApplicationState(pcontext.getSessionId(), pcontext.getPortalOwner(),state);
SessionManagerContainer pcontainer = (SessionManagerContainer)app.getApplicationServiceContainer();
pcontainer.createSessionContainer(context.getSessionId(), uiApplication.getOwner());
}
@@ -133,14 +133,32 @@
public void expire(String sessionId, WebuiApplication app)
{
- PortalApplicationState state = uiApplications.remove(sessionId);
- if (state != null)
- {
- log.warn("Session expires, remove application: " + state.getUIPortalApplication());
- }
+ uiApplications.remove(sessionId);
SessionManagerContainer pcontainer = (SessionManagerContainer)app.getApplicationServiceContainer();
pcontainer.removeSessionContainer(sessionId);
}
+
+ private PortalApplicationState getApplicationState(WebuiRequestContext context) {
+ PortalRequestContext portalContext = null;
+ if (context instanceof PortalRequestContext)
+ portalContext = (PortalRequestContext)context;
+ else
+ portalContext = (PortalRequestContext)context.getParentAppRequestContext();
+ String portalName = portalContext.getPortalOwner();
+ String sessionId = portalContext.getSessionId();
+
+ HashMap<String, PortalApplicationState> appStates = uiApplications.get(sessionId);
+ return (appStates == null) ? null : appStates.get(portalName);
+ }
+
+ private void cacheApplicationState(String sessionId, String portalName, PortalApplicationState state) {
+ HashMap<String, PortalApplicationState> appStates = uiApplications.get(sessionId);
+ if (appStates == null) {
+ appStates = new HashMap<String, PortalApplicationState>();
+ uiApplications.put(sessionId, appStates);
+ }
+ appStates.put(portalName, state);
+ }
private UserPortalConfig getUserPortalConfig(PortalRequestContext context) throws Exception
{
15 years, 2 months
- 1
- 0
gatein SVN: r434 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-10-27 14:43:02 -0400 (Tue, 27 Oct 2009)
New Revision: 434
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
Log:
Handle public render parameters (GTNPORTAL-118).
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-10-27 02:00:59 UTC (rev 433)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-10-27 18:43:02 UTC (rev 434)
@@ -601,6 +601,7 @@
HttpServletRequest servletRequest = prc.getRequest();
HashMap<String, String[]> allParams = new HashMap<String, String[]>();
allParams.putAll(servletRequest.getParameterMap());
+ allParams.putAll(this.getPublicParameters());
if (type.equals(ActionInvocation.class))
{
ActionInvocation actionInvocation = new ActionInvocation(pic);
@@ -667,8 +668,7 @@
invocation.setWindowState(org.gatein.pc.api.WindowState.create(getCurrentWindowState().toString()));
// Public navigational state
- invocation.setPublicNavigationalState(allParams);
-
+ invocation.setPublicNavigationalState(this.getPublicParameters());
//
StatefulPortletContext<C> preferencesPortletContext = getPortletContext();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-10-27 02:00:59 UTC (rev 433)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-10-27 18:43:02 UTC (rev 434)
@@ -150,9 +150,7 @@
*/
//
- Map<String, String[]> map =
- StateString.decodeOpaqueValue((navStateResponse.getNavigationalState()).getStringValue());
- uiPortlet.setRenderParametersMap(map);
+ uiPortlet.setRenderParametersMap(navStateResponse.getPublicNavigationalStateUpdates());
//
/*
15 years, 2 months
- 1
- 0
gatein SVN: r433 - portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-10-26 22:00:59 -0400 (Mon, 26 Oct 2009)
New Revision: 433
Modified:
portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml
Log:
PORTAL-3650: Calculator gadget: when user input many numeral characters, the textbox for displaying will be overflowed characters.
Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml 2009-10-26 11:27:53 UTC (rev 432)
+++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml 2009-10-27 02:00:59 UTC (rev 433)
@@ -86,21 +86,21 @@
text-align: center;
}
- .Display p {
+ .Display input {
background: url(/eXoGadgets/skin/image/Display.png) no-repeat top left;
width: 164px;
height: 23px;
- text-align: __BIDI_END_EDGE__;
margin: 0 auto;
font-size: 15px;
line-height: auto;
color: #333333;
font-weight: bold;
- padding: 11px 3px 0 0;
+ padding: 3px 3px 0 0;
+ direction: __BIDI_REVERSE_DIR__;
}
.Number {
- padding-top: 8px;
+ padding-top: 8px;
padding-__BIDI_START_EDGE__: 9px;
}
@@ -115,13 +115,13 @@
display: block;
float: __BIDI_START_EDGE__;
margin-top: 4px;
- margin-__BIDI_START_EDGE__: 3px;
+ margin-__BIDI_START_EDGE__: 3px;
cursor: pointer;
padding-top: 3px;
}
.ClearLeft {
- clear: __BIDI_START_EDGE__
+ clear: __BIDI_START_EDGE__;
}
.Row a sup {
@@ -159,7 +159,7 @@
var NewNumber = "blank";
var opvalue = "";
function Display(displaynumber) {
- document.getElementById("calculator").innerHTML = displaynumber;
+ document.getElementById("calculator").value = displaynumber;
}
function ClearCalc() {
Number1 = "";
@@ -169,7 +169,7 @@
}
function CheckNumber(answer) {
if(answer == ".") {
- Number = document.getElementById("calculator").innerHTML;;
+ Number = document.getElementById("calculator").value;
if(Number.indexOf(".") != -1) {
answer = "";
}
@@ -257,7 +257,7 @@
<div class="RightCalculator">
<div class="CenterCalculator">
<div class="Display">
- <p id="calculator">0</p>
+ <input id="calculator" value="0" disabled />
</div>
<div class="Number">
<div class="Row">
15 years, 2 months
- 1
- 0
gatein SVN: r432 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-10-26 07:27:53 -0400 (Mon, 26 Oct 2009)
New Revision: 432
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
Log:
GTNPORTAL-17: Events seems to be triggered twice
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-10-26 09:54:31 UTC (rev 431)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-10-26 11:27:53 UTC (rev 432)
@@ -33,6 +33,7 @@
import org.exoplatform.portal.webui.util.PortalDataMapper;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.web.application.JavascriptManager;
@@ -373,6 +374,8 @@
}
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWizard.saveData();
+ UIPortalToolPanel toolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class);
+ toolPanel.setUIComponent(null);
uiWizard.updateUIPortal(uiPortalApp, event);
JavascriptManager jsManager = event.getRequestContext().getJavascriptManager();
jsManager.addJavascript("eXo.portal.portalMode=" + UIPortalApplication.NORMAL_MODE + ";");
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2009-10-26 09:54:31 UTC (rev 431)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2009-10-26 11:27:53 UTC (rev 432)
@@ -24,6 +24,7 @@
import org.exoplatform.portal.webui.portal.UIPortalComposer;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.webui.application.WebuiRequestContext;
@@ -160,6 +161,8 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
+ UIPortalToolPanel toolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class);
+ toolPanel.setUIComponent(null);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
JavascriptManager jsManager = event.getRequestContext().getJavascriptManager();
jsManager.addJavascript("eXo.portal.portalMode=" + UIPortalApplication.NORMAL_MODE + ";");
15 years, 2 months
- 1
- 0
gatein SVN: r431 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui.
by do-not-reply＠jboss.org
Author: tam_nguyen
Date: 2009-10-26 05:54:31 -0400 (Mon, 26 Oct 2009)
New Revision: 431
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
Log:
GTNPORTAL-68 Error when change time when create/edit page
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2009-10-26 04:14:57 UTC (rev 430)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2009-10-26 09:54:31 UTC (rev 431)
@@ -69,7 +69,6 @@
UICalendar.prototype.show = function() {
document.onmousedown = new Function('eXo.webui.UICalendar.hide()') ;
-
var re = /^(\d{1,2}\/\d{1,2}\/\d{1,4})\s*(\s+\d{1,2}:\d{1,2}:\d{1,2})?$/i ;
this.selectedDate = new Date() ;
@@ -109,6 +108,10 @@
var secondIndex = this.datePattern.indexOf("ss");
var secondValue = parseInt(dateFieldValue.substring(secondIndex,secondIndex+2),10);
+ if(isNaN(secondValue)) { secondValue = "00"; }
+ if(isNaN(minutesValue)) { minutesValue = "00"; }
+ if(isNaN(hoursValue)) { hoursValue = "00"; }
+
var testDate = "MM/dd/yyyy HH:mm:ss";
testDate = testDate.replace("dd",dateValue);
testDate = testDate.replace("MM",monthValue+1);
@@ -116,6 +119,7 @@
testDate = testDate.replace("HH",hoursValue);
testDate = testDate.replace("mm",minutesValue);
testDate = testDate.replace("ss",secondValue);
+
if (re.test(testDate)) {
this.selectedDate.setDate(dateValue) ;
this.selectedDate.setMonth(monthValue) ;
15 years, 2 months
- 1
- 0
gatein SVN: r430 - portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-10-26 00:14:57 -0400 (Mon, 26 Oct 2009)
New Revision: 430
Modified:
portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java
Log:
PORTAL-3554 Check some case in logo portlet
Modified: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java
===================================================================
--- portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java 2009-10-26 03:09:01 UTC (rev 429)
+++ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UILogoEditMode.java 2009-10-26 04:14:57 UTC (rev 430)
@@ -19,8 +19,12 @@
package org.exoplatform.portal.webui.component;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletPreferences;
+
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.application.portlet.PortletRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -28,13 +32,12 @@
import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
+import org.exoplatform.webui.exception.MessageException;
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormStringInput;
import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.exoplatform.webui.form.validator.URLValidator;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-
/**
* Created by The eXo Platform SAS Author : eXoPlatform October 2, 2009
*/
@@ -58,6 +61,12 @@
{
UILogoEditMode uiForm = event.getSource();
String url = uiForm.getUIStringInput(FIELD_URL).getValue();
+ if (url != null && !url.trim().matches(URLValidator.URL_REGEX)) {
+ UILogoPortlet uiPortlet = uiForm.getParent();
+ uiForm.getUIStringInput(FIELD_URL).setValue(uiPortlet.getURL());
+ Object[] args = {FIELD_URL, "URL"};
+ throw new MessageException(new ApplicationMessage("ExpressionValidator.msg.value-invalid", args));
+ }
PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance();
PortletPreferences pref = pcontext.getRequest().getPreferences();
pref.setValue("url", uiForm.getUIStringInput(FIELD_URL).getValue());
15 years, 2 months
- 1
- 0
gatein SVN: r429 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-10-25 23:09:01 -0400 (Sun, 25 Oct 2009)
New Revision: 429
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
PORTAL-3601 Sesstion time out when click switch view mode in special case
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2009-10-25 22:09:27 UTC (rev 428)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2009-10-26 03:09:01 UTC (rev 429)
@@ -70,7 +70,7 @@
{
UserPortalConfigService configService = uiPortalApp.getApplicationComponent(UserPortalConfigService.class);
String remoteUser = Util.getPortalRequestContext().getRemoteUser();
- UserPortalConfig portalConfig = configService.getUserPortalConfig(uiPortal.getOwner(), remoteUser);
+ UserPortalConfig portalConfig = configService.getUserPortalConfig(Util.getPortalRequestContext().getPortalOwner(), remoteUser);
uiPortal.getChildren().clear();
PortalDataMapper.toUIPortal(uiPortal, portalConfig);
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
15 years, 2 months
- 1
- 0
gatein SVN: r428 - portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-25 18:09:27 -0400 (Sun, 25 Oct 2009)
New Revision: 428
Modified:
portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java
Log:
fix bug
Modified: portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java
===================================================================
--- portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java 2009-10-25 21:04:29 UTC (rev 427)
+++ portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java 2009-10-25 22:09:27 UTC (rev 428)
@@ -64,19 +64,19 @@
switch (bytes.length)
{
case 0:
+ throw new AssertionError();
+ case 1:
out.write(bytes[0]);
break;
- case 1:
+ case 2:
out.write(bytes[0]);
out.write(bytes[1]);
break;
- case 2:
+ case 3:
out.write(bytes[0]);
out.write(bytes[1]);
out.write(bytes[2]);
break;
- case 3:
- break;
default:
out.write(bytes);
}
15 years, 2 months
- 1
- 0
gatein SVN: r427 - in portal/branches/performance: component/common/src/test/java/org/exoplatform/commons/utils and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-25 17:04:29 -0400 (Sun, 25 Oct 2009)
New Revision: 427
Added:
portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/BufferingOutputStream.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestPrinter.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestSafe.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestTextEncoder.java
Removed:
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/OutputStreamPrinterTestCase.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/PrinterTestCase.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/SafeTestCase.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TextEncoderTestCase.java
Modified:
portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java
portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java
portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/Printer.java
portal/branches/performance/component/scripting/src/main/java/org/exoplatform/commons/utils/PortalPrinter.java
portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
- avoid to use byte[] when not necessary during the conversion of char to byte
- maintains a byte[] buffer at the portal level instead of relying on the servlet output stream buffer
- rename a few unit tests to Test* as the *TestCase is not recognized by the build
Added: portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/BufferingOutputStream.java
===================================================================
--- portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/BufferingOutputStream.java (rev 0)
+++ portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/BufferingOutputStream.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2003-2007 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.commons.utils;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * A stream that maintains a buffer and flush it on a delegate output stream when it is
+ * filled. Unlike {@link java.io.BufferedOutputStream} this class is not synchronized.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class BufferingOutputStream extends OutputStream
+{
+
+ /** . */
+ private final OutputStream out;
+
+ /** . */
+ private byte[] buffer;
+
+ /** . */
+ private boolean open;
+
+ /** . */
+ private int offset;
+
+ /** . */
+ private final int size;
+
+ public BufferingOutputStream(OutputStream out, int bufferSize)
+ {
+ if (out == null)
+ {
+ throw new NullPointerException("No null output stream");
+ }
+ if (bufferSize < 1)
+ {
+ throw new IllegalArgumentException("No buffer size under 1");
+ }
+ this.out = out;
+ this.buffer = new byte[bufferSize];
+ this.size = bufferSize;
+ this.open = true;
+ }
+
+ @Override
+ public void write(int b) throws IOException
+ {
+ if (!open)
+ {
+ throw new IOException("closed");
+ }
+ if (offset >= size)
+ {
+ out.write(buffer);
+ offset = 0;
+ }
+ buffer[offset++] = (byte)b;
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException
+ {
+ if (!open)
+ {
+ throw new IOException("closed");
+ }
+
+ //
+ if (offset + len >= size)
+ {
+ // Clear the buffer
+ out.write(buffer, 0, offset);
+ offset = 0;
+
+ // While the data length is greater than the the buffer size
+ // write directly to the wire
+ while (len >= size)
+ {
+ out.write(b, off, size);
+ off += size;
+ len -= size;
+ }
+ }
+
+ //
+ System.arraycopy(b, off, buffer, offset, len);
+ offset += len;
+ }
+
+ @Override
+ public void flush() throws IOException
+ {
+ if (!open)
+ {
+ throw new IOException("closed");
+ }
+
+ //
+ if (offset > 0)
+ {
+ out.write(buffer, 0, offset);
+ offset = 0;
+ }
+
+ //
+ out.flush();
+ }
+
+ @Override
+ public void close() throws IOException
+ {
+ if (!open)
+ {
+ throw new IOException("closed");
+ }
+
+ //
+ if (offset > 0)
+ {
+ out.write(buffer, 0, offset);
+ offset = 0;
+ }
+
+ //
+ open = false;
+ out.close();
+ }
+}
Modified: portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java
===================================================================
--- portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/CharsetTextEncoder.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -29,7 +29,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class CharsetTextEncoder implements TextEncoder
+public final class CharsetTextEncoder implements TextEncoder
{
private static final CharsetTextEncoder UTF8 = new CharsetTextEncoder(CharsetCharEncoder.getUTF8());
@@ -54,8 +54,33 @@
public void encode(char c, OutputStream out) throws IOException
{
- byte[] bytes = charEncoder.encode(c);
- out.write(bytes);
+ if (c > -1 && c < 128)
+ {
+ out.write((int)c);
+ }
+ else
+ {
+ byte[] bytes = charEncoder.encode(c);
+ switch (bytes.length)
+ {
+ case 0:
+ out.write(bytes[0]);
+ break;
+ case 1:
+ out.write(bytes[0]);
+ out.write(bytes[1]);
+ break;
+ case 2:
+ out.write(bytes[0]);
+ out.write(bytes[1]);
+ out.write(bytes[2]);
+ break;
+ case 3:
+ break;
+ default:
+ out.write(bytes);
+ }
+ }
}
public void encode(char[] chars, int off, int len, OutputStream out) throws IOException
@@ -63,8 +88,7 @@
for (int i = off; i < len; i++)
{
char c = chars[i];
- byte[] bytes = charEncoder.encode(c);
- out.write(bytes);
+ encode(c, out);
}
}
@@ -73,8 +97,7 @@
for (int i = off; i < len; i++)
{
char c = str.charAt(i);
- byte[] bytes = charEncoder.encode(c);
- out.write(bytes);
+ encode(c, out);
}
}
}
Modified: portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java
===================================================================
--- portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -42,6 +42,9 @@
*
* </p>
*
+ * <p>The class provides direct write access to the underlying output stream when the client of the stream can provides
+ * bytes directly.</p>
+ *
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
@@ -71,10 +74,37 @@
*/
public OutputStreamPrinter(TextEncoder encoder, OutputStream out, boolean flushOnClose) throws IllegalArgumentException
{
- this(encoder, out, IOFailureFlow.RETHROW, false, flushOnClose);
+ this(encoder, out, IOFailureFlow.RETHROW, false, flushOnClose, 0);
}
/**
+ * Builds an instance with the failureFlow being {@link IOFailureFlow#RETHROW} and
+ * a the ignoreOnFailure property set to false.
+ *
+ * @param encoder the encoder
+ * @param out the output
+ * @param flushOnClose flush when stream is closed
+ * @throws IllegalArgumentException if any argument is null
+ */
+ public OutputStreamPrinter(TextEncoder encoder, OutputStream out, boolean flushOnClose, int bufferSize) throws IllegalArgumentException
+ {
+ this(encoder, out, IOFailureFlow.RETHROW, false, flushOnClose, bufferSize);
+ }
+
+ /**
+ * Builds an instance with the failureFlow being {@link IOFailureFlow#RETHROW} and
+ * a the ignoreOnFailure property set to false.
+ *
+ * @param encoder the encoder
+ * @param out the output
+ * @throws IllegalArgumentException if any argument is null
+ */
+ public OutputStreamPrinter(TextEncoder encoder, OutputStream out) throws IllegalArgumentException
+ {
+ this(encoder, out, IOFailureFlow.RETHROW, false, false, 0);
+ }
+
+ /**
* Builds a new instance.
*
* @param encoder the encoder
@@ -89,7 +119,8 @@
OutputStream out,
IOFailureFlow failureFlow,
boolean ignoreOnFailure,
- boolean flushOnClose)
+ boolean flushOnClose,
+ int bufferSize)
throws IllegalArgumentException
{
if (encoder == null)
@@ -104,6 +135,18 @@
{
throw new IllegalArgumentException("No null control flow mode accepted");
}
+ if (bufferSize < 0)
+ {
+ throw new IllegalArgumentException("Invalid negative max buffer size: " + bufferSize);
+ }
+
+ //
+ if (bufferSize > 0)
+ {
+ out = new BufferingOutputStream(out, bufferSize);
+ }
+
+ //
this.encoder = encoder;
this.out = out;
this.failureFlow = failureFlow;
@@ -137,6 +180,55 @@
return failed;
}
+ // Bytes access interface
+
+ public void write(byte b) throws IOException
+ {
+ if (!failed)
+ {
+ try
+ {
+ out.write(b);
+ }
+ catch (IOException e)
+ {
+ handle(e);
+ }
+ }
+ }
+
+ public void write(byte[] bytes) throws IOException
+ {
+ if (!failed)
+ {
+ try
+ {
+ out.write(bytes);
+ }
+ catch (IOException e)
+ {
+ handle(e);
+ }
+ }
+ }
+
+ public void write(byte[] b, int off, int len) throws IOException
+ {
+ if (!failed)
+ {
+ try
+ {
+ out.write(b, off, len);
+ }
+ catch (IOException e)
+ {
+ handle(e);
+ }
+ }
+ }
+
+ //
+
@Override
public void write(int c) throws IOException
{
Modified: portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/Printer.java
===================================================================
--- portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/Printer.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/Printer.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -54,17 +54,21 @@
{
try
{
- if (o instanceof Text)
+ if (o == null)
{
+ write("null");
+ }
+ else if (o instanceof Text)
+ {
((Text)o).writeTo(this);
}
else
{
- String s = String.valueOf(o);
+ String s = (o == null) ? "null" : o.toString();
write(s);
}
}
- catch (IOException ignore)
+ catch (IOException e)
{
}
}
Deleted: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/OutputStreamPrinterTestCase.java
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/OutputStreamPrinterTestCase.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/OutputStreamPrinterTestCase.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -1,312 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.utils;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.LinkedList;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class OutputStreamPrinterTestCase extends TestCase
-{
-
- static final int NOOP = -1;
-
- static final int WRITE = 0;
-
- static final int FLUSH = 1;
-
- static final int CLOSE = 2;
-
- public void testIOExceptionBlocking()
- {
- internalTest(IOFailureFlow.RETHROW, true);
- }
-
- public void testUndeclaredIOExceptionBlocking()
- {
- internalTest(IOFailureFlow.THROW_UNDECLARED, true);
- }
-
- public void testIgnoreIOExceptionBlocking()
- {
- internalTest(IOFailureFlow.IGNORE, true);
- }
-
- public void testIOExceptionNoBlocking()
- {
- internalTest(IOFailureFlow.RETHROW, false);
- }
-
- public void testUndeclaredIOExceptionNoBlocking()
- {
- internalTest(IOFailureFlow.THROW_UNDECLARED, false);
- }
-
- public void testIgnoreIOExceptionNoBlocking()
- {
- internalTest(IOFailureFlow.IGNORE, false);
- }
-
- public void internalTest(IOFailureFlow mode, boolean blockOnFailure)
- {
- int writeAfterFailure = blockOnFailure ? NOOP : WRITE;
- int flushAfterFailure = blockOnFailure ? NOOP : FLUSH;
-
- //
- TestOutputStream out = new TestOutputStream(true, mode, blockOnFailure);
- out.write(mode);
- out.assertOperation(WRITE).assertEmpty().wantFailure = false;
- out.flush(IOFailureFlow.IGNORE);
- out.assertOperation(flushAfterFailure).assertEmpty();
- out.write(IOFailureFlow.IGNORE);
- out.assertOperation(writeAfterFailure).assertEmpty();
- out.close(IOFailureFlow.IGNORE);
- out.assertOperation(CLOSE).assertEmpty();
-
- //
- out = new TestOutputStream(false, mode, blockOnFailure);
- out.write(IOFailureFlow.IGNORE);
- out.assertOperation(WRITE).assertEmpty().wantFailure = true;
- out.flush(mode);
- out.assertOperation(FLUSH).assertEmpty().wantFailure = false;
- out.write(IOFailureFlow.IGNORE);
- out.assertOperation(writeAfterFailure).assertEmpty();
- out.close(IOFailureFlow.IGNORE);
- out.assertOperation(CLOSE).assertEmpty();
-
- //
- out = new TestOutputStream(false, mode, blockOnFailure);
- out.write(IOFailureFlow.IGNORE);
- out.assertOperation(WRITE).assertEmpty();
- out.flush(IOFailureFlow.IGNORE);
- out.assertOperation(FLUSH).assertEmpty().wantFailure = true;
- out.write(mode);
- out.assertOperation(WRITE).assertEmpty().wantFailure = false;
- out.close(IOFailureFlow.IGNORE);
- out.assertOperation(CLOSE).assertEmpty();
-
- //
- out = new TestOutputStream(false, mode, blockOnFailure);
- out.write(IOFailureFlow.IGNORE);
- out.assertOperation(WRITE).assertEmpty();
- out.flush(IOFailureFlow.IGNORE);
- out.assertOperation(FLUSH).assertEmpty();
- out.write(IOFailureFlow.IGNORE);
- out.assertOperation(WRITE).assertEmpty().wantFailure = true;
- out.close(mode);
- out.assertOperation(CLOSE).assertEmpty();
- }
-
- private static class TestOutputStream extends OutputStream
- {
-
- boolean wantFailure = false;
-
- final LinkedList<Integer> operations = new LinkedList<Integer>();
-
- OutputStreamPrinter osp;
-
- private TestOutputStream(boolean wantFailure, IOFailureFlow mode, boolean blockOnFailure)
- {
- this.wantFailure = wantFailure;
- this.osp = new OutputStreamPrinter(CharsetTextEncoder.getUTF8(), this, mode, blockOnFailure, false);
- }
-
- public void write(int b) throws IOException
- {
- operations.add(WRITE);
- if (wantFailure)
- {
- throw new IOException();
- }
- }
-
- @Override
- public void flush() throws IOException
- {
- operations.add(FLUSH);
- if (wantFailure)
- {
- throw new IOException();
- }
- }
-
- @Override
- public void close() throws IOException
- {
- operations.add(CLOSE);
- if (wantFailure)
- {
- throw new IOException();
- }
- }
-
- public void write(IOFailureFlow mode)
- {
- switch (mode)
- {
- case RETHROW :
- try
- {
- osp.write("a");
- fail();
- }
- catch (IOException ignore)
- {
- }
- break;
- case THROW_UNDECLARED :
- try
- {
- osp.write("a");
- fail();
- }
- catch (UndeclaredIOException ignore)
- {
- }
- catch (IOException expected)
- {
- fail();
- }
- break;
- case IGNORE :
- try
- {
- osp.write("a");
- }
- catch (UndeclaredIOException ignore)
- {
- fail();
- }
- catch (IOException expected)
- {
- fail();
- }
- break;
- }
- }
-
- public void flush(IOFailureFlow mode)
- {
- switch (mode)
- {
- case RETHROW :
- try
- {
- osp.flush();
- fail();
- }
- catch (IOException ignore)
- {
- }
- break;
- case THROW_UNDECLARED :
- try
- {
- osp.flush();
- fail();
- }
- catch (UndeclaredIOException ignore)
- {
- }
- catch (IOException e)
- {
- fail();
- }
- break;
- case IGNORE :
- try
- {
- osp.flush();
- }
- catch (IOException e)
- {
- fail();
- }
- break;
- }
- }
-
- public void close(IOFailureFlow mode)
- {
- switch (mode)
- {
- case RETHROW :
- try
- {
- osp.close();
- fail();
- }
- catch (IOException ignore)
- {
- }
- break;
- case THROW_UNDECLARED :
- try
- {
- osp.close();
- fail();
- }
- catch (UndeclaredIOException ignore)
- {
- }
- catch (IOException e)
- {
- fail();
- }
- break;
- case IGNORE :
- try
- {
- osp.close();
- }
- catch (IOException e)
- {
- fail();
- }
- break;
- }
- }
-
- public TestOutputStream assertEmpty()
- {
- Assert.assertTrue(operations.isEmpty());
- return this;
- }
-
- public TestOutputStream assertOperation(int operation)
- {
- if (operation != NOOP)
- {
- Assert.assertFalse(operations.isEmpty());
- int actual = operations.removeFirst();
- Assert.assertEquals(operation, actual);
- }
- return this;
- }
- }
-}
Deleted: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/PrinterTestCase.java
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/PrinterTestCase.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/PrinterTestCase.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.utils;
-
-import junit.framework.TestCase;
-
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class PrinterTestCase extends TestCase
-{
-
- private MyPrinter printer;
-
- @Override
- protected void setUp() throws Exception
- {
- printer = new MyPrinter();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- printer = null;
- }
-
- public void testPrintNull()
- {
- printer.print(null);
- assertEquals("null", printer.buffer.toString());
- }
-
- public void testPrint()
- {
- printer.print("foo");
- assertEquals("foo", printer.buffer.toString());
- }
-
- public void testPrintlnNull()
- {
- printer.println(null);
- assertEquals("null\n", printer.buffer.toString());
- }
-
- public void testPrintln()
- {
- printer.println("foo");
- assertEquals("foo\n", printer.buffer.toString());
- }
-
- public void testPrintln2()
- {
- printer.println();
- assertEquals("\n", printer.buffer.toString());
- }
-
- public void testWriteNull() throws IOException
- {
- try
- {
- printer.write((String)null);
- fail();
- }
- catch (Exception ignore)
- {
- assertEquals("", printer.buffer.toString());
- }
- try
- {
- printer.write((String)null, 0, 10);
- fail();
- }
- catch (Exception ignore)
- {
- assertEquals("", printer.buffer.toString());
- }
- try
- {
- printer.write((char[])null, 0, 10);
- fail();
- }
- catch (Exception ignore)
- {
- assertEquals("", printer.buffer.toString());
- }
- try
- {
- printer.write((char[])null);
- fail();
- }
- catch (Exception ignore)
- {
- assertEquals("", printer.buffer.toString());
- }
- }
-
- private static class MyPrinter extends Printer
- {
-
- private StringBuffer buffer = new StringBuffer();
-
- public void write(char[] cbuf, int off, int len) throws IOException
- {
- buffer.append(cbuf, off, len);
- }
-
- public void flush() throws IOException
- {
- }
-
- public void close() throws IOException
- {
- }
- }
-}
Deleted: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/SafeTestCase.java
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/SafeTestCase.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/SafeTestCase.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -1,142 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.utils;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class SafeTestCase extends TestCase
-{
-
- public SafeTestCase()
- {
- }
-
- public SafeTestCase(String s)
- {
- super(s);
- }
-
- public void testClose()
- {
- assertFalse(Safe.close(null));
- assertTrue(Safe.close(new ByteArrayOutputStream()));
- assertFalse(Safe.close(new Closeable()
- {
- public void close() throws IOException
- {
- throw new IOException();
- }
- }));
- assertFalse(Safe.close(new Closeable()
- {
- public void close() throws IOException
- {
- throw new RuntimeException();
- }
- }));
- final Error expectedError = new Error();
- try
- {
- Safe.close(new Closeable()
- {
- public void close() throws IOException
- {
- throw expectedError;
- }
- });
- fail();
- }
- catch (Error error)
- {
- assertSame(expectedError, error);
- }
- }
-
- private static class Thrower
- {
-
- private final Throwable t;
-
- private Thrower(Throwable t)
- {
- this.t = t;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (t instanceof Error)
- {
- throw ((Error)t);
- }
- if (t instanceof RuntimeException)
- {
- throw ((RuntimeException)t);
- }
- throw new AssertionFailedError();
- }
- }
-
- public void testEquals()
- {
- Object o = new Object();
- assertTrue(Safe.equals(o, o));
- assertTrue(Safe.equals(null, null));
- assertFalse(Safe.equals(new Object(), null));
- assertFalse(Safe.equals(null, new Object()));
- assertFalse(Safe.equals(new Object(), new Object()));
- assertFalse(Safe.equals(new Thrower(new RuntimeException()), null));
- assertFalse(Safe.equals(null, new Thrower(new RuntimeException())));
- assertFalse(Safe.equals(new Object(), new Thrower(new RuntimeException())));
- assertFalse(Safe.equals(new Thrower(new Error()), null));
- assertFalse(Safe.equals(null, new Thrower(new Error())));
- assertFalse(Safe.equals(new Object(), new Thrower(new Error())));
- RuntimeException re = new RuntimeException();
- Error er = new Error();
- try
- {
- Safe.equals(new Thrower(er), new Object());
- fail();
- }
- catch (Error e)
- {
- assertSame(er, e);
- }
- try
- {
- Safe.equals(new Thrower(re), new Object());
- fail();
- }
- catch (RuntimeException e)
- {
- assertSame(re, e);
- }
- }
-
-}
Copied: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java (from rev 424, portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/OutputStreamPrinterTestCase.java)
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java (rev 0)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestOutputStreamPrinter.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -0,0 +1,312 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.utils;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.LinkedList;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestOutputStreamPrinter extends TestCase
+{
+
+ static final int NOOP = -1;
+
+ static final int WRITE = 0;
+
+ static final int FLUSH = 1;
+
+ static final int CLOSE = 2;
+
+ public void testIOExceptionBlocking()
+ {
+ internalTest(IOFailureFlow.RETHROW, true);
+ }
+
+ public void testUndeclaredIOExceptionBlocking()
+ {
+ internalTest(IOFailureFlow.THROW_UNDECLARED, true);
+ }
+
+ public void testIgnoreIOExceptionBlocking()
+ {
+ internalTest(IOFailureFlow.IGNORE, true);
+ }
+
+ public void testIOExceptionNoBlocking()
+ {
+ internalTest(IOFailureFlow.RETHROW, false);
+ }
+
+ public void testUndeclaredIOExceptionNoBlocking()
+ {
+ internalTest(IOFailureFlow.THROW_UNDECLARED, false);
+ }
+
+ public void testIgnoreIOExceptionNoBlocking()
+ {
+ internalTest(IOFailureFlow.IGNORE, false);
+ }
+
+ public void internalTest(IOFailureFlow mode, boolean blockOnFailure)
+ {
+ int writeAfterFailure = blockOnFailure ? NOOP : WRITE;
+ int flushAfterFailure = blockOnFailure ? NOOP : FLUSH;
+
+ //
+ TestOutputStream out = new TestOutputStream(true, mode, blockOnFailure);
+ out.write(mode);
+ out.assertOperation(WRITE).assertEmpty().wantFailure = false;
+ out.flush(IOFailureFlow.IGNORE);
+ out.assertOperation(flushAfterFailure).assertEmpty();
+ out.write(IOFailureFlow.IGNORE);
+ out.assertOperation(writeAfterFailure).assertEmpty();
+ out.close(IOFailureFlow.IGNORE);
+ out.assertOperation(CLOSE).assertEmpty();
+
+ //
+ out = new TestOutputStream(false, mode, blockOnFailure);
+ out.write(IOFailureFlow.IGNORE);
+ out.assertOperation(WRITE).assertEmpty().wantFailure = true;
+ out.flush(mode);
+ out.assertOperation(FLUSH).assertEmpty().wantFailure = false;
+ out.write(IOFailureFlow.IGNORE);
+ out.assertOperation(writeAfterFailure).assertEmpty();
+ out.close(IOFailureFlow.IGNORE);
+ out.assertOperation(CLOSE).assertEmpty();
+
+ //
+ out = new TestOutputStream(false, mode, blockOnFailure);
+ out.write(IOFailureFlow.IGNORE);
+ out.assertOperation(WRITE).assertEmpty();
+ out.flush(IOFailureFlow.IGNORE);
+ out.assertOperation(FLUSH).assertEmpty().wantFailure = true;
+ out.write(mode);
+ out.assertOperation(WRITE).assertEmpty().wantFailure = false;
+ out.close(IOFailureFlow.IGNORE);
+ out.assertOperation(CLOSE).assertEmpty();
+
+ //
+ out = new TestOutputStream(false, mode, blockOnFailure);
+ out.write(IOFailureFlow.IGNORE);
+ out.assertOperation(WRITE).assertEmpty();
+ out.flush(IOFailureFlow.IGNORE);
+ out.assertOperation(FLUSH).assertEmpty();
+ out.write(IOFailureFlow.IGNORE);
+ out.assertOperation(WRITE).assertEmpty().wantFailure = true;
+ out.close(mode);
+ out.assertOperation(CLOSE).assertEmpty();
+ }
+
+ private static class TestOutputStream extends OutputStream
+ {
+
+ boolean wantFailure = false;
+
+ final LinkedList<Integer> operations = new LinkedList<Integer>();
+
+ OutputStreamPrinter osp;
+
+ private TestOutputStream(boolean wantFailure, IOFailureFlow mode, boolean blockOnFailure)
+ {
+ this.wantFailure = wantFailure;
+ this.osp = new OutputStreamPrinter(CharsetTextEncoder.getUTF8(), this, mode, blockOnFailure, false, 0);
+ }
+
+ public void write(int b) throws IOException
+ {
+ operations.add(WRITE);
+ if (wantFailure)
+ {
+ throw new IOException();
+ }
+ }
+
+ @Override
+ public void flush() throws IOException
+ {
+ operations.add(FLUSH);
+ if (wantFailure)
+ {
+ throw new IOException();
+ }
+ }
+
+ @Override
+ public void close() throws IOException
+ {
+ operations.add(CLOSE);
+ if (wantFailure)
+ {
+ throw new IOException();
+ }
+ }
+
+ public void write(IOFailureFlow mode)
+ {
+ switch (mode)
+ {
+ case RETHROW :
+ try
+ {
+ osp.write("a");
+ fail();
+ }
+ catch (IOException ignore)
+ {
+ }
+ break;
+ case THROW_UNDECLARED :
+ try
+ {
+ osp.write("a");
+ fail();
+ }
+ catch (UndeclaredIOException ignore)
+ {
+ }
+ catch (IOException expected)
+ {
+ fail();
+ }
+ break;
+ case IGNORE :
+ try
+ {
+ osp.write("a");
+ }
+ catch (UndeclaredIOException ignore)
+ {
+ fail();
+ }
+ catch (IOException expected)
+ {
+ fail();
+ }
+ break;
+ }
+ }
+
+ public void flush(IOFailureFlow mode)
+ {
+ switch (mode)
+ {
+ case RETHROW :
+ try
+ {
+ osp.flush();
+ fail();
+ }
+ catch (IOException ignore)
+ {
+ }
+ break;
+ case THROW_UNDECLARED :
+ try
+ {
+ osp.flush();
+ fail();
+ }
+ catch (UndeclaredIOException ignore)
+ {
+ }
+ catch (IOException e)
+ {
+ fail();
+ }
+ break;
+ case IGNORE :
+ try
+ {
+ osp.flush();
+ }
+ catch (IOException e)
+ {
+ fail();
+ }
+ break;
+ }
+ }
+
+ public void close(IOFailureFlow mode)
+ {
+ switch (mode)
+ {
+ case RETHROW :
+ try
+ {
+ osp.close();
+ fail();
+ }
+ catch (IOException ignore)
+ {
+ }
+ break;
+ case THROW_UNDECLARED :
+ try
+ {
+ osp.close();
+ fail();
+ }
+ catch (UndeclaredIOException ignore)
+ {
+ }
+ catch (IOException e)
+ {
+ fail();
+ }
+ break;
+ case IGNORE :
+ try
+ {
+ osp.close();
+ }
+ catch (IOException e)
+ {
+ fail();
+ }
+ break;
+ }
+ }
+
+ public TestOutputStream assertEmpty()
+ {
+ Assert.assertTrue(operations.isEmpty());
+ return this;
+ }
+
+ public TestOutputStream assertOperation(int operation)
+ {
+ if (operation != NOOP)
+ {
+ Assert.assertFalse(operations.isEmpty());
+ int actual = operations.removeFirst();
+ Assert.assertEquals(operation, actual);
+ }
+ return this;
+ }
+ }
+}
Copied: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestPrinter.java (from rev 413, portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/PrinterTestCase.java)
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestPrinter.java (rev 0)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestPrinter.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -0,0 +1,135 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.utils;
+
+import junit.framework.TestCase;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestPrinter extends TestCase
+{
+
+ private MyPrinter printer;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ printer = new MyPrinter();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ printer = null;
+ }
+
+ public void testPrintNull()
+ {
+ printer.print(null);
+ assertEquals("null", printer.buffer.toString());
+ }
+
+ public void testPrint()
+ {
+ printer.print("foo");
+ assertEquals("foo", printer.buffer.toString());
+ }
+
+ public void testPrintlnNull()
+ {
+ printer.println(null);
+ assertEquals("null\n", printer.buffer.toString());
+ }
+
+ public void testPrintln()
+ {
+ printer.println("foo");
+ assertEquals("foo\n", printer.buffer.toString());
+ }
+
+ public void testPrintln2()
+ {
+ printer.println();
+ assertEquals("\n", printer.buffer.toString());
+ }
+
+ public void testWriteNull() throws IOException
+ {
+ try
+ {
+ printer.write((String)null);
+ fail();
+ }
+ catch (Exception ignore)
+ {
+ assertEquals("", printer.buffer.toString());
+ }
+ try
+ {
+ printer.write((String)null, 0, 10);
+ fail();
+ }
+ catch (Exception ignore)
+ {
+ assertEquals("", printer.buffer.toString());
+ }
+ try
+ {
+ printer.write((char[])null, 0, 10);
+ fail();
+ }
+ catch (Exception ignore)
+ {
+ assertEquals("", printer.buffer.toString());
+ }
+ try
+ {
+ printer.write((char[])null);
+ fail();
+ }
+ catch (Exception ignore)
+ {
+ assertEquals("", printer.buffer.toString());
+ }
+ }
+
+ private static class MyPrinter extends Printer
+ {
+
+ private StringBuffer buffer = new StringBuffer();
+
+ public void write(char[] cbuf, int off, int len) throws IOException
+ {
+ buffer.append(cbuf, off, len);
+ }
+
+ public void flush() throws IOException
+ {
+ }
+
+ public void close() throws IOException
+ {
+ }
+ }
+}
Copied: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestSafe.java (from rev 413, portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/SafeTestCase.java)
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestSafe.java (rev 0)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestSafe.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -0,0 +1,142 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.utils;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestSafe extends TestCase
+{
+
+ public TestSafe()
+ {
+ }
+
+ public TestSafe(String s)
+ {
+ super(s);
+ }
+
+ public void testClose()
+ {
+ assertFalse(Safe.close(null));
+ assertTrue(Safe.close(new ByteArrayOutputStream()));
+ assertFalse(Safe.close(new Closeable()
+ {
+ public void close() throws IOException
+ {
+ throw new IOException();
+ }
+ }));
+ assertFalse(Safe.close(new Closeable()
+ {
+ public void close() throws IOException
+ {
+ throw new RuntimeException();
+ }
+ }));
+ final Error expectedError = new Error();
+ try
+ {
+ Safe.close(new Closeable()
+ {
+ public void close() throws IOException
+ {
+ throw expectedError;
+ }
+ });
+ fail();
+ }
+ catch (Error error)
+ {
+ assertSame(expectedError, error);
+ }
+ }
+
+ private static class Thrower
+ {
+
+ private final Throwable t;
+
+ private Thrower(Throwable t)
+ {
+ this.t = t;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (t instanceof Error)
+ {
+ throw ((Error)t);
+ }
+ if (t instanceof RuntimeException)
+ {
+ throw ((RuntimeException)t);
+ }
+ throw new AssertionFailedError();
+ }
+ }
+
+ public void testEquals()
+ {
+ Object o = new Object();
+ assertTrue(Safe.equals(o, o));
+ assertTrue(Safe.equals(null, null));
+ assertFalse(Safe.equals(new Object(), null));
+ assertFalse(Safe.equals(null, new Object()));
+ assertFalse(Safe.equals(new Object(), new Object()));
+ assertFalse(Safe.equals(new Thrower(new RuntimeException()), null));
+ assertFalse(Safe.equals(null, new Thrower(new RuntimeException())));
+ assertFalse(Safe.equals(new Object(), new Thrower(new RuntimeException())));
+ assertFalse(Safe.equals(new Thrower(new Error()), null));
+ assertFalse(Safe.equals(null, new Thrower(new Error())));
+ assertFalse(Safe.equals(new Object(), new Thrower(new Error())));
+ RuntimeException re = new RuntimeException();
+ Error er = new Error();
+ try
+ {
+ Safe.equals(new Thrower(er), new Object());
+ fail();
+ }
+ catch (Error e)
+ {
+ assertSame(er, e);
+ }
+ try
+ {
+ Safe.equals(new Thrower(re), new Object());
+ fail();
+ }
+ catch (RuntimeException e)
+ {
+ assertSame(re, e);
+ }
+ }
+
+}
Copied: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestTextEncoder.java (from rev 413, portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TextEncoderTestCase.java)
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestTextEncoder.java (rev 0)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TestTextEncoder.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -0,0 +1,88 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons.utils;
+
+import junit.framework.TestCase;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestTextEncoder extends TestCase
+{
+
+ public void testA() throws IOException
+ {
+ assertOK("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+ /*
+ assertOK("<>&\"\\=+");
+
+ // Chinese
+ assertOK(new String(new char[]{0x4EAC, 0x4EC5, 0x5C3D, 0x5F84, 0x60CA, 0x740E, 0x7579, 0x7D27, 0x7ECF, 0x8B66, 0x8C28, 0x9CB8}));
+
+ // Extended Roman
+ assertOK(new String(new char[]{0xEA, 0xFC, 0xE2, 0xCC}));
+
+ // Russian
+ assertOK(new String(new char[]{0x0433, 0x043E, 0x0432, 0x043E, 0x0440, 0x044E}));
+
+ // Greek
+ assertOK(new String(new char[]{0x0391, 0x03C5, 0x034, 0x03BF, 0x03C5}));
+ */
+ }
+
+ private void assertOK(String s) throws IOException
+ {
+ TextEncoder encoder = CharsetTextEncoder.getUTF8();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ encoder.encode(s, 0, s.length(), baos);
+ baos.flush();
+ byte[] b1 = baos.toByteArray();
+
+ //
+ baos.reset();
+ OutputStreamWriter osw = new OutputStreamWriter(baos);
+ osw.write(s);
+ osw.close();
+ byte[] b2 = baos.toByteArray();
+
+ //
+ List<Byte> expected = toList(b2);
+ List<Byte> actual = toList(b1);
+ assertEquals(expected, actual);
+ }
+
+ private List<Byte> toList(byte[] bytes)
+ {
+ List<Byte> tmp = new ArrayList<Byte>(bytes.length);
+ for (byte aByte : bytes)
+ {
+ tmp.add(aByte);
+ }
+ return tmp;
+ }
+
+}
Deleted: portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TextEncoderTestCase.java
===================================================================
--- portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TextEncoderTestCase.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/TextEncoderTestCase.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -1,88 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.commons.utils;
-
-import junit.framework.TestCase;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class TextEncoderTestCase extends TestCase
-{
-
- public void testA() throws IOException
- {
- assertOK("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
- /*
- assertOK("<>&\"\\=+");
-
- // Chinese
- assertOK(new String(new char[]{0x4EAC, 0x4EC5, 0x5C3D, 0x5F84, 0x60CA, 0x740E, 0x7579, 0x7D27, 0x7ECF, 0x8B66, 0x8C28, 0x9CB8}));
-
- // Extended Roman
- assertOK(new String(new char[]{0xEA, 0xFC, 0xE2, 0xCC}));
-
- // Russian
- assertOK(new String(new char[]{0x0433, 0x043E, 0x0432, 0x043E, 0x0440, 0x044E}));
-
- // Greek
- assertOK(new String(new char[]{0x0391, 0x03C5, 0x034, 0x03BF, 0x03C5}));
- */
- }
-
- private void assertOK(String s) throws IOException
- {
- TextEncoder encoder = CharsetTextEncoder.getUTF8();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- encoder.encode(s, 0, s.length(), baos);
- baos.flush();
- byte[] b1 = baos.toByteArray();
-
- //
- baos.reset();
- OutputStreamWriter osw = new OutputStreamWriter(baos);
- osw.write(s);
- osw.close();
- byte[] b2 = baos.toByteArray();
-
- //
- List<Byte> expected = toList(b2);
- List<Byte> actual = toList(b1);
- assertEquals(expected, actual);
- }
-
- private List<Byte> toList(byte[] bytes)
- {
- List<Byte> tmp = new ArrayList<Byte>(bytes.length);
- for (byte aByte : bytes)
- {
- tmp.add(aByte);
- }
- return tmp;
- }
-
-}
Modified: portal/branches/performance/component/scripting/src/main/java/org/exoplatform/commons/utils/PortalPrinter.java
===================================================================
--- portal/branches/performance/component/scripting/src/main/java/org/exoplatform/commons/utils/PortalPrinter.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/component/scripting/src/main/java/org/exoplatform/commons/utils/PortalPrinter.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -19,52 +19,36 @@
package org.exoplatform.commons.utils;
-import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.Charset;
/**
+ * The portal printer convert char to bytes based on a charset encoder.
+ *
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
public class PortalPrinter extends OutputStreamPrinter
{
- public PortalPrinter(TextEncoder encoder, OutputStream out, boolean flushOnClose) throws IllegalArgumentException
- {
- super(encoder, out, flushOnClose);
- }
+ /** The optimized encoder. */
+ private static final TextEncoder encoder = new CharsetTextEncoder(new TableCharEncoder(CharsetCharEncoder.getUTF8()));
- public void println()
+ /** The charset used. */
+ private static final Charset charset = Charset.forName("UTF8");
+
+ public PortalPrinter(OutputStream out, boolean flushOnClose, int bufferSize) throws IllegalArgumentException
{
- try
- {
- write('\n');
- }
- catch (IOException e)
- {
- }
+ super(encoder, out, flushOnClose, bufferSize);
}
- public void print(Object o)
+ /**
+ * Returns the charset used for the conversion
+ *
+ * @return the charset used
+ */
+ public Charset getCharset()
{
- try
- {
- if (o == null)
- {
- write("null");
- }
- else if (o instanceof Text)
- {
- ((Text)o).writeTo(this);
- }
- else
- {
- String s = (o == null) ? "null" : o.toString();
- write(s);
- }
- }
- catch (IOException e)
- {
- }
+ return charset;
}
}
Modified: portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2009-10-25 11:55:22 UTC (rev 426)
+++ portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2009-10-25 21:04:29 UTC (rev 427)
@@ -265,22 +265,13 @@
return request_.isUserInRole(roleUser);
}
- /** The optimized encoder. */
- private static final TextEncoder encoder =
- new CharsetTextEncoder(new TableCharEncoder(CharsetCharEncoder.getUTF8()));
-
final public Writer getWriter() throws Exception
{
if (writer_ == null)
{
+ PortalPrinter printer = new PortalPrinter(response_.getOutputStream(), true, 30000);
- // Setup a buffer size of 20K
- response_.setBufferSize(30000);
-
//
- PortalPrinter printer = new PortalPrinter(encoder, response_.getOutputStream(), true);
-
- //
if (HtmlValidator.DEBUG_MODE)
{
writer_ = new WriterPrinter(new HtmlValidator(printer));
15 years, 2 months
- 1
- 0