gatein SVN: r5523 - in epp/portal/branches/EPP_5_1_Branch: webui/portal/src/main/java/org/exoplatform/portal/webui and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-12-09 07:24:59 -0500 (Thu, 09 Dec 2010)
New Revision: 5523
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/UICaptcha.java
Log:
JBEPP-565: Captcha doesn't change after successful registration.
Now it should update all the time
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java 2010-12-09 10:04:35 UTC (rev 5522)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/RegisterPortletApplicationController.java 2010-12-09 12:24:59 UTC (rev 5523)
@@ -67,18 +67,18 @@
{
PortletSession session = req.getPortletSession();
Captcha captcha;
- if (session.getAttribute(NAME, PortletSession.APPLICATION_SCOPE) == null)
+ if (session.getAttribute(NAME) == null)
{
captcha = new Captcha.Builder(_width, _height).addText().gimp().addNoise().addBackground().build();
- session.setAttribute(NAME, captcha, PortletSession.APPLICATION_SCOPE);
+ session.setAttribute(NAME, captcha);
writeImage(resp, captcha.getImage());
return;
}
- captcha = (Captcha)session.getAttribute(NAME, PortletSession.APPLICATION_SCOPE);
+ captcha = (Captcha)session.getAttribute(NAME);
writeImage(resp, captcha.getImage());
}
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2010-12-09 10:04:35 UTC (rev 5522)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2010-12-09 12:24:59 UTC (rev 5523)
@@ -19,7 +19,6 @@
package org.exoplatform.account.webui.component;
-import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.webui.CaptchaValidator;
import org.exoplatform.portal.webui.UICaptcha;
import org.exoplatform.portal.webui.util.Util;
@@ -27,6 +26,7 @@
import org.exoplatform.services.organization.UserHandler;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.application.portlet.PortletRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.core.UIApplication;
@@ -99,10 +99,11 @@
if(popupMessages.getWarnings().size() > 0 || popupMessages.getErrors().size() > 0)
{
//Invalidate the capcha
- PortalRequestContext prContext = Util.getPortalRequestContext();
- HttpServletRequest request = prContext.getRequest();
- HttpSession session = request.getSession();
- session.removeAttribute(Captcha.NAME);
+ if (context instanceof PortletRequestContext)
+ {
+ PortletRequestContext prc = (PortletRequestContext)context;
+ prc.getRequest().getPortletSession().removeAttribute(Captcha.NAME);
+ }
context.addUIComponentToUpdateByAjax(getChild(UIRegisterInputSet.class));
}
}
@@ -112,9 +113,6 @@
@Override
public void execute(Event<UIRegisterForm> event) throws Exception
{
- // Invalidate the captcha image
- PortalRequestContext prContext = Util.getPortalRequestContext();
-
UIRegisterForm registerForm = event.getSource();
OrganizationService orgService = registerForm.getApplicationComponent(OrganizationService.class);
UserHandler userHandler = orgService.getUserHandler();
@@ -127,9 +125,13 @@
UIApplication uiApp = context.getUIApplication();
uiApp.addMessage(new ApplicationMessage("UIRegisterForm.registerWithSuccess.message", null));
}
- HttpServletRequest request = prContext.getRequest();
- HttpSession session = request.getSession();
- session.removeAttribute(Captcha.NAME);
+
+ //Invalidate the capcha
+ if (context instanceof PortletRequestContext)
+ {
+ PortletRequestContext prc = (PortletRequestContext)context;
+ prc.getRequest().getPortletSession().removeAttribute(Captcha.NAME);
+ }
}
}
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java 2010-12-09 10:04:35 UTC (rev 5522)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/CaptchaValidator.java 2010-12-09 12:24:59 UTC (rev 5523)
@@ -49,7 +49,7 @@
PortletRequest req = ctx.getRequest();
PortletSession session = req.getPortletSession();
- Captcha captcha = (Captcha) session.getAttribute(Captcha.NAME, PortletSession.APPLICATION_SCOPE);
+ Captcha captcha = (Captcha) session.getAttribute(Captcha.NAME);
if ((captcha != null) && (captcha.isCorrect((String) uiInput.getValue())))
{
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/UICaptcha.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/UICaptcha.java 2010-12-09 10:04:35 UTC (rev 5522)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/UICaptcha.java 2010-12-09 12:24:59 UTC (rev 5523)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.exoplatform.portal.webui;
+import java.util.Calendar;
+
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.form.UIFormStringInput;
@@ -50,9 +52,9 @@
// context.getPortalContextPath() + "/captcha?v=" + Calendar.getInstance().getTimeInMillis()
+ String random = "&v=" + Calendar.getInstance().getTimeInMillis();
-
- context.getWriter().write("<div id='" + getId() + "'><img src=\"" + url.toString() + "\" /><br/>");
+ context.getWriter().write("<div id='" + getId() + "'><img src=\"" + url.toString() + random + "\" /><br/>");
super.processRender(context);
context.getWriter().write("</div>");
}
14 years
- 1
- 0
gatein SVN: r5522 - in exo/portal/branches/webos-gatein-branch: portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component and 8 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-12-09 05:04:35 -0500 (Thu, 09 Dec 2010)
New Revision: 5522
Removed:
exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl
exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
Modified:
exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java
Log:
Merge bulk of changes that have been done before
Modified: exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -197,4 +197,18 @@
{
return "Page[ownerType=" + ownerType + ",ownerId=" + ownerId + ",name=" + name + "]";
}
+
+ @Override
+ public final String getFactoryId()
+ {
+ String factoryId = super.getFactoryId();
+ if (factoryId != null)
+ {
+ return factoryId;
+ }
+ else
+ {
+ return "org.exoplatform.portal.webui.page.UIPage";
+ }
+ }
}
\ No newline at end of file
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -40,9 +40,6 @@
@ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl")
public class UIAdminToolbarPortlet extends UIPortletApplication
{
- // Minh Hoang TO
- // TODO: Add a ThreadLocal cache to avoid double invocation of editPermission
- // check ( one in processRender method, and one in Groovy template )
public UIAdminToolbarPortlet() throws Exception
{
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-12-09 10:04:35 UTC (rev 5522)
@@ -22,6 +22,12 @@
<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+
+ <public-render-parameter>
+ <identifier>navigation_uri</identifier>
+ <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigation_uri</qname>
+ </public-render-parameter>
+
<portlet>
<description xml:lang="EN">Organization Portlet</description>
<portlet-name>OrganizationPortlet</portlet-name>
@@ -250,6 +256,8 @@
<short-title>Administration Toolbar</short-title>
<keywords>gatein_internal</keywords>
</portlet-info>
+
+ <supported-public-render-parameter>navigation_uri</supported-public-render-parameter>
</portlet>
<portlet>
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2010-12-09 10:04:35 UTC (rev 5522)
@@ -5,9 +5,18 @@
import org.exoplatform.services.organization.User;
import org.exoplatform.services.security.ConversationState;
import org.exoplatform.web.CacheUserProfileFilter;
-
- def rcontext = _ctx.getRequestContext();
+ import org.exoplatform.webui.application.portlet.PortletRequestContext;
+ import org.exoplatform.portal.webui.util.Util;
+ import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+ import org.exoplatform.portal.webui.page.UIPage;
+ def rcontext = (PortletRequestContext)_ctx.getRequestContext();
+
+ java.util.Map<String, String[]> publicRenderParams = rcontext.getRequest().getPublicParameterMap();
+ String[] navigation_uri_properties = publicRenderParams.get("navigation_uri");
+
+ String navigation_uri = (navigation_uri_properties == null)? null : navigation_uri_properties[0];
+
JavascriptManager jsmanager = rcontext.getJavascriptManager();
jsmanager.importJavascript('eXo.portal.UIPortalNavigation');
jsmanager.importJavascript('eXo.portal.UIAdminToolbar');
@@ -45,16 +54,27 @@
</div>
<% } %>
- <% if(userCouldEditPage){ %>
+ <% if(userCouldEditPage){
+
+ UIPortalApplication portalApp = Util.getUIPortalApplication();
+ UIPage uiPage = portalApp.findFirstComponentOfType(UIPage.class);//TODO: Find a better solution than this traversing
+ String editPageRequest = "javascript:ajaxGet(eXo.env.server.createPortalURL('" + uiPage.getId() + "', 'EditCurrentPage', true))";
+ %>
<div class="MenuItem">
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
+ <a href="$editPageRequest" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
</div>
<% } %>
<% if(userCouldEditPortal){ %>
- <div class="MenuItem">
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
- </div>
+ <% if("classicWebosPage".equals(navigation_uri)){ %>
+ <div class="MenuItem">
+ <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditBackground', true))" title="" class="ItemIcon EditSiteIcon">Edit Background</a>
+ </div>
+ <% }else{ %>
+ <div class="MenuItem">
+ <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
+ </div>
+ <% } %>
<% } %>
</div>
</div>
Deleted: exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl 2010-12-09 10:04:35 UTC (rev 5522)
@@ -1,152 +0,0 @@
-<%
- import org.exoplatform.web.application.Parameter;
- List appCategories = uicomponent.getApplicationCategories();
-%>
-<div class="UIAddApplication" id="UIAddNewApplication">
- <div class="UIBarStyle">
- <div class="TitleBar">
- <div class="LeftBar">
- <div class="RightBar">
- <div class="MiddleBar"><%=_ctx.appRes("UIAddNewApplication.label.AddApplication")%></div>
- </div>
- </div>
- </div>
- </div>
-
- <div class="ContentContainerDetail">
- <div class="CategoryContainer">
-
- <div class="UITabContentContainer">
- <div class="UITabContent" style="display: block">
- <div class="UIAddPortlet">
- <div class="UIItemSelector">
- <div class="LeftColumnStyle">
- <div class="ItemListContainer">
-
- <div class="ItemListTitle">
- <div class="TitleIcon ItemListIcon"><span></span></div>
- <div class="Title"><%=_ctx.appRes("UIAddNewApplication.label.Categories")%></div>
- <div class="ClearLeft"><span></span></div>
- </div>
- <div class="ItemList">
- <%
- boolean selected = true;
- for(category in appCategories){
- %>
- <div onmouseout="eXo.webui.UIItemSelector.onOver(this, false);" onmouseover="eXo.webui.UIItemSelector.onOver(this, true);" onclick="eXo.webui.UIItemSelector.onClick(this);" class="<%= selected ? "SelectedItem" : "" %> Item" title="<%=category.getDisplayName()%>">
- <div class="LeftItem">
- <div class="RightItem"><div id="<%=category.getName()%>" class="ItemTitle"><div class="CenterItemTitle"><%=category.getDisplayName()%></div></div></div>
- </div>
- </div>
- <%
- selected = false;
- }
- %>
- </div>
-
- </div>
-
- <div class="ItemDetailList">
- <div class="ItemDetailTitle">
- <div class="TitleIcon ViewListIcon"><span></span></div>
- <div class="Title"><%=_ctx.appRes("UIAddNewApplication.label.Select")%></div>
- <div class="ClearLeft"><span></span></div>
- </div>
- <div class="ApplicationListContainer">
- <% if(appCategories==null || appCategories.isEmpty()){ %>
- <div class="ItemDetail" style="display:block">
- <div class="NoneAppsMessage" style="display:block">
- <%=_ctx.appRes("UIAddNewApplication.label.NoneApp")%>
- </div>
- </div>
- <% } %>
- <%
- selected = true;
- for(category in appCategories) {
- List listApplication = category.getApplications();
- %>
- <div class="ItemDetail" style="display: <%= selected ? "block" : "none" %>">
-
- <%
- for(application in listApplication) {
- String srcBG = application.getApplicationGroup() + "/skin/DefaultSkin/portletIcons/" + application.getApplicationName()+ ".png";
- String srcNormalBG = "/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png";
-
- //Create add Application Ajax request URL
- String callingAction = "AddApplication";
- String addApplicationURL = uicomponent.event(callingAction, application.getId());
- String addToStartup = uicomponent.event("AddToStartup", application.getId());
- %>
- <div class="Application">
- <div class="ApplicationDescription">
- <div onclick="$addApplicationURL" title="<%= application.getDisplayName() %>" class="PortletIcon">
- <span><img src="/$srcBG" alt="" onError="src='$srcNormalBG'" /></span>
- </div>
- <div class="ApplicationContent">
- <div class="TitleBarApplication">
- <div class="Title"><%= application.getDisplayName() %></div>
- <div class="ApplicationButton">
- <% if (org.exoplatform.web.application.Application.EXO_PORTLET_TYPE.equals(application.getApplicationType())) { %>
- <div title="<%=_ctx.appRes("UIAddNewApplication.label.AddToStartup")%>" class="AddToStartUp" onclick="$addToStartup" ><span></span></div>
- <%}%>
- <div title="<%=_ctx.appRes("UIAddNewApplication.label.Add")%>" class="AddButton" onclick="$addApplicationURL" ><span></span></div>
- </div>
- </div>
- <div class="ApplicationContentLabel">
- <div class="ContentLabel">
- <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Type")%></span>
- <span class="RightLabel"><%=application.getApplicationType()%></span>
- </div>
- <div class="ContentLabel">
- <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Created")%></span>
- <span class="RightLabel">eXo Platform SAS.</span>
- </div>
- <div class="ContentLabel">
- <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Description")%></span>
- <span class="RightLabel"><%= application.getDescription() %></span>
- </div>
- </div>
- </div>
- </div>
- <div class="ClearRight"><span ></span></div>
- </div>
- <%
- }
- %>
-
- </div>
- <%
- selected = false;
- }
- %>
- </div>
- </div>
- <div class="ClearLeft"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </div>
-
- <div class="UIAction">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ActionButton LightBlueStyle" onclick="<%= uicomponent.event("Close") %>" >
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <a href="javascript:void(0);"><%=_ctx.appRes("UIAddNewApplication.label.Close")%></a>
- </div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
-
-</div>
\ No newline at end of file
Deleted: exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl 2010-12-09 10:04:35 UTC (rev 5522)
@@ -1,307 +0,0 @@
-<%
- import org.exoplatform.portal.webui.application.UIPortlet;
- import org.exoplatform.web.application.JavascriptManager;
- import org.exoplatform.portal.config.model.PageNavigation;
- import org.exoplatform.portal.config.model.PageNode;
- def rcontext = _ctx.getRequestContext();
- JavascriptManager jsmanager = rcontext.getJavascriptManager();
-
- jsmanager.importJavascript('eXo.desktop.UIDesktop');
- jsmanager.importJavascript('eXo.webui.UIPopupSelectCategory');
- jsmanager.importJavascript('eXo.desktop.UIWindow');
- jsmanager.importJavascript('eXo.webui.UIRightClickPopupMenu');
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.SaveTitle='" + _ctx.appRes("UIDashboardContainer.label.SaveTitle") + "';");
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.CancelTitle='" + _ctx.appRes("UIDashboardContainer.label.CancelTitle") + "';");
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.Cache='" + _ctx.appRes("UIDashboardContainer.label.Cache") + "';");
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.Debug='" + _ctx.appRes("UIDashboardContainer.label.Debug") + "';");
- jsmanager.addCustomizedOnLoadScript('eXo.desktop.UIDockbar.initNav();');
-
- String docBase = rcontext.getRequestContextPath();
- String comId = uicomponent.getId();
- boolean modifiable = uicomponent.isModifiable();
-
- void renderSinglePageNode(PageNavigation nav, PageNode node) {
- String href = uicomponent.event("ChangePage", nav.getId() + "::" + node.getUri());
- String icon = node.getIcon();
- if(icon == null) icon = "DefaultPageIcon";
- print """
- <div class="MenuItem">
- <div class="LabelItem">
- <div class="Icon $icon" style="padding-left: 18px">
- <div class="LabelText"><a href="#" onclick="$href">$node.resolvedLabel</a></div>
- </div>
- </div>
- </div>
- """;
- }
-
- void renderPageNode(PageNavigation nav, PageNode node) {
- String href = uicomponent.event("ChangePage", nav.getId() + "::" + node.getUri());
- String icon = node.getIcon();
- String scrollUpTitle = _ctx.appRes("UIExoStart.tooltip.scrollUp");
- String scrollDownTitle = _ctx.appRes("UIExoStart.tooltip.scrollDown");
- if(icon == null) icon = "DefaultPageIcon";
- print """
- <div class="MenuItem">
- <div class="LabelItem">
- <div class="Icon $icon" style="padding-left: 18px">
- <div class="BlackArrowIcon">
- <div class="LabelText "><a href="#" onclick="$href">$node.resolvedLabel</a></div>
- </div>
- </div>
- </div>
- <div class="MenuItemContainer">
- <div class="StartMenuDecorator">
- <div class="StartMenuTL">
- <div class="StartMenuTR">
- <div class="StartMenuTC"><span></span></div>
- </div>
- </div>
- <div class="StartMenuML">
- <div class="StartMenuMR">
- <div class="StartMenuBG" style="padding-bottom: 6px">
- <div class="TopNavigator" style="display: none;" title="$scrollUpTitle">
- <div class="UpNavigatorIcon"><span></span></div>
- </div>
- <div class="BlockMenu">
- <div class="MenuContainer">
- """;
- for(child in node.getChildren()) {
- if(child.getChildren() != null && child.getChildren().size() > 0) renderPageNode(nav, child);
- else renderSinglePageNode(nav, child);
- }
- print """
- </div>
- </div>
- <div class="BottomNavigator" style="display: none;" title="$scrollDownTitle">
- <div class="DownNavigatorIcon"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- <div class="StartMenuBL">
- <div class="StartMenuBR">
- <div class="StartMenuBC"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- """;
- }
-
- void renderPageNavigation(PageNavigation navigation) {
- nodes = navigation.getNodes();
- if(nodes.size() < 1) return;
- String navTitle = _ctx.appRes("UIPageNavigation.label.titleBar");
- navTitle = navTitle.replace("{0}", navigation.ownerId);
- print """
- <div class="PageNavigationBlock">
- <div class="DecoratorBlock">
- <div class="PageOwnerContainer">
- <div class="TitleBar">$navTitle </div>
- """;
- for(node in nodes) {
- if(node.getChildren() != null && node.getChildren().size() > 0) {
- renderPageNode(navigation, node);
- }
- else renderSinglePageNode(navigation, node);
- }
- print """
- </div>
- </div>
- </div>
- """;
- }
-
- void renderNavigations() {
- String label = _ctx.appRes(uicomponent.getId() + ".item.PageNavigation");
- String scrollUpTitle = _ctx.appRes("UIExoStart.tooltip.scrollUp");
- String scrollDownTitle = _ctx.appRes("UIExoStart.tooltip.scrollDown");
- navigations = uicomponent.getNavigations();
- //if (navigations != null && navigations.size() > 0 && navigations.get(0).getNodes().size() > 0) {
- if (navigations != null && navigations.size() > 0) {
- print """
- <div class="MenuItemContainer NavigationContainer" style="position: absolute; top: -450px;">
- <div class="StartMenuDecorator">
- <div class="StartMenuTL">
- <div class="StartMenuTR">
- <div class="StartMenuTC"><span></span></div>
- </div>
- </div>
- <div class="StartMenuML">
- <div class="StartMenuMR">
- <div class="StartMenuBG" style="padding: 5px 0px;">
- <div class="TopNavigator" style="display: none;" title="$scrollUpTitle">
- <div class="UpNavigatorIcon"><span></span></div>
- </div>
- <div class="BlockMenu">
- <div class="MenuContainer">
- """;
- for(navigation in navigations) {
- renderPageNavigation(navigation);
- }
- print """
- </div>
- </div>
- <div class="BottomNavigator" style="display: none;" title="$scrollDownTitle">
- <div class="DownNavigatorIcon"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- <div class="StartMenuBL">
- <div class="StartMenuBR">
- <div class="StartMenuBC"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- """;
- }
- }
-
-%>
-
-
-<div class="UIPage" id="UIPage-${uicomponent.id}">
- <div class="META-DATA-BLOCK" style="display: none">
- <div class="id">$uicomponent.id</div>
- <div class="title"><%=_ctx.appRes("UIPage.label.title")%></div>
- <div class="description"><%=_ctx.appRes("UIPage.label.description")%></div>
- </div>
- <div class="VIEW-PAGE">
- <div id="UIPage">
- <div class="UIPageDesktop" id="UIPageDesktop">
- <%int x = 15; y = 15 %>
- <%for(uiChild in uicomponent.getChildren()) {
- if(!(uiChild instanceof UIPortlet)) {
- uicomponent.renderUIComponent(uiChild);
- continue;
- }
-
- String popupId = uiChild.getId();
- String title = uiChild.getTitle();
- if(title == null || title.trim().length() < 1) {
- title = popupId;
- uiChild.setTitle(title);
- }
- uiChild.setShowInfoBar(true);
- uiChild.setPortletStyle("Window");
- uicomponent.renderUIComponent(uiChild);
-
- String posX = uiChild.getProperties().get("locationX");
- String posY = uiChild.getProperties().get("locationY");
-
- if(posX == null) posX = (String)x;
- if(posY == null) posY = (String)y;
-
- jsmanager.addJavascript("eXo.desktop.UIWindow.init('UIWindow-${popupId}', true, ${posX}, ${posY});");
- %>
- <% x += 10; y += 20;%>
- <%}%>
-
- <%//String containerMouseOver = "eXo.desktop.UIDockbar.containerMouseOver();";%>
- <div class="UIDockBar" id="UIDockBar" onmouseover="eXo.desktop.UIDockbar.startDockBarEvt(event);">
- <div id="DockNavigation" class="UIExoStart" style="position: absolute; display: none; width: 0px;">
- <div class="StartMenuContainer">
- <% renderNavigations(); %>
- </div>
- </div>
- <div class="UIRightClickPopupMenu" id="DockbarContextMenu" onmousedown="event.cancelBubble = true;">
- <div class="UIContextMenuContainer" >
- <div class="TopLeftRightClickPopupMenu">
- <div class="TopRightRightClickPopupMenu">
- <div class="TopCenterRightClickPopupMenu"><span></span></div>
- </div>
- </div>
- <div class="MiddleLeftRightClickPopupMenu">
- <div class="MiddleRightRightClickPopupMenu">
- <div class="UIRightPopupMenuContainer">
- <div class="MenuItem">
- <a href="javascript:eXo.desktop.UIDesktop.removeApp('<%=uicomponent.url("RemoveChild", "_objectid_")%>')" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);"
- class="ItemIcon CloseDockBarIcon"><%=_ctx.appRes("UIPageDesktop.action.Close")%></a>
- </div>
- <div class="MenuItem">
- <a class="ItemIcon QuitDockBarIcon" href="javascript:eXo.desktop.UIDesktop.removeWindowContent('_objectid_')" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" ><%=_ctx.appRes("UIPageDesktop.action.Quit")%></a>
- </div>
- <div class="RightClickCustomItem"><%=_ctx.appRes("UIPageDesktop.action.action.Open")%></div>
- </div>
- </div>
- </div>
- <div class="BottomLeftRightClickPopupMenu">
- <div class="BottomRightRightClickPopupMenu">
- <div class="BottomCenterRightClickPopupMenu">
- <div class="ClickCenterBottom"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="DockbarLeft">
- <div class="DockbarRight">
- <div class="DockbarCenter" id="DockbarCenter">
-
- <div class="IconContainer" id="IconContainer" style="text-align: center;">
- <img id="FixBug" alt="" src="/eXoResources/skin/sharedImages/Debug1x32.gif" />
-
- <%if(rcontext.getRemoteUser() == null) {%>
- <img id="SignInIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/Signin.png" alt="" title=""
- onclick="<%=uicomponent.event("ShowLoginForm", null);%>" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.SignIn")%></span>
- <%} else {%>
- <img id="SignOutIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/Signout.png" alt="" title=""
- onclick="eXo.portal.logout()" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.SignOut")%></span>
- <%} %>
- <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png"/>
-
- <% String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));"; %>
- <img id="ChangeLanguageIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/ChangeLanguage.png" alt="" title=""
- onclick="$changeLanguageAction" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIExoStart.item.ChangeLanguage")%></span>
-
- <img class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/NavigationIcon.png" alt="" title=""
- id="NavigationIcon"
- onclick="eXo.desktop.UIDockbar.showNavigation(event)"/><span class="Tooltip" style="display: none"><%=_ctx.appRes("UIPageDesktop.title.pageNavigation")%></span>
-
- <%if(modifiable) {%>
- <img class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/AddPortlet.png" alt="" title=""
- id="UIAddApplicationIcon"
- onclick="<%=uicomponent.event("ShowAddNewApplication")%>"/><span class="Tooltip" style="display: none"><%=_ctx.appRes("UIPageDesktop.title.AddApplication")%></span>
- <%}%>
- <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png"/>
- <%
- def res = rcontext.getApplicationResourceBundle();
- String skin = rcontext.getUIApplication().getSkin();
-
- for(uiChild in uicomponent.getChildren()) {
- if(!(uiChild instanceof UIPortlet)) continue;
- String imgLocation = uiChild.getExoWindowID().getPortletApplicationName() + "/skin/DefaultSkin/portletIcons/" + uiChild.getExoWindowID().getPortletName();
- String appStatus = uiChild.getProperties().get("appStatus");
- boolean isVisible = "SHOW".equals(appStatus) || "HIDE".equals(appStatus);
-
- if(rcontext.getRemoteUser() != null) {
- %>
- <img id="DockItem${uiChild.id}" class="Icon <%=isVisible ? "ShowIcon": ""%>" onmousedown="eXo.webui.UIRightClickPopupMenu.clickRightMouse(event, this, 'DockbarContextMenu', '${uiChild.id}', null, 1)" src="/${imgLocation}.png" alt=""
- onerror="this.src='/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png'" onclick="eXo.desktop.UIDesktop.showHideWindow('UIWindow-${uiChild.id}', this);" /><span class="Tooltip" style="display: none"><%=uiChild.getTitle();%></span>
- <%}else{%>
- <img id="DockItem${uiChild.id}" class="Icon <%=isVisible ? "ShowIcon": ""%>" src="/${imgLocation}.png" alt=""
- onerror="this.src='/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png'" onclick="eXo.desktop.UIDesktop.showHideWindow('UIWindow-${uiChild.id}', this);" /><span class="Tooltip" style="display: none"><%=uiChild.getTitle();%></span>
- <%}}%>
-
- <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png" />
- <img id="PortletsViewer" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/ShowPortletsViewer.png" alt="" title=""/><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.ShowPortletDesktop")%></span>
- <img id="GadgetsViewer" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/HideWidgetsViewer.png" alt="" title=""/><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.ShowWidgetDesktop")%></span>
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </div>
- </div>
- </div>
-</div>
-
-<%
- jsmanager.addOnLoadJavascript('eXo.desktop.UIDesktop.init');
- jsmanager.addOnResizeJavascript('eXo.desktop.UIDesktop.fixDesktop');
-%>
\ No newline at end of file
Deleted: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -1,289 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.portal.webui.application;
-
-import org.exoplatform.application.registry.Application;
-import org.exoplatform.application.registry.ApplicationCategory;
-import org.exoplatform.application.registry.ApplicationRegistryService;
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.portal.application.PortalRequestContext;
-import org.exoplatform.portal.config.DataStorage;
-import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.portal.config.model.ApplicationType;
-import org.exoplatform.portal.config.model.CloneApplicationState;
-import org.exoplatform.portal.config.model.ModelObject;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.TransientApplicationState;
-import org.exoplatform.portal.pom.spi.gadget.Gadget;
-import org.exoplatform.portal.pom.spi.portlet.Portlet;
-import org.exoplatform.portal.pom.spi.wsrp.WSRPState;
-import org.exoplatform.portal.webui.page.UIPage;
-import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.portal.webui.util.PortalDataMapper;
-import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
-import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
-import org.exoplatform.webui.config.annotation.ComponentConfig;
-import org.exoplatform.webui.config.annotation.EventConfig;
-import org.exoplatform.webui.core.UIComponent;
-import org.exoplatform.webui.core.UIContainer;
-import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.EventListener;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/** Created by The eXo Platform SARL Author : Anh Nguyen ntuananh.vn(a)gmail.com Oct 18, 2007 */
-@ComponentConfig(template = "system:/groovy/portal/webui/application/UIAddNewApplication.gtmpl", events = {
- @EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class),
- @EventConfig(listeners = UIAddNewApplication.AddApplicationActionListener.class),
- @EventConfig(listeners = UIAddNewApplication.AddToStartupActionListener.class)})
-public class UIAddNewApplication extends UIContainer
-{
-
- private List<ApplicationCategory> listAppCategories;
-
- private UIComponent uiComponentParent;
-
- private boolean isInPage;
-
- public List<ApplicationCategory> getApplicationCategories() throws Exception
- {
- return listAppCategories;
- }
-
- public List<ApplicationCategory> getApplicationCategories(String remoteUser,
- ApplicationType[] applicationType) throws Exception
- {
- ExoContainer container = ExoContainerContext.getCurrentContainer();
- ApplicationRegistryService prService = (ApplicationRegistryService)container.getComponentInstanceOfType(ApplicationRegistryService.class);
-
- if (applicationType == null)
- {
- applicationType = new ApplicationType[0];
- }
-
- List<ApplicationCategory> appCategories = prService.getApplicationCategories(remoteUser,
- applicationType);
-
- if (appCategories == null)
- {
- appCategories = new ArrayList();
- }
- else
- {
- Iterator<ApplicationCategory> cateItr = appCategories.iterator();
- while (cateItr.hasNext())
- {
- ApplicationCategory cate = cateItr.next();
- List<Application> applications = cate.getApplications();
- if (applications.size() < 1)
- {
- cateItr.remove();
- }
- }
- }
- listAppCategories = appCategories;
-
- return listAppCategories;
-
- }
-
- public UIComponent getUiComponentParent()
- {
- return uiComponentParent;
- }
-
- public void setUiComponentParent(UIComponent uiComponentParent)
- {
- this.uiComponentParent = uiComponentParent;
- }
-
- public boolean isInPage()
- {
- return isInPage;
- }
-
- public void setInPage(boolean isInPage)
- {
- this.isInPage = isInPage;
- }
-
- private Application getApplication(String id) throws Exception
- {
-
- List<ApplicationCategory> pCategories = getApplicationCategories();
-
- for (ApplicationCategory pCategory : pCategories)
- {
- List<Application> applications = pCategory.getApplications();
- for (Application application : applications)
- {
- if (application.getId().equals(id))
- {
- return application;
- }
- }
- }
-
- return null;
- }
-
- /**
- * Add Application to UiPage
- *
- * @param event
- * @throws Exception
- */
- private static void addApplicationToPage(Event<UIAddNewApplication> event, boolean atStartup) throws Exception
- {
- UIPortal uiPortal = Util.getUIPortal();
-
- UIPortalApplication uiPortalApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
- UIPage uiPage;
- if (uiPortal.isRendered())
- {
- uiPage = uiPortal.findFirstComponentOfType(UIPage.class);
- }
- else
- {
- UIPortalToolPanel uiPortalToolPanel = uiPortalApp.findFirstComponentOfType(UIPortalToolPanel.class);
- uiPage = uiPortalToolPanel.findFirstComponentOfType(UIPage.class);
- }
-
- String applicationId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
-
- Application application = event.getSource().getApplication(applicationId);
- ApplicationType appType = application.getType();
- String portletName = application.getApplicationName();
-// String appGroup = application.getApplicationGroup();
-
- // TODO review windowId for eXoWidget and eXoApplication
- UIComponent component = null;
- if (ApplicationType.GADGET.equals(appType))
- {
- UIGadget uiGadget = uiPage.createUIComponent(event.getRequestContext(), UIGadget.class, null, null);
-
- uiGadget.setState(new TransientApplicationState<Gadget>(portletName));
-
- // Set Properties For gadget
- int posX = (int)(Math.random() * 400);
- int posY = (int)(Math.random() * 200);
-
- uiGadget.getProperties().put(UIApplication.locationX, String.valueOf(posX));
- uiGadget.getProperties().put(UIApplication.locationY, String.valueOf(posY));
-
- component = uiGadget;
- }
- else
- {
- boolean remote = ApplicationType.WSRP_PORTLET.equals(appType);
-
- UIPortlet uiPortlet = uiPage.createUIComponent(UIPortlet.class, null, null);
-
- CloneApplicationState appState;
- Object appId;
- if (!remote)
- {
- appState = new CloneApplicationState<Portlet>(application.getId());
- }
- else
- {
- appState = new CloneApplicationState<WSRPState>(application.getId());
- }
-
- ApplicationType applicationType = remote ? ApplicationType.WSRP_PORTLET : ApplicationType.PORTLET;
- PortletState portletState = new PortletState(appState, applicationType);
-
- uiPortlet.setState(portletState);
- uiPortlet.setPortletInPortal(false);
-
- if (atStartup)
- {
- uiPortlet.getProperties().setProperty("appStatus", "HIDE");
- }
-
- if (application != null)
- {
- String displayName = application.getDisplayName();
- if (displayName != null)
- {
- uiPortlet.setTitle(displayName);
- }
- else if (portletName != null)
- {
- uiPortlet.setTitle(portletName);
- }
- uiPortlet.setDescription(application.getDescription());
- List<String> accessPers = application.getAccessPermissions();
- String[] accessPermissions = accessPers.toArray(new String[accessPers.size()]);
- uiPortlet.setAccessPermissions(accessPermissions);
-
- component = uiPortlet;
- }
- }
-
- // Add component to page
- uiPage.addChild(component);
-
- // Save all changes
- if (uiPage.isModifiable())
- {
- Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- if (page.getChildren() == null)
- {
- page.setChildren(new ArrayList<ModelObject>());
- }
- DataStorage dataService = uiPortalApp.getApplicationComponent(DataStorage.class);
- dataService.save(page);
- }
-
- PortalRequestContext pcontext = Util.getPortalRequestContext();
- UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
- pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
- }
-
- static public class AddApplicationActionListener extends EventListener<UIAddNewApplication>
- {
- public void execute(Event<UIAddNewApplication> event) throws Exception
- {
- if (event.getSource().isInPage())
- {
- addApplicationToPage(event, false);
- }
- }
- }
-
- static public class AddToStartupActionListener extends EventListener<UIAddNewApplication>
- {
- public void execute(Event<UIAddNewApplication> event) throws Exception
- {
- if (event.getSource().isInPage())
- {
- addApplicationToPage(event, true);
- }
- }
- }
-}
Deleted: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -1,235 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.portal.webui.page;
-
-import org.exoplatform.portal.config.DataStorage;
-import org.exoplatform.portal.config.model.ModelObject;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.PageNavigation;
-import org.exoplatform.portal.webui.application.UIAddNewApplication;
-import org.exoplatform.portal.webui.application.UIApplication;
-import org.exoplatform.portal.webui.application.UIGadget;
-import org.exoplatform.portal.webui.application.UIPortlet;
-import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
-import org.exoplatform.portal.webui.page.UIPageActionListener.DeleteGadgetActionListener;
-import org.exoplatform.portal.webui.page.UIPageActionListener.RemoveChildActionListener;
-import org.exoplatform.portal.webui.portal.PageNodeEvent;
-import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.ShowLoginFormActionListener;
-import org.exoplatform.portal.webui.util.PortalDataMapper;
-import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.webui.config.annotation.ComponentConfig;
-import org.exoplatform.webui.config.annotation.EventConfig;
-import org.exoplatform.webui.core.UIComponent;
-import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.EventListener;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.portlet.WindowState;
-
-/**
- * May 19, 2006
- */
-
-@ComponentConfig(lifecycle = UIPageLifecycle.class, template = "system:/groovy/portal/webui/page/UIDesktopPage.gtmpl", events = {
- @EventConfig(listeners = ShowLoginFormActionListener.class),
- @EventConfig(listeners = DeleteGadgetActionListener.class),
- @EventConfig(listeners = RemoveChildActionListener.class),
- @EventConfig(listeners = UIDesktopPage.SaveGadgetPropertiesActionListener.class),
- @EventConfig(listeners = UIDesktopPage.SaveWindowPropertiesActionListener.class),
- @EventConfig(listeners = UIDesktopPage.ShowAddNewApplicationActionListener.class),
- @EventConfig(listeners = UIDesktopPage.ChangePageActionListener.class),
- @EventConfig(listeners = UIDesktopPage.ShowPortletActionListener.class)})
-public class UIDesktopPage extends UIPage
-{
-
- public UIDesktopPage()
- {
- setChildren((List<UIComponent>)new CopyOnWriteArrayList<UIComponent>());
- }
-
- public boolean isShowMaxWindow()
- {
- return true;
- }
-
- public List<PageNavigation> getNavigations() throws Exception
- {
- List<PageNavigation> allNav = Util.getUIPortal().getNavigations();
- String removeUser = Util.getPortalRequestContext().getRemoteUser();
- List<PageNavigation> result = new ArrayList<PageNavigation>();
- for (PageNavigation nav : allNav)
- {
- result.add(PageNavigationUtils.filter(nav, removeUser));
- }
- return result;
- }
-
- static public class SaveGadgetPropertiesActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- String objectId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
- List<UIGadget> uiGadgets = new ArrayList<UIGadget>();
- uiPage.findComponentOfType(uiGadgets, UIGadget.class);
- UIGadget uiGadget = null;
- for (UIGadget ele : uiGadgets)
- {
- if (ele.getId().equals(objectId))
- {
- uiGadget = ele;
- break;
- }
- }
- if (uiGadget == null)
- return;
- String posX = event.getRequestContext().getRequestParameter("posX");
- String posY = event.getRequestContext().getRequestParameter("posY");
- String zIndex = event.getRequestContext().getRequestParameter(UIApplication.zIndex);
-
- uiGadget.getProperties().put(UIApplication.locationX, posX);
- uiGadget.getProperties().put(UIApplication.locationY, posY);
- uiGadget.getProperties().put(UIApplication.zIndex, zIndex);
-
- if (!uiPage.isModifiable())
- return;
- Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- if (page.getChildren() == null)
- page.setChildren(new ArrayList<ModelObject>());
- DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class);
- dataService.save(page);
- }
- }
-
- static public class SaveWindowPropertiesActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- String objectId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
-
- UIApplication uiApp = uiPage.getChildById(objectId);
- if (uiApp == null)
- return;
-
- /*########################## Save Position ##########################*/
- String posX = event.getRequestContext().getRequestParameter("posX");
- String posY = event.getRequestContext().getRequestParameter("posY");
-
- if (posX != null)
- uiApp.getProperties().put(UIApplication.locationX, posX);
- if (posY != null)
- uiApp.getProperties().put(UIApplication.locationY, posY);
-
- //System.out.println("\n\n\n\n\n\n\n\n\n\n\n SAVE POSX: "+posX+"\n SAVE POSY: "+posY+"\n\n\n\n\n\n\n\n\n");
- /*########################## Save ZIndex ##########################*/
- String zIndex = event.getRequestContext().getRequestParameter(UIApplication.zIndex);
-
- if (zIndex != null)
- uiApp.getProperties().put(UIApplication.zIndex, zIndex);
-
- /*########################## Save Dimension ##########################*/
- String windowWidth = event.getRequestContext().getRequestParameter("windowWidth");
- String windowHeight = event.getRequestContext().getRequestParameter("windowHeight");
-
- if (windowWidth != null)
- uiApp.getProperties().put("windowWidth", windowWidth);
- if (windowHeight != null)
- uiApp.getProperties().put("windowHeight", windowHeight);
-
- // if(appWidth != null) uiComponent.getProperties().put(UIApplication.appWidth, appWidth);
- // if(appHeight != null) uiComponent.getProperties().put(UIApplication.appHeight, appHeight);
-
- // String applicationHeight = event.getRequestContext().getRequestParameter("applicationHeight");
- // if(applicationHeight != null) uiComponent.getProperties().put("applicationHeight", applicationHeight);
-
- /*########################## Save Window status (SHOW / HIDE) ##########################*/
- String appStatus = event.getRequestContext().getRequestParameter(UIApplication.appStatus);
- if (appStatus != null)
- uiApp.getProperties().put(UIApplication.appStatus, appStatus);
-
- // if(!uiPage.isModifiable()) return;
- // Page page = PortalDataMapper.toPageModel(uiPage);
- // UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class);
- // if(page.getChildren() == null) page.setChildren(new ArrayList<Object>());
- // configService.update(page);
- }
- }
-
- static public class ShowAddNewApplicationActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- UIPortalApplication uiPortalApp = uiPage.getAncestorOfType(UIPortalApplication.class);
- UIMaskWorkspace uiMaskWorkspace = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
-
- UIAddNewApplication uiAddApplication = uiPage.createUIComponent(UIAddNewApplication.class, null, null);
- uiAddApplication.setInPage(true);
- uiAddApplication.setUiComponentParent(uiPage);
- uiAddApplication.getApplicationCategories(event.getRequestContext().getRemoteUser(), null);
-
- uiMaskWorkspace.setWindowSize(700, 375);
- uiMaskWorkspace.setUIComponent(uiAddApplication);
- uiMaskWorkspace.setShow(true);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace);
- }
- }
-
- static public class ChangePageActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- String uri = event.getRequestContext().getRequestParameter(OBJECTID);
- UIPortal uiPortal = Util.getUIPortal();
- UIPageBody uiPageBody = uiPortal.findFirstComponentOfType(UIPageBody.class);
- if (uiPageBody != null)
- {
- if (uiPageBody.getMaximizedUIComponent() != null)
- {
- UIPortlet currentPortlet = (UIPortlet)uiPageBody.getMaximizedUIComponent();
- currentPortlet.setCurrentWindowState(WindowState.NORMAL);
- uiPageBody.setMaximizedUIComponent(null);
- }
- }
- PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
- uiPortal.broadcast(pnevent, Event.Phase.PROCESS);
- }
- }
-
- static public class ShowPortletActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- String portletId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
- UIPortlet uiPortlet = uiPage.getChildById(portletId);
- uiPortlet.getProperties().setProperty("appStatus", "SHOW");
- event.getRequestContext().addUIComponentToUpdateByAjax(uiPortlet);
- }
- }
-
-}
\ No newline at end of file
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -19,16 +19,29 @@
package org.exoplatform.portal.webui.page;
+import org.exoplatform.portal.config.UserACL;
+import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.container.UIContainer;
+import org.exoplatform.portal.webui.portal.UIPortalComposer;
import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.MoveChildActionListener;
+import org.exoplatform.portal.webui.util.PortalDataMapper;
+import org.exoplatform.portal.webui.util.Util;
+import org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace;
+import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
+import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
+import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
+import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
/**
* May 19, 2006
*/
-@ComponentConfig(lifecycle = UIPageLifecycle.class, template = "system:/groovy/portal/webui/page/UIPage.gtmpl", events = {@EventConfig(listeners = MoveChildActionListener.class)})
+@ComponentConfig(lifecycle = UIPageLifecycle.class, template = "system:/groovy/portal/webui/page/UIPage.gtmpl", events = {@EventConfig(listeners = MoveChildActionListener.class),
+ @EventConfig(name = "EditCurrentPage", listeners = UIPage.EditCurrentPageActionListener.class)})
public class UIPage extends UIContainer
{
@@ -104,4 +117,61 @@
{
this.maximizedUIPortlet = maximizedUIPortlet;
}
+
+ public static class EditCurrentPageActionListener extends EventListener<UIPage>
+ {
+ @Override
+ public void execute(Event<UIPage> event) throws Exception {
+ UIPortalApplication uiApp = Util.getUIPortalApplication();
+ UIWorkingWorkspace uiWorkingWS = uiApp
+ .getChildById(UIPortalApplication.UI_WORKING_WS_ID);
+
+ // check edit permission for page
+ UIPageBody pageBody = uiWorkingWS
+ .findFirstComponentOfType(UIPageBody.class);
+ UIPage uiPage = (UIPage) pageBody.getUIComponent();
+ if (uiPage == null) {
+ uiApp.addMessage(new ApplicationMessage(
+ "UIPageBrowser.msg.PageNotExist", null));
+ return;
+ }
+ Page page = PortalDataMapper.toPageModel(uiPage);
+
+ UserACL userACL = uiApp.getApplicationComponent(UserACL.class);
+ if (!userACL.hasEditPermission(page)) {
+ uiApp.addMessage(new ApplicationMessage(
+ "UIPortalManagement.msg.Invalid-EditPage-Permission", null));
+ return;
+ }
+
+ uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class);
+
+ UIPortalComposer portalComposer = uiWorkingWS.findFirstComponentOfType(
+ UIPortalComposer.class).setRendered(true);
+ portalComposer.setComponentConfig(UIPortalComposer.class, "UIPageEditor");
+ portalComposer.setId("UIPageEditor");
+ portalComposer.setShowControl(true);
+ portalComposer.setEditted(false);
+ portalComposer.setCollapse(false);
+
+ UIPortalToolPanel uiToolPanel = uiWorkingWS
+ .findFirstComponentOfType(UIPortalToolPanel.class);
+ uiToolPanel.setShowMaskLayer(false);
+ uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
+
+ // We clone the edited UIPage object, that is required for Abort action
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId())
+ .asSubclass(UIPage.class);
+ UIPage newUIPage = uiWorkingWS.createUIComponent(clazz, null, null);
+ PortalDataMapper.toUIPage(newUIPage, page);
+ uiToolPanel.setWorkingComponent(newUIPage);
+
+ // Remove current UIPage from UIPageBody
+ pageBody.setUIComponent(null);
+
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
+ Util.getPortalRequestContext().setFullRender(true);
+
+ }
+ }
}
\ No newline at end of file
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -146,14 +146,9 @@
return uiPage;
}
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = createUIComponent(context, UIPage.class, null, null);
- }
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ uiPage = createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
uiPortal.setUIPage(page.getId(), uiPage);
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -350,16 +350,10 @@
}
UIPagePreview uiPagePreview = uiWizard.getChild(UIPagePreview.class);
- UIPage uiPage;
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = uiWizard.createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = uiWizard.createUIComponent(context, UIPage.class, null, null);
- }
-
+
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ UIPage uiPage = uiWizard.createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
uiPagePreview.setUIComponent(uiPage);
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -19,13 +19,14 @@
package org.exoplatform.portal.webui.util;
+import java.util.List;
+
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.container.UIContainer;
-import org.exoplatform.portal.webui.page.UIDesktopPage;
import org.exoplatform.portal.webui.page.UIPage;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.portal.UIPortalComponent;
@@ -38,8 +39,6 @@
import org.exoplatform.webui.core.UIComponentDecorator;
import org.exoplatform.webui.event.Event;
-import java.util.List;
-
/**
* Jun 5, 2006
*/
@@ -226,14 +225,10 @@
if (uiPage != null && uiPage.getId().equals(page.getId()))
return uiPage;
WebuiRequestContext context = Util.getPortalRequestContext();
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = uiParent.createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = uiParent.createUIComponent(context, UIPage.class, null, null);
- }
+
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ uiPage = uiParent.createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
return uiPage;
}
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.webui.workspace;
+import java.lang.reflect.Method;
+
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.UserPortalConfig;
@@ -37,6 +39,7 @@
import org.exoplatform.portal.webui.util.PortalDataMapper;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
@@ -88,8 +91,8 @@
uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
// We clone the edited UIPage object, that is required for Abort action
- //UIPage newUIPage = new UIPage();
- UIPage newUIPage = uiWorkingWS.createUIComponent(UIPage.class, null, null);
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ UIPage newUIPage = uiWorkingWS.createUIComponent(clazz, null, null);
PortalDataMapper.toUIPage(newUIPage, page);
uiToolPanel.setWorkingComponent(newUIPage);
@@ -225,5 +228,22 @@
prContext.addUIComponentToUpdateByAjax(uiMaskWS);
}
}
+
+ public static class EditBackgroundActionListener extends EventListener<UIWorkingWorkspace>
+ {
+ @Override
+ public void execute(Event<UIWorkingWorkspace> event) throws Exception
+ {
+
+ UIWorkingWorkspace workingWorkspace = event.getSource();
+ UIPage uiPage = workingWorkspace.findFirstComponentOfType(UIPage.class);
+
+ Method showEditBackgroundPopupMethod = uiPage.getClass().getDeclaredMethod("showEditBackgroundPopup", WebuiRequestContext.class);
+ if(showEditBackgroundPopupMethod != null)
+ {
+ showEditBackgroundPopupMethod.invoke(uiPage, event.getRequestContext());
+ }
+ }
+ }
}
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2010-12-09 09:50:36 UTC (rev 5521)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2010-12-09 10:04:35 UTC (rev 5522)
@@ -42,6 +42,7 @@
@EventConfig(listeners = UIMainActionListener.CreatePortalActionListener.class),
@EventConfig(listeners = UIMainActionListener.EditCurrentPageActionListener.class),
@EventConfig(listeners = UIMainActionListener.PageCreationWizardActionListener.class),
+ @EventConfig(listeners = UIMainActionListener.EditBackgroundActionListener.class),
@EventConfig(listeners = UIMainActionListener.EditInlineActionListener.class)})
public class UIWorkingWorkspace extends UIContainer
{
14 years
- 1
- 0
gatein SVN: r5521 - epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-12-09 04:50:36 -0500 (Thu, 09 Dec 2010)
New Revision: 5521
Modified:
epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml
Log:
Typo
Modified: epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
+++ epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml 2010-12-09 09:50:36 UTC (rev 5521)
@@ -12,7 +12,7 @@
<properties>
<portletBridge.home>${EPP_HOME}/portletbridge</portletBridge.home>
- <portletBridge.version>2.1.0.CR1</portletBridge.version>
+ <portletBridge.version>2.1.0.CR2.EPP51</portletBridge.version>
</properties>
<build>
@@ -35,8 +35,8 @@
<resource>
<directory>${portletBridge.home}</directory>
<includes>
- <include>portletbridge-api-${portletbridge.version}.jar</include>
- <include>portletbridge-impl-${portletbridge.version}.jar</include>
+ <include>portletbridge-api-${portletBridge.version}.jar</include>
+ <include>portletbridge-impl-${portletBridge.version}.jar</include>
</includes>
<targetPath>WEB-INF/lib</targetPath>
</resource>
14 years
- 1
- 0
gatein SVN: r5520 - in exo/portal/branches: webos-gatein-branch and 72 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-12-09 04:08:07 -0500 (Thu, 09 Dec 2010)
New Revision: 5520
Added:
exo/portal/branches/webos-gatein-branch/
Modified:
exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml
exo/portal/branches/webos-gatein-branch/component/common/pom.xml
exo/portal/branches/webos-gatein-branch/component/dashboard/pom.xml
exo/portal/branches/webos-gatein-branch/component/identity/pom.xml
exo/portal/branches/webos-gatein-branch/component/management/pom.xml
exo/portal/branches/webos-gatein-branch/component/pc/pom.xml
exo/portal/branches/webos-gatein-branch/component/pom.xml
exo/portal/branches/webos-gatein-branch/component/portal/pom.xml
exo/portal/branches/webos-gatein-branch/component/resources/pom.xml
exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/pom.xml
exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml
exo/portal/branches/webos-gatein-branch/docs/pom.xml
exo/portal/branches/webos-gatein-branch/docs/reference-guide/pom.xml
exo/portal/branches/webos-gatein-branch/docs/user-guide/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml
exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml
exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml
exo/portal/branches/webos-gatein-branch/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml
exo/portal/branches/webos-gatein-branch/server/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml
exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml
exo/portal/branches/webos-gatein-branch/starter/pom.xml
exo/portal/branches/webos-gatein-branch/starter/war/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml
exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml
exo/portal/branches/webos-gatein-branch/web/pom.xml
exo/portal/branches/webos-gatein-branch/web/portal/pom.xml
exo/portal/branches/webos-gatein-branch/web/rest/pom.xml
exo/portal/branches/webos-gatein-branch/webui/core/pom.xml
exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml
exo/portal/branches/webos-gatein-branch/webui/pom.xml
exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml
Log:
Re-create webos gatein branch from revision 5519 of EXOGTN 3.1.x branch
Copied: exo/portal/branches/webos-gatein-branch (from rev 5519, exo/portal/branches/3.1.x)
Modified: exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/common/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/common/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/common/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/component/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/dashboard/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/identity/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/identity/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/identity/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/management/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/management/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/management/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/pc/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/pc/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/pc/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/component/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/portal/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/portal/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/resources/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/resources/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/resources/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/test/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/web/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/web/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/docs/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/docs/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/webos-gatein-branch/docs/reference-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/docs/reference-guide/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/webos-gatein-branch/docs/user-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/docs/user-guide/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>gatein-user-guide-en</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,23 +37,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,29 +37,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/gadgets/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -72,19 +72,19 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.patch-ear</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<!-- Missing packaging dependencies -->
Modified: exo/portal/branches/webos-gatein-branch/packaging/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/packaging/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
@@ -341,110 +341,110 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
Modified: exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/portlet/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/portlet/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/server/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/starter/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/starter/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/starter/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/war/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/starter/war/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/testsuite/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/web/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/web/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/portal/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/web/portal/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/web/rest/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/rest/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/web/rest/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/core/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/webui/core/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/webui/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-12-09 08:10:17 UTC (rev 5519)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml 2010-12-09 09:08:07 UTC (rev 5520)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.6-PLF-SNAPSHOT</version>
+ <version>3.1.x-WebOS-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years
- 1
- 0
gatein SVN: r5519 - exo/portal/branches.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-12-09 03:10:17 -0500 (Thu, 09 Dec 2010)
New Revision: 5519
Removed:
exo/portal/branches/webos-gatein-branch/
Log:
Delete webos gatein branch which was created from GateIn trunk
14 years
- 1
- 0
gatein SVN: r5518 - in epp/docs/branches: EPP_5_0_Branch/Reference_Guide/en-US and 3 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-09 03:08:04 -0500 (Thu, 09 Dec 2010)
New Revision: 5518
Modified:
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml
Log:
Incremented version numbers for re-staging
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -12,7 +12,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
<edition>1</edition>
- <pubsnumber>1.7</pubsnumber>
+ <pubsnumber>4.0</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and
Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/Revision_History.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-4.0</revnumber>
+ <date>Thu Dec 09 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Numerous bug fixes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-1.7</revnumber>
<date>Thu Dec 02 2010</date>
<author>
@@ -22,7 +36,7 @@
</simplelist>
</revdescription>
</revision>
- <revision>
+<!-- <revision>
<revnumber>1-1.6</revnumber>
<date>Thu Sep 30 2010</date>
<author>
@@ -63,7 +77,7 @@
<member>Updates as described in JBEPP-288 for the version 5.0 release.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-1.1</revnumber>
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
<edition>1</edition>
- <pubsnumber>1.12</pubsnumber>
+ <pubsnumber>4.0</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-4.0</revnumber>
+ <date>Thu Dec 09 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>NUmerous bug fixes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+<!-- <revision>
<revnumber>1-1.12</revnumber>
<date>Thu Dec 02 2010</date>
<author>
@@ -21,7 +35,7 @@
</simplelist>
</revdescription>
</revision>
-<!-- <revision>
+ <revision>
<revnumber>1-1.11</revnumber>
<date>Thu Sep 30 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Book_Info.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -7,7 +7,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
<edition>1</edition>
- <pubsnumber>3.1</pubsnumber>
+ <pubsnumber>4.0</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Revision_History.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -7,7 +7,21 @@
<title>Revision History</title>
<simpara>
<revhistory>
- <revision>
+ <revision>
+ <revnumber>1-4.0</revnumber>
+ <date>Thu Dec 09 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Numberous bug fixes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+<!-- <revision>
<revnumber>1-3.1</revnumber>
<date>Mon Dec 06 2010</date>
<author>
@@ -21,7 +35,7 @@
</simplelist>
</revdescription>
</revision>
- <!--<revision>
+ <revision>
<revnumber>1-2.7</revnumber>
<date>Thu Sep 30 2010</date>
<author>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>1.22</pubsnumber>
+ <pubsnumber>4.0</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-4.0</revnumber>
+ <date>Thu Dec 09 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Numerous bug fixes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+<!-- <revision>
<revnumber>1-1.22</revnumber>
<date>Mon Dec 06 2010</date>
<author>
@@ -20,7 +34,7 @@
<member>Republished for 5.1 branch.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-1.21</revnumber>
<date>Wed Dec 01 2010</date>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -7,7 +7,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>2.10</pubsnumber>
+ <pubsnumber>4.0</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2010-12-09 08:07:07 UTC (rev 5517)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2010-12-09 08:08:04 UTC (rev 5518)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-4.0</revnumber>
+ <date>Thu Dec 09 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Numerous bug fixes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <!--<revision>
<revnumber>1-2.10</revnumber>
<date>Mon Dec 06 2010</date>
<author>
@@ -62,7 +76,7 @@
<member>Added icons/ folder to workaround Publican bug. Corrected typo in Introduction.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision>-->
<revision>
<revnumber>1-2.5</revnumber>
<date>Mon May 10 2010</date>
@@ -78,7 +92,7 @@
</revdescription>
</revision>
- <revision>
+<!-- <revision>
<revnumber>1-2.0</revnumber>
<date>Sat Mar 20 2010</date>
<author>
@@ -133,7 +147,7 @@
<member>First edit to add/remove content.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-0</revnumber>
<date>Tue Nov 17 2009</date>
14 years
- 1
- 0
gatein SVN: r5517 - epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-09 03:07:07 -0500 (Thu, 09 Dec 2010)
New Revision: 5517
Modified:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
Log:
Updated version installation admonitions
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml 2010-12-09 08:06:49 UTC (rev 5516)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml 2010-12-09 08:07:07 UTC (rev 5517)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>1.2</pubsnumber>
+ <pubsnumber>4.0</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and running &PRODUCT;. It forms the documentation suite along with the &PRODUCT; User Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html" />
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-12-09 08:06:49 UTC (rev 5516)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-12-09 08:07:07 UTC (rev 5517)
@@ -17,9 +17,27 @@
<para>
The &JBEPP; Installation Guide is available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." />. A User Guide and Reference Guide are also available at this location and should be reviewed to ensure your Portal Platform is configured correctly.
</para>
- <para>
- If you have an existing installation of &JBEPP; 5.0 or 5.0.1 (including installations that include the technical preview release of the &PRODUCT; extension) you must either replace this installation or deploy a new instance of &JBEPP; &VERSION_MIRCO; in order to use &PRODUCT;.
- </para>
+ <important>
+ <title>&JBEPP; Environments</title>
+ <para>
+ The Site Publisher add-on can only be installed into a <emphasis>clean</emphasis> installation of &PRODUCT; &VERSION_MICRO;.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ It <emphasis role="bold">cannot</emphasis> be installed into a <emphasis>pre-existing</emphasis> &PRODUCT; &VERSION_MICRO; installation (in this instance pre-existing is taken to mean a deployment that contains configuration settings or data that is not standard in the release).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Likewise, Site Publisher <emphasis role="bold">cannot</emphasis> be installed onto &PRODUCT; 5.0 or 5.0.1 versions (including installations that include the technical preview release of the Site Publisher extension).
+ </para>
+ <para>
+ You must deploy a new instance of &PRODUCT; &VERSION_MICRO; in order to use the Site Publisher add-on.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </important>
<note>
<title>&JBEPP; Subscriptions</title>
<para>
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2010-12-09 08:06:49 UTC (rev 5516)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2010-12-09 08:07:07 UTC (rev 5517)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-4.0</revnumber>
+ <date>Thu Dec 09 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updated base installation admonitions.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+<!-- <revision>
<revnumber>1-1.2</revnumber>
<date>Mon Dec 06 2010</date>
<author>
@@ -34,7 +48,7 @@
<member>Added first draft content.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-1.0</revnumber>
14 years
- 1
- 0
gatein SVN: r5516 - epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-09 03:06:49 -0500 (Thu, 09 Dec 2010)
New Revision: 5516
Modified:
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Add-ons.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
Log:
Updated version installation admonitions
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Add-ons.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Add-ons.xml 2010-12-09 05:03:48 UTC (rev 5515)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Add-ons.xml 2010-12-09 08:06:49 UTC (rev 5516)
@@ -9,12 +9,12 @@
<important>
<title>Important</title>
<para>
- Do not read further in this guide if you intend to install the &JBSP; add-on. The Site Publisher add-on must be deployed into a data-free &PRODUCT; environment to install successfully.
+ Do not read further in this guide if you intend to install the &JBSP; add-on.
</para>
</important>
<para>
- You shoud refer to the Site Publisher Installation Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html"></ulink> and install the add-on before making any changes to the underlying &PRODUCT; &VERSION_MINOR; installation.
+ At this point you shoud refer to the Site Publisher Installation Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html"></ulink> and install the add-on.
</para>
<para>
Once you have completed the installation for the &JBSP; extension, you should return to this document and continue this process.
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-09 05:03:48 UTC (rev 5515)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-09 08:06:49 UTC (rev 5516)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>2.3</pubsnumber>
+ <pubsnumber>4.0</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and running &PRODUCT;. It forms part of the complete document suite along with the &PRODUCT; User Guide and the &PRODUCT; Reference Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." />.
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml 2010-12-09 05:03:48 UTC (rev 5515)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml 2010-12-09 08:06:49 UTC (rev 5516)
@@ -7,19 +7,42 @@
<chapter id="Getting_Started">
<title>Getting Started</title>
-<!-- Commented out as per migration information from Thomas Heute.
<section id="sect-Installation_Guide-Getting_Started-Upgrading_Previous_Installations">
- <title>Upgrading to &PRODUCT; &VERSION_MICRO;</title>
- <important>
- <title></title>
+ <title>Upgrading and Add-ons</title>
<para>
- Unfortunately existing &PRODUCT; 5.0 or 5.0.1 installations cannot be upgraded in order to deploy &PRODUCT; &VERSION_MICRO;.
+ If you currently have an installation of &PRODUCT; in operation, you should read the ntes below to ensure you choose the correct installation/migration path for your circumstances.
</para>
- <para>
- If you have an existing installation of &PRODUCT; 5.0 or 5.0.1 (including installations that include the technical preview release of the &PRODUCT; Site Publisher extension) you must either replace this installation or deploy a new instance of &PRODUCT;.
- </para>
- </important>
- </section> -->
+ <important>
+ <title>Upgrading &PRODUCT;</title>
+ <para>
+ It is possible to upgrade from &PRODUCT; version 5.0 or 5.0.1 to &PRODUCT; &VERSION_MICRO;.
+ </para>
+ <para>
+ MORE INFO NEEDED HERE ON HOW TO DO THIS.
+ </para>
+ </important>
+ <important>
+ <title>Add-ons</title>
+ <para>
+ The <emphasis role="bold">Site Publisher</emphasis> add-on that is part of the &VERSION_MICRO; release can only be installed into a <emphasis>clean</emphasis> installation of &PRODUCT; &VERSION_MICRO;.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ It <emphasis role="bold">cannot</emphasis> be installed into a <emphasis>pre-existing</emphasis> &PRODUCT; &VERSION_MICRO; installation (in this instance pre-existing is taken to mean a deployment that contains configuration settings or data that is not standard in the release).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Likewise, Site Publisher <emphasis role="bold">cannot</emphasis> be installed onto &PRODUCT; 5.0 or 5.0.1 versions (including installations that include the technical preview release of the Site Publisher extension).
+ </para>
+ <para>
+ You must deploy a new instance of &PRODUCT; &VERSION_MICRO; in order to use the Site Publisher add-on.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </important>
+ </section>
<section id="Getting_Started-Pre_Requisites">
<title>Pre-Requisites</title>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2010-12-09 05:03:48 UTC (rev 5515)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2010-12-09 08:06:49 UTC (rev 5516)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-4.0</revnumber>
+ <date>Thu Dec 09 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Numerous bug fixes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-2.3</revnumber>
<date>Mon Nov 29 2010</date>
<author>
14 years
- 1
- 0
gatein SVN: r5515 - in epp/docs/branches: EPP_5_1_Branch/User_Guide/en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-09 00:03:48 -0500 (Thu, 09 Dec 2010)
New Revision: 5515
Modified:
epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Preface.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Preface.xml
Log:
Fixed incorrect page ID in Preface.xml (both branches)
Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Preface.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Preface.xml 2010-12-09 04:55:59 UTC (rev 5514)
+++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/Preface.xml 2010-12-09 05:03:48 UTC (rev 5515)
@@ -2,7 +2,7 @@
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<preface id="pref-JBoss_Portlet_Bridge_Reference_Guide-Preface">
+<preface id="pref-User_Guide-Preface">
<title>Preface</title>
<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Middleware_Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Preface.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Preface.xml 2010-12-09 04:55:59 UTC (rev 5514)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Preface.xml 2010-12-09 05:03:48 UTC (rev 5515)
@@ -2,7 +2,7 @@
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<preface id="pref-JBoss_Portlet_Bridge_Reference_Guide-Preface">
+<preface id="pref-User_Guide-Preface">
<title>Preface</title>
<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Middleware_Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
14 years
- 1
- 0
gatein SVN: r5514 - in epp/docs/branches: EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration and 9 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-08 23:55:59 -0500 (Wed, 08 Dec 2010)
New Revision: 5514
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
Log:
Fixed further QA feedback issues (kernel_1_0.xsd references and updated code from conf/common/common.configuration.xml
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -129,69 +129,4 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
- </workspace>
-
-<!-- This code has been updated as per advice from Villiam Rockai that the prodct config file differs.
-<workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr"/>
- <property name="dialect" value="hsqldb"/>
- <property name="multi-db" value="true"/>
- <property name="max-buffer-size" value="200K"/>
- <property name="swap-directory" value="target/temp/swap/ws"/>
- </properties>
- </container>
- <cache enabled="true">
- <properties>
- <property name="max-size" value="10K"/><!-- 10KBytes -->
-<!-- <property name="live-time" value="30m"/><!-- 30 min -->
-<!-- </properties>
- </cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="target/temp/index"/>
- </properties>
- </query-handler>
- <lock-manager>
- <time-out>15m</time-out><!-- 15 min -->
-<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="target/temp/lock/ws"/>
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="ws1" auto-init-root-nodetype="nt:unstructured">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr1"/>
- <property name="dialect" value="mysql"/>
- <property name="multi-db" value="true"/>
- <property name="max-buffer-size" value="200K"/>
- <property name="swap-directory" value="target/temp/swap/ws1"/>
- </properties>
- </container>
- <cache enabled="true">
- <properties>
- <property name="max-size" value="10K"/>
- <property name="live-time" value="5m"/>
- </properties>
- </cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="target/temp/index"/>
- </properties>
- </query-handler>
- <lock-manager>
- <time-out>15m</time-out><!-- 15 min -->
-<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="target/temp/lock/ws1"/>
- </properties>
- </persister>
- </lock-manager>
- </workspace>
-</workspaces>
--->
\ No newline at end of file
+ </workspace>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -10,18 +10,4 @@
<value>autologin</value>
</values-param>
</init-params>
- </component>
-
-<!-- Code replaced as per advice from Vilaim Rockai that product config file differs.
-<component>
- <key>org.exoplatform.web.security.security.CookieTokenService</key>
- <type>org.exoplatform.web.security.security.CookieTokenService</type>
- <init-params>
- <values-param>
- <name>service.configuration</name>
- <value>jcr-token</value>
- <value>7</value>
- <value>DAY</value>
- </values-param>
- </init-params>
-</component>-->
+ </component>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -89,87 +89,4 @@
</value-param>
</init-params>
- </component>
-
-<!-- Code updated as per advice from Villiam Rockai that product idm-config file differs.
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
- <component>
- <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
- <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type>
- <init-params>
- <value-param>
- <name>config</name>
- <value>war:/conf/organization/idm-config.xml</value>
- </value-param>
- <value-param>
- <name>portalRealm</name>
- <value>realm${container.name.suffix}</value>
- </value-param>
- </init-params>
- </component>
-
-
- <component>
- <key>org.exoplatform.services.organization.OrganizationService</key>
- <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type>
- <init-params>
- <object-param>
- <name>configuration</name>
- <object type="org.exoplatform.services.organization.idm.Config">
- <field name="useParentIdAsGroupType">
- <boolean>true</boolean>
- </field>
-
- <field name="forceMembershipOfMappedTypes">
- <boolean>true</boolean>
- </field>
-
- <field name="pathSeparator">
- <string>.</string>
- </field>
-
- <field name="rootGroupName">
- <string>GTN_ROOT_GROUP</string>
- </field>
-
- <field name="groupTypeMappings">
- <map type="java.util.HashMap">
- <entry>
- <key><string>/</string></key>
- <value><string>root_type</string></value>
- </entry>
-
- <!-- Sample mapping -->
- <!--
- <entry>
- <key><string>/platform/*</string></key>
- <value><string>platform_type</string></value>
- </entry>
- <entry>
- <key><string>/organization/*</string></key>
- <value><string>organization_type</string></value>
- </entry>
- -->
-
-<!-- </map>
- </field>
-
- <field name="associationMembershipType">
- <string>member</string>
- </field>
-
- <field name="ignoreMappedMembershipType">
- <boolean>false</boolean>
- </field>
- </object>
- </object-param>
- </init-params>
-
-
- </component>
-
-</configuration>
--->
\ No newline at end of file
+ </component>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -86,80 +86,4 @@
<value>idm_realm</value>
</option>
</options>
-</jboss-identity>
-
-<!--This code has been updated as per advice from Villiam Rockai that that product configuration file differs.
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd">
- <realms>
- <realm>
- <id>PortalRealm</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- </realms>
- <repositories>
- <repository>
- <id>PortalRepository</id>
- <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>HibernateStore</default-identity-store-id>
- <default-attribute-store-id>HibernateStore</default-attribute-store-id>
- </repository>
- </repositories>
- <stores>
- <attribute-stores/>
- <identity-stores>
- <identity-store>
- <id>HibernateStore</id>
- <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
- <external-config/>
- <supported-relationship-types>
- <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
- <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
- </supported-relationship-types>
- <supported-identity-object-types>
- <identity-object-type>
- <name>USER</name>
- <relationships/>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- </credentials>
- <attributes/>
- <options/>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <option>
- <name>hibernateSessionFactoryRegistryName</name>
- <value>hibernateSessionFactory</value>
- </option>
- <option>
- <name>allowNotDefinedIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateRelationshipTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- <option>
- <name>isRealmAware</name>
- <value>true</value>
- </option>
- </options>
- </identity-store>
- </identity-stores>
- </stores>
-</jboss-identity>
--->
\ No newline at end of file
+</jboss-identity>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -29,38 +29,4 @@
</object>
</object-param>
</init-params>
- </component-plugin>
-
-<!-- Code replaced as per advice from Villiam Rockai that "ignoredUser" fields differed in product config file.
-<component-plugin>
- <name>new.user.event.listener</name>
- <set-method>addListenerPlugin</set-method>
- <type>org.exoplatform.services.organization.impl.NewUserEventListener</type>
- <description>this listener assign group and membership to a new created user</description>
- <init-params>
- <object-param>
- <name>configuration</name>
- <description>description</description>
- <object type="org.exoplatform.services.organization.impl.NewUserConfig">
- <field name="group">
- <collection type="java.util.ArrayList">
- <value>
- <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup">
- <field name="groupId"><string>/platform/users</string></field>
- <field name="membership"><string>member</string></field>
- </object>
- </value>
- </collection>
- </field>
- <field name="ignoredUser">
- <collection type="java.util.HashSet">
- <value><string>exo</string></value>
- <value><string>root</string></value>
- <value><string>company</string></value>
- <value><string>community</string></value>
- </collection>
- </field>
- </object>
- </object-param>
- </init-params>
-</component-plugin> -->
+ </component-plugin>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -34,42 +34,4 @@
</value>
...
</collection>
-</field>
-<!-- Code replaced from 02portal.war/WEB-INF/conf/organization/organization-configuration.xml as per advice from Villiam Rockai that fields were incorrect.
-<field name="group">
- <collection type="java.util.ArrayList">
- <value>
- <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field name="name">
- <string>portal</string>
- </field>
- <field name="parentId">
- <string></string>
- </field>
- <field name="type">
- <string>hierachy</string>
- </field>
- <field name="description">
- <string>the /portal group</string>
- </field>
- </object>
- </value>
- <value>
- <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field name="name">
- <string>community</string>
- </field>
- <field name="parentId">
- <string>/portal</string>
- </field>
- <field name="type">
- <string>hierachy</string>
- </field>
- <field name="description">
- <string>the /portal/community group</string>
- </field>
- </object>
- </value>
- ...
- </collection>
-</field> -->
+</field>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -270,20 +270,7 @@
</para>
<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_statistics/default88.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <!-- <programlisting language="XML" role="XML"><![CDATA[<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-<component>
-<type>org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig</type>
-<init-params>
-<values-param>
-<name>targetInterfaces</name>
-<value>org.exoplatform.services.jcr.core.ExtendedSession</value>
-<value>org.exoplatform.services.jcr.core.ExtendedNode</value>
-<value>javax.jcr.Property</value>
-</values-param>
-</init-params>
-</component>
-</configuration>]]></programlisting> -->
+
<para>
The file content below is the content of <emphasis>META-INF/aop.xml</emphasis> that will also need to be modified to add or remove interfaces to monitor in the expression filter of the pointcut called <emphasis>JCRAPIPointcut</emphasis>.
</para>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
- http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd
+ http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<key>org.exoplatform.services.database.HibernateService</key>
<type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
- http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd
+ http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<external-component-plugins>
<target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -1,7 +1,7 @@
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
- http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd
+ http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<import>war:/conf/sample-ext/jcr/jcr-configuration.xml</import>
<import>war:/conf/sample-ext/portal/portal-configuration.xml</import>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -1,12 +1,10 @@
<component>
- <key>org.exoplatform.services.naming.InitialContextInitializer</key>
- <type>org.exoplatform.services.naming.InitialContextInitializer</type>
- <init-params>
- <properties-param>
- <name>default-properties</name>
- <description>Default initial context properties</description>
- <property name="java.naming.factory.initial"
- value="org.exoplatform.services.naming.SimpleContextFactory" />
- </properties-param>
- </init-params>
+ <key>org.exoplatform.services.naming.InitialContextInitializer</key>
+ <type>org.exoplatform.commons.InitialContextInitializer2</type>
+ <init-params>
+ <properties-param>
+ <name>default-properties</name>
+ <description>Default initial context properties</description>
+ </properties-param>
+ </init-params>
</component>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -129,69 +129,4 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
- </workspace>
-
-<!-- This code has been updated as per advice from Villiam Rockai that the prodct config file differs.
-<workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr"/>
- <property name="dialect" value="hsqldb"/>
- <property name="multi-db" value="true"/>
- <property name="max-buffer-size" value="200K"/>
- <property name="swap-directory" value="target/temp/swap/ws"/>
- </properties>
- </container>
- <cache enabled="true">
- <properties>
- <property name="max-size" value="10K"/><!-- 10KBytes -->
-<!-- <property name="live-time" value="30m"/><!-- 30 min -->
-<!-- </properties>
- </cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="target/temp/index"/>
- </properties>
- </query-handler>
- <lock-manager>
- <time-out>15m</time-out><!-- 15 min -->
-<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="target/temp/lock/ws"/>
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="ws1" auto-init-root-nodetype="nt:unstructured">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr1"/>
- <property name="dialect" value="mysql"/>
- <property name="multi-db" value="true"/>
- <property name="max-buffer-size" value="200K"/>
- <property name="swap-directory" value="target/temp/swap/ws1"/>
- </properties>
- </container>
- <cache enabled="true">
- <properties>
- <property name="max-size" value="10K"/>
- <property name="live-time" value="5m"/>
- </properties>
- </cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="target/temp/index"/>
- </properties>
- </query-handler>
- <lock-manager>
- <time-out>15m</time-out><!-- 15 min -->
-<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="target/temp/lock/ws1"/>
- </properties>
- </persister>
- </lock-manager>
- </workspace>
-</workspaces>
--->
\ No newline at end of file
+ </workspace>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -10,18 +10,4 @@
<value>autologin</value>
</values-param>
</init-params>
- </component>
-
-<!-- Code replaced as per advice from Vilaim Rockai that product config file differs.
-<component>
- <key>org.exoplatform.web.security.security.CookieTokenService</key>
- <type>org.exoplatform.web.security.security.CookieTokenService</type>
- <init-params>
- <values-param>
- <name>service.configuration</name>
- <value>jcr-token</value>
- <value>7</value>
- <value>DAY</value>
- </values-param>
- </init-params>
-</component>-->
+ </component>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -89,87 +89,4 @@
</value-param>
</init-params>
- </component>
-
-<!-- Code updated as per advice from Villiam Rockai that product idm-config file differs.
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
- <component>
- <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
- <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type>
- <init-params>
- <value-param>
- <name>config</name>
- <value>war:/conf/organization/idm-config.xml</value>
- </value-param>
- <value-param>
- <name>portalRealm</name>
- <value>realm${container.name.suffix}</value>
- </value-param>
- </init-params>
- </component>
-
-
- <component>
- <key>org.exoplatform.services.organization.OrganizationService</key>
- <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type>
- <init-params>
- <object-param>
- <name>configuration</name>
- <object type="org.exoplatform.services.organization.idm.Config">
- <field name="useParentIdAsGroupType">
- <boolean>true</boolean>
- </field>
-
- <field name="forceMembershipOfMappedTypes">
- <boolean>true</boolean>
- </field>
-
- <field name="pathSeparator">
- <string>.</string>
- </field>
-
- <field name="rootGroupName">
- <string>GTN_ROOT_GROUP</string>
- </field>
-
- <field name="groupTypeMappings">
- <map type="java.util.HashMap">
- <entry>
- <key><string>/</string></key>
- <value><string>root_type</string></value>
- </entry>
-
- <!-- Sample mapping -->
- <!--
- <entry>
- <key><string>/platform/*</string></key>
- <value><string>platform_type</string></value>
- </entry>
- <entry>
- <key><string>/organization/*</string></key>
- <value><string>organization_type</string></value>
- </entry>
- -->
-
-<!-- </map>
- </field>
-
- <field name="associationMembershipType">
- <string>member</string>
- </field>
-
- <field name="ignoreMappedMembershipType">
- <boolean>false</boolean>
- </field>
- </object>
- </object-param>
- </init-params>
-
-
- </component>
-
-</configuration>
--->
\ No newline at end of file
+ </component>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -86,80 +86,4 @@
<value>idm_realm</value>
</option>
</options>
-</jboss-identity>
-
-<!--This code has been updated as per advice from Villiam Rockai that that product configuration file differs.
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd">
- <realms>
- <realm>
- <id>PortalRealm</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
- </realms>
- <repositories>
- <repository>
- <id>PortalRepository</id>
- <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>HibernateStore</default-identity-store-id>
- <default-attribute-store-id>HibernateStore</default-attribute-store-id>
- </repository>
- </repositories>
- <stores>
- <attribute-stores/>
- <identity-stores>
- <identity-store>
- <id>HibernateStore</id>
- <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
- <external-config/>
- <supported-relationship-types>
- <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
- <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
- </supported-relationship-types>
- <supported-identity-object-types>
- <identity-object-type>
- <name>USER</name>
- <relationships/>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- </credentials>
- <attributes/>
- <options/>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <option>
- <name>hibernateSessionFactoryRegistryName</name>
- <value>hibernateSessionFactory</value>
- </option>
- <option>
- <name>allowNotDefinedIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateRelationshipTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- <option>
- <name>isRealmAware</name>
- <value>true</value>
- </option>
- </options>
- </identity-store>
- </identity-stores>
- </stores>
-</jboss-identity>
--->
\ No newline at end of file
+</jboss-identity>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -29,38 +29,4 @@
</object>
</object-param>
</init-params>
- </component-plugin>
-
-<!-- Code replaced as per advice from Villiam Rockai that "ignoredUser" fields differed in product config file.
-<component-plugin>
- <name>new.user.event.listener</name>
- <set-method>addListenerPlugin</set-method>
- <type>org.exoplatform.services.organization.impl.NewUserEventListener</type>
- <description>this listener assign group and membership to a new created user</description>
- <init-params>
- <object-param>
- <name>configuration</name>
- <description>description</description>
- <object type="org.exoplatform.services.organization.impl.NewUserConfig">
- <field name="group">
- <collection type="java.util.ArrayList">
- <value>
- <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup">
- <field name="groupId"><string>/platform/users</string></field>
- <field name="membership"><string>member</string></field>
- </object>
- </value>
- </collection>
- </field>
- <field name="ignoredUser">
- <collection type="java.util.HashSet">
- <value><string>exo</string></value>
- <value><string>root</string></value>
- <value><string>company</string></value>
- <value><string>community</string></value>
- </collection>
- </field>
- </object>
- </object-param>
- </init-params>
-</component-plugin> -->
+ </component-plugin>
\ No newline at end of file
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -35,41 +35,3 @@
...
</collection>
</field>
-<!-- Code replaced from 02portal.war/WEB-INF/conf/organization/organization-configuration.xml as per advice from Villiam Rockai that fields were incorrect.
-<field name="group">
- <collection type="java.util.ArrayList">
- <value>
- <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field name="name">
- <string>portal</string>
- </field>
- <field name="parentId">
- <string></string>
- </field>
- <field name="type">
- <string>hierachy</string>
- </field>
- <field name="description">
- <string>the /portal group</string>
- </field>
- </object>
- </value>
- <value>
- <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field name="name">
- <string>community</string>
- </field>
- <field name="parentId">
- <string>/portal</string>
- </field>
- <field name="type">
- <string>hierachy</string>
- </field>
- <field name="description">
- <string>the /portal/community group</string>
- </field>
- </object>
- </value>
- ...
- </collection>
-</field> -->
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:08:54 UTC (rev 5513)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:55:59 UTC (rev 5514)
@@ -270,20 +270,7 @@
</para>
<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_statistics/default88.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <!-- <programlisting language="XML" role="XML"><![CDATA[<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-<component>
-<type>org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig</type>
-<init-params>
-<values-param>
-<name>targetInterfaces</name>
-<value>org.exoplatform.services.jcr.core.ExtendedSession</value>
-<value>org.exoplatform.services.jcr.core.ExtendedNode</value>
-<value>javax.jcr.Property</value>
-</values-param>
-</init-params>
-</component>
-</configuration>]]></programlisting> -->
+
<para>
The file content below is the content of <emphasis>META-INF/aop.xml</emphasis> that will also need to be modified to add or remove interfaces to monitor in the expression filter of the pointcut called <emphasis>JCRAPIPointcut</emphasis>.
</para>
14 years
- 1
- 0