gatein SVN: r6901 - in portal/branches/api/component/api-impl: src/main/java/org/gatein/portal/api/impl and 2 other directories.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-20 15:53:48 -0400 (Wed, 20 Jul 2011)
New Revision: 6901
Added:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ApplicationImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ContentRegistryImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java
Modified:
portal/branches/api/component/api-impl/pom.xml
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java
Log:
- Adapted for API changes.
- Started implementing ContentRegistry scenario.
Modified: portal/branches/api/component/api-impl/pom.xml
===================================================================
--- portal/branches/api/component/api-impl/pom.xml 2011-07-20 12:33:23 UTC (rev 6900)
+++ portal/branches/api/component/api-impl/pom.xml 2011-07-20 19:53:48 UTC (rev 6901)
@@ -30,6 +30,10 @@
<artifactId>guava</artifactId>
<version>r09</version>
</dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.application-registry</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-20 12:33:23 UTC (rev 6900)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-20 19:53:48 UTC (rev 6901)
@@ -22,6 +22,8 @@
package org.gatein.portal.api.impl;
+import org.exoplatform.application.gadget.GadgetRegistryService;
+import org.exoplatform.application.registry.ApplicationRegistryService;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.container.component.RequestLifeCycle;
@@ -40,6 +42,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.gatein.api.GateIn;
import org.gatein.api.content.Application;
+import org.gatein.api.content.Category;
import org.gatein.api.content.Content;
import org.gatein.api.content.Gadget;
import org.gatein.api.content.ManagedContent;
@@ -79,10 +82,14 @@
.withDefaultSeparator("::").build();
public static final Context GROUP_CONTEXT = Context.builder().requiredUnboundedHierarchicalComponent("group", Identifiable.class, Pattern.compile("(" + GROUP_CHARS + ")+"))
.withDefaultSeparator("/").requireSeparatorInFirstPosition().build();
+ public static final Context APPLICATION_CONTEXT = Context.builder().requiredComponent("application", Identifiable.class, Pattern.compile("\\w+"))
+ .requiredComponent("portlet", Application.class, Pattern.compile("\\w+")).withDefaultSeparator("/").build();
private ExoContainer container;
private ModelDataStorage dataStorage;
private NavigationService navigationService;
private OrganizationService organizationService;
+ private ApplicationRegistryService registryService;
+ private GadgetRegistryService gadgetService;
public GateInImpl(ExoContainerContext context, InitParams params, ConfigurationManager configurationManager)
{
@@ -249,7 +256,7 @@
public Id groupId(String root, String... children)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return Id.create(GROUP_CONTEXT, root, children);
}
public Id<Application> applicationId(String application, String portlet)
@@ -272,11 +279,16 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public <T extends Content> Id<ManagedContent<T>> managedContentId(Id<Content<T>> contentId)
+ public <T extends Content<T>> Id<ManagedContent<T>> managedContentId(Id<T> contentId)
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ public Id<Category> categoryId(String name)
+ {
+ return null;
+ }
+
public <T extends Site> Id<T> siteId(Site.Type<T> siteType, String siteName)
{
return Id.create(CONTEXT, siteType.getValueType(), siteType.getName(), siteName);
@@ -293,6 +305,8 @@
dataStorage = (ModelDataStorage)container.getComponentInstanceOfType(ModelDataStorage.class);
navigationService = (NavigationService)container.getComponentInstanceOfType(NavigationService.class);
organizationService = (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class);
+ registryService = (ApplicationRegistryService)container.getComponentInstanceOfType(ApplicationRegistryService.class);
+ gadgetService = (GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class);
}
public void stop()
@@ -310,6 +324,11 @@
return navigationService;
}
+ public ApplicationRegistryService getRegistryService()
+ {
+ return registryService;
+ }
+
private PortalData getPortalDataFor(Id<Portal> portalId)
{
ParameterValidation.throwIllegalArgExceptionIfNull(portalId, "Portal Id");
@@ -333,4 +352,9 @@
{
RequestLifeCycle.begin(container);
}
+
+ public GadgetRegistryService getGadgetService()
+ {
+ return gadgetService;
+ }
}
Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ApplicationImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ApplicationImpl.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ApplicationImpl.java 2011-07-20 19:53:48 UTC (rev 6901)
@@ -0,0 +1,40 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.portal.api.impl.content;
+
+import org.exoplatform.application.registry.Application;
+import org.gatein.api.id.Id;
+import org.gatein.portal.api.impl.GateInImpl;
+import org.gatein.portal.api.impl.IdentifiableImpl;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class ApplicationImpl extends IdentifiableImpl<org.gatein.api.content.Application> implements org.gatein.api.content.Application
+{
+ private final Application application;
+
+ public ApplicationImpl(Application application, GateInImpl gateIn)
+ {
+ super(Id.parse(GateInImpl.APPLICATION_CONTEXT, application.getId()), application.getApplicationName(), gateIn);
+ this.application = application;
+ }
+}
Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/CategoryImpl.java 2011-07-20 19:53:48 UTC (rev 6901)
@@ -0,0 +1,101 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.portal.api.impl.content;
+
+import org.exoplatform.application.registry.ApplicationCategory;
+import org.gatein.api.GateIn;
+import org.gatein.api.content.Category;
+import org.gatein.api.content.Content;
+import org.gatein.api.content.ManagedContent;
+import org.gatein.api.id.Id;
+import org.gatein.portal.api.impl.GateInImpl;
+
+import java.util.List;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class CategoryImpl implements Category
+{
+ private final ApplicationCategory category;
+ private final GateInImpl gateIn;
+
+ public CategoryImpl(ApplicationCategory category, GateInImpl gateIn)
+ {
+ this.category = category;
+ this.gateIn = gateIn;
+ }
+
+ public <T extends Content<T>> ManagedContent<T> getContent(Id<ManagedContent<T>> contentId)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public boolean contains(Id<? extends ManagedContent> contentId)
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public <T extends Content<T>> ManagedContent<T> addContent(Id<T> contentId)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public List<Id<? extends ManagedContent>> getKnownManagedContentIds()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getDescription()
+ {
+ return category.getDescription();
+ }
+
+ public void setDescription(String description)
+ {
+ category.setDescription(description);
+ }
+
+ public <T extends Content<T>> void removeContent(Id<ManagedContent<T>> id)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Id<Category> getId()
+ {
+ return gateIn.categoryId(getName());
+ }
+
+ public String getName()
+ {
+ return category.getName();
+ }
+
+ public String getDisplayName()
+ {
+ return category.getDisplayName();
+ }
+
+ public GateIn getGateIn()
+ {
+ return gateIn;
+ }
+}
Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ContentRegistryImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ContentRegistryImpl.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/ContentRegistryImpl.java 2011-07-20 19:53:48 UTC (rev 6901)
@@ -0,0 +1,128 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.portal.api.impl.content;
+
+import org.exoplatform.application.registry.ApplicationCategory;
+import org.exoplatform.application.registry.ApplicationRegistryService;
+import org.gatein.api.content.Application;
+import org.gatein.api.content.Category;
+import org.gatein.api.content.Content;
+import org.gatein.api.content.ContentRegistry;
+import org.gatein.api.content.Gadget;
+import org.gatein.api.content.ManagedContent;
+import org.gatein.api.id.Id;
+import org.gatein.api.util.IterableResult;
+import org.gatein.api.util.Query;
+import org.gatein.portal.api.impl.GateInImpl;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class ContentRegistryImpl implements ContentRegistry
+{
+ private final GateInImpl gateIn;
+
+ public ContentRegistryImpl(GateInImpl gateIn)
+ {
+ this.gateIn = gateIn;
+ }
+
+ public Category getOrCreateCategory(String name)
+ {
+ return getOrCreateCategory(name, true);
+ }
+
+ public Category getCategory(String name)
+ {
+ return getOrCreateCategory(name, false);
+ }
+
+ private Category getOrCreateCategory(String name, boolean forceCreate)
+ {
+ try
+ {
+ ApplicationRegistryService registryService = gateIn.getRegistryService();
+ ApplicationCategory applicationCategory = registryService.getApplicationCategory(name);
+ if (applicationCategory == null)
+ {
+ if (forceCreate)
+ {
+ applicationCategory = new ApplicationCategory();
+ applicationCategory.setName(name);
+ registryService.save(applicationCategory);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ return new CategoryImpl(applicationCategory, gateIn);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public <T extends Content<T>> T getContent(Id<T> id)
+ {
+ Class<T> type = id.getIdentifiableType();
+ Object result;
+ if (Application.class.equals(type))
+ {
+ try
+ {
+ result = new ApplicationImpl(gateIn.getRegistryService().getApplication(id.toString()), gateIn);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ else if (Gadget.class.equals(type))
+ {
+ try
+ {
+ result = new GadgetImpl(gateIn.getGadgetService().getGadget(id.toString()), gateIn);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ else
+ {
+ throw new IllegalArgumentException("Unknown Content type: " + type.getCanonicalName());
+ }
+ return type.cast(result);
+ }
+
+ public IterableResult<ManagedContent> getManagedContents(Query<ManagedContent> query)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Gadget createGadget(String gadget, String source)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+}
Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/content/GadgetImpl.java 2011-07-20 19:53:48 UTC (rev 6901)
@@ -0,0 +1,75 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.portal.api.impl.content;
+
+import org.exoplatform.application.gadget.Gadget;
+import org.gatein.api.id.Id;
+import org.gatein.portal.api.impl.GateInImpl;
+import org.gatein.portal.api.impl.IdentifiableImpl;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class GadgetImpl extends IdentifiableImpl<org.gatein.api.content.Gadget> implements org.gatein.api.content.Gadget
+{
+ private final Gadget gadget;
+
+ public GadgetImpl(Gadget gadget, GateInImpl gateIn)
+ {
+ super(Id.parse(GateInImpl.APPLICATION_CONTEXT, gadget.getName(), org.gatein.api.content.Gadget.class), gadget.getName(), gateIn);
+ this.gadget = gadget;
+ }
+
+ public URL getViewURL()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public URL getEditURL()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public URL getReferenceURL()
+ {
+ try
+ {
+ return URI.create(gadget.getReferenceUrl()).toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public String getSource()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setSource(String source)
+ {
+ }
+}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java 2011-07-20 12:33:23 UTC (rev 6900)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java 2011-07-20 19:53:48 UTC (rev 6901)
@@ -28,6 +28,7 @@
import org.gatein.api.portal.Portal;
import org.gatein.api.portal.Site;
import org.gatein.portal.api.impl.GateInImpl;
+import org.gatein.portal.api.impl.content.ContentRegistryImpl;
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
public class PortalImpl extends SiteImpl implements Portal
@@ -40,7 +41,7 @@
public ContentRegistry getContentRegistry()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return new ContentRegistryImpl(getGateInImpl());
}
public Type getType()
13 years, 5 months
gatein SVN: r6900 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 08:33:23 -0400 (Wed, 20 Jul 2011)
New Revision: 6900
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-893
Issue with picketlink cache - cached items are never evicted
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-20 12:28:21 UTC (rev 6899)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-20 12:33:23 UTC (rev 6900)
@@ -47,7 +47,7 @@
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.1.8.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.9.GA</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.1-EPP511-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
13 years, 5 months
gatein SVN: r6899 - in epp/portal/branches/EPP_5_1_Branch: web/eXoResources/src/main/webapp/javascript/eXo/webui and 1 other directories.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 08:28:21 -0400 (Wed, 20 Jul 2011)
New Revision: 6899
Modified:
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
Log:
JBEPP-1019
The day of the month in the calendar pop-up is not translated to French
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js 2011-07-20 12:02:16 UTC (rev 6898)
+++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js 2011-07-20 12:28:21 UTC (rev 6899)
@@ -20,4 +20,9 @@
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
-eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
+eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
+eXo.i18n.I18NMessage.PreviousMonth="Previous Month";
+eXo.i18n.I18NMessage.NextMonth="Next Month";
+eXo.i18n.I18NMessage.PreviousYear="Previous Year";
+eXo.i18n.I18NMessage.NextYear="Next Year";
+eXo.i18n.I18NMessage.weekdays=["S", "M", "T", "W", "T", "F", "S"];
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js 2011-07-20 12:02:16 UTC (rev 6898)
+++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js 2011-07-20 12:28:21 UTC (rev 6899)
@@ -20,4 +20,9 @@
eXo.i18n.I18NMessage.SessionTimeout = "La session a expir\u00e9 ! Veuillez recharger la page.";
eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
-eXo.i18n.I18NMessage.DefaultTheme = "Style par Défaut";
\ No newline at end of file
+eXo.i18n.I18NMessage.DefaultTheme = "Style par Défaut";
+eXo.i18n.I18NMessage.PreviousMonth="Mois précédent";
+eXo.i18n.I18NMessage.NextMonth="Mois prochain";
+eXo.i18n.I18NMessage.PreviousYear="Année précédente";
+eXo.i18n.I18NMessage.NextYear="Année suivante";
+eXo.i18n.I18NMessage.weekdays=["D", "L", "M", "M", "J", "V", "S"];
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js 2011-07-20 12:02:16 UTC (rev 6898)
+++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js 2011-07-20 12:28:21 UTC (rev 6899)
@@ -20,4 +20,9 @@
eXo.i18n.I18NMessage.SessionTimeout = "Phiên làm việc hết hạn! Tải lại trang này.";
eXo.i18n.I18NMessage.TargetBlockNotFound = "Không tìm thấy vùng đích với ID là : {0}";
eXo.i18n.I18NMessage.BlockUpdateNotFound = "Không tìm thấy vùng cần cập nhật : {0}";
-eXo.i18n.I18NMessage.DefaultTheme = "Mặc định";
\ No newline at end of file
+eXo.i18n.I18NMessage.DefaultTheme = "Mặc định";
+eXo.i18n.I18NMessage.PreviousMonth="Tháng trước";
+eXo.i18n.I18NMessage.NextMonth="Tháng sau";
+eXo.i18n.I18NMessage.PreviousYear="Năm trước";
+eXo.i18n.I18NMessage.NextYear="Năm sau";
+eXo.i18n.I18NMessage.weekdays=["CN", "T2", "T3", "T4", "T5", "T6", "T7"];
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-07-20 12:02:16 UTC (rev 6898)
+++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-07-20 12:28:21 UTC (rev 6899)
@@ -26,6 +26,9 @@
// if selectedDate is invalid, currentDate deals with system time;
this.selectedDate = null ; //Datetime value of input date&time field
this.months ;
+
+ this.firstDayOfWeek = 1;// Indecates what the first day of the week is; e.g., SUNDAY (1) in the U.S, MONDAY (2) in France, TUESDAY (3), etc
+ this.weekdays = null;
}
UICalendar.prototype.init = function(field, isDisplayTime, datePattern, value, monthNames) {
@@ -42,6 +45,11 @@
this.months = monthNames.split(',');
this.months.pop();
+ var weekdays = eXo.i18n.I18NMessage.getMessage("weekdays");
+ if(weekdays != null && typeof(weekdays) == "object") {
+ this.weekdays = weekdays;
+ }
+
if (!document.getElementById(this.calendarId)) this.create();
this.show() ;
@@ -184,26 +192,36 @@
table += '<div class="UICalendar" onmousedown="event.cancelBubble = true">' ;
table += ' <table class="MonthYearBox">' ;
table += ' <tr>' ;
- table += ' <td class="MonthButton"><a class="PreviousMonth" href="javascript:eXo.webui.UICalendar.changeMonth(-1);" title="Previous Month"></a></td>' ;
- table += ' <td class="YearButton"><a class="PreviousYear" href="javascript:eXo.webui.UICalendar.changeYear(-1);" title="Previous Year"></a></td>' ;
+ table += ' <td class="MonthButton"><a class="PreviousMonth" href="javascript:eXo.webui.UICalendar.changeMonth(-1);" title="' + eXo.i18n.I18NMessage.getMessage("PreviousMonth") + '"></a></td>' ;
+ table += ' <td class="YearButton"><a class="PreviousYear" href="javascript:eXo.webui.UICalendar.changeYear(-1);" title="' + eXo.i18n.I18NMessage.getMessage("PreviousYear") + '"></a></td>' ;
table += ' <td><font color="#f89302">' + this.months[this.currentDate.getMonth()] + '</font> - ' + this.currentDate.getFullYear() + '</td>' ;
- table += ' <td class="YearButton"><a class="NextYear" href="javascript:eXo.webui.UICalendar.changeYear(1);" title="Next Year"></a></td>' ;
- table += ' <td class="MonthButton"><a class="NextMonth" href="javascript:eXo.webui.UICalendar.changeMonth(1);" title="Next Month"></a></td>' ;
+ table += ' <td class="YearButton"><a class="NextYear" href="javascript:eXo.webui.UICalendar.changeYear(1);" title="' + eXo.i18n.I18NMessage.getMessage("NextYear") + '"></a></td>' ;
+ table += ' <td class="MonthButton"><a class="NextMonth" href="javascript:eXo.webui.UICalendar.changeMonth(1);" title="' + eXo.i18n.I18NMessage.getMessage("NextMonth") + '"></a></td>' ;
table += ' </tr>' ;
table += ' </table>' ;
table += ' <div style="margin-top: 6px;padding: 0px 5px;">' ;
table += ' <table>' ;
table += ' <tr>' ;
- table += ' <td><font color="red">S</font></td><td>M</td><td>T</td><td>W</td><td>T</td><td>F</td><td>S</td>' ;
+ if(this.weekdays == null) {
+ this.weekdays = new Array("S", "M", "T", "W", "T", "F", "S");
+ }
+ for (var i = 0; i < 7; i++) {
+ if(i == (8-this.firstDayOfWeek)%7) {
+ table += ' <td><font color="red">' + this.weekdays[(i + this.firstDayOfWeek - 1)%7] + '</font></td>';
+ } else {
+ table += ' <td>' + this.weekdays[(i + this.firstDayOfWeek - 1)%7] + '</td>';
+ }
+ }
table += ' </tr>' ;
table += ' </table>' ;
table += ' </div>' ;
table += ' <div class="CalendarGrid">' ;
table += ' <table>' ;
+
for (var week=0; week < 6; week++) {
table += "<tr>";
- for (var dayOfWeek=0; dayOfWeek < 7; dayOfWeek++) {
- if (week == 0 && startDayOfWeek == dayOfWeek) {
+ for (var dayOfWeek=0; dayOfWeek <= 6; dayOfWeek++) {
+ if (week == 0 && dayOfWeek == (startDayOfWeek + ((8-this.firstDayOfWeek)%7))%7) {
validDay = 1;
} else if (validDay == 1 && dayOfMonth > daysInMonth) {
validDay = 0;
@@ -423,4 +441,12 @@
return [31, ((!(year % 4 ) && ( (year % 100 ) || !( year % 400 ) ))? 29:28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
}
+UICalendar.prototype.getFirstDayOfWeek = function() {
+ return this.firstDayOfWeek;
+}
+
+UICalendar.prototype.setFirstDayOfWeek = function(dayOfWeek) {
+ this.firstDayOfWeek = dayOfWeek;
+}
+
eXo.webui.UICalendar = new UICalendar('UICalendarControl') ;
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-07-20 12:02:16 UTC (rev 6898)
+++ epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-07-20 12:28:21 UTC (rev 6899)
@@ -19,6 +19,7 @@
package org.exoplatform.webui.form;
+import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.webui.application.WebuiRequestContext;
import java.io.Writer;
@@ -211,7 +212,9 @@
value_ = "";
}
- context.getJavascriptManager().importJavascript("eXo.webui.UICalendar");
+ JavascriptManager jsManager = context.getJavascriptManager();
+ jsManager.importJavascript("eXo.webui.UICalendar");
+ jsManager.addJavascript("eXo.webui.UICalendar.setFirstDayOfWeek(" + Calendar.getInstance(context.getLocale()).getFirstDayOfWeek() + ")");
Writer w = context.getWriter();
w.write("<input type='text' onfocus='eXo.webui.UICalendar.init(this,");
13 years, 5 months
gatein SVN: r6898 - in epp/portal/branches/EPP_5_1_Branch: component/wsrp/src/main/java/conf and 3 other directories.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 08:02:16 -0400 (Wed, 20 Jul 2011)
New Revision: 6898
Added:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/conf/wsrp-consumers-config.xml
Modified:
epp/portal/branches/EPP_5_1_Branch/
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java
Log:
JBEPP-1018
WSRP Consumer: consumersConfigLocation is ignored in wsrp-configuration.xml
Property changes on: epp/portal/branches/EPP_5_1_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6533
/portal/trunk:4891,5744,5943,6168,6196,6201-6203,6205-6206,6857
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/epp/portal/branches/EPP_5_1_WSRP:6737
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6533
/portal/trunk:4891,5744,5943,6168,6196,6201-6203,6205-6206,6857
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/conf/wsrp-consumers-config.xml (from rev 6737, epp/portal/branches/EPP_5_1_WSRP/component/wsrp/src/main/java/conf/wsrp-consumers-config.xml)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/conf/wsrp-consumers-config.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/conf/wsrp-consumers-config.xml 2011-07-20 12:02:16 UTC (rev 6898)
@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2010, 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.
+ -->
+
+<deployments xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd">
+ <deployment>
+ <wsrp-producer id="selfv1" expiration-cache="500" ws-timeout="50000">
+ <endpoint-wsdl-url>http://localhost:8080/wsrp-producer/v1/MarkupService?wsdl</endpoint-wsdl-url>
+ <registration-data/>
+ </wsrp-producer>
+ </deployment>
+ <deployment>
+ <wsrp-producer id="selfv2" expiration-cache="500" ws-timeout="50000">
+ <endpoint-wsdl-url>http://localhost:8080/wsrp-producer/v2/MarkupService?wsdl</endpoint-wsdl-url>
+ <registration-data/>
+ </wsrp-producer>
+ </deployment>
+ <!--<deployment>
+ <wsrp-producer id="NetUnity" expiration-cache="300">
+ <endpoint-wsdl-url>http://wsrp.netunitysoftware.com/WSRPTestService/WSRPTestService.asmx?Ope...</endpoint-wsdl-url>
+ <registration-data/>
+ </wsrp-producer>
+ </deployment>-->
+ <!--<deployment>
+ <wsrp-producer id="NetUnityV2" expiration-cache="300">
+ <endpoint-wsdl-url>http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=...</endpoint-wsdl-url>
+ <registration-data/>
+ </wsrp-producer>
+ </deployment>
+ <deployment>
+ <wsrp-producer id="NetUnityV1" expiration-cache="300">
+ <endpoint-wsdl-url>http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=...</endpoint-wsdl-url>
+ <registration-data/>
+ </wsrp-producer>
+ </deployment>-->
+ <!--<deployment>
+ <wsrp-producer id="vignette" expiration-cache="300">
+ <endpoint-wsdl-url>http://wsrpdemo.vignette.com:8080/producer/wsdl</endpoint-wsdl-url>
+ <registration-data>
+ <property>
+ <name>com.vignette.wsrp.registration.username</name>
+ <lang>en</lang>
+ <value>test</value>
+ </property>
+ <property>
+ <name>com.vignette.wsrp.registration.password</name>
+ <lang>en</lang>
+ <value>test</value>
+ </property>
+ </registration-data>
+ </wsrp-producer>
+ </deployment>-->
+ <!--<deployment>
+ <wsrp-producer id="bea" expiration-cache="300">
+ <endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
+ <registration-data>
+ <property>
+ <name>{urn:bea:wlp:prop:reg:registration}consumerRole</name>
+ <lang>en</lang>
+ <value>insider</value>
+ </property>
+ </registration-data>
+ </wsrp-producer>
+ </deployment>-->
+ <!--<deployment>
+ <wsrp-producer id="oracle" expiration-cache="300">
+ <endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlets?WSDL</endpoint-wsdl-url>
+ <registration-data/>
+ </wsrp-producer>
+ </deployment>-->
+</deployments>
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java 2011-07-20 11:53:20 UTC (rev 6897)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java 2011-07-20 12:02:16 UTC (rev 6898)
@@ -88,11 +88,13 @@
private static final String PRODUCER_CONFIG_LOCATION = "producerConfigLocation";
private static final String CONSUMERS_CONFIG_LOCATION = "consumersConfigLocation";
- private final InputStream configurationIS;
+ private final InputStream producerConfigurationIS;
private final String producerConfigLocation;
private WSRPProducer producer;
- private ConsumerRegistry consumerRegistry;
+ private final InputStream consumersConfigurationIS;
+ private final String consumersConfigLocation;
+ private JCRConsumerRegistry consumerRegistry;
private ExoContainer container;
private final ExoKernelIntegration exoKernelIntegration;
private final boolean bypass;
@@ -106,7 +108,6 @@
// todo: we currently only allow the service to go through initialization if we are running in the default portal
// as this service is not meant to work with extensions yet...
- String consumersConfigLocation;
if ("portal".equals(context.getName()))
{
if (params != null)
@@ -120,7 +121,8 @@
+ PRODUCER_CONFIG_LOCATION + "and " + CONSUMERS_CONFIG_LOCATION);
}
- configurationIS = configurationManager.getInputStream(CLASSPATH + producerConfigLocation);
+ producerConfigurationIS = configurationManager.getInputStream(CLASSPATH + producerConfigLocation);
+ consumersConfigurationIS = configurationManager.getInputStream(CLASSPATH + consumersConfigLocation);
container = context.getContainer();
@@ -135,7 +137,8 @@
producerConfigLocation = null;
consumersConfigLocation = null;
- configurationIS = null;
+ producerConfigurationIS = null;
+ consumersConfigurationIS = null;
exoKernelIntegration = null;
bypass = true;
}
@@ -165,7 +168,7 @@
try
{
producerConfigurationService = new JCRProducerConfigurationService(container);
- producerConfigurationService.setDefaultConfigurationIS(configurationIS);
+ producerConfigurationService.setConfigurationIS(producerConfigurationIS);
producerConfigurationService.reloadConfiguration();
}
catch (Exception e)
@@ -282,6 +285,7 @@
consumerRegistry = new JCRConsumerRegistry(container);
consumerRegistry.setFederatingPortletInvoker(federatingPortletInvoker);
consumerRegistry.setSessionEventBroadcaster(sessionEventBroadcaster);
+ consumerRegistry.setConfigurationIS(consumersConfigurationIS);
// create ConsumerStructureProvider and register it to listen to page events
POMSessionManager sessionManager = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
@@ -305,7 +309,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("Couldn't start WSRP consumers registry.", e);
+ throw new RuntimeException("Couldn't start WSRP consumers registry from configuration " + consumersConfigLocation, e);
}
container.registerComponentInstance(ConsumerRegistry.class, consumerRegistry);
}
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2011-07-20 11:53:20 UTC (rev 6897)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2011-07-20 12:02:16 UTC (rev 6898)
@@ -39,6 +39,7 @@
import org.gatein.wsrp.consumer.registry.AbstractConsumerRegistry;
import org.gatein.wsrp.consumer.registry.xml.XMLConsumerRegistry;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -54,6 +55,7 @@
// private NewJCRPersister persister;
private JCRPersister persister;
private static final String PRODUCER_INFOS_PATH = ProducerInfosMapping.NODE_NAME;
+ private InputStream configurationIS;
public JCRConsumerRegistry(ExoContainer container) throws Exception
{
@@ -67,6 +69,11 @@
// persister = NewJCRPersister.getInstance(container);
}
+ public void setConfigurationIS(InputStream configurationIS)
+ {
+ this.configurationIS = configurationIS;
+ }
+
@Override
protected void save(ProducerInfo info, String messageOnError)
{
@@ -167,7 +174,7 @@
List<ProducerInfoMapping> infos = producerInfosMapping.getProducerInfos();
// Load from XML
- XMLConsumerRegistry fromXML = new XMLConsumerRegistry();
+ XMLConsumerRegistry fromXML = new XMLConsumerRegistry(configurationIS);
fromXML.reloadConsumers();
// Save to JCR
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java 2011-07-20 11:53:20 UTC (rev 6897)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java 2011-07-20 12:02:16 UTC (rev 6898)
@@ -46,7 +46,7 @@
{
private static String PRODUCER_CONFIGURATION_PATH = ProducerConfigurationMapping.NODE_NAME;
- private InputStream defaultConfigurationIS;
+ private InputStream configurationIS;
// private NewJCRPersister persister;
private JCRPersister persister;
@@ -62,15 +62,9 @@
// persister = NewJCRPersister.getInstance(container);
}
- /**
- * todo: remove
- *
- * @param is
- * @deprecated this should be removed when a better initialization of default is setup
- */
- public void setDefaultConfigurationIS(InputStream is)
+ public void setConfigurationIS(InputStream is)
{
- this.defaultConfigurationIS = is;
+ this.configurationIS = is;
}
protected void loadConfiguration() throws Exception
@@ -84,7 +78,7 @@
{
pcm = session.insert(ProducerConfigurationMapping.class, PRODUCER_CONFIGURATION_PATH);
- ProducerConfigurationService service = new SimpleXMLProducerConfigurationService(defaultConfigurationIS);
+ ProducerConfigurationService service = new SimpleXMLProducerConfigurationService(configurationIS);
service.reloadConfiguration();
configuration = service.getConfiguration();
13 years, 5 months
gatein SVN: r6897 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 07:53:20 -0400 (Wed, 20 Jul 2011)
New Revision: 6897
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-1017
PortletBridge upgrade seam
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-20 11:32:28 UTC (rev 6896)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-20 11:53:20 UTC (rev 6897)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.1-EPP511-CR01</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.1-EPP511-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
13 years, 5 months
gatein SVN: r6896 - in epp/portal/branches/EPP_5_2_Branch: examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic and 3 other directories.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 07:32:28 -0400 (Wed, 20 Jul 2011)
New Revision: 6896
Modified:
epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
Log:
JBEPP-1013
Change iFrame location to www.gatein.org
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-07-20 11:32:28 UTC (rev 6896)
@@ -37,7 +37,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-07-20 11:32:28 UTC (rev 6896)
@@ -37,7 +37,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml 2011-07-20 11:17:48 UTC (rev 6895)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml 2011-07-20 11:32:28 UTC (rev 6896)
@@ -274,7 +274,7 @@
<portlet-preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</portlet-preferences>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-07-20 11:32:28 UTC (rev 6896)
@@ -53,7 +53,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-07-20 11:32:28 UTC (rev 6896)
@@ -37,7 +37,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
13 years, 5 months
gatein SVN: r6895 - in epp/portal/branches/EPP_5_1_Branch: examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic and 4 other directories.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 07:17:48 -0400 (Wed, 20 Jul 2011)
New Revision: 6895
Modified:
epp/portal/branches/EPP_5_1_Branch/
epp/portal/branches/EPP_5_1_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
epp/portal/branches/EPP_5_1_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
Log:
JBEPP-1013
Change iFrame location to www.gatein.org
Property changes on: epp/portal/branches/EPP_5_1_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6533
/portal/trunk:4891,5744,5943,6168,6196,6201-6203,6205-6206
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6533
/portal/trunk:4891,5744,5943,6168,6196,6201-6203,6205-6206,6857
Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-07-20 10:23:18 UTC (rev 6894)
+++ epp/portal/branches/EPP_5_1_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
@@ -37,7 +37,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-07-20 10:23:18 UTC (rev 6894)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
@@ -37,7 +37,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml 2011-07-20 10:23:18 UTC (rev 6894)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/web/src/main/webapp/WEB-INF/portlet.xml 2011-07-20 11:17:48 UTC (rev 6895)
@@ -266,7 +266,7 @@
<portlet-preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</portlet-preferences>
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-07-20 10:23:18 UTC (rev 6894)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
@@ -53,7 +53,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-07-20 10:23:18 UTC (rev 6894)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2011-07-20 11:17:48 UTC (rev 6895)
@@ -37,7 +37,7 @@
<preferences>
<preference>
<name>url</name>
- <value>http://blog.gatein.org</value>
+ <value>http://jboss.org/gatein</value>
<read-only>false</read-only>
</preference>
</preferences>
13 years, 5 months
gatein SVN: r6894 - in components/wsrp/tags/2.0.1-EPP511-GA: admin-gui and 9 other directories.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 06:23:18 -0400 (Wed, 20 Jul 2011)
New Revision: 6894
Modified:
components/wsrp/tags/2.0.1-EPP511-GA/admin-gui/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/api/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/common/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/consumer/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/hibernate-impl/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/producer/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/test/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/wsrp-producer-war/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/wsrp1-ws/pom.xml
components/wsrp/tags/2.0.1-EPP511-GA/wsrp2-ws/pom.xml
Log:
Changed version, changed dependency on PortletBridge
Modified: components/wsrp/tags/2.0.1-EPP511-GA/admin-gui/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/admin-gui/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/admin-gui/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
@@ -68,12 +68,12 @@
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-api</artifactId>
- <version>2.1.0.FINAL</version>
+ <version>2.1.2.GA.EPP51</version>
</dependency>
<dependency>
<groupId>org.jboss.portletbridge</groupId>
<artifactId>portletbridge-impl</artifactId>
- <version>2.1.0.FINAL</version>
+ <version>2.1.2.GA.EPP51</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/api/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/api/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/api/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/common/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/common/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/common/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/consumer/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/consumer/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/consumer/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/hibernate-impl/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/hibernate-impl/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
<packaging>pom</packaging>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/producer/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/producer/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/producer/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/test/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/test/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/test/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/wsrp-producer-war/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/wsrp-producer-war/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/wsrp1-ws/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/wsrp1-ws/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/tags/2.0.1-EPP511-GA/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/tags/2.0.1-EPP511-GA/wsrp2-ws/pom.xml 2011-07-20 10:10:22 UTC (rev 6893)
+++ components/wsrp/tags/2.0.1-EPP511-GA/wsrp2-ws/pom.xml 2011-07-20 10:23:18 UTC (rev 6894)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.1-GA</version>
+ <version>2.0.1.GA.EPP51</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 5 months
gatein SVN: r6893 - components/wsrp/tags.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 06:10:22 -0400 (Wed, 20 Jul 2011)
New Revision: 6893
Added:
components/wsrp/tags/2.0.1-EPP511-GA/
Log:
Preparing the tag, will need to modify the tag
13 years, 5 months
gatein SVN: r6892 - in components/wsrp/branches/2.0.x: admin-gui and 9 other directories.
by do-not-reply@jboss.org
Author: theute
Date: 2011-07-20 05:19:31 -0400 (Wed, 20 Jul 2011)
New Revision: 6892
Modified:
components/wsrp/branches/2.0.x/admin-gui/pom.xml
components/wsrp/branches/2.0.x/api/pom.xml
components/wsrp/branches/2.0.x/common/pom.xml
components/wsrp/branches/2.0.x/consumer/pom.xml
components/wsrp/branches/2.0.x/hibernate-impl/pom.xml
components/wsrp/branches/2.0.x/pom.xml
components/wsrp/branches/2.0.x/producer/pom.xml
components/wsrp/branches/2.0.x/test/pom.xml
components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml
components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml
components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/branches/2.0.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/admin-gui/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/admin-gui/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/branches/2.0.x/api/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/api/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/api/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/branches/2.0.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/common/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/common/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/branches/2.0.x/consumer/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/consumer/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/consumer/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/branches/2.0.x/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/hibernate-impl/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/hibernate-impl/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/branches/2.0.x/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,10 +40,10 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.1-GA
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/branches/2....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/branches/2.0.x/
</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.1-GA</url>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/branches/2.0.x/</url>
</scm>
<properties>
Modified: components/wsrp/branches/2.0.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/producer/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/producer/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/branches/2.0.x/test/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/test/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/test/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml 2011-07-20 09:19:08 UTC (rev 6891)
+++ components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml 2011-07-20 09:19:31 UTC (rev 6892)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.1-GA</version>
+ <version>2.0.2-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 5 months