January 2011 - gatein-commits - Jboss List Archives

gatein SVN: r5675 - in components/wsrp/branches/2.0.x/admin-gui/src/main: webapp/WEB-INF and 3 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-01-04 04:57:01 -0500 (Tue, 04 Jan 2011) New Revision: 5675 Added: components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectToErrorIfWSRPUnavailablePhaseListener.java components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/WSRPVersionBean.java Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/faces-config.xml components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/common/template.xhtml components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/error.xhtml components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml Log: - GTNWSRP-191: Added PhaseListener to check if the WSRP service is available before restoring the view. - GTNWSRP-193: Added WSRPVersionBean to display version of the WSRP service. Added: components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectToErrorIfWSRPUnavailablePhaseListener.java =================================================================== --- components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectToErrorIfWSRPUnavailablePhaseListener.java (rev 0) +++ components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectToErrorIfWSRPUnavailablePhaseListener.java 2011-01-04 09:57:01 UTC (rev 5675) @@ -0,0 +1,69 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.wsrp.admin.ui; + +import javax.faces.application.NavigationHandler; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class RedirectToErrorIfWSRPUnavailablePhaseListener implements PhaseListener +{ + /** Same value as used in faces-config.xml to set the ConsumerRegistry */ + private static final String CONSUMER_REGISTRY = "ConsumerRegistry"; + /** Same value as used in faces-config.xml to set the ProducerConfigurationService */ + private static final String PRODUCER_CONFIGURATION_SERVICE = "ProducerConfigurationService"; + + public void afterPhase(PhaseEvent event) + { + // nothing to do + } + + public void beforePhase(PhaseEvent event) + { + FacesContext context = event.getFacesContext(); + + // if we don't have a ConsumerRegistry or ProducerConfigurationService set in the application scope, then it means + // that the WSRP is not properly setup and we need to redirect to the error page + ExternalContext externalContext = context.getExternalContext(); + Map<String, Object> applicationMap = externalContext.getApplicationMap(); + if (!applicationMap.containsKey(CONSUMER_REGISTRY) || !applicationMap.containsKey(PRODUCER_CONFIGURATION_SERVICE)) + { + NavigationHandler navigationHandler = context.getApplication().getNavigationHandler(); + navigationHandler.handleNavigation(context, null, "error"); + } + } + + public PhaseId getPhaseId() + { + return PhaseId.RESTORE_VIEW; + } +} Added: components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/WSRPVersionBean.java =================================================================== --- components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/WSRPVersionBean.java (rev 0) +++ components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/WSRPVersionBean.java 2011-01-04 09:57:01 UTC (rev 5675) @@ -0,0 +1,38 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.wsrp.admin.ui; + +import org.gatein.wsrp.WSRPConstants; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class WSRPVersionBean +{ + public String getVersion() + { + return WSRPConstants.WSRP_SERVICE_VERSION; + } +} Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties =================================================================== --- components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2011-01-04 07:51:30 UTC (rev 5674) +++ components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2011-01-04 09:57:01 UTC (rev 5675) @@ -1,6 +1,6 @@ # # JBoss, a division of Red Hat -# Copyright 2010, Red Hat Middleware, LLC, and individual +# Copyright 2011, Red Hat Middleware, LLC, and individual # contributors as indicated by the @authors tag. See the # copyright.txt in the distribution for a full listing of # individual contributors. @@ -220,4 +220,5 @@ org.jboss.portal.object.name.admin.WSRP=WSRP INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '/', '.', '\\', '<', '>', '(', ')', '=' or '%5c' -DUPLICATE_ERROR=A {1} named ''{0}'' already exists! \ No newline at end of file +DUPLICATE_ERROR=A {1} named ''{0}'' already exists! +unavailable_service = WSRP service is unavailble. Please activate it before using this portlet. \ No newline at end of file Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties =================================================================== --- components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2011-01-04 07:51:30 UTC (rev 5674) +++ components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2011-01-04 09:57:01 UTC (rev 5675) @@ -1,6 +1,6 @@ # # JBoss, a division of Red Hat -# Copyright 2010, Red Hat Middleware, LLC, and individual +# Copyright 2011, Red Hat Middleware, LLC, and individual # contributors as indicated by the @authors tag. See the # copyright.txt in the distribution for a full listing of # individual contributors. @@ -182,4 +182,5 @@ edit_consumer_import_title=Portlets en import bean_consumermanager_refresh_failure_wsdl=Le rafra\u00eechissement a \u00e9chou\u00e9 (probablement \u00e0 cause d'URL WSDL non valide) producer_config_wsdl_v1=Adresse WSDL pour le Producteur WSRP v1: -producer_config_wsdl_v2=Adresse WSDL pour le Producteur WSRP v2: \ No newline at end of file +producer_config_wsdl_v2=Adresse WSDL pour le Producteur WSRP v2: +unavailable_service=Le service WSRP n''est pas disponible. Veuillez l''activer avant d'utiliser cette portlet. \ No newline at end of file Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2011-01-04 07:51:30 UTC (rev 5674) +++ components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2011-01-04 09:57:01 UTC (rev 5675) @@ -1,7 +1,7 @@ <?xml version="1.0"?>  + </navigation-case> + </navigation-rule> </faces-config> Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/common/template.xhtml =================================================================== --- components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/common/template.xhtml 2011-01-04 07:51:30 UTC (rev 5674) +++ components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/common/template.xhtml 2011-01-04 09:57:01 UTC (rev 5675) @@ -1,6 +1,6 @@  <ui:decorate template="errorTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:webui="http://jboss.org/gatein"> + xmlns:h="http://java.sun.com/jsf/html"> <ui:define name="content"> - An Error Has Occured. + <div class="portlet-msg"> + <div class="portlet-msg-icon"> + <h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/> + </div> + <div class="portlet-msg-body"> + <p class="portlet-msg-alert"> + #{i18n.unavailable_service} + </p> + </div> + </div> </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml =================================================================== --- components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml 2011-01-04 07:51:30 UTC (rev 5674) +++ components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml 2011-01-04 09:57:01 UTC (rev 5675) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2010, Red Hat Middleware, LLC, and individual + ~ Copyright 2011, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -23,10 +23,7 @@ <ui:decorate template="common/template.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:webui="http://jboss.org/gatein"> + xmlns:h="http://java.sun.com/jsf/html"> <ui:define name="topnav"> <h:form id="cons-temp-form" styleClass="cons-temp-form"> @@ -40,7 +37,8 @@ <div class="LeftTab"> <div class="RightTab"> <div class="MiddleTab"> - #{i18n.nav_tabs_consumers} + <h:commandLink id="consumersTab" action="consumers" + value="#{i18n.nav_tabs_consumers}"/> </div> </div> </div>

13 years, 4 months

1
0
0 / 0

gatein SVN: r5674 - exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/config.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2011-01-04 02:51:30 -0500 (Tue, 04 Jan 2011) New Revision: 5674 Modified: exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/config/Param.java Log: EXOGTN-223 Prevent to load concurrently several time the same webui parameter Modified: exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/config/Param.java =================================================================== --- exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/config/Param.java 2011-01-04 07:41:46 UTC (rev 5673) +++ exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/config/Param.java 2011-01-04 07:51:30 UTC (rev 5674) @@ -40,7 +40,7 @@ private String value; - private transient Object object; + private transient volatile Object object; public String getName() { @@ -64,54 +64,77 @@ public Object getMapXMLObject(WebuiRequestContext context) throws Exception { - if (object != null) - return object; - ResourceResolver resolver = context.getResourceResolver(value); - InputStream is = resolver.getInputStream(value); - object = XMLObject.getObject(is); - is.close(); + if (object == null) + { + synchronized (this) + { + if (object == null) + { + ResourceResolver resolver = context.getResourceResolver(value); + InputStream is = resolver.getInputStream(value); + object = XMLObject.getObject(is); + is.close(); + } + } + } return object; } - @SuppressWarnings("unchecked") public Object getMapGroovyObject(WebuiRequestContext context) throws Exception { - try + if (object == null) { - if (object != null) - return object; - ResourceResolver resolver = context.getResourceResolver(value); - InputStream is = resolver.getInputStream(value); - //TODO if is == null throw an exception saying the it's impossible to find the file - Binding binding = new Binding(); - GroovyShell shell = new GroovyShell(Thread.currentThread().getContextClassLoader(), binding); - object = shell.evaluate(is); - is.close(); - return object; + synchronized (this) + { + if (object == null) + { + try + { + ResourceResolver resolver = context.getResourceResolver(value); + InputStream is = resolver.getInputStream(value); + //TODO if is == null throw an exception saying the it's impossible to find the file + Binding binding = new Binding(); + GroovyShell shell = new GroovyShell(Thread.currentThread().getContextClassLoader(), binding); + object = shell.evaluate(is); + is.close(); + } + catch (Exception e) + { + log.error("A problem in the groovy script : " + value, e); + throw e; + } + } + } } - catch (Exception e) - { - log.error("A problem in the groovy script : " + value, e); - throw e; - } + return object; } public Object getFreshObject(WebuiRequestContext context) throws Exception { - try + if (object == null) { - ResourceResolver resolver = context.getResourceResolver(value); - InputStream is = resolver.getInputStream(value); - Binding binding = new Binding(); - GroovyShell shell = new GroovyShell(Thread.currentThread().getContextClassLoader(), binding); - object = shell.evaluate(is); - is.close(); - return object; + synchronized (this) + { + if (object == null) + { + try + { + ResourceResolver resolver = context.getResourceResolver(value); + InputStream is = resolver.getInputStream(value); + Binding binding = new Binding(); + GroovyShell shell = new GroovyShell(Thread.currentThread().getContextClassLoader(), binding); + object = shell.evaluate(is); + is.close(); + return object; + } + catch (Exception e) + { + log.error("A problem in the groovy script : " + value, e); + throw e; + } + } + } } - catch (Exception e) - { - log.error("A problem in the groovy script : " + value, e); - throw e; - } + return object; } } \ No newline at end of file

13 years, 4 months

1
0
0 / 0

gatein SVN: r5673 - in exo/portal/branches/3.1.x/component/resources/src: test/java/org/exoplatform/services/resources/test and 1 other directory.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2011-01-04 02:41:46 -0500 (Tue, 04 Jan 2011) New Revision: 5673 Modified: exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java exo/portal/branches/3.1.x/component/resources/src/test/java/org/exoplatform/services/resources/test/TestResourceBundleService.java Log: EXOGTN-222 Prevent to load concurrently several time the same ResourceBundle Modified: exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java =================================================================== --- exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java 2011-01-04 03:28:41 UTC (rev 5672) +++ exo/portal/branches/3.1.x/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java 2011-01-04 07:41:46 UTC (rev 5673) @@ -19,6 +19,9 @@ package org.exoplatform.services.resources.impl; +import org.exoplatform.commons.cache.future.FutureCache; +import org.exoplatform.commons.cache.future.FutureExoCache; +import org.exoplatform.commons.cache.future.Loader; import org.exoplatform.commons.utils.IOUtil; import org.exoplatform.commons.utils.MapResourceBundle; import org.exoplatform.commons.utils.PageList; @@ -64,6 +67,19 @@ protected ExoCache<String, ResourceBundle> cache_; + private volatile FutureCache<String, ResourceBundle, ResourceBundleContext> futureCache_; + + private final Loader<String, ResourceBundle, ResourceBundleContext> loader_ = new Loader<String, ResourceBundle, ResourceBundleContext>() + { + /** + * {@inheritDoc} + */ + public ResourceBundle retrieve(ResourceBundleContext context, String key) throws Exception + { + return context.get(key); + } + }; + private volatile List<String> initResources_; @SuppressWarnings("unchecked") @@ -300,7 +316,7 @@ candidateFiles.add(baseName + "_" + language + "_" + country + ".properties"); } - if (language != null && language.length() > 0 ) + if (language != null && language.length() > 0) { candidateFiles.add(baseName + "_" + language + ".properties"); } @@ -395,56 +411,35 @@ boolean isClasspathResource = isClasspathResource(name); boolean isCacheable = !isClasspathResource || !PropertyManager.isDevelopping(); - if (isCacheable) + if (isCacheable && isClasspathResource) { - if (isClasspathResource) - { - // Avoid naming collision - id += "_" + cl.getClass() + "_" + cl.hashCode(); - } - try - { - ResourceBundle rb = cache_.get(id); - if (rb != null) - { - return rb; - } - } - catch (Exception ex) - { - } + // Avoid naming collision + id += "_" + cl.getClass() + "_" + System.identityHashCode(cl); } // Case 1: ResourceBundle of portlets, standard java API is used if (isClasspathResource) { - ResourceBundle res = ResourceBundleLoader.load(name, locale, cl); - //Cache classpath resource bundle while running portal in non-dev mode + // Cache classpath resource bundle while running portal in non-dev mode if (isCacheable) - cache_.put(id, res); - return res; + { + ResourceBundleLoaderContext ctx = new ResourceBundleLoaderContext(name, locale, cl); + ResourceBundle result = getFutureCache().get(ctx, id); + if (ctx.e != null) + { + // Throw the RuntimeException if it occurs to remain compatible with the old behavior + throw ctx.e; + } + return result; + } + else + { + return ResourceBundleLoader.load(name, locale, cl); + } } // Case 2: ResourceBundle of portal - try - { - ResourceBundle res = null; - String rootId = name + "_" + localeService_.getDefaultLocaleConfig().getLanguage(); - ResourceBundle parent = getResourceBundleFromDb(rootId, null, locale); - if (parent != null) - { - res = getResourceBundleFromDb(id, parent, locale); - if (res == null) - res = parent; - cache_.put(id, res); - return res; - } - } - catch (Exception ex) - { - log_.error("Error: " + id, ex); - } - return null; + return getFutureCache().get(new GetResourceBundleFromDbContext(name, locale), id); } public ResourceBundle getResourceBundle(String[] name, Locale locale, ClassLoader cl) @@ -458,34 +453,165 @@ idBuf.append(n).append("_"); idBuf.append(locale); String id = idBuf.toString(); - try + return getFutureCache().get(new GetResourceBundleContext(name, locale, cl), id); + } + + protected FutureCache<String, ResourceBundle, ResourceBundleContext> getFutureCache() + { + if (futureCache_ == null) { - ResourceBundle res = cache_.get(id); - if (res != null) - return res; - MapResourceBundle outputBundled = new MapResourceBundle(locale); - for (int i = 0; i < name.length; i++) + synchronized(this) { - ResourceBundle temp = getResourceBundle(name[i], locale, cl); - if (temp != null) + if (futureCache_ == null) { - outputBundled.merge(temp); - continue; + futureCache_ = new FutureExoCache<String, ResourceBundle, ResourceBundleContext>(loader_, cache_); } - log_.warn("Cannot load and merge the bundle: " + name[i]); } - outputBundled.resolveDependencies(); - cache_.put(id, outputBundled); - return outputBundled; } - catch (Exception ex) + return futureCache_; + } + + abstract protected ResourceBundle getResourceBundleFromDb(String id, ResourceBundle parent, Locale locale) + throws Exception; + + /** + * Generic class defining a context needed to get a ResourceBundle + */ + private static abstract class ResourceBundleContext + { + /** + * Get the resource bundle corresponding to the context + */ + abstract ResourceBundle get(String id); + } + + /** + * The class defining the context required to load a ResourceBundle thanks to the method + * <code>ResourceBundleLoader.load(String name, Locale locale, ClassLoader cl)</code> + */ + private static class ResourceBundleLoaderContext extends ResourceBundleContext + { + private final String name; + + private final Locale locale; + + private final ClassLoader cl; + + private RuntimeException e; + + public ResourceBundleLoaderContext(String name, Locale locale, ClassLoader cl) { - log_.error("Cannot load and merge the bundle: " + id, ex); + this.name = name; + this.locale = locale; + this.cl = cl; } - return null; + + /** + * {@inheritDoc} + */ + @Override + ResourceBundle get(String id) + { + try + { + return ResourceBundleLoader.load(name, locale, cl); + } + catch (RuntimeException e) + { + this.e = e; + } + return null; + } } - abstract protected ResourceBundle getResourceBundleFromDb(String id, ResourceBundle parent, Locale locale) - throws Exception; + /** + * The class defining the context required to load a ResourceBundle thanks to the method + * <code>getResourceBundleFromDb(String id, ResourceBundle parent, Locale locale)</code> + */ + private class GetResourceBundleFromDbContext extends ResourceBundleContext + { + private final String name; -} + private final Locale locale; + + public GetResourceBundleFromDbContext(String name, Locale locale) + { + this.name = name; + this.locale = locale; + } + + /** + * {@inheritDoc} + */ + @Override + ResourceBundle get(String id) + { + ResourceBundle res = null; + try + { + String rootId = name + "_" + localeService_.getDefaultLocaleConfig().getLanguage(); + ResourceBundle parent = getResourceBundleFromDb(rootId, null, locale); + if (parent != null) + { + res = getResourceBundleFromDb(id, parent, locale); + if (res == null) + res = parent; + } + } + catch (Exception ex) + { + log_.error("Error: " + id, ex); + } + return res; + } + } + + /** + * The class defining the context required to load a ResourceBundle thanks to the method + * <code>getResourceBundle(String[] name, Locale locale, ClassLoader cl)</code> + */ + private class GetResourceBundleContext extends ResourceBundleContext + { + private final String[] name; + + private final Locale locale; + + private final ClassLoader cl; + + public GetResourceBundleContext(String[] name, Locale locale, ClassLoader cl) + { + this.name = name; + this.locale = locale; + this.cl = cl; + } + + /** + * {@inheritDoc} + */ + @Override + ResourceBundle get(String id) + { + MapResourceBundle outputBundled = null; + try + { + outputBundled = new MapResourceBundle(locale); + for (int i = 0; i < name.length; i++) + { + ResourceBundle temp = getResourceBundle(name[i], locale, cl); + if (temp != null) + { + outputBundled.merge(temp); + continue; + } + log_.warn("Cannot load and merge the bundle: " + name[i]); + } + outputBundled.resolveDependencies(); + } + catch (Exception ex) + { + log_.error("Cannot load and merge the bundle: " + id, ex); + } + return outputBundled; + } + } +} \ No newline at end of file Modified: exo/portal/branches/3.1.x/component/resources/src/test/java/org/exoplatform/services/resources/test/TestResourceBundleService.java =================================================================== --- exo/portal/branches/3.1.x/component/resources/src/test/java/org/exoplatform/services/resources/test/TestResourceBundleService.java 2011-01-04 03:28:41 UTC (rev 5672) +++ exo/portal/branches/3.1.x/component/resources/src/test/java/org/exoplatform/services/resources/test/TestResourceBundleService.java 2011-01-04 07:41:46 UTC (rev 5673) @@ -211,5 +211,11 @@ { return "MyClassLoader"; } + + @Override + public int hashCode() + { + return 0; + } } }

13 years, 4 months

1
0
0 / 0

gatein SVN: r5672 - in portal/branches/branch-GTNPORTAL-1731: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-01-03 22:28:41 -0500 (Mon, 03 Jan 2011) New Revision: 5672 Modified: portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js portal/branches/branch-GTNPORTAL-1731/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java Log: GTNPORTAL-1403 Calendar appearing even on non-focus Modified: portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-04 02:19:29 UTC (rev 5671) +++ portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-04 03:28:41 UTC (rev 5672) @@ -162,6 +162,14 @@ } } +UICalendar.prototype.onTabOut =function(event) { + var keyCode = event.keyCode; + //identify the tab key: + if (keyCode == 9) { + eXo.webui.UICalendar.hide(); + } +}; + UICalendar.prototype.hide = function() { if (this.dateField) { document.getElementById(this.calendarId).firstChild.style.display = 'none' ; Modified: portal/branches/branch-GTNPORTAL-1731/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-04 02:19:29 UTC (rev 5671) +++ portal/branches/branch-GTNPORTAL-1731/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-04 03:28:41 UTC (rev 5672) @@ -234,6 +234,6 @@ w.write(value_.toString()); w.write('\''); } - w.write(" onclick='event.cancelBubble = true'/>"); + w.write(" onclick='event.cancelBubble = true' onkeydown='eXo.webui.UICalendar.onTabOut(event)'/>"); } }

13 years, 4 months

1
0
0 / 0

gatein SVN: r5671 - portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/portal.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-01-03 21:19:29 -0500 (Mon, 03 Jan 2011) New Revision: 5671 Modified: portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js Log: GTNPORTAL-1410 Can not select page from menu bar when there're many page Modified: portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-01-03 11:29:58 UTC (rev 5670) +++ portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-01-04 02:19:29 UTC (rev 5671) @@ -158,6 +158,7 @@ eXo.portal.UIPortalNavigation.toggleSubMenu(e, tab, menuItemContainer) ; } } + eXo.portal.UIPortalNavigation.cancelHideMenuContainer(); eXo.portal.UIPortalNavigation.menuVisible = true ; } ; @@ -327,7 +328,6 @@ subContainer.firstTime = true; } } - eXo.portal.UIPortalNavigation.cancelHideMenuContainer() ; }; /** * Shows a sub menu, uses the methods from superClass (eXo.webui.UIPopupMenu)

13 years, 4 months

1
0
0 / 0

gatein SVN: r5670 - in portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap: DefaultSkin/background and 1 other directory.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2011-01-03 06:29:58 -0500 (Mon, 03 Jan 2011) New Revision: 5670 Modified: portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.gif portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css Log: Error UI in sitemap page when change language to Arabic (IE7) Modified: portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif =================================================================== (Binary files differ) Modified: portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.gif =================================================================== (Binary files differ) Modified: portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-01-03 10:29:01 UTC (rev 5669) +++ portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-01-03 11:29:58 UTC (rev 5670) @@ -93,36 +93,36 @@ .UISitemap .UISiteTree .Node { line-height: 24px; - background: url('DefaultSkin/background/Dotted.gif') repeat-y 4px top; /* orientation=lt */ - background: url('DefaultSkin/background/Dotted-rt.gif') repeat-y 99.6% top; /* orientation=rt */ + background: url('DefaultSkin/background/Dotted.gif') repeat-y left top; /* orientation=lt */ + background: url('DefaultSkin/background/Dotted.gif') repeat-y right top; /* orientation=rt */ } .UISitemap .UISiteTree .LastNode { line-height: 24px; - background: url('DefaultSkin/background/LastNode.gif') no-repeat 4px top; /* orientation=lt */ - background: url('DefaultSkin/background/LastNode-rt.gif') no-repeat 99.6% top; /* orientation=rt */ + background: url('DefaultSkin/background/LastNode.gif') no-repeat left top; /* orientation=lt */ + background: url('DefaultSkin/background/LastNode.gif') no-repeat right top; /* orientation=rt */ } .UISitemap .CollapseIcon { background: url('DefaultSkin/background/CollapseIcon.gif') no-repeat left center; /* orientation=lt */ background: url('DefaultSkin/background/CollapseIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 5px 0px 35px; /* orientation=lt */ - padding: 0px 35px 0px 5px; /* orientation=rt */ + padding: 0px 5px 0px 30px; /* orientation=lt */ + padding: 0px 30px 0px 5px; /* orientation=rt */ cursor: pointer; } .UISitemap .ExpandIcon { background: url('DefaultSkin/background/ExpandIcon.gif') no-repeat left center; /* orientation=lt */ background: url('DefaultSkin/background/ExpandIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 5px 0px 35px; /* orientation=lt */ - padding: 0px 35px 0px 5px; /* orientation=rt */ + padding: 0px 5px 0px 30px; /* orientation=lt */ + padding: 0px 30px 0px 5px; /* orientation=rt */ cursor: pointer; } .UISitemap .NullItem { background: url('DefaultSkin/background/NullItem.gif') no-repeat left center; /* orientation=lt */ background: url('DefaultSkin/background/NullItem-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 35px; + padding: 0px 30px; } .UISitemap .DefaultPageIcon {

13 years, 4 months

1
0
0 / 0

gatein SVN: r5669 - portal/branches/branch-GTNPORTAL-1731/webui/dashboard/src/main/resources/groovy/dashboard/webui/component.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-01-03 05:29:01 -0500 (Mon, 03 Jan 2011) New Revision: 5669 Modified: portal/branches/branch-GTNPORTAL-1731/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl Log: GTNPORTAL-1467 IE7: Position of Add gadget icon in Dashboard workspace is incorrect when list gadget too long Modified: portal/branches/branch-GTNPORTAL-1731/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-01-03 08:14:01 UTC (rev 5668) +++ portal/branches/branch-GTNPORTAL-1731/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-01-03 10:29:01 UTC (rev 5669) @@ -36,8 +36,8 @@ <% List lstGadgets = uicomponent.getGadgetsOfCategory(category); if(lstGadgets != null){ - if(lstGadgets.size() >= 20) - uiPopup.setWindowSize(-1, 600); +// if(lstGadgets.size() >= 20) +// uiPopup.setWindowSize(-1, 600); for(gadget in lstGadgets){ %>

13 years, 4 months

1
0
0 / 0

gatein SVN: r5668 - portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2011-01-03 03:14:01 -0500 (Mon, 03 Jan 2011) New Revision: 5668 Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java Log: GTNPORTAL-1402 Update priority for group navigation after changed and clean some code remains Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-03 03:17:55 UTC (rev 5667) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-03 08:14:01 UTC (rev 5668) @@ -42,6 +42,8 @@ import org.exoplatform.webui.form.UIFormStringInput; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /* @@ -158,60 +160,48 @@ } WebuiRequestContext pcontext = event.getRequestContext(); - - // if edit navigation - if (pageNav != null) - { - uiForm.invokeSetBindingBean(pageNav); - UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority"); - int priority = Integer.parseInt(uiSelectBox.getValue()); - pageNav.setPriority(priority); - - // update navigation - dataService.save(pageNav); - - UIPopupWindow uiPopup = uiForm.getParent(); - uiPopup.setShow(false); - UIComponent opener = uiPopup.getParent(); - pcontext.addUIComponentToUpdateByAjax(opener); - return; - } - - // if add navigation - pageNav = new PageNavigation(); - // set properties for navigation uiForm.invokeSetBindingBean(pageNav); - UIFormStringInput uiOwnerId = uiForm.findComponentById("ownerId"); - UIFormStringInput uiOwnerType = uiForm.findComponentById("ownerType"); UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority"); int priority = Integer.parseInt(uiSelectBox.getValue()); pageNav.setPriority(priority); - pageNav.setModifiable(true); - pageNav.setOwnerId(uiOwnerId.getValue()); - pageNav.setOwnerType(uiOwnerType.getValue()); - //UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class); - UIPortalApplication uiPortalApp = Util.getUIPortal().getAncestorOfType(UIPortalApplication.class); - // ensure this navigation is not exist - if (dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()) != null) - { - uiPortalApp.addMessage(new ApplicationMessage("UIPageNavigationForm.msg.existPageNavigation", - new String[]{pageNav.getOwnerId()}));; - return; - } + // update navigation + dataService.save(pageNav); - // create navigation for group - dataService.create(pageNav); + pageNav = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()); - // close popup window, update popup window + UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); + updateNavPriority(uiPortalApp.getNavigations(), pageNav); + + uiPortalApp.localizeNavigations(); + UIPopupWindow uiPopup = uiForm.getParent(); uiPopup.setShow(false); UIComponent opener = uiPopup.getParent(); + UIWorkingWorkspace uiWorkingWS = + Util.getUIPortal().getAncestorOfType(UIPortalApplication.class).getChild(UIWorkingWorkspace.class); + uiWorkingWS.updatePortletsByName("UserToolbarGroupPortlet"); pcontext.addUIComponentToUpdateByAjax(opener); + } + + private void updateNavPriority(List<PageNavigation> navs, PageNavigation nav) + { + for (int i = 0; i < navs.size(); i++) + { + if (navs.get(i).getId() == nav.getId()) + { + navs.set(i, nav); + break; + } + } - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class); - uiWorkingWS.updatePortletsByName("GroupNavigationPortlet"); - + Collections.sort(navs, new Comparator<PageNavigation>() + { + public int compare(PageNavigation nav1, PageNavigation nav2) + { + return nav1.getPriority() - nav2.getPriority(); + } + }); } }

13 years, 4 months

1
0
0 / 0

gatein SVN: r5667 - in portal/branches/branch-GTNPORTAL-1731: component/portal/src/test/resources/portal/group/platform/administrators and 44 other directories.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2011-01-02 22:17:55 -0500 (Sun, 02 Jan 2011) New Revision: 5667 Modified: portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/platform/administrators/group.xml portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/template/group/group.xml portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml portal/branches/branch-GTNPORTAL-1731/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml Log: GTNPORTAL-1729 Update XML schema for gatein configuration files correspondingly Modified: portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">  <portal-skin> Modified: portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/platform/administrators/group.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>platform/administrators</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/template/group/group.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/template/group/group.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/component/portal/src/test/resources/portal/group/template/group/group.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -20,8 +20,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">  <portal-skin> Modified: portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -19,8 +19,8 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">  <portal-skin> Modified: portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>8</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sitemap</name> <title>Site Map</title> Modified: portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>samplePage</name> Modified: portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>3</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sampledashboard</name> <title>Sample Dashboard</title> Modified: portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portlet-skin> <application-name>web</application-name> Modified: portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>8</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sitemap</name> <title>Site Map</title> Modified: portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>samplePage</name> Modified: portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>3</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sampledashboard</name> <title>Sample Dashboard</title> Modified: portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/portal/war/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portlet-skin> <application-name>web</application-name> Modified: portal/branches/branch-GTNPORTAL-1731/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portal-skin> <skin-name>SimpleSkin</skin-name> Modified: portal/branches/branch-GTNPORTAL-1731/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -22,7 +22,7 @@ <gadgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gadgets_1_0" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gadgets_1_0" xmlns="http://www.gatein.org/xml/ns/gadgets_1_0"> <gadget name="Todo"> Modified: portal/branches/branch-GTNPORTAL-1731/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/portlet/dashboard/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">  Modified: portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">  Modified: portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/portlet/web/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">  Modified: portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portal-skin> <skin-name>Default</skin-name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>5</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -16,8 +16,8 @@ --> <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>newStaff</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>2</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>newAccount</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>9</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>sitemap</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>8</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>mylink-blog</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> <node> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>homepage</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>classic</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <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/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>homepage</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>1</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>homepage</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <portal-name>@owner@</portal-name> <locale>en</locale> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl"> </container> <container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl"> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <portlet-application> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> </page> \ No newline at end of file Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <title></title> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> <access-permissions>Everyone</access-permissions> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <name></name> <title></title> <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> \ No newline at end of file Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> </page-set> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <priority>2</priority> <page-nodes> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_objects_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> <page> <name>wsrpConfiguration</name> Modified: portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 01:34:34 UTC (rev 5666) +++ portal/branches/branch-GTNPORTAL-1731/web/portal/src/main/webapp/WEB-INF/gatein-resources.xml 2011-01-03 03:17:55 UTC (rev 5667) @@ -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 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> <portlet-skin> <application-name>web</application-name>

13 years, 4 months

1
0
0 / 0

gatein SVN: r5666 - components/wci/trunk/test/servers/tomcat6.

by do-not-reply＠jboss.org

Author: aheritier Date: 2011-01-02 20:34:34 -0500 (Sun, 02 Jan 2011) New Revision: 5666 Modified: components/wci/trunk/test/servers/tomcat6/pom.xml Log: Scope test isn't allowed in maven 3 for a plugin dependency and useless for maven 2 Modified: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml 2010-12-30 17:34:58 UTC (rev 5665) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-01-03 01:34:34 UTC (rev 5666) @@ -272,7 +272,6 @@ <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.jdom</groupId>

13 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits January 2011