[gatein-commits] gatein SVN: r8998 - in epp/portal/branches/EPP_5_2_Branch: component/common/src/main/java/org/exoplatform/commons/chromattic and 19 other directories.

Author: ppalaga Date: 2012-12-13 09:35:09 -0500 (Thu, 13 Dec 2012) New Revision: 8998 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java epp/portal/branches/EPP_5_2_Branch/component/management/src/main/java/org/exoplatform/management/data/RestResource.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java epp/portal/branches/EPP_5_2_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JSMin.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/services/html/refs/CharRefs.java epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java epp/portal/branches/EPP_5_2_Branch/starter/jar/src/main/java/org/gatein/portal/starter/VersionDisplayer.java epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleContent.java epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/PermissionValidaror.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java Log: Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -693,8 +693,7 @@ } catch (Exception e) { - // log.error(e); - e.printStackTrace(); + log.error(e.getMessage(), e); } finally { Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -18,14 +18,16 @@ */ package org.exoplatform.commons.chromattic; +import java.util.HashMap; +import java.util.Map; + import org.exoplatform.container.ExoContainer; import org.exoplatform.container.component.ComponentPlugin; import org.exoplatform.container.component.ComponentRequestLifecycle; import org.exoplatform.services.jcr.RepositoryService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; -import java.util.HashMap; -import java.util.Map; - /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -44,6 +46,9 @@ /** . */ private final ThreadLocal<Synchronization> currentSynchronization = new ThreadLocal<Synchronization>(); + + /** . */ + private final Logger log = LoggerFactory.getLogger(ChromatticManager.class); public ChromatticManager(RepositoryService repositoryService) throws Exception { this.repositoryService = repositoryService; @@ -71,7 +76,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -113,7 +113,7 @@ } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + log.error(e.getMessage(), e); } finally { @@ -168,7 +168,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } @@ -204,7 +204,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } @@ -229,7 +229,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } Modified: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -284,7 +284,7 @@ try { groupEventListener.preSave(group, true); groupEventListener.postSave(group, true); - } catch (Exception e) {e.printStackTrace(); + } catch (Exception e) { log.warn("Failed to initialize " + group.getId() + " Group, listener = " + groupEventListener.getClass()); log.debug(e); ok = false; Modified: epp/portal/branches/EPP_5_2_Branch/component/management/src/main/java/org/exoplatform/management/data/RestResource.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/src/main/java/org/exoplatform/management/data/RestResource.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/management/src/main/java/org/exoplatform/management/data/RestResource.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -19,15 +19,15 @@ package org.exoplatform.management.data; -import org.exoplatform.management.ValueWrapper; -import org.exoplatform.management.invocation.MethodInvoker; -import org.exoplatform.management.annotations.ImpactType; -import org.exoplatform.management.spi.ManagedMethodMetaData; -import org.exoplatform.management.spi.ManagedPropertyMetaData; -import org.exoplatform.management.spi.ManagedResource; -import org.exoplatform.management.spi.ManagedTypeMetaData; -import org.exoplatform.services.rest.impl.ApplicationContextImpl; -import org.exoplatform.services.rest.impl.MultivaluedMapImpl; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -42,15 +42,17 @@ import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.MessageBodyReader; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.exoplatform.management.ValueWrapper; +import org.exoplatform.management.annotations.ImpactType; +import org.exoplatform.management.invocation.MethodInvoker; +import org.exoplatform.management.spi.ManagedMethodMetaData; +import org.exoplatform.management.spi.ManagedPropertyMetaData; +import org.exoplatform.management.spi.ManagedResource; +import org.exoplatform.management.spi.ManagedTypeMetaData; +import org.exoplatform.services.rest.impl.ApplicationContextImpl; +import org.exoplatform.services.rest.impl.MultivaluedMapImpl; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -74,6 +76,9 @@ /** . */ private final String description; + /** . */ + private final Logger log = LoggerFactory.getLogger(RestResource.class); + public RestResource(String name, ManagedResource managedResource) { ManagedTypeMetaData managedType = managedResource.getMetaData(); @@ -236,7 +241,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); return Response.serverError(); } finally Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -54,6 +54,8 @@ import org.exoplatform.portal.pom.data.PageKey; import org.exoplatform.portal.pom.data.PortalData; import org.exoplatform.portal.pom.data.PortalKey; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.jibx.runtime.BindingDirectory; import org.jibx.runtime.IBindingFactory; import org.jibx.runtime.impl.UnmarshallingContext; @@ -64,7 +66,8 @@ */ public class POMDataStorage implements ModelDataStorage { - + private final Logger log = LoggerFactory.getLogger(POMDataStorage.class); + /** . */ private final POMSessionManager pomMgr; @@ -342,7 +345,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); return null; } } Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -22,6 +22,10 @@ import groovy.lang.Writable; import groovy.text.Template; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Locale; + import org.exoplatform.commons.cache.future.FutureCache; import org.exoplatform.commons.cache.future.FutureExoCache; import org.exoplatform.commons.cache.future.Loader; @@ -41,11 +45,9 @@ import org.exoplatform.services.cache.CacheService; import org.exoplatform.services.cache.ExoCache; import org.gatein.common.io.IOTools; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Locale; - /** * Created by The eXo Platform SAS Dec 26, 2005 */ @@ -98,6 +100,9 @@ }; private FutureCache<ResourceKey, GroovyTemplate, ResourceResolver> futureCache; + + /** . */ + private final Logger log = LoggerFactory.getLogger(TemplateService.class); public TemplateService(TemplateStatisticService statisticService, CacheService cservice) throws Exception { @@ -186,7 +191,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } @@ -209,7 +214,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } @@ -229,7 +234,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); return null; } } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -234,12 +234,12 @@ catch (InterruptedException e) { // Find out what is relevant to do - e.printStackTrace(); + log.error(e.getMessage(), e); } catch (ExecutionException e) { // Cleanup - e.printStackTrace(); + log.error(e.getMessage(), e); mirroredImageCache.remove(resource); } } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigRemoval.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -23,6 +23,8 @@ import javax.servlet.ServletContext; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.wci.WebAppEvent; import org.gatein.wci.WebAppLifeCycleEvent; import org.gatein.wci.WebAppListener; @@ -34,7 +36,8 @@ */ public class GateInSkinConfigRemoval implements WebAppListener { - + private final Logger log = LoggerFactory.getLogger(GateInSkinConfigRemoval.class); + private SkinService service; private String portalContainerName; @@ -74,7 +77,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); } } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JSMin.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JSMin.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JSMin.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -27,6 +27,9 @@ import java.io.Reader; import java.io.Writer; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; + public class JSMin { private static final int EOF = -1; @@ -310,6 +313,7 @@ public static void main(String arg[]) { + Logger log = LoggerFactory.getLogger(JSMin.class); try { JSMin jsmin = new JSMin(new FileReader(arg[0]), new PrintWriter(System.out)); @@ -317,27 +321,27 @@ } catch (FileNotFoundException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } catch (ArrayIndexOutOfBoundsException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } catch (IOException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } catch (UnterminatedRegExpLiteralException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } catch (UnterminatedCommentException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } catch (UnterminatedStringLiteralException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigParser.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -18,10 +18,6 @@ */ package org.exoplatform.web.application.javascript; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -30,6 +26,12 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + /** * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> * @version $Id$ @@ -52,7 +54,11 @@ /** . */ private ServletContext context; + + /** . */ + private final Logger log = LoggerFactory.getLogger(JavascriptConfigParser.class); + private JavascriptConfigParser(ServletContext context) { this.context = context; @@ -157,7 +163,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); return null; } } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -104,7 +104,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); } finally { @@ -113,7 +113,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } return new CachedJavascript(sB.toString()); Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/services/html/refs/CharRefs.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/services/html/refs/CharRefs.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/services/html/refs/CharRefs.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -43,10 +43,16 @@ import java.util.Arrays; import java.util.Comparator; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; + final class CharRefs { boolean sorted = false; + + /** . */ + private final Logger log = LoggerFactory.getLogger(CharRefs.class); CharRef[] charRefs = { @@ -349,7 +355,7 @@ } catch (Exception exp) { - exp.printStackTrace(); + log.error(exp.getMessage(), exp); return null; } } Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/DownloadHandler.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -26,6 +26,8 @@ import org.exoplatform.web.ControllerContext; import org.exoplatform.web.WebAppController; import org.exoplatform.web.WebRequestHandler; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.io.InputStream; import java.io.OutputStream; @@ -42,6 +44,7 @@ */ public class DownloadHandler extends WebRequestHandler { + private final Logger log = LoggerFactory.getLogger(DownloadHandler.class); public String getHandlerName() { @@ -90,7 +93,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); } finally { Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -28,10 +28,15 @@ import org.apache.shindig.common.crypto.BlobCrypterException; import org.apache.shindig.common.util.TimeSource; import org.exoplatform.web.application.RequestContext; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; public class ExoDefaultSecurityTokenGenerator implements SecurityTokenGenerator { private final TimeSource timeSource; + + /** . */ + private final Logger log = LoggerFactory.getLogger(ExoDefaultSecurityTokenGenerator.class); public ExoDefaultSecurityTokenGenerator() throws Exception { @@ -55,11 +60,11 @@ } catch (IOException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } catch (BlobCrypterException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } return null; } Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -2,6 +2,8 @@ import org.apache.commons.io.IOUtils; import org.apache.shindig.common.servlet.GuiceServletContextListener; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -22,7 +24,9 @@ public class GateInGuiceServletContextListener extends GuiceServletContextListener { private static ThreadLocal<GateInContainerConfigLoader> currentLoader = new ThreadLocal<GateInContainerConfigLoader>(); - + + private final Logger log = LoggerFactory.getLogger(GateInGuiceServletContextListener.class); + @Override public void contextInitialized(ServletContextEvent event) { @@ -55,7 +59,7 @@ } catch(Exception ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); } finally { Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -19,20 +19,24 @@ package org.exoplatform.account.webui.component; -import nl.captcha.Captcha; -import nl.captcha.servlet.CaptchaServletUtil; -import org.exoplatform.webui.application.portlet.PortletApplicationController; +import static nl.captcha.Captcha.NAME; +import java.awt.image.BufferedImage; +import java.io.IOException; + import javax.portlet.PortletException; import javax.portlet.PortletSession; import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; import javax.portlet.ResourceServingPortlet; -import java.awt.image.BufferedImage; -import java.io.IOException; -import static nl.captcha.Captcha.NAME; +import nl.captcha.Captcha; +import nl.captcha.servlet.CaptchaServletUtil; +import org.exoplatform.webui.application.portlet.PortletApplicationController; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; + /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -40,6 +44,9 @@ public class RegisterPortletApplicationController extends PortletApplicationController implements ResourceServingPortlet { + /** . */ + private static final Logger log = LoggerFactory.getLogger(RegisterPortletApplicationController.class); + private static final String PARAM_HEIGHT = "height"; private static final String PARAM_WIDTH = "width"; @@ -93,7 +100,7 @@ } catch (IOException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } } Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.List; +import nl.captcha.Captcha; + import org.exoplatform.portal.registration.PostRegistrationService; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; @@ -34,17 +36,17 @@ import org.exoplatform.webui.core.UIApplication; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.exception.MessageException; import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormInputWithActions; +import org.exoplatform.webui.form.UIFormInputWithActions.ActionData; import org.exoplatform.webui.form.UIFormStringInput; -import org.exoplatform.webui.form.UIFormInputWithActions.ActionData; import org.exoplatform.webui.form.validator.MandatoryValidator; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; -import nl.captcha.Captcha; - /** * * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a> @@ -62,6 +64,9 @@ private final static String[] ACTIONS = {"Subscribe", "Reset"}; static final String ATTR_USER = "UIRegisterForm$User"; + + /** . */ + private static final Logger log = LoggerFactory.getLogger(UIRegisterForm.class); public UIRegisterForm() throws Exception { @@ -184,7 +189,7 @@ } catch (Exception ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); } return false; } Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -19,16 +19,18 @@ package org.exoplatform.organization.webui.component; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.config.UserACL; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.OrganizationService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * Created by The eXo Platform SAS * Author : Huu-Dung Kieu @@ -37,6 +39,8 @@ */ public class GroupManagement { + /** . */ + private static final Logger log = LoggerFactory.getLogger(GroupManagement.class); public static OrganizationService getOrganizationService() { @@ -59,7 +63,7 @@ if (username == null) username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser(); OrganizationService orgService = getOrganizationService(); - Collection groups = orgService.getGroupHandler().findGroupByMembership(username, membership); + Collection<?> groups = orgService.getGroupHandler().findGroupByMembership(username, membership); for (Object group : groups) { if (((Group)group).getId().equals(groupId)) @@ -192,7 +196,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } return false; } Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/src/main/java/org/gatein/portal/starter/VersionDisplayer.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/src/main/java/org/gatein/portal/starter/VersionDisplayer.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/starter/jar/src/main/java/org/gatein/portal/starter/VersionDisplayer.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -35,7 +35,7 @@ */ public class VersionDisplayer implements ServletContextListener { - private Logger logger = LoggerFactory.getLogger(VersionDisplayer.class); + private final Logger log = LoggerFactory.getLogger(VersionDisplayer.class); public void contextDestroyed(ServletContextEvent arg0) { @@ -47,9 +47,9 @@ eppVersion = this.getClass().getPackage().getImplementationVersion(); } catch (Exception e) { eppVersion = "Version not found"; - e.printStackTrace(); + log.error(e.getMessage(), e); } - logger.info("JBoss Enterprise Portal Platform [" + eppVersion + "]"); + log.info("JBoss Enterprise Portal Platform [" + eppVersion + "]"); } } Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleContent.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleContent.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleContent.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -19,15 +19,15 @@ import java.util.ArrayList; import java.util.List; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.core.UIConfirmation; -import org.exoplatform.webui.core.UIContainer; import org.exoplatform.webui.core.UIConfirmation.ActionConfirm; +import org.exoplatform.webui.core.UIContainer; import org.exoplatform.webui.core.lifecycle.UIContainerLifecycle; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; /** * Created by The eXo Platform SAS Author : Nguyen Duc Khoi @@ -37,7 +37,7 @@ @ComponentConfig(lifecycle = UIContainerLifecycle.class) public class UISampleContent extends UIContainer { - private Log log_ = ExoLogger.getLogger(UISampleContent.class); + private final Logger log = LoggerFactory.getLogger(UISampleContent.class); public static final int NODE_UIFORM = 0; @@ -100,7 +100,7 @@ showMultiValueInputSet(); break; default : - log_.error("not implement yet"); + log.error("Unexpected node type '"+ nodeType +"'."); } } @@ -175,8 +175,7 @@ } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e.getMessage(), e); } } return uiComp; Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/PermissionValidaror.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/PermissionValidaror.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/PermissionValidaror.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -26,6 +26,8 @@ import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.exception.MessageException; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; /** * Created by The eXo Platform SARL @@ -38,6 +40,8 @@ public class PermissionValidaror { + private final Logger log = LoggerFactory.getLogger(PermissionValidaror.class); + public void validate(UIComponent uicomponent, String permission) throws Exception { OrganizationService service = @@ -62,7 +66,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } if (membership.equals("*")) { Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -19,6 +19,7 @@ package org.exoplatform.portal.application; +import org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl; import org.exoplatform.management.annotations.Impact; import org.exoplatform.management.annotations.ImpactType; import org.exoplatform.management.annotations.Managed; @@ -28,6 +29,8 @@ import org.exoplatform.management.jmx.annotations.Property; import org.exoplatform.management.rest.annotations.RESTEndpoint; import org.exoplatform.portal.config.UserPortalConfigService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.picocontainer.Startable; import java.util.List; @@ -51,6 +54,9 @@ private ConcurrentMap<String, PortalStatistic> apps = new ConcurrentHashMap<String, PortalStatistic>(); private UserPortalConfigService configService; + + /** . */ + private final Logger log = LoggerFactory.getLogger(PortalStatisticService.class); public PortalStatisticService(UserPortalConfigService res) { @@ -72,7 +78,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); return new String[0]; } } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -19,35 +19,37 @@ package org.exoplatform.portal.webui.application; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import org.apache.commons.io.IOUtils; import org.exoplatform.application.gadget.Gadget; import org.exoplatform.application.gadget.GadgetRegistryService; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.PortalContainer; -import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.gadget.core.SecurityTokenGenerator; import org.exoplatform.portal.webui.util.Util; -import org.json.JSONArray; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.json.JSONException; import org.json.JSONObject; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - /** * Created by The eXo Platform SAS Author : Pham Thanh Tung * thanhtungty(a)gmail.com Oct 2, 2008 */ public class GadgetUtil { + private static final Logger log = LoggerFactory.getLogger(GadgetUtil.class); + static public Gadget toGadget(String name, String path, boolean isLocal) throws Exception { Gadget gadget = new Gadget(); @@ -105,7 +107,7 @@ } catch (IOException ioexc) { - ioexc.printStackTrace(); + log.error(ioexc.getMessage(), ioexc); return "{}"; } return result; @@ -146,7 +148,7 @@ } catch (IOException ioexc) { - ioexc.printStackTrace(); + log.error(ioexc.getMessage(), ioexc); return "{}"; } return result; Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -37,6 +37,8 @@ import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.exception.MessageException; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -74,6 +76,8 @@ private JSONObject metadata_; private String url_; + + private final Logger log = LoggerFactory.getLogger(UIGadget.class); public static final String PREF_KEY = "_pref_gadget_"; @@ -161,7 +165,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } else Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -943,7 +943,7 @@ // Whenever couldn't invoke the portlet object, set the request portlet to null for the error tobe // properly handled and displayed when the portlet is rendered producedOfferedPortlet = null; - exp.printStackTrace(); + log.error(exp.getMessage(), exp); } this.adapter = adapter; @@ -958,7 +958,7 @@ } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } else Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -368,7 +368,7 @@ } catch (Throwable ex) { - ex.printStackTrace(); + log.error(ex.getMessage(), ex); } } } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2012-12-13 04:12:57 UTC (rev 8997) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2012-12-13 14:35:09 UTC (rev 8998) @@ -19,6 +19,12 @@ package org.exoplatform.portal.webui.login; +import java.net.URLEncoder; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +import javax.servlet.http.HttpServletRequest; + import org.exoplatform.commons.utils.PageList; import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.webui.util.Util; @@ -33,21 +39,17 @@ import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormStringInput; import org.exoplatform.webui.form.validator.EmailAddressValidator; import org.exoplatform.webui.form.validator.MandatoryValidator; import org.exoplatform.webui.url.ComponentURL; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.wci.security.Credentials; -import java.net.URLEncoder; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import javax.servlet.http.HttpServletRequest; - /** * Created by The eXo Platform SARL * Author : dang.tung @@ -62,7 +64,7 @@ static final String Username = "username"; static final String Email = "email"; - + public UIForgetPassword() throws Exception { addUIFormInput(new UIFormStringInput(Username, null).addValidator(MandatoryValidator.class)).addUIFormInput( @@ -72,6 +74,8 @@ static public class SendActionListener extends EventListener<UIForgetPassword> { + private final Logger log = LoggerFactory.getLogger(SendActionListener.class); + public void execute(Event<UIForgetPassword> event) throws Exception { UIForgetPassword uiForm = event.getSource(); @@ -141,7 +145,7 @@ } catch (MissingResourceException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } HttpServletRequest request = portalContext.getRequest(); String host = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();