gatein SVN: r1854 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-02-24 23:10:17 -0500 (Wed, 24 Feb 2010)
New Revision: 1854
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
GTNPORTAL-611: Edit inline from a page of group navigation shows layout of dashboard
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 2010-02-25 02:40:50 UTC (rev 1853)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-02-25 04:10:17 UTC (rev 1854)
@@ -125,6 +125,12 @@
cachedUIPortal.setSelectedNode(targetPageNode);
cachedUIPortal.setSelectedPath(targetedPathNodes);
uiPortalApp.setShowedUIPortal(cachedUIPortal);
+
+ //Temporary solution to fix edit inline error while switching between navigations
+ DataStorage storageService = uiPortalApp.getApplicationComponent(DataStorage.class);
+ PortalConfig associatedPortalConfig = storageService.getPortalConfig(newNavType, newNavId);
+ uiPortalApp.getUserPortalConfig().setPortal(associatedPortalConfig);
+
cachedUIPortal.refreshUIPage();
return;
}
14 years, 10 months
- 1
- 0
gatein SVN: r1853 - in portal/trunk: testsuite and 1 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-02-24 21:40:50 -0500 (Wed, 24 Feb 2010)
New Revision: 1853
Modified:
portal/trunk/pom.xml
portal/trunk/testsuite/pom.xml
portal/trunk/testsuite/selenium-snifftests/pom.xml
Log:
Correct the version number
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-02-24 19:49:32 UTC (rev 1852)
+++ portal/trunk/pom.xml 2010-02-25 02:40:50 UTC (rev 1853)
@@ -84,6 +84,7 @@
<module>examples</module>
<module>starter</module>
<module>packaging</module>
+ <module>testsuite</module>
</modules>
<dependencyManagement>
Modified: portal/trunk/testsuite/pom.xml
===================================================================
--- portal/trunk/testsuite/pom.xml 2010-02-24 19:49:32 UTC (rev 1852)
+++ portal/trunk/testsuite/pom.xml 2010-02-25 02:40:50 UTC (rev 1853)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-CR02-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-24 19:49:32 UTC (rev 1852)
+++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-02-25 02:40:50 UTC (rev 1853)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-CR02-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
14 years, 10 months
- 1
- 0
gatein SVN: r1852 - in components/pc/trunk: api/src/main/java/org/gatein/pc/api/invocation/response and 18 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 14:49:32 -0500 (Wed, 24 Feb 2010)
New Revision: 1852
Removed:
components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/misc/
components/pc/trunk/test/src/test/resources/jsr168/misc/log4j-war/WEB-INF/
Modified:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java
components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java
components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java
components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java
components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java
components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java
components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java
components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java
components/pc/trunk/pom.xml
components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java
components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java
components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java
components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java
components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java
components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java
components/pc/trunk/test/src/test/build.xml
Log:
GTNPC-14 : Replace log4j by GateIn logging
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -23,7 +23,7 @@
package org.gatein.pc.api.invocation.response;
import org.gatein.common.util.Exceptions;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
/**
* Application level error.
Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java
===================================================================
--- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.gatein.pc.controller;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.controller.event.EventControllerContext;
import org.gatein.pc.controller.event.EventPhaseContext;
import org.gatein.pc.controller.event.PortletWindowEvent;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
/**
* An help class to catch and log exceptions thrown by an event controller context.
@@ -38,7 +39,7 @@
{
/** . */
- private final Logger log = Logger.getLogger(EventControllerContextSafeInvoker.class);
+ private final Logger log = LoggerFactory.getLogger(EventControllerContextSafeInvoker.class);
public boolean eventProduced(EventControllerContext controllerContext, EventPhaseContext phaseContext, PortletWindowEvent sourceEvent, PortletWindowEvent producedEvent)
{
Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java
===================================================================
--- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -24,7 +24,7 @@
import org.gatein.pc.controller.event.EventPhaseContext;
import org.gatein.pc.controller.event.PortletWindowEvent;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import java.util.LinkedList;
Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java
===================================================================
--- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -23,7 +23,8 @@
package org.gatein.pc.controller;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.controller.request.ControllerRequest;
import org.gatein.pc.controller.response.ControllerResponse;
@@ -36,7 +37,7 @@
abstract class RequestHandler<T extends ControllerRequest>
{
/** . */
- protected static final Logger log = Logger.getLogger(RequestHandler.class);
+ protected static final Logger log = LoggerFactory.getLogger(RequestHandler.class);
/** . */
protected PortletController controller;
Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java
===================================================================
--- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -23,6 +23,7 @@
package org.gatein.pc.controller.impl;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.util.MarkupInfo;
import org.gatein.common.io.Serialization;
import org.gatein.common.net.media.MediaType;
@@ -48,7 +49,7 @@
import org.gatein.pc.api.spi.PortletInvocationContext;
import org.gatein.pc.api.spi.PortalContext;
import org.gatein.wci.IllegalRequestException;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -65,7 +66,7 @@
{
/** . */
- private static Logger log = Logger.getLogger(AbstractPortletControllerContext.class);
+ private static Logger log = LoggerFactory.getLogger(AbstractPortletControllerContext.class);
/** . */
public static final PortalContext PORTAL_CONTEXT = new AbstractPortalContext(Collections.singletonMap("javax.portlet.markup.head.element.support", "true"));
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
*/
package org.gatein.pc.federation.impl;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.InvokerUnavailableException;
import org.gatein.pc.api.NoSuchPortletException;
import org.gatein.pc.api.Portlet;
@@ -57,7 +58,7 @@
{
/** . */
- private static final Logger log = Logger.getLogger(FederatingPortletInvokerService.class);
+ private static final Logger log = LoggerFactory.getLogger(FederatingPortletInvokerService.class);
/** The separator used in the id to route to the correct invoker. */
static final String SEPARATOR = ".";
Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java
===================================================================
--- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,8 +22,9 @@
******************************************************************************/
package org.gatein.pc.mc;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import org.gatein.common.io.IOTools;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.portlet.container.ContainerPortletInvoker;
import org.gatein.pc.portlet.container.PortletContainer;
@@ -91,7 +92,7 @@
}
/** . */
- private Logger log = Logger.getLogger(PortletApplicationDeployer.class);
+ private Logger log = LoggerFactory.getLogger(PortletApplicationDeployer.class);
/** . */
private PortletApplicationRegistry registry;
Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java
===================================================================
--- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.mc;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.portlet.impl.info.ContainerInfoBuilder;
import org.gatein.pc.portlet.impl.info.ContainerInfoBuilderContext;
import org.gatein.pc.portlet.impl.info.ContainerPortletInfo;
@@ -71,7 +72,7 @@
this.listener = listener;
this.webApp = webApp;
this.metaData = metaData;
- this.log = Logger.getLogger(PortletApplicationDeployment.class + "." + webApp.getContextPath().replace('.', '_'));
+ this.log = LoggerFactory.getLogger(PortletApplicationDeployment.class + "." + webApp.getContextPath().replace('.', '_'));
}
public PortletApplicationLifeCycle getPortletApplicationLifeCycle()
Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java
===================================================================
--- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -23,8 +23,9 @@
package org.gatein.pc.mc.metadata.factory;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import org.gatein.common.i18n.LocalizedString;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.gatein.pc.portlet.impl.metadata.common.LocalizedDescriptionMetaData;
@@ -44,7 +45,7 @@
private Map<Object, LocalizedMetaDataContainer> map = new LinkedHashMap<Object, LocalizedMetaDataContainer>();
/** The logger. */
- private static final Logger log = Logger.getLogger(LocalizedStringBuilder.class);
+ private static final Logger log = LoggerFactory.getLogger(LocalizedStringBuilder.class);
public void put(Object object, LocalizedDescriptionMetaData description)
{
Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java
===================================================================
--- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -23,8 +23,9 @@
package org.gatein.pc.mc.metadata.factory;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import org.gatein.common.i18n.LocalizedString;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.LifeCyclePhase;
import org.gatein.pc.api.TransportGuarantee;
import org.gatein.pc.portlet.impl.metadata.CustomPortletModeMetaData;
@@ -80,7 +81,7 @@
private LocalizedStringBuilder displayNames = new LocalizedStringBuilder();
/** Guess what? The logger. */
- private static final Logger log = Logger.getLogger(PortletApplicationModelFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(PortletApplicationModelFactory.class);
public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
{
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/pom.xml 2010-02-24 19:49:32 UTC (rev 1852)
@@ -125,6 +125,15 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <!--<version>${org.slf4j.version}</version>-->
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
Modified: components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java
===================================================================
--- components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.portal;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
@@ -42,7 +43,7 @@
{
/** . */
- private final Logger log = Logger.getLogger(ErrorHandlingFilter.class);
+ private final Logger log = LoggerFactory.getLogger(ErrorHandlingFilter.class);
public void init(FilterConfig config) throws ServletException
{
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.gatein.pc.portlet.aspects;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.EventInvocation;
import org.gatein.pc.portlet.PortletInvokerInterceptor;
@@ -37,7 +38,7 @@
import org.gatein.pc.portlet.impl.info.ContainerTypeInfo;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.common.io.IOTools;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import javax.xml.namespace.QName;
import java.io.Serializable;
@@ -55,7 +56,7 @@
{
/** . */
- private final static Logger log = Logger.getLogger(EventPayloadInterceptor.class);
+ private final static Logger log = LoggerFactory.getLogger(EventPayloadInterceptor.class);
public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
{
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.container;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.portlet.container.managed.ManagedObject;
import org.gatein.pc.portlet.container.managed.LifeCycleStatus;
import org.gatein.pc.portlet.container.managed.ManagedObjectRegistryEventListener;
import org.gatein.pc.portlet.container.managed.ManagedObjectLifeCycleEvent;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import java.util.Set;
import java.util.HashSet;
@@ -39,7 +40,7 @@
{
/** . */
- private Logger log = Logger.getLogger(LifeCycle.class);
+ private Logger log = LoggerFactory.getLogger(LifeCycle.class);
/** . */
private LifeCycleStatus status = LifeCycleStatus.STOPPED;
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.info;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.Mode;
import org.gatein.pc.api.WindowState;
import org.gatein.common.net.media.MediaType;
@@ -44,7 +45,7 @@
*/
public class ContainerCapabilitiesInfo implements CapabilitiesInfo
{
- private final static Logger log = Logger.getLogger(ContainerCapabilitiesInfo.class);
+ private final static Logger log = LoggerFactory.getLogger(ContainerCapabilitiesInfo.class);
/** . */
private final MediaTypeMapImpl<ModeInfo> supportedModes;
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.info;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.Mode;
import org.gatein.pc.api.WindowState;
import org.gatein.common.i18n.LocaleFormat;
@@ -175,7 +176,7 @@
private final Map<org.gatein.pc.api.WindowState, ContainerWindowStateInfo> customWindowStates;
/** . */
- private final Logger log = Logger.getLogger(ContainerInfoBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(ContainerInfoBuilder.class);
public ContainerInfoBuilder(
String portletApplicationId,
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -23,7 +23,7 @@
package org.gatein.pc.portlet.impl.jsr168;
import org.gatein.pc.portlet.container.PortletInitializationException;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.jsr168;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.portlet.impl.info.ContainerPortletInfo;
import org.gatein.pc.api.info.MetaInfo;
@@ -40,7 +41,7 @@
public class InlineBundle extends ListResourceBundle
{
- private static final Logger log = Logger.getLogger(InlineBundle.class);
+ private static final Logger log = LoggerFactory.getLogger(InlineBundle.class);
/** . */
private final Object[][] content;
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.jsr168;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.portlet.impl.jsr168.api.PortletContextImpl;
import org.gatein.pc.portlet.impl.jsr168.api.PortletURLGenerationListenerChain;
import org.gatein.pc.portlet.impl.jsr168.api.FilterConfigImpl;
@@ -33,7 +34,7 @@
import org.gatein.pc.portlet.container.PortletContainer;
import org.gatein.pc.portlet.container.PortletInitializationException;
import org.gatein.pc.portlet.container.object.PortletApplicationObject;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import javax.portlet.PortletContext;
import javax.portlet.PortletURLGenerationListener;
@@ -77,7 +78,7 @@
{
this.info = info;
this.portlets = new LinkedHashMap<String, PortletContainer>();
- this.log = Logger.getLogger(PortletApplication.class.getName() + "." + info.getId().replace('.', '_'));
+ this.log = LoggerFactory.getLogger(PortletApplication.class.getName() + "." + info.getId().replace('.', '_'));
}
public void setContext(PortletApplicationContext context)
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,9 +22,10 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.jsr168;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import org.gatein.common.concurrent.Valve;
import org.gatein.common.i18n.ResourceBundleManager;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.invocation.ActionInvocation;
import org.gatein.pc.api.invocation.EventInvocation;
@@ -159,7 +160,7 @@
//
this.info = info;
this.valve = new Valve();
- this.log = Logger.getLogger("org.gatein.pc.container." + info.getClassName().replace('.', '_'));
+ this.log = LoggerFactory.getLogger("org.gatein.pc.container." + info.getClassName().replace('.', '_'));
this.started = false;
this.filters = new HashSet<PortletFilterImpl>();
}
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.jsr168;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.portlet.container.PortletApplication;
import org.gatein.pc.portlet.container.PortletFilterContext;
import org.gatein.pc.portlet.container.object.PortletFilterObject;
import org.gatein.pc.portlet.impl.info.ContainerFilterInfo;
import org.gatein.pc.api.LifeCyclePhase;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import javax.portlet.PortletContext;
import javax.portlet.filter.ActionFilter;
@@ -74,7 +75,7 @@
public PortletFilterImpl(ContainerFilterInfo info)
{
this.info = info;
- this.log = Logger.getLogger(PortletFilterImpl.class);
+ this.log = LoggerFactory.getLogger(PortletFilterImpl.class);
}
public <T> T instance(Class<T> type)
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.jsr168.api;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.state.PropertyChange;
import org.gatein.pc.api.state.PropertyContext;
import org.gatein.pc.api.info.PreferenceInfo;
@@ -52,7 +53,7 @@
{
/** The logger. */
- protected static final Logger log = Logger.getLogger(PortletPreferencesImpl.class);
+ protected static final Logger log = LoggerFactory.getLogger(PortletPreferencesImpl.class);
/** Indicates the object is used during a action phase. */
public static final int ACTION = 1;
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.jsr168.api;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.util.Tools;
import org.gatein.common.util.ParameterMap;
import org.gatein.common.util.MultiValuedPropertyMap;
@@ -80,7 +81,7 @@
{
/** . */
- protected static final Logger log = Logger.getLogger(PortletRequestImpl.class);
+ protected static final Logger log = LoggerFactory.getLogger(PortletRequestImpl.class);
/** . */
protected PortletInvocation invocation;
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,8 +22,9 @@
******************************************************************************/
package org.gatein.pc.portlet.impl.jsr168.api;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
import org.gatein.common.NotYetImplemented;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.util.Tools;
import org.gatein.pc.api.ParametersStateString;
import org.gatein.pc.portlet.impl.info.ContainerEventInfo;
@@ -63,7 +64,7 @@
{
/** . */
- private static final Logger log = Logger.getLogger(ActionResponseImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(ActionResponseImpl.class);
/** . */
protected WantUpdate wantUpdate;
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.portlet.state.producer;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.InvalidPortletIdException;
import org.gatein.pc.api.NoSuchPortletException;
import org.gatein.pc.api.Portlet;
@@ -86,7 +87,7 @@
private StateConverter stateConverter;
/** . */
- private Logger log = Logger.getLogger(ProducerPortletInvoker.class);
+ private Logger log = LoggerFactory.getLogger(ProducerPortletInvoker.class);
public PortletStatePersistenceManager getPersistenceManager()
{
Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -23,7 +23,8 @@
package org.gatein.pc.test.controller;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.invocation.response.ErrorResponse;
import java.io.IOException;
@@ -36,7 +37,7 @@
{
/** . */
- private static final Logger log = Logger.getLogger(ErrorResponseRenderer.class);
+ private static final Logger log = LoggerFactory.getLogger(ErrorResponseRenderer.class);
/** . */
private ErrorResponse response;
Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.test.unit;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.jboss.unit.remote.driver.RemoteTestDriverServer;
import org.gatein.common.net.URLNavigator;
import org.gatein.common.net.URLVisitor;
@@ -58,7 +59,7 @@
{
/** . */
- private static final Logger log = Logger.getLogger(PortletTestSuite.class);
+ private static final Logger log = LoggerFactory.getLogger(PortletTestSuite.class);
/** . */
private PortletTestDriver driver;
Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -31,8 +31,10 @@
import java.util.HashMap;
import static org.jboss.unit.api.Assert.*;
+
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.util.Tools;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
/**
* @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a>
@@ -48,7 +50,7 @@
{
if (log == null)
{
- log = Logger.getLogger(getClass());
+ log = LoggerFactory.getLogger(getClass());
}
return log;
}
Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.test.unit.base;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.test.unit.JoinPoint;
import org.gatein.pc.test.unit.PortletTestCase;
import org.gatein.pc.test.unit.actions.PortletActionTestAction;
@@ -448,7 +449,7 @@
{
throw new IllegalStateException("The logger should not be re");
}
- return Logger.getLogger(getClass());
+ return LoggerFactory.getLogger(getClass());
}
/** Return the logger. */
Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java 2010-02-24 19:49:32 UTC (rev 1852)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.pc.test.unit.base;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.test.unit.JoinPoint;
import org.gatein.pc.test.unit.PortletTestCase;
import org.gatein.pc.test.unit.actions.ServletServiceTestAction;
@@ -49,7 +50,7 @@
{
/** The logger. */
- private final Logger log = Logger.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/** Jointpoint for service method. */
private final JoinPoint serviceJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.SERVLET_SERVICE);
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2010-02-24 16:43:44 UTC (rev 1851)
+++ components/pc/trunk/test/src/test/build.xml 2010-02-24 19:49:32 UTC (rev 1852)
@@ -333,13 +333,6 @@
<antcall target="__evaluate_properties.tomcat"/>
</target>
- <macrodef name="package-misc-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="misc" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
<macrodef name="package-ext-test">
<attribute name="test"/>
<sequential>
@@ -487,7 +480,6 @@
<package-ext-test test="portletmode"/>
<package-ext-test test="portletconfig"/>
<package-ext-test test="taglib"/>
- <package-misc-test test="log4j"/>
<package-jsr286-tck-test test="dispatcher"/>
<package-jsr286-tck-test test="portletconfig"/>
<package-jsr286-tck-test test="portletconfignonamespace"/>
@@ -834,7 +826,7 @@
<configuration>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
-<!-- <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> -->
+ <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> -->
<deployable type="war" file="${test.temp.lib}/manager.war"/>
<file file="${test.temp.lib}/manager" todir="webapps/manager"/>
<deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>
14 years, 10 months
- 1
- 0
gatein SVN: r1851 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-02-24 11:43:44 -0500 (Wed, 24 Feb 2010)
New Revision: 1851
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java
Log:
Use the portal owner as part of the portal session key to differentiate between multiple portals when accessing a portal application state (GTNPORTAL-650)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java 2010-02-24 15:55:37 UTC (rev 1850)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java 2010-02-24 16:43:44 UTC (rev 1851)
@@ -154,7 +154,8 @@
else
{
PortalRequestContext portalRC = (PortalRequestContext)webuiRC;
- return "portal";
+ String portalOwner = portalRC.getPortalOwner();
+ return "portal_" + portalOwner;
}
}
14 years, 10 months
- 1
- 0
gatein SVN: r1850 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/common and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 10:55:37 -0500 (Wed, 24 Feb 2010)
New Revision: 1850
Added:
portal/trunk/server/tomcat/patch/src/main/tomcat/conf/logging.properties
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
Log:
GTNPORTAL-748 : Default logging configuration for tomcat
Added: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/logging.properties
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/conf/logging.properties (rev 0)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/logging.properties 2010-02-24 15:55:37 UTC (rev 1850)
@@ -0,0 +1,85 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6gatein.org.apache.juli.FileHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+3manager.org.apache.juli.FileHandler.level = FINE
+3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.FileHandler.prefix = manager.
+
+4admin.org.apache.juli.FileHandler.level = FINE
+4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+4admin.org.apache.juli.FileHandler.prefix = admin.
+
+5host-manager.org.apache.juli.FileHandler.level = FINE
+5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+5host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+6gatein.org.apache.juli.FileHandler.level = FINE
+6gatein.org.apache.juli.FileHandler.directory = ${catalina.base}/gatein/logs
+6gatein.org.apache.juli.FileHandler.prefix = gatein
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#org.apache.catalina.startup.ContextConfig.level = FINE
+#org.apache.catalina.startup.HostConfig.level = FINE
+#org.apache.catalina.session.ManagerBase.level = FINE
+#org.apache.catalina.core.AprLifecycleListener.level=FINE
+
+############################################################
+# GateIn log configuration
+############################################################
+
+org.exoplatform.level = FINE
+org.exoplatform.handlers = 6gatein.org.apache.juli.FileHandler
+
+org.gatein.level = FINE
+org.gatein.handlers = 6gatein.org.apache.juli.FileHandler
+
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml 2010-02-24 15:45:14 UTC (rev 1849)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml 2010-02-24 15:55:37 UTC (rev 1850)
@@ -22,9 +22,9 @@
<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>
+ 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 profiles="jboss">
<key>org.exoplatform.services.log.LogConfigurationInitializer</key>
<type>org.exoplatform.services.log.LogConfigurationInitializer</type>
<init-params>
14 years, 10 months
- 1
- 0
gatein SVN: r1849 - portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-02-24 10:45:14 -0500 (Wed, 24 Feb 2010)
New Revision: 1849
Modified:
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java
Log:
GTNPORTAL-708: fixed an encryption key lookup method to search in the common config. directory
Modified: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java
===================================================================
--- portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java 2010-02-24 13:48:33 UTC (rev 1848)
+++ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java 2010-02-24 15:45:14 UTC (rev 1849)
@@ -19,16 +19,17 @@
package org.exoplatform.portal.gadget.core;
+import java.io.File;
+import java.io.IOException;
+
import org.apache.shindig.auth.BlobCrypterSecurityToken;
import org.apache.shindig.common.crypto.BasicBlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypterException;
import org.apache.shindig.common.util.TimeSource;
+import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
import org.exoplatform.web.application.RequestContext;
-import java.io.File;
-import java.io.IOException;
-
public class ExoDefaultSecurityTokenGenerator implements SecurityTokenGenerator
{
private String containerKey;
@@ -39,7 +40,7 @@
{
// TODO should be moved to config
// generateKeys("RSA", 1024);
- this.containerKey = "key.txt";
+ this.containerKey = getKeyFilePath();
this.timeSource = new TimeSource();
}
@@ -129,4 +130,25 @@
return c;
}
+ /**
+ * Method returns a path to the file containing the encryption key
+ */
+ private String getKeyFilePath(){
+ J2EEServerInfo info = new J2EEServerInfo();
+ String confPath = info.getExoConfigurationDirectory();
+ File keyFile = null;
+
+ if (confPath != null) {
+ File confDir = new File(confPath);
+ if (confDir != null && confDir.exists() && confDir.isDirectory()) {
+ keyFile = new File(confDir, "gadgets/key.txt");
+ }
+ }
+
+ if (keyFile == null) {
+ keyFile = new File("key.txt");
+ }
+
+ return keyFile.getAbsolutePath();
+ }
}
14 years, 10 months
- 1
- 0
gatein SVN: r1848 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/resource/config/xml and 41 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 08:48:33 -0500 (Wed, 24 Feb 2010)
New Revision: 1848
Modified:
portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd
portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java
portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml
portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml
Log:
following Nicolas suggestion:
- http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd -> http://www.gatein.org/xml/ns/gatein_resources_1_0
- http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd -> http://www.gatein.org/xml/ns/gatein_objects_1_0
Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd 2010-02-24 13:48:33 UTC (rev 1848)
@@ -21,8 +21,8 @@
-->
<xs:schema
- targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
Modified: portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd 2010-02-24 13:48:33 UTC (rev 1848)
@@ -21,8 +21,8 @@
-->
<xs:schema
- targetNamespace="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
+ targetNamespace="http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2010-02-24 13:48:33 UTC (rev 1848)
@@ -47,7 +47,7 @@
{
/** . */
- public static final String GATEIN_RESOURCES_1_0_SYSTEM_ID = "http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd";
+ public static final String GATEIN_RESOURCES_1_0_SYSTEM_ID = "http://www.gatein.org/xml/ns/gatein_resources_1_0";
/** . */
private static final String GATEIN_RESOURCE_1_0_XSD_PATH = "gatein_resources_1_0.xsd";
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<portal-name>platform/administrators</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -20,8 +20,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -204,7 +204,7 @@
<para>Default portal skin and window styles are defined in
01eXoResources.war:/WEB-INF/gatein-resources.xml and the part dedicated to
- skinning is defined like:<programlisting><gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd" xmlns="http://www.ga
+ skinning is defined like:<programlisting><gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0" xmlns="http://www.ga
tein.org/xml/ns/gatein_resources_1_0.xsd">
<portal-skin>
<skin-name>Default</skin-name>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -21,8 +21,8 @@
-->
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>sitemap</name>
<title>Site Map</title>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>samplePage</name>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>3</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>sales</name>
<title>Sales BI</title>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -21,8 +21,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
<portlet-skin>
<application-name>web</application-name>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>sitemap</name>
<title>Site Map</title>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>samplePage</name>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>3</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>sales</name>
<title>Sales BI</title>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
<portlet-skin>
<application-name>web</application-name>
Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
<!-- GadgetPortlet skins -->
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
<!-- OrganizationPortlet skins -->
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
<!-- BannerPortlet skins -->
Modified: portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -21,8 +21,8 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
<portal-skin>
<skin-name>Default</skin-name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>5</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>newStaff</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>2</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>newAccount</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>9</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>sitemap</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>mylink-blog</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>1</priority>
<page-nodes>
<node>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>homepage</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<portal-name>classic</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<container template="system:/groovy/portal/webui/container/UIToolbarContainer.gtmpl">
<access-permissions>*:/platform/users</access-permissions>
<container id="StarToolBarPortlet" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
<name>homepage</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<portal-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<container template="classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
</container>
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<portlet-application>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,7 +22,7 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
</page>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'></container>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl">
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
<container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<title></title>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl">
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
<container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<page
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<name></name>
<title></title>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,6 +22,6 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
</page-set>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,6 +22,6 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,6 +22,6 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,7 +22,7 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,7 +22,7 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
</page-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:25:57 UTC (rev 1847)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-24 13:48:33 UTC (rev 1848)
@@ -22,8 +22,8 @@
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
<portlet-skin>
<application-name>web</application-name>
14 years, 10 months
- 1
- 0
gatein SVN: r1847 - portal/trunk/component/portal/src/main/java.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 08:25:57 -0500 (Wed, 24 Feb 2010)
New Revision: 1847
Added:
portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd
Removed:
portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd
Log:
darn even better now...
Deleted: portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd 2010-02-24 13:25:00 UTC (rev 1846)
+++ portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd 2010-02-24 13:25:57 UTC (rev 1847)
@@ -1,184 +0,0 @@
-<?xml version="1.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.
-
--->
-
-<xs:schema
- targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
-
- <!-- A top page element -->
- <xs:element name="page" type="pageType"/>
-
- <!-- A top page-set element -->
- <xs:element name="page-set" type="pageSetType"/>
-
- <!-- A top portal-config element -->
- <xs:element name="portal-config" type="portalConfigType"/>
-
- <!-- A top container element -->
- <xs:element name="container" type="containerType"/>
-
- <!-- A top node-navigation element -->
- <xs:element name="node-navigation" type="nodeNavigationType"/>
-
- <!-- The type of a top navigation node -->
- <xs:complexType name="nodeNavigationType">
- <xs:sequence>
- <xs:element name="priority" type="xs:positiveInteger"/>
- <xs:element name="page-nodes" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <!-- The type of a navigation node -->
- <xs:complexType name="nodeType">
- <xs:sequence>
- <xs:element name="uri" type="xs:string"/>
- <xs:element name="name" type="xs:string"/>
- <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-publication-date" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="visible" type="xs:boolean" default="true" minOccurs="0" maxOccurs="1"/>
- <xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="pageSetType">
- <xs:sequence>
- <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portalConfigType">
- <xs:sequence>
- <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="skin" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="properties" type="propertiesType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="portal-layout" minOccurs="1" maxOccurs="1">
- <xs:complexType>
- <xs:group ref="containerChildrenGroup"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="propertiesType">
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element name="entry" type="propertiesEntryType" minOccurs="1" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="propertiesEntryType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="key" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:group name="containerChildrenGroup">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
- <xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
- <xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="site-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
- </xs:choice>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="pageType">
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-max-window" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:group ref="containerChildrenGroup"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="containerType">
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:group ref="containerChildrenGroup"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string"/>
- <xs:attribute name="template" type="xs:string"/>
- <xs:attribute name="attribute" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="portletApplicationType">
- <xs:sequence>
- <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
- <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
- <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portletType">
- <xs:sequence>
- <xs:element name="application-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="portlet-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="preferences" type="portletPreferencesType" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portletPreferencesType">
- <xs:sequence>
- <xs:element name="preference" type="portletPreferenceType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portletPreferenceType">
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
\ No newline at end of file
Copied: portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd (from rev 1846, portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd)
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd (rev 0)
+++ portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd 2010-02-24 13:25:57 UTC (rev 1847)
@@ -0,0 +1,184 @@
+<?xml version="1.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.
+
+-->
+
+<xs:schema
+ targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <!-- A top page element -->
+ <xs:element name="page" type="pageType"/>
+
+ <!-- A top page-set element -->
+ <xs:element name="page-set" type="pageSetType"/>
+
+ <!-- A top portal-config element -->
+ <xs:element name="portal-config" type="portalConfigType"/>
+
+ <!-- A top container element -->
+ <xs:element name="container" type="containerType"/>
+
+ <!-- A top node-navigation element -->
+ <xs:element name="node-navigation" type="nodeNavigationType"/>
+
+ <!-- The type of a top navigation node -->
+ <xs:complexType name="nodeNavigationType">
+ <xs:sequence>
+ <xs:element name="priority" type="xs:positiveInteger"/>
+ <xs:element name="page-nodes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- The type of a navigation node -->
+ <xs:complexType name="nodeType">
+ <xs:sequence>
+ <xs:element name="uri" type="xs:string"/>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-publication-date" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="visible" type="xs:boolean" default="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="pageSetType">
+ <xs:sequence>
+ <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portalConfigType">
+ <xs:sequence>
+ <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="skin" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="properties" type="propertiesType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="portal-layout" minOccurs="1" maxOccurs="1">
+ <xs:complexType>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="entry" type="propertiesEntryType" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesEntryType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="key" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:group name="containerChildrenGroup">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="site-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="pageType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-max-window" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="containerType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="template" type="xs:string"/>
+ <xs:attribute name="attribute" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="portletApplicationType">
+ <xs:sequence>
+ <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletType">
+ <xs:sequence>
+ <xs:element name="application-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="portlet-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="preferences" type="portletPreferencesType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferencesType">
+ <xs:sequence>
+ <xs:element name="preference" type="portletPreferenceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferenceType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
14 years, 10 months
- 1
- 0
gatein SVN: r1846 - portal/trunk/component/portal/src/main/java.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 08:25:00 -0500 (Wed, 24 Feb 2010)
New Revision: 1846
Added:
portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd
Removed:
portal/trunk/component/portal/src/main/java/gatein-objects.xsd
Log:
actually better named this way
Deleted: portal/trunk/component/portal/src/main/java/gatein-objects.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein-objects.xsd 2010-02-24 13:04:51 UTC (rev 1845)
+++ portal/trunk/component/portal/src/main/java/gatein-objects.xsd 2010-02-24 13:25:00 UTC (rev 1846)
@@ -1,184 +0,0 @@
-<?xml version="1.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.
-
--->
-
-<xs:schema
- targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
-
- <!-- A top page element -->
- <xs:element name="page" type="pageType"/>
-
- <!-- A top page-set element -->
- <xs:element name="page-set" type="pageSetType"/>
-
- <!-- A top portal-config element -->
- <xs:element name="portal-config" type="portalConfigType"/>
-
- <!-- A top container element -->
- <xs:element name="container" type="containerType"/>
-
- <!-- A top node-navigation element -->
- <xs:element name="node-navigation" type="nodeNavigationType"/>
-
- <!-- The type of a top navigation node -->
- <xs:complexType name="nodeNavigationType">
- <xs:sequence>
- <xs:element name="priority" type="xs:positiveInteger"/>
- <xs:element name="page-nodes" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <!-- The type of a navigation node -->
- <xs:complexType name="nodeType">
- <xs:sequence>
- <xs:element name="uri" type="xs:string"/>
- <xs:element name="name" type="xs:string"/>
- <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-publication-date" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="visible" type="xs:boolean" default="true" minOccurs="0" maxOccurs="1"/>
- <xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="pageSetType">
- <xs:sequence>
- <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portalConfigType">
- <xs:sequence>
- <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="skin" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="properties" type="propertiesType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="portal-layout" minOccurs="1" maxOccurs="1">
- <xs:complexType>
- <xs:group ref="containerChildrenGroup"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="propertiesType">
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element name="entry" type="propertiesEntryType" minOccurs="1" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="propertiesEntryType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="key" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:group name="containerChildrenGroup">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
- <xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
- <xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="site-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
- </xs:choice>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="pageType">
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-max-window" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:group ref="containerChildrenGroup"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="containerType">
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:group ref="containerChildrenGroup"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string"/>
- <xs:attribute name="template" type="xs:string"/>
- <xs:attribute name="attribute" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="portletApplicationType">
- <xs:sequence>
- <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
- <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
- <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portletType">
- <xs:sequence>
- <xs:element name="application-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="portlet-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="preferences" type="portletPreferencesType" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portletPreferencesType">
- <xs:sequence>
- <xs:element name="preference" type="portletPreferenceType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="portletPreferenceType">
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
\ No newline at end of file
Copied: portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd (from rev 1844, portal/trunk/component/portal/src/main/java/gatein-objects.xsd)
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd (rev 0)
+++ portal/trunk/component/portal/src/main/java/gatein-objects_1_0.xsd 2010-02-24 13:25:00 UTC (rev 1846)
@@ -0,0 +1,184 @@
+<?xml version="1.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.
+
+-->
+
+<xs:schema
+ targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <!-- A top page element -->
+ <xs:element name="page" type="pageType"/>
+
+ <!-- A top page-set element -->
+ <xs:element name="page-set" type="pageSetType"/>
+
+ <!-- A top portal-config element -->
+ <xs:element name="portal-config" type="portalConfigType"/>
+
+ <!-- A top container element -->
+ <xs:element name="container" type="containerType"/>
+
+ <!-- A top node-navigation element -->
+ <xs:element name="node-navigation" type="nodeNavigationType"/>
+
+ <!-- The type of a top navigation node -->
+ <xs:complexType name="nodeNavigationType">
+ <xs:sequence>
+ <xs:element name="priority" type="xs:positiveInteger"/>
+ <xs:element name="page-nodes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- The type of a navigation node -->
+ <xs:complexType name="nodeType">
+ <xs:sequence>
+ <xs:element name="uri" type="xs:string"/>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-publication-date" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="visible" type="xs:boolean" default="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="pageSetType">
+ <xs:sequence>
+ <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portalConfigType">
+ <xs:sequence>
+ <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="skin" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="properties" type="propertiesType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="portal-layout" minOccurs="1" maxOccurs="1">
+ <xs:complexType>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="entry" type="propertiesEntryType" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesEntryType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="key" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:group name="containerChildrenGroup">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="site-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="pageType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-max-window" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="containerType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="template" type="xs:string"/>
+ <xs:attribute name="attribute" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="portletApplicationType">
+ <xs:sequence>
+ <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletType">
+ <xs:sequence>
+ <xs:element name="application-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="portlet-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="preferences" type="portletPreferencesType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferencesType">
+ <xs:sequence>
+ <xs:element name="preference" type="portletPreferenceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferenceType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
14 years, 10 months
- 1
- 0
gatein SVN: r1845 - in portal/trunk/examples: extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 08:04:51 -0500 (Wed, 24 Feb 2010)
New Revision: 1845
Removed:
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml
Modified:
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
Log:
now update the samples descriptors
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,9 +20,10 @@
-->
-<node-navigation>
- <owner-type>group</owner-type>
- <owner-id>/platform/users</owner-id>
+<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -19,7 +19,10 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<page-set>
+<page-set
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<page>
<name>sitemap</name>
<title>Site Map</title>
Deleted: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<portlet-preferences-set/>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,9 +20,10 @@
-->
-<node-navigation>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
+<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,23 +20,34 @@
-->
-<page-set>
+<page-set
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<page>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
<name>samplePage</name>
<title>Sample Page</title>
<access-permissions>Everyone</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
- <application>
- <instance-id>portal#classic:/web/IFramePortlet/samplePage</instance-id>
- <title>Sample Page portlet</title>
- <access-permissions>Everyone</access-permissions>
- <show-info-bar>false</show-info-bar>
- <show-application-state>false</show-application-state>
- <show-application-mode>false</show-application-mode>
- </application>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>IFramePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>url</name>
+ <value>http://blog.gatein.org</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <title>Sample Page portlet</title>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ <show-application-state>false</show-application-state>
+ <show-application-mode>false</show-application-mode>
+ </portlet-application>
</page>
</page-set>
Deleted: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<portlet-preferences-set>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/IFramePortlet/samplePage</window-id>
- <preference>
- <name>url</name>
- <value>http://blog.gatein.org</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-</portlet-preferences-set>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,9 +20,10 @@
-->
-<node-navigation>
- <owner-type>user</owner-type>
- <owner-id>root</owner-id>
+<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<priority>3</priority>
<page-nodes>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,7 +20,10 @@
-->
-<page-set>
+<page-set
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<page>
<name>sales</name>
<title>Sales BI</title>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,9 +20,10 @@
-->
-<node-navigation>
- <owner-type>group</owner-type>
- <owner-id>/platform/users</owner-id>
+<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<priority>8</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,7 +20,10 @@
-->
-<page-set>
+<page-set
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<page>
<name>sitemap</name>
<title>Site Map</title>
Deleted: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<portlet-preferences-set/>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,9 +20,10 @@
-->
-<node-navigation>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
+<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<priority>1</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,23 +20,34 @@
-->
-<page-set>
+<page-set
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<page>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
<name>samplePage</name>
<title>Sample Page</title>
<access-permissions>Everyone</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
- <application>
- <instance-id>portal#classic:/web/IFramePortlet/samplePage</instance-id>
- <title>Sample Page portlet</title>
- <access-permissions>Everyone</access-permissions>
- <show-info-bar>false</show-info-bar>
- <show-application-state>false</show-application-state>
- <show-application-mode>false</show-application-mode>
- </application>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>IFramePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>url</name>
+ <value>http://blog.gatein.org</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <title>Sample Page portlet</title>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ <show-application-state>false</show-application-state>
+ <show-application-mode>false</show-application-mode>
+ </portlet-application>
</page>
</page-set>
Deleted: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<portlet-preferences-set>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <window-id>portal#classic:/web/IFramePortlet/samplePage</window-id>
- <preference>
- <name>url</name>
- <value>http://blog.gatein.org</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-</portlet-preferences-set>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,9 +20,10 @@
-->
-<node-navigation>
- <owner-type>user</owner-type>
- <owner-id>root</owner-id>
+<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<priority>3</priority>
<page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-02-24 13:00:58 UTC (rev 1844)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-02-24 13:04:51 UTC (rev 1845)
@@ -20,7 +20,10 @@
-->
-<page-set>
+<page-set
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd">
<page>
<name>sales</name>
<title>Sales BI</title>
14 years, 10 months
- 1
- 0