gatein SVN: r426 - portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-25 07:55:22 -0400 (Sun, 25 Oct 2009)
New Revision: 426
Modified:
portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
GTNPORTAL-65 : use a 30k buffer on servlet output stream to avoid too many implicit flushes
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:45:39 UTC (rev 425)
+++ portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2009-10-25 11:55:22 UTC (rev 426)
@@ -274,6 +274,9 @@
if (writer_ == null)
{
+ // Setup a buffer size of 20K
+ response_.setBufferSize(30000);
+
//
PortalPrinter printer = new PortalPrinter(encoder, response_.getOutputStream(), true);
15 years, 2 months
- 1
- 0
gatein SVN: r425 - portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-25 07:45:39 -0400 (Sun, 25 Oct 2009)
New Revision: 425
Modified:
portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-64 : found out another unnecessary flush on the wire
Modified: portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2009-10-25 11:30:56 UTC (rev 424)
+++ portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2009-10-25 11:45:39 UTC (rev 425)
@@ -264,12 +264,5 @@
{
}
}
- try
- {
- prcontext.getResponse().flushBuffer();
- }
- catch (Throwable ex)
- {
- }
}
}
15 years, 2 months
- 1
- 0
gatein SVN: r424 - in portal/branches/performance: component/common/src/test/java/org/exoplatform/commons/utils and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-25 07:30:56 -0400 (Sun, 25 Oct 2009)
New Revision: 424
Modified:
portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java
portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/OutputStreamPrinterTestCase.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
portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
Log:
GTNPORTAL-64 : the portal seems to flush too many times per request to the servlet output stream and only once at the end of the request (actually done by the close()) is good enough
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 10:56:09 UTC (rev 423)
+++ portal/branches/performance/component/common/src/main/java/org/exoplatform/commons/utils/OutputStreamPrinter.java 2009-10-25 11:30:56 UTC (rev 424)
@@ -58,17 +58,20 @@
private boolean failed;
+ private final boolean flushOnClose;
+
/**
* 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) throws IllegalArgumentException
+ public OutputStreamPrinter(TextEncoder encoder, OutputStream out, boolean flushOnClose) throws IllegalArgumentException
{
- this(encoder, out, IOFailureFlow.RETHROW, false);
+ this(encoder, out, IOFailureFlow.RETHROW, false, flushOnClose);
}
/**
@@ -78,9 +81,15 @@
* @param out the output
* @param failureFlow the control flow failureFlow
* @param ignoreOnFailure the behavior on failure
+ * @param flushOnClose flush when stream is closed
* @throws IllegalArgumentException if any argument is null
*/
- public OutputStreamPrinter(TextEncoder encoder, OutputStream out, IOFailureFlow failureFlow, boolean ignoreOnFailure)
+ public OutputStreamPrinter(
+ TextEncoder encoder,
+ OutputStream out,
+ IOFailureFlow failureFlow,
+ boolean ignoreOnFailure,
+ boolean flushOnClose)
throws IllegalArgumentException
{
if (encoder == null)
@@ -100,6 +109,7 @@
this.failureFlow = failureFlow;
this.failed = false;
this.ignoreOnFailure = ignoreOnFailure;
+ this.flushOnClose = flushOnClose;
}
/**
@@ -208,7 +218,7 @@
public void flush() throws IOException
{
- if (!failed)
+ if (!failed && !flushOnClose)
{
try
{
Modified: 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 10:56:09 UTC (rev 423)
+++ portal/branches/performance/component/common/src/test/java/org/exoplatform/commons/utils/OutputStreamPrinterTestCase.java 2009-10-25 11:30:56 UTC (rev 424)
@@ -133,7 +133,7 @@
private TestOutputStream(boolean wantFailure, IOFailureFlow mode, boolean blockOnFailure)
{
this.wantFailure = wantFailure;
- this.osp = new OutputStreamPrinter(CharsetTextEncoder.getUTF8(), this, mode, blockOnFailure);
+ this.osp = new OutputStreamPrinter(CharsetTextEncoder.getUTF8(), this, mode, blockOnFailure, false);
}
public void write(int b) throws IOException
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 10:56:09 UTC (rev 423)
+++ portal/branches/performance/component/scripting/src/main/java/org/exoplatform/commons/utils/PortalPrinter.java 2009-10-25 11:30:56 UTC (rev 424)
@@ -29,9 +29,9 @@
public class PortalPrinter extends OutputStreamPrinter
{
- public PortalPrinter(TextEncoder encoder, OutputStream out) throws IllegalArgumentException
+ public PortalPrinter(TextEncoder encoder, OutputStream out, boolean flushOnClose) throws IllegalArgumentException
{
- super(encoder, out);
+ super(encoder, out, flushOnClose);
}
public void println()
@@ -59,7 +59,8 @@
}
else
{
- write(String.valueOf(o));
+ String s = (o == null) ? "null" : o.toString();
+ write(s);
}
}
catch (IOException e)
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 10:56:09 UTC (rev 423)
+++ portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2009-10-25 11:30:56 UTC (rev 424)
@@ -275,7 +275,7 @@
{
//
- PortalPrinter printer = new PortalPrinter(encoder, response_.getOutputStream());
+ PortalPrinter printer = new PortalPrinter(encoder, response_.getOutputStream(), true);
//
if (HtmlValidator.DEBUG_MODE)
Modified: portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
===================================================================
--- portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-10-25 10:56:09 UTC (rev 423)
+++ portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-10-25 11:30:56 UTC (rev 424)
@@ -423,83 +423,92 @@
public void processRender(WebuiRequestContext context) throws Exception
{
Writer w = context.getWriter();
- if (!context.useAjax())
+
+ try
{
- super.processRender(context);
- }
- else
- {
- PortalRequestContext pcontext = (PortalRequestContext)context;
-
- UIMaskWorkspace uiMaskWS = getChildById(UIPortalApplication.UI_MASK_WS_ID);
- if (uiMaskWS.isUpdated())
- pcontext.addUIComponentToUpdateByAjax(uiMaskWS);
- if (getUIPopupMessages().hasMessage())
+ if (!context.useAjax())
{
- pcontext.addUIComponentToUpdateByAjax(getUIPopupMessages());
+ super.processRender(context);
}
+ else
+ {
+ PortalRequestContext pcontext = (PortalRequestContext)context;
- Set<UIComponent> list = context.getUIComponentToUpdateByAjax();
- List<UIPortlet> uiPortlets = new ArrayList<UIPortlet>(3);
- List<UIComponent> uiDataComponents = new ArrayList<UIComponent>(5);
-
- if (list != null)
- {
- for (UIComponent uicomponent : list)
+ UIMaskWorkspace uiMaskWS = getChildById(UIPortalApplication.UI_MASK_WS_ID);
+ if (uiMaskWS.isUpdated())
+ pcontext.addUIComponentToUpdateByAjax(uiMaskWS);
+ if (getUIPopupMessages().hasMessage())
{
- if (uicomponent instanceof UIPortlet)
- uiPortlets.add((UIPortlet)uicomponent);
- else
- uiDataComponents.add(uicomponent);
+ pcontext.addUIComponentToUpdateByAjax(getUIPopupMessages());
}
- }
- w.write("<div class=\"PortalResponse\">");
- w.write("<div class=\"PortalResponseData\">");
- for (UIComponent uicomponent : uiDataComponents)
- {
- if (log.isDebugEnabled())
- log.debug("AJAX call: Need to refresh the UI component " + uicomponent.getName());
- renderBlockToUpdate(uicomponent, context, w);
- }
- w.write("</div>");
- if (!context.getFullRender())
- {
- for (UIPortlet uiPortlet : uiPortlets)
+ Set<UIComponent> list = context.getUIComponentToUpdateByAjax();
+ List<UIPortlet> uiPortlets = new ArrayList<UIPortlet>(3);
+ List<UIComponent> uiDataComponents = new ArrayList<UIComponent>(5);
+
+ if (list != null)
{
+ for (UIComponent uicomponent : list)
+ {
+ if (uicomponent instanceof UIPortlet)
+ uiPortlets.add((UIPortlet)uicomponent);
+ else
+ uiDataComponents.add(uicomponent);
+ }
+ }
+ w.write("<div class=\"PortalResponse\">");
+ w.write("<div class=\"PortalResponseData\">");
+ for (UIComponent uicomponent : uiDataComponents)
+ {
if (log.isDebugEnabled())
- log.debug("AJAX call: Need to refresh the Portlet " + uiPortlet.getId());
+ log.debug("AJAX call: Need to refresh the UI component " + uicomponent.getName());
+ renderBlockToUpdate(uicomponent, context, w);
+ }
+ w.write("</div>");
- w.write("<div class=\"PortletResponse\" style=\"display: none\">");
- w.append("<div class=\"PortletResponsePortletId\">" + uiPortlet.getId() + "</div>");
- w.append("<div class=\"PortletResponseData\">");
+ if (!context.getFullRender())
+ {
+ for (UIPortlet uiPortlet : uiPortlets)
+ {
+ if (log.isDebugEnabled())
+ log.debug("AJAX call: Need to refresh the Portlet " + uiPortlet.getId());
- /*
- * If the portlet is using our UI framework or supports it then it
- * will return a set of block to updates. If there is not block to
- * update the javascript client will see that as a full refresh of the
- * content part
- */
- uiPortlet.processRender(context);
+ w.write("<div class=\"PortletResponse\" style=\"display: none\">");
+ w.append("<div class=\"PortletResponsePortletId\">" + uiPortlet.getId() + "</div>");
+ w.append("<div class=\"PortletResponseData\">");
- w.append("</div>");
- w.append("<div class=\"PortletResponseScript\"></div>");
- w.write("</div>");
+ /*
+ * If the portlet is using our UI framework or supports it then it
+ * will return a set of block to updates. If there is not block to
+ * update the javascript client will see that as a full refresh of the
+ * content part
+ */
+ uiPortlet.processRender(context);
+
+ w.append("</div>");
+ w.append("<div class=\"PortletResponseScript\"></div>");
+ w.write("</div>");
+ }
}
- }
- w.write("<div class=\"PortalResponseScript\">");
- w.write(pcontext.getJavascriptManager().getJavascript());
- w.write("eXo.core.Browser.onLoad();\n");
- w.write(pcontext.getJavascriptManager().getCustomizedOnLoadScript());
- String skin = getAddSkinScript(list);
- if (skin != null)
- {
- w.write(skin);
+ w.write("<div class=\"PortalResponseScript\">");
+ w.write(pcontext.getJavascriptManager().getJavascript());
+ w.write("eXo.core.Browser.onLoad();\n");
+ w.write(pcontext.getJavascriptManager().getCustomizedOnLoadScript());
+ String skin = getAddSkinScript(list);
+ if (skin != null)
+ {
+ w.write(skin);
+ }
+ w.write("</div>");
+ w.write("</div>");
}
- w.write("</div>");
- w.write("</div>");
}
+ finally
+ {
+ //
+ w.close();
+ }
}
private String getAddSkinScript(Set<UIComponent> updateComponents)
15 years, 2 months
- 1
- 0
gatein SVN: r423 - portal/branches/performance/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-25 06:56:09 -0400 (Sun, 25 Oct 2009)
New Revision: 423
Modified:
portal/branches/performance/packaging/module/src/main/javascript/portal.packaging.module.js
Log:
GTNPORTAL-63 : use Groovy 1.7-beta-2
Modified: portal/branches/performance/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- portal/branches/performance/packaging/module/src/main/javascript/portal.packaging.module.js 2009-10-25 10:42:03 UTC (rev 422)
+++ portal/branches/performance/packaging/module/src/main/javascript/portal.packaging.module.js 2009-10-25 10:56:09 UTC (rev 423)
@@ -90,7 +90,7 @@
new Project("org.exoplatform.portal", "exo.portal.component.scripting", "jar", module.version).
addDependency(module.component.xmlParser).
addDependency(new Project("rhino", "js", "jar", "1.6R5")).
- addDependency(new Project("org.codehaus.groovy", "groovy-all", "jar", "1.5.7"));
+ addDependency(new Project("org.codehaus.groovy", "groovy-all", "jar", "1.7-beta-2"));
module.component.web =
new Project("org.exoplatform.portal", "exo.portal.component.web", "jar", module.version).
15 years, 2 months
- 1
- 0
gatein SVN: r422 - portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-25 06:42:03 -0400 (Sun, 25 Oct 2009)
New Revision: 422
Modified:
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
Log:
fix permission issue in dashboard that was hidding it from the user
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2009-10-24 23:34:26 UTC (rev 421)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2009-10-25 10:42:03 UTC (rev 422)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.pom.data;
+import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
import org.exoplatform.portal.pom.data.BodyType;
@@ -463,7 +464,10 @@
null,
null,
Collections.<String, String>emptyMap(),
- Collections.<String>emptyList());
+ Collections.singletonList(UserACL.EVERYONE));
+ // Julien : the everyone is bad but having null permission
+ // means the same thing cf {@link UIPortalComponent} class
+ // we need to solve that somehow
}
else
{
15 years, 2 months
- 1
- 0
gatein SVN: r421 - portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-24 19:34:26 -0400 (Sat, 24 Oct 2009)
New Revision: 421
Modified:
portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
Log:
User profile is accessed for anonymous users and it looks like the code for accessing a user is wrong (cf GTNPORTAL-62 )
Modified: portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-10-24 15:15:00 UTC (rev 420)
+++ portal/branches/performance/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2009-10-24 23:34:26 UTC (rev 421)
@@ -672,11 +672,14 @@
//
StatefulPortletContext<C> preferencesPortletContext = getPortletContext();
- // todo : wire user profile
- // Create an ExoUserContext in component.pc package
+ //
OrganizationService service = getApplicationComponent(OrganizationService.class);
- UIPortalApplication uiPortalApp = getAncestorOfType(UIPortalApplication.class);
- UserProfile userProfile = service.getUserProfileHandler().findUserProfileByName(uiPortalApp.getOwner());
+ String user = prc.getRemoteUser();
+ UserProfile userProfile = null;
+ if (user != null)
+ {
+ userProfile = service.getUserProfileHandler().findUserProfileByName(user);
+ }
// client context
AbstractClientContext clientContext;
15 years, 2 months
- 1
- 0
gatein SVN: r420 - portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-24 11:15:00 -0400 (Sat, 24 Oct 2009)
New Revision: 420
Modified:
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java
Log:
cache null preferences too
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2009-10-24 15:08:58 UTC (rev 419)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2009-10-24 15:15:00 UTC (rev 420)
@@ -129,7 +129,7 @@
public Object getValue()
{
- return prefs == null ? NULL_PREFS : prefs;
+ return prefs == null ? NULL_PREFS : prefs ;
}
public PersistentApplicationState<S> getKey()
15 years, 2 months
- 1
- 0
gatein SVN: r419 - in portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal: pom/config/tasks and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-24 11:08:58 -0400 (Sat, 24 Oct 2009)
New Revision: 419
Modified:
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java
Log:
cache portlet preferences access
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java 2009-10-24 14:00:56 UTC (rev 418)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java 2009-10-24 15:08:58 UTC (rev 419)
@@ -19,13 +19,15 @@
package org.exoplatform.portal.config.model;
+import java.io.Serializable;
+
/**
* Represents the state of the application when it is bound to the database.
*
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class PersistentApplicationState<S> extends ApplicationState<S>
+public class PersistentApplicationState<S> extends ApplicationState<S> implements Serializable
{
/** The id of the content state. */
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2009-10-24 14:00:56 UTC (rev 418)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2009-10-24 15:08:58 UTC (rev 419)
@@ -22,6 +22,8 @@
import org.exoplatform.portal.config.model.PersistentApplicationState;
import org.exoplatform.portal.pom.config.AbstractPOMTask;
import org.exoplatform.portal.pom.config.POMSession;
+import org.exoplatform.portal.pom.config.cache.CacheableDataTask;
+import org.exoplatform.portal.pom.config.cache.DataAccessMode;
import org.gatein.mop.api.content.Customization;
/**
@@ -31,7 +33,10 @@
public abstract class PreferencesTask<S> extends AbstractPOMTask
{
- public static class Load<S> extends PreferencesTask<S>
+ /** . */
+ private static final Object NULL_PREFS = new Object();
+
+ public static class Load<S> extends PreferencesTask<S> implements CacheableDataTask<PersistentApplicationState<S>, Object>
{
/** . */
@@ -40,11 +45,39 @@
/** . */
private S prefs;
- public Load(PersistentApplicationState state)
+ public Load(PersistentApplicationState<S> state)
{
this.state = state;
}
+ public DataAccessMode getAccessMode()
+ {
+ return DataAccessMode.READ;
+ }
+
+ public void setValue(Object value)
+ {
+ if (value != NULL_PREFS)
+ {
+ prefs = (S)value;
+ }
+ }
+
+ public Class<Object> getValueType()
+ {
+ return Object.class;
+ }
+
+ public Object getValue()
+ {
+ return prefs == null ? NULL_PREFS : prefs;
+ }
+
+ public PersistentApplicationState<S> getKey()
+ {
+ return state;
+ }
+
public void run(POMSession session) throws Exception
{
String id = state.getStorageId();
@@ -64,7 +97,7 @@
}
}
- public static class Save<S> extends PreferencesTask<S>
+ public static class Save<S> extends PreferencesTask<S> implements CacheableDataTask<PersistentApplicationState<S>, Object>
{
/** . */
@@ -79,6 +112,31 @@
this.prefs = prefs;
}
+ public DataAccessMode getAccessMode()
+ {
+ return DataAccessMode.WRITE;
+ }
+
+ public void setValue(Object value)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Class<Object> getValueType()
+ {
+ return Object.class;
+ }
+
+ public Object getValue()
+ {
+ return prefs == null ? NULL_PREFS : prefs;
+ }
+
+ public PersistentApplicationState<S> getKey()
+ {
+ return state;
+ }
+
public void run(POMSession session) throws Exception
{
15 years, 2 months
- 1
- 0
gatein SVN: r418 - in portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom: data and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-24 10:00:56 -0400 (Sat, 24 Oct 2009)
New Revision: 418
Modified:
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java
Log:
minor renaming
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -48,7 +48,7 @@
protected PageNavigationTask(NavigationKey key)
{
this.key = key;
- this.siteType = Mapper.parseSiteType(key.getOwnerType());
+ this.siteType = Mapper.parseSiteType(key.getType());
}
public static class Load extends PageNavigationTask implements CacheableDataTask<NavigationKey, NavigationData>
@@ -95,7 +95,7 @@
public void run(POMSession session) throws Exception
{
Workspace workspace = session.getWorkspace();
- Site site = workspace.getSite(siteType, key.getOwnerId());
+ Site site = workspace.getSite(siteType, key.getId());
if (site != null)
{
Navigation nav = site.getRootNavigation();
@@ -107,7 +107,7 @@
}
else
{
- System.out.println("Cannot load page navigation as the corresponding portal " + key.getOwnerId()
+ System.out.println("Cannot load page navigation as the corresponding portal " + key.getId()
+ " with type " + siteType + " does not exist");
}
}
@@ -115,7 +115,7 @@
@Override
public String toString()
{
- return "PageNavigation.Load[ownerType=" + key.getOwnerType() + ",ownerId=" + key.getOwnerId() + "]";
+ return "PageNavigation.Load[ownerType=" + key.getType() + ",ownerId=" + key.getId() + "]";
}
}
@@ -165,11 +165,11 @@
public void run(POMSession session) throws Exception
{
Workspace workspace = session.getWorkspace();
- Site site = workspace.getSite(siteType, key.getOwnerId());
+ Site site = workspace.getSite(siteType, key.getId());
if (site == null)
{
throw new IllegalArgumentException("Cannot insert page navigation "
- + " as the corresponding portal " + key.getOwnerId() + " with type " + siteType + " does not exist");
+ + " as the corresponding portal " + key.getId() + " with type " + siteType + " does not exist");
}
// Delete node descendants first
@@ -189,7 +189,7 @@
@Override
public String toString()
{
- return "PageNavigation.Save[ownerType=" + key.getOwnerType() + ",ownerId=" + key.getOwnerId() + "]";
+ return "PageNavigation.Save[ownerType=" + key.getType() + ",ownerId=" + key.getId() + "]";
}
}
@@ -229,11 +229,11 @@
public void run(POMSession session) throws Exception
{
Workspace workspace = session.getWorkspace();
- Site site = workspace.getSite(siteType, key.getOwnerId());
+ Site site = workspace.getSite(siteType, key.getId());
if (site == null)
{
throw new IllegalArgumentException("Cannot insert page navigation "
- + " as the corresponding portal " + key.getOwnerId() + " with type " + siteType + " does not exist");
+ + " as the corresponding portal " + key.getId() + " with type " + siteType + " does not exist");
}
// Delete descendants
@@ -250,7 +250,7 @@
@Override
public String toString()
{
- return "PageNavigation.Remove[ownerType=" + key.getOwnerType() + ",ownerId=" + key.getOwnerId() + "]";
+ return "PageNavigation.Remove[ownerType=" + key.getType() + ",ownerId=" + key.getId() + "]";
}
}
}
\ No newline at end of file
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -66,8 +66,8 @@
protected PageTask(PageKey key)
{
this.key = key;
- this.ownerType = key.getOwnerType();
- this.ownerId = key.getOwnerId();
+ this.ownerType = key.getType();
+ this.ownerId = key.getId();
this.name = key.getName();
this.siteType = Mapper.parseSiteType(ownerType);
}
@@ -98,8 +98,8 @@
super(key);
//
- this.cloneOwnerType = cloneKey.getOwnerType();
- this.cloneOwnerId = cloneKey.getOwnerId();
+ this.cloneOwnerType = cloneKey.getType();
+ this.cloneOwnerId = cloneKey.getId();
this.cloneName = cloneKey.getName();
this.deep = deep;
this.cloneSiteType = Mapper.parseSiteType(cloneOwnerType);
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -48,7 +48,7 @@
protected PortalConfigTask(PortalKey key)
{
this.key = key;
- this.type = Mapper.parseSiteType(key.getOwnerType());
+ this.type = Mapper.parseSiteType(key.getType());
}
public static class Remove extends PortalConfigTask implements CacheableDataTask<PortalKey, PortalData>
@@ -87,10 +87,10 @@
public void run(POMSession session)
{
Workspace workspace = session.getWorkspace();
- Site site = workspace.getSite(type, key.getOwnerId());
+ Site site = workspace.getSite(type, key.getId());
if (site == null)
{
- throw new NullPointerException("Could not remove non existing portal " + key.getOwnerId());
+ throw new NullPointerException("Could not remove non existing portal " + key.getId());
}
else
{
@@ -101,7 +101,7 @@
@Override
public String toString()
{
- return "PortalConfig.Remove[ownerType=" + key.getOwnerType() + ",ownerId=" + key.getOwnerId() + "]";
+ return "PortalConfig.Remove[ownerType=" + key.getType() + ",ownerId=" + key.getId() + "]";
}
}
@@ -151,7 +151,7 @@
public void run(POMSession session) throws Exception
{
Workspace workspace = session.getWorkspace();
- Site site = workspace.getSite(type, key.getOwnerId());
+ Site site = workspace.getSite(type, key.getId());
if (site != null)
{
if (!overwrite)
@@ -178,7 +178,7 @@
@Override
public String toString()
{
- return "PortalConfig.Save[ownerType=" + key.getOwnerType() + ",ownerId=" + key.getOwnerId() + "]";
+ return "PortalConfig.Save[ownerType=" + key.getType() + ",ownerId=" + key.getId() + "]";
}
}
@@ -226,7 +226,7 @@
public void run(POMSession session)
{
Workspace workspace = session.getWorkspace();
- Site site = workspace.getSite(type, key.getOwnerId());
+ Site site = workspace.getSite(type, key.getId());
if (site != null)
{
this.config = new Mapper(session).load(site);
@@ -236,7 +236,7 @@
@Override
public String toString()
{
- return "PortalConfig.Load[ownerType=" + key.getOwnerType() + ",ownerId=" + key.getOwnerId() + "]";
+ return "PortalConfig.Load[ownerType=" + key.getType() + ",ownerId=" + key.getId() + "]";
}
}
}
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -91,12 +91,12 @@
public String getOwnerType()
{
- return key.getOwnerType();
+ return key.getType();
}
public String getOwnerId()
{
- return key.getOwnerId();
+ return key.getId();
}
public String getDescription()
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -27,9 +27,9 @@
public class NavigationKey extends OwnerKey
{
- public NavigationKey(String ownerType, String ownerId)
+ public NavigationKey(String type, String id)
{
- super(ownerType, ownerId);
+ super(type, id);
}
public static NavigationKey create(String compositeId)
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -28,39 +28,39 @@
{
/** . */
- private final String ownerType;
+ private final String type;
/** . */
- private final String ownerId;
+ private final String id;
- public OwnerKey(String ownerType, String ownerId)
+ public OwnerKey(String type, String id)
{
- if (ownerType == null)
+ if (type == null)
{
throw new NullPointerException();
}
- if (ownerId == null)
+ if (id == null)
{
throw new NullPointerException();
}
- this.ownerType = ownerType;
- this.ownerId = ownerId;
+ this.type = type;
+ this.id = id;
}
- public String getOwnerType()
+ public String getType()
{
- return ownerType;
+ return type;
}
- public String getOwnerId()
+ public String getId()
{
- return ownerId;
+ return id;
}
@Override
public int hashCode()
{
- return ownerId.hashCode() ^ ownerType.hashCode();
+ return id.hashCode() ^ type.hashCode();
}
@Override
@@ -69,7 +69,7 @@
if (obj instanceof OwnerKey)
{
OwnerKey that = (OwnerKey)obj;
- return ownerType.equals(that.ownerType) && ownerId.equals(that.ownerId);
+ return type.equals(that.type) && id.equals(that.id);
}
return false;
}
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -80,12 +80,12 @@
public String getOwnerType()
{
- return key.getOwnerType();
+ return key.getType();
}
public String getOwnerId()
{
- return key.getOwnerId();
+ return key.getId();
}
public String getEditPermission()
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -30,9 +30,9 @@
/** . */
private final String name;
- public PageKey(String ownerType, String ownerId, String name)
+ public PageKey(String type, String id, String name)
{
- super(ownerType, ownerId);
+ super(type, id);
//
if (name == null)
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -94,12 +94,12 @@
public String getName()
{
- return key.getOwnerId();
+ return key.getId();
}
public String getType()
{
- return key.getOwnerType();
+ return key.getType();
}
public String getLocale()
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java 2009-10-24 13:57:58 UTC (rev 417)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java 2009-10-24 14:00:56 UTC (rev 418)
@@ -27,9 +27,9 @@
public class PortalKey extends OwnerKey
{
- public PortalKey(String ownerType, String ownerId)
+ public PortalKey(String type, String id)
{
- super(ownerType, ownerId);
+ super(type, id);
}
public static PortalKey create(String compositeId)
15 years, 2 months
- 1
- 0
gatein SVN: r417 - in portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal: pom/config and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-24 09:57:58 -0400 (Sat, 24 Oct 2009)
New Revision: 417
Modified:
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ModelDemarcation.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataAccessMode.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ApplicationData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyType.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java
portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java
Log:
fix copyright
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.config;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ExecutorDispatcher.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,22 +1,23 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.config;
-import org.exoplatform.portal.pom.config.TaskExecutor;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ModelDemarcation.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ModelDemarcation.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/ModelDemarcation.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.config;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/TaskExecutor.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.config;
-import org.exoplatform.portal.pom.config.POMTask;
-
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/CacheableDataTask.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.config.cache;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataAccessMode.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataAccessMode.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataAccessMode.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.config.cache;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.config.cache;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ApplicationData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ApplicationData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ApplicationData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
-import org.exoplatform.portal.pom.data.BodyType;
-
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyType.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyType.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/BodyType.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/OwnerKey.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
Modified: portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java
===================================================================
--- portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java 2009-10-24 10:48:25 UTC (rev 416)
+++ portal/branches/performance/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java 2009-10-24 13:57:58 UTC (rev 417)
@@ -1,18 +1,20 @@
-/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+/**
+ * Copyright (C) 2009 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 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * 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.portal.pom.data;
15 years, 2 months
- 1
- 0