gatein SVN: r900 - in components/mop/trunk/core: src/main/java/org/gatein/mop/core/api and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-02 04:09:05 -0500 (Wed, 02 Dec 2009)
New Revision: 900
Modified:
components/mop/trunk/core/pom.xml
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java
Log:
- change how the mop obtain its chromattic session for better integration within the portal
- use "compile" scope for the APT plugin
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-12-02 08:37:09 UTC (rev 899)
+++ components/mop/trunk/core/pom.xml 2009-12-02 09:09:05 UTC (rev 900)
@@ -67,6 +67,7 @@
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
+ <scope>compile</scope>
</dependency>
<!--
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java 2009-12-02 08:37:09 UTC (rev 899)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java 2009-12-02 09:09:05 UTC (rev 900)
@@ -21,28 +21,6 @@
import org.chromattic.api.ChromatticBuilder;
import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticSession;
-import org.gatein.mop.core.api.workspace.WorkspaceImpl;
-import org.gatein.mop.core.api.workspace.UIContainerImpl;
-import org.gatein.mop.core.api.workspace.UIWindowImpl;
-import org.gatein.mop.core.api.workspace.UIBodyImpl;
-import org.gatein.mop.core.api.workspace.PageImpl;
-import org.gatein.mop.core.api.workspace.NavigationImpl;
-import org.gatein.mop.core.api.workspace.PageLinkImpl;
-import org.gatein.mop.core.api.workspace.URLLinkImpl;
-import org.gatein.mop.core.api.workspace.PortalSiteContainer;
-import org.gatein.mop.core.api.workspace.PortalSite;
-import org.gatein.mop.core.api.workspace.GroupSiteContainer;
-import org.gatein.mop.core.api.workspace.GroupSite;
-import org.gatein.mop.core.api.workspace.PageContainer;
-import org.gatein.mop.core.api.workspace.NavigationContainer;
-import org.gatein.mop.core.api.workspace.UserSiteContainer;
-import org.gatein.mop.core.api.workspace.UserSite;
-import org.gatein.mop.core.api.workspace.content.CustomizationContainer;
-import org.gatein.mop.core.api.workspace.content.ContextType;
-import org.gatein.mop.core.api.workspace.content.ContextTypeContainer;
-import org.gatein.mop.core.api.workspace.content.ContextSpecialization;
-import org.gatein.mop.core.api.workspace.content.WorkspaceClone;
-import org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization;
import org.gatein.mop.core.api.content.ContentManagerRegistry;
import org.gatein.mop.core.api.content.CustomizationContextProviderRegistry;
@@ -50,29 +28,34 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class MOPService
+public abstract class MOPService
{
/** . */
- private Chromattic chrome;
-
- /** . */
private ContentManagerRegistry contentManagerRegistry;
/** . */
private CustomizationContextProviderRegistry customizationContextResolvers;
- /** . */
- private final ChromatticBuilder builder;
-
public MOPService()
{
- ChromatticBuilder builder = ChromatticBuilder.create();
- builder.setOption(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl");
-// builder.setOption(ChromatticBuilder.OBJECT_FORMATTER_CLASSNAME, MOPFormatter.class.getName());
+ this(ChromatticBuilder.create());
+ }
+ /**
+ * Build a mop service with a chromattic builder.
+ *
+ * @param builder the builder
+ * @throws NullPointerException if the builder is null
+ */
+ public MOPService(ChromatticBuilder builder) throws NullPointerException
+ {
+ if (builder == null)
+ {
+ throw new NullPointerException();
+ }
+
//
- this.builder = builder;
}
public CustomizationContextProviderRegistry getCustomizationContextResolvers()
@@ -90,50 +73,15 @@
//
}
- protected void configure(ChromatticBuilder builder)
- {
- //
- }
-
protected void configure(ContentManagerRegistry registry)
{
//
}
+ protected abstract Chromattic getChromattic();
+
public void start() throws Exception
{
- builder.add(WorkspaceImpl.class);
- builder.add(UIContainerImpl.class);
- builder.add(UIWindowImpl.class);
- builder.add(UIBodyImpl.class);
- builder.add(PageImpl.class);
- builder.add(PageContainer.class);
- builder.add(NavigationImpl.class);
- builder.add(NavigationContainer.class);
- builder.add(PageLinkImpl.class);
- builder.add(URLLinkImpl.class);
- builder.add(PortalSiteContainer.class);
- builder.add(PortalSite.class);
- builder.add(GroupSiteContainer.class);
- builder.add(GroupSite.class);
- builder.add(UserSiteContainer.class);
- builder.add(UserSite.class);
-
- //
- builder.add(CustomizationContainer.class);
- builder.add(ContextTypeContainer.class);
- builder.add(ContextType.class);
- builder.add(ContextSpecialization.class);
- builder.add(WorkspaceClone.class);
- builder.add(WorkspaceSpecialization.class);
-
- //
- configure(builder);
-
- //
- chrome = builder.build();
-
- //
CustomizationContextProviderRegistry customizationContextResolvers = new CustomizationContextProviderRegistry();
//
@@ -146,14 +94,14 @@
configure(cmr);
//
- this.chrome = builder.build();
this.contentManagerRegistry = cmr;
this.customizationContextResolvers = customizationContextResolvers;
}
public ModelImpl getModel()
{
- ChromatticSession chromeSession = chrome.openSession();
+ Chromattic chromattic = getChromattic();
+ ChromatticSession chromeSession = chromattic.openSession();
return new ModelImpl(
chromeSession,
contentManagerRegistry,
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java 2009-12-02 08:37:09 UTC (rev 899)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java 2009-12-02 09:09:05 UTC (rev 900)
@@ -18,9 +18,32 @@
*/
package org.gatein.mop.core.support;
+import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticBuilder;
import org.gatein.mop.core.api.MOPService;
import org.gatein.mop.core.api.content.ContentManagerRegistry;
+import org.gatein.mop.core.api.workspace.GroupSite;
+import org.gatein.mop.core.api.workspace.GroupSiteContainer;
+import org.gatein.mop.core.api.workspace.NavigationContainer;
+import org.gatein.mop.core.api.workspace.NavigationImpl;
+import org.gatein.mop.core.api.workspace.PageContainer;
+import org.gatein.mop.core.api.workspace.PageImpl;
+import org.gatein.mop.core.api.workspace.PageLinkImpl;
+import org.gatein.mop.core.api.workspace.PortalSite;
+import org.gatein.mop.core.api.workspace.PortalSiteContainer;
+import org.gatein.mop.core.api.workspace.UIBodyImpl;
+import org.gatein.mop.core.api.workspace.UIContainerImpl;
+import org.gatein.mop.core.api.workspace.UIWindowImpl;
+import org.gatein.mop.core.api.workspace.URLLinkImpl;
+import org.gatein.mop.core.api.workspace.UserSite;
+import org.gatein.mop.core.api.workspace.UserSiteContainer;
+import org.gatein.mop.core.api.workspace.WorkspaceImpl;
+import org.gatein.mop.core.api.workspace.content.ContextSpecialization;
+import org.gatein.mop.core.api.workspace.content.ContextType;
+import org.gatein.mop.core.api.workspace.content.ContextTypeContainer;
+import org.gatein.mop.core.api.workspace.content.CustomizationContainer;
+import org.gatein.mop.core.api.workspace.content.WorkspaceClone;
+import org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization;
import org.gatein.mop.core.support.content.gadget.Gadget;
import org.gatein.mop.core.support.content.gadget.GadgetContentProvider;
import org.gatein.mop.core.support.content.gadget.GadgetState;
@@ -36,17 +59,60 @@
public class TestMOPService extends MOPService
{
- @Override
- protected void configure(ChromatticBuilder builder)
+ /** . */
+ private final Chromattic chromattic;
+
+ public TestMOPService() throws Exception
{
+ ChromatticBuilder builder = ChromatticBuilder.create();
+
+ //
+ builder.setOption(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl");
+
+ //
+ builder.add(WorkspaceImpl.class);
+ builder.add(UIContainerImpl.class);
+ builder.add(UIWindowImpl.class);
+ builder.add(UIBodyImpl.class);
+ builder.add(PageImpl.class);
+ builder.add(PageContainer.class);
+ builder.add(NavigationImpl.class);
+ builder.add(NavigationContainer.class);
+ builder.add(PageLinkImpl.class);
+ builder.add(URLLinkImpl.class);
+ builder.add(PortalSiteContainer.class);
+ builder.add(PortalSite.class);
+ builder.add(GroupSiteContainer.class);
+ builder.add(GroupSite.class);
+ builder.add(UserSiteContainer.class);
+ builder.add(UserSite.class);
+
+ //
+ builder.add(CustomizationContainer.class);
+ builder.add(ContextTypeContainer.class);
+ builder.add(ContextType.class);
+ builder.add(ContextSpecialization.class);
+ builder.add(WorkspaceClone.class);
+ builder.add(WorkspaceSpecialization.class);
+
+ //
builder.add(PortletPreferencesState.class);
builder.add(PortletPreferenceState.class);
//
builder.add(GadgetState.class);
+
+ //
+ this.chromattic = builder.build();
}
@Override
+ protected Chromattic getChromattic()
+ {
+ return chromattic;
+ }
+
+ @Override
protected void configure(ContentManagerRegistry registry)
{
registry.register(Preferences.CONTENT_TYPE, new PortletContentProvider());
15 years
gatein SVN: r899 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-12-02 03:37:09 -0500 (Wed, 02 Dec 2009)
New Revision: 899
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
Log:
GTNPORTAL-325 IE: Show message when create new page for Dashboard
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-12-02 08:11:58 UTC (rev 898)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-12-02 08:37:09 UTC (rev 899)
@@ -394,9 +394,9 @@
UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class);
PageNode selectedNode = uiNodeSelector.getSelectedPageNode();
- String uri = Util.getPortalRequestContext().getPortalURI() + "\\" + selectedNode.getUri();
+ String uri = Util.getPortalRequestContext().getPortalURI() + selectedNode.getUri();
//Util.getPortalRequestContext().sendRedirect(uri);
- jsManager.addJavascript("window.location = '" + uri + "'");
+ jsManager.addJavascript("window.location = '" + uri + "';");
}
}
15 years
gatein SVN: r898 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: truong.le
Date: 2009-12-02 03:11:58 -0500 (Wed, 02 Dec 2009)
New Revision: 898
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
Log:
GTNPORTAL-329: Show exception when click Abort in case edit layout of new portal
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-12-02 07:16:28 UTC (rev 897)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-12-02 08:11:58 UTC (rev 898)
@@ -318,23 +318,18 @@
UIPortal uiPortal = (UIPortal)siteBody.getUIComponent();
String uri = null;
- if (uiPortal == null)
- {
+ String remoteUser = prContext.getRemoteUser();
+ String ownerUser = prContext.getPortalOwner();
+ if(uiEditPortal != null && uiEditPortal.getOwner().equals(ownerUser))
uri = (uiEditPortal.getSelectedNode() != null) ? uiEditPortal.getSelectedNode().getUri() : null;
- UserPortalConfigService configService = uiPortalApp.getApplicationComponent(UserPortalConfigService.class);
- String remoteUser = prContext.getRemoteUser();
- String ownerUser = prContext.getPortalOwner();
- UserPortalConfig userPortalConfig = configService.getUserPortalConfig(ownerUser, remoteUser);
- UIPortal newPortal = uiWorkingWS.createUIComponent(UIPortal.class, null, null);
- PortalDataMapper.toUIPortal(newPortal, userPortalConfig);
- siteBody.setUIComponent(newPortal);
- }
- else
- {
- siteBody.setUIComponent(uiEditPortal);
- }
- // uiEditWS.setUIComponent(null);
- // uiWorkingWS.removeChild(UIEditInlineWorkspace.class);
+ else if(uiPortal != null)
+ uri = (uiPortal.getSelectedNode() != null) ? uiPortal.getSelectedNode().getUri() : null;
+
+ UserPortalConfigService configService = uiPortalApp.getApplicationComponent(UserPortalConfigService.class);
+ UserPortalConfig userPortalConfig = configService.getUserPortalConfig(ownerUser, remoteUser);
+ UIPortal newPortal = uiWorkingWS.createUIComponent(UIPortal.class, null, null);
+ PortalDataMapper.toUIPortal(newPortal, userPortalConfig);
+ siteBody.setUIComponent(newPortal);
uiWorkingWS.getChild(UIEditInlineWorkspace.class).setRendered(false);
uiPortal = (UIPortal)siteBody.getUIComponent();
15 years
gatein SVN: r897 - in portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui: portal and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-12-02 02:16:28 -0500 (Wed, 02 Dec 2009)
New Revision: 897
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
Log:
GTNPORTAL-251: Update the code to fix the error while unmaximize the page
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2009-12-02 02:24:04 UTC (rev 896)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2009-12-02 07:16:28 UTC (rev 897)
@@ -273,21 +273,9 @@
Container container = pConfig.getPortalLayout();
if (container != null)
{
- /** Keep track of show max window property * */
- boolean showMaxWindow = false;
- try
- {
- PageNode selectedNode = uiPortal.getSelectedNode();
- Page displayedPage = storage.getPage(selectedNode.getPageReference());
- showMaxWindow = displayedPage.isShowMaxWindow();
- }
- catch (Exception ex)
- {
-
- }
UserPortalConfig portalConfig = uiPortalApp.getUserPortalConfig();
portalConfig.setPortal(pConfig);
- rebuildUIPortal(uiPortal, portalConfig, showMaxWindow);
+ rebuildUIPortal(uiPortal, portalConfig);
}
}
@@ -298,8 +286,7 @@
* @param portalConfig
* @throws Exception
*/
- private void rebuildUIPortal(UIPortal uiPortal, UserPortalConfig portalConfig, boolean showMaxWindow)
- throws Exception
+ private void rebuildUIPortal(UIPortal uiPortal, UserPortalConfig portalConfig) throws Exception
{
PageNode backupSelectedNode = uiPortal.getSelectedNode();
PageNavigation backupSelectedNavigation = uiPortal.getSelectedNavigation();
@@ -309,26 +296,6 @@
uiPortal.setSelectedNode(backupSelectedNode);
uiPortal.setSelectedNavigation(backupSelectedNavigation);
uiPortal.setSelectedPaths(backupSelectedPaths);
-
- /** Update the show-max-window property on UIPage * */
- UIPageBody uiPageBody = uiPortal.findFirstComponentOfType(UIPageBody.class);
- UIPage uiPage = (UIPage)uiPageBody.getUIComponent();
- uiPage.setShowMaxWindow(showMaxWindow);
-
- if(showMaxWindow){
- //To maximized the UIPage
- uiPortal.setMaximizedUIComponent(uiPage);
- }else{
- //To un-maximized the UIPage
- UIComponent uiPortalMaxComponent = uiPortal.getMaximizedUIComponent();
- if(uiPortalMaxComponent instanceof UIPage){
- uiPortal.setMaximizedUIComponent(null);
- }
- UIComponent pageBodyMaxComponent = uiPageBody.getMaximizedUIComponent();
- if(pageBodyMaxComponent instanceof UIPage){
- uiPageBody.setMaximizedUIComponent(null);
- }
- }
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2009-12-02 02:24:04 UTC (rev 896)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2009-12-02 07:16:28 UTC (rev 897)
@@ -32,6 +32,7 @@
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.UIComponentDecorator;
/**
@@ -109,7 +110,22 @@
}
PortalDataMapper.toUIPage(uiPage, page);
if (uiPage.isShowMaxWindow())
+ {
uiPortal.setMaximizedUIComponent(uiPage);
+ }
+ else
+ {
+ UIComponent maximizedComponent = uiPortal.getMaximizedUIComponent();
+ if (maximizedComponent != null && maximizedComponent instanceof UIPage)
+ {
+ uiPortal.setMaximizedUIComponent(null);
+ }
+ UIComponent maximizedComponentInPageBody = this.getMaximizedUIComponent();
+ if(maximizedComponentInPageBody !=null && maximizedComponentInPageBody instanceof UIPage){
+ this.setMaximizedUIComponent(null);
+ }
+ }
+
}
setUIComponent(uiPage);
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2009-12-02 02:24:04 UTC (rev 896)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2009-12-02 07:16:28 UTC (rev 897)
@@ -227,8 +227,10 @@
if (pNav == null)
return;
// ----------------------------------------------------------
- selectedNode_ = pNav.getNodes().get(0);
- selectedPaths_.add(selectedNode_);
+ if(selectedNode_ == null){
+ selectedNode_ = pNav.getNodes().get(0);
+ selectedPaths_.add(selectedNode_);
+ }
UIPageBody uiPageBody = findFirstComponentOfType(UIPageBody.class);
if (uiPageBody == null)
return;
15 years
gatein SVN: r896 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: truong.le
Date: 2009-12-01 21:24:04 -0500 (Tue, 01 Dec 2009)
New Revision: 896
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
Log:
GTNPORTAL-327: Show portal name is null when edit portal properties
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-12-01 15:40:52 UTC (rev 895)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-12-02 02:24:04 UTC (rev 896)
@@ -281,12 +281,18 @@
public void execute(Event<UIPortalComposer> event) throws Exception
{
- UIPortal uiPortal = Util.getUIPortal();
+ UIComponent temp = null;
+ UIPortal uiPortal = null;
+ UIEditInlineWorkspace uiEditWS = event.getSource().getAncestorOfType(UIEditInlineWorkspace.class);
+ temp = uiEditWS.getUIComponent();
+ if(temp != null && (temp instanceof UIPortal))
+ uiPortal = (UIPortal)temp;
+ else
+ uiPortal = Util.getUIPortal();
UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
-
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
- UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm");
- portalForm.setPortalOwner(uiPortal.getOwner());
+ UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm");
+ portalForm.setPortalOwner(uiPortal.getOwner());
portalForm.setBindingBean();
if(PortalConfig.USER_TYPE.equals(uiPortal.getOwnerType())){
portalForm.removeChildById("PermissionSetting");
@@ -337,7 +343,7 @@
if (uri == null)
{
uri = (uiPortal.getSelectedNode() != null) ? uiPortal.getSelectedNode().getUri() : null;
- }
+ }
PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
uiPortal.broadcast(pnevent, Event.Phase.PROCESS);
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
15 years
gatein SVN: r895 - in portal/branches/EPP_5_0_0_ER01_Branch: examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr and 2 other directories.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2009-12-01 10:40:52 -0500 (Tue, 01 Dec 2009)
New Revision: 895
Modified:
portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml
portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
Log:
Initial productization steps for EPP 5.0.0 ER1
Modified: portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-12-01 15:21:22 UTC (rev 894)
+++ portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-12-01 15:40:52 UTC (rev 895)
@@ -22,24 +22,24 @@
<repository-service default-repository="repository">
<repositories>
<repository name="repository" system-workspace="system" default-workspace="portal-system">
- <security-domain>gatein-domain</security-domain>
+ <security-domain>exo-domain</security-domain>
<access-control>optional</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
<workspace name="sample-ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcexo${container.name.suffix}" />
+ <property name="source-name" value="gatein${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
- <property name="swap-directory" value="../temp/swap/sample-ws${container.name.suffix}" />
+ <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/sample-ws${container.name.suffix}" />
</properties>
<value-storages>
<value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="../temp/values/sample-ws${container.name.suffix}" />
+ <property name="path" value="${jboss.server.data.dir}/gatein/values/sample-ws${container.name.suffix}" />
</properties>
<filters>
<filter property-type="Binary" />
@@ -62,14 +62,14 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="../temp/jcrlucenedb/sample-ws${container.name.suffix}" />
+ <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/sample-ws${container.name.suffix}" />
</properties>
</query-handler>
<lock-manager>
<time-out>15m</time-out><!-- 15min -->
<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
- <property name="path" value="../temp/lock/sample-ws${container.name.suffix}" />
+ <property name="path" value="${jboss.server.data.dir}/gatein/lock/sample-ws${container.name.suffix}" />
</properties>
</persister>
</lock-manager>
Modified: portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-12-01 15:21:22 UTC (rev 894)
+++ portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-12-01 15:40:52 UTC (rev 895)
@@ -22,24 +22,24 @@
<repository-service default-repository="repository">
<repositories>
<repository name="repository" system-workspace="system" default-workspace="portal-system">
- <security-domain>gatein-domain</security-domain>
+ <security-domain>exo-domain</security-domain>
<access-control>optional</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
<workspace name="sample-ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcexo${container.name.suffix}" />
+ <property name="source-name" value="gatein${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
- <property name="swap-directory" value="../temp/swap/sample-ws${container.name.suffix}" />
+ <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/sample-ws${container.name.suffix}" />
</properties>
<value-storages>
<value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="../temp/values/sample-ws${container.name.suffix}" />
+ <property name="path" value="${jboss.server.data.dir}/gatein/values/sample-ws${container.name.suffix}" />
</properties>
<filters>
<filter property-type="Binary" />
@@ -62,14 +62,14 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="../temp/jcrlucenedb/sample-ws${container.name.suffix}" />
+ <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/sample-ws${container.name.suffix}" />
</properties>
</query-handler>
<lock-manager>
<time-out>15m</time-out><!-- 15min -->
<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
- <property name="path" value="../temp/lock/sample-ws${container.name.suffix}" />
+ <property name="path" value="${jboss.server.data.dir}/gatein/lock/sample-ws${container.name.suffix}" />
</properties>
</persister>
</lock-manager>
Modified: portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2009-12-01 15:21:22 UTC (rev 894)
+++ portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2009-12-01 15:40:52 UTC (rev 895)
@@ -38,49 +38,11 @@
<property name="hibernate.cache.use_query_cache" value="true"/>
<!--CHANGEME HashtableCacheProvider shold not be used in production env-->
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
- <property name="hibernate.cglib.use_reflection_optimizer" value="true"/>
- <property name="hibernate.connection.url" value="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}"/>
- <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
+ <property name="hibernate.bytecode.use_reflection_optimizer" value="true"/>
+ <property name="hibernate.connection.datasource" value="gatein${container.name.suffix}" />
<property name="hibernate.connection.autocommit" value="true"/>
- <property name="hibernate.connection.username" value="sa"/>
- <property name="hibernate.connection.password" value=""/>
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.c3p0.min_size" value="5"/>
- <property name="hibernate.c3p0.max_size" value="20"/>
- <property name="hibernate.c3p0.timeout" value="1800"/>
- <property name="hibernate.c3p0.max_statements" value="50"/>
</properties-param>
</init-params>
</component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcexo${container.name.suffix}</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </properties-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
</configuration>
Modified: portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-12-01 15:21:22 UTC (rev 894)
+++ portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-12-01 15:40:52 UTC (rev 895)
@@ -37,7 +37,7 @@
<name>working-conf</name>
<description>working-conf</description>
<property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/>
- <property name="source-name" value="jdbcexo${container.name.suffix}"/>
+ <property name="source-name" value="gatein${container.name.suffix}"/>
<property name="dialect" value="hsqldb"/>
</properties-param>
</init-params>
Modified: portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-12-01 15:21:22 UTC (rev 894)
+++ portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-12-01 15:40:52 UTC (rev 895)
@@ -22,24 +22,24 @@
<repository-service default-repository="repository">
<repositories>
<repository name="repository" system-workspace="system" default-workspace="portal-system">
- <security-domain>gatein-domain</security-domain>
+ <security-domain>exo-domain</security-domain>
<access-control>optional</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
<workspace name="system">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcexo${container.name.suffix}"/>
+ <property name="source-name" value="gatein${container.name.suffix}"/>
<property name="dialect" value="hsqldb"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
- <property name="swap-directory" value="../temp/swap/system${container.name.suffix}"/>
+ <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/system${container.name.suffix}"/>
</properties>
<value-storages>
<value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="../temp/values/system${container.name.suffix}"/>
+ <property name="path" value="${jboss.server.data.dir}/gatein/values/system${container.name.suffix}"/>
</properties>
<filters>
<filter property-type="Binary"/>
@@ -61,14 +61,14 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="../temp/jcrlucenedb/system${container.name.suffix}"/>
+ <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/system${container.name.suffix}"/>
</properties>
</query-handler>
<lock-manager>
<time-out>15m</time-out><!-- 15min -->
<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
- <property name="path" value="../temp/lock/system${container.name.suffix}"/>
+ <property name="path" value="${jboss.server.data.dir}/gatein/lock/system${container.name.suffix}"/>
</properties>
</persister>
</lock-manager>
@@ -76,17 +76,17 @@
<workspace name="portal-system">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcexo${container.name.suffix}"/>
+ <property name="source-name" value="gatein${container.name.suffix}"/>
<property name="dialect" value="hsqldb"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
- <property name="swap-directory" value="../temp/swap/portal-system${container.name.suffix}"/>
+ <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/portal-system${container.name.suffix}"/>
</properties>
<value-storages>
<value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="../temp/values/portal-system${container.name.suffix}"/>
+ <property name="path" value="${jboss.server.data.dir}/gatein/values/portal-system${container.name.suffix}"/>
</properties>
<filters>
<filter property-type="Binary"/>
@@ -108,14 +108,14 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="../temp/jcrlucenedb/portal-system${container.name.suffix}"/>
+ <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/portal-system${container.name.suffix}"/>
</properties>
</query-handler>
<lock-manager>
<time-out>15m</time-out><!-- 15min -->
<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
- <property name="path" value="../temp/lock/portal-system${container.name.suffix}"/>
+ <property name="path" value="${jboss.server.data.dir}/gatein/lock/portal-system${container.name.suffix}"/>
</properties>
</persister>
</lock-manager>
@@ -123,17 +123,17 @@
<workspace name="gadgets">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcexo${container.name.suffix}"/>
+ <property name="source-name" value="gatein${container.name.suffix}"/>
<property name="dialect" value="hsqldb"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
- <property name="swap-directory" value="../temp/swap/gadgets${container.name.suffix}"/>
+ <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/gadgets${container.name.suffix}"/>
</properties>
<value-storages>
<value-storage id="gadgets" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="../temp/values/gadgets${container.name.suffix}"/>
+ <property name="path" value="${jboss.server.data.dir}/gatein/values/gadgets${container.name.suffix}"/>
</properties>
<filters>
<filter property-type="Binary"/>
@@ -155,14 +155,14 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="../temp/jcrlucenedb/gadgets${container.name.suffix}"/>
+ <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/gadgets${container.name.suffix}"/>
</properties>
</query-handler>
<lock-manager>
<time-out>15m</time-out>
<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
- <property name="path" value="../temp/lock/gadgets${container.name.suffix}"/>
+ <property name="path" value="${jboss.server.data.dir}/gatein/lock/gadgets${container.name.suffix}"/>
</properties>
</persister>
</lock-manager>
15 years
gatein SVN: r894 - portal/branches/mc-integration/packaging/pkg.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-12-01 10:21:22 -0500 (Tue, 01 Dec 2009)
New Revision: 894
Modified:
portal/branches/mc-integration/packaging/pkg/pom.xml
Log:
Fixed packager version
Modified: portal/branches/mc-integration/packaging/pkg/pom.xml
===================================================================
--- portal/branches/mc-integration/packaging/pkg/pom.xml 2009-12-01 15:16:51 UTC (rev 893)
+++ portal/branches/mc-integration/packaging/pkg/pom.xml 2009-12-01 15:21:22 UTC (rev 894)
@@ -37,7 +37,7 @@
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
<type>zip</type>
- <version>1.0.0-Beta02-SNAPSHOT</version>
+ <version>1.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
15 years
gatein SVN: r893 - portal/branches.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2009-12-01 10:16:51 -0500 (Tue, 01 Dec 2009)
New Revision: 893
Added:
portal/branches/EPP_5_0_0_ER01_Branch/
Log:
Creating a branch from tag 3.0.0-Beta03
Copied: portal/branches/EPP_5_0_0_ER01_Branch (from rev 892, portal/tags/3.0.0-Beta03)
15 years
gatein SVN: r892 - portal/branches.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2009-12-01 10:14:34 -0500 (Tue, 01 Dec 2009)
New Revision: 892
Removed:
portal/branches/EPP_5_0_0_ER01_Branch/
Log:
Deleted empty branch directory
15 years