gatein SVN: r1072 - portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-18 10:27:33 -0500 (Fri, 18 Dec 2009)
New Revision: 1072
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java
Log:
actually mis used the portal container init task
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2009-12-18 15:07:21 UTC (rev 1071)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2009-12-18 15:27:33 UTC (rev 1072)
@@ -21,8 +21,6 @@
import org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl;
import org.exoplatform.commons.chromattic.ChromatticLifeCycle;
import org.exoplatform.commons.chromattic.SessionContext;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.container.RootContainer;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.xml.XMLTools;
@@ -75,14 +73,7 @@
final URL url = scontext.getResource("/WEB-INF/gadget.xml");
if (url != null)
{
- final RootContainer.PortalContainerPostInitTask task = new RootContainer.PortalContainerPostInitTask()
- {
- public void execute(ServletContext context, PortalContainer portalContainer)
- {
- handle(context, url);
- }
- };
- PortalContainer.addInitTask(scontext, task);
+ handle(scontext, url);
}
}
catch (MalformedURLException e)
15 years
gatein SVN: r1071 - portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-12-18 10:07:21 -0500 (Fri, 18 Dec 2009)
New Revision: 1071
Modified:
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
Log:
- Version of JCRPersister that seems to work. Might be less efficient because we need to retrieve the container and session
provider at instantiation of the SessionLifeCycle instead of doing it just once when the class is loaded but this seems
to work and it seems that there was some classloading-related issues going preventing the proper behavior.
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2009-12-18 14:38:58 UTC (rev 1070)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2009-12-18 15:07:21 UTC (rev 1071)
@@ -84,33 +84,23 @@
public static class WSRPSessionLifeCycle implements SessionLifeCycle
{
- private static boolean initialized = false;
- private static ManageableRepository repository;
- private static SessionProvider provider;
+ private ManageableRepository repository;
+ private SessionProvider provider;
public WSRPSessionLifeCycle()
{
- init();
- }
-
- private static void init()
- {
- if (!initialized)
+ try
{
- try
- {
- ExoContainer container = ExoContainerContext.getCurrentContainer();
- RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
- repository = repoService.getRepository(REPOSITORY_NAME);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
-
- provider = SessionProvider.createSystemProvider();
- initialized = true;
+ ExoContainer container = ExoContainerContext.getCurrentContainer();
+ RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
+ repository = repoService.getRepository(REPOSITORY_NAME);
}
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ provider = SessionProvider.createSystemProvider();
}
public Session login() throws RepositoryException
15 years
gatein SVN: r1070 - portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-12-18 09:38:58 -0500 (Fri, 18 Dec 2009)
New Revision: 1070
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java
Log:
better logging for gadget import
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2009-12-18 14:12:44 UTC (rev 1069)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2009-12-18 14:38:58 UTC (rev 1070)
@@ -118,7 +118,7 @@
{
Element gadgetElement = (Element)nodeList.item(i);
String gadgetName = gadgetElement.getAttribute("name");
- log.info("About to import gadget " + gadgetName);
+ log.debug("About to import gadget " + gadgetName);
Element pathElt = XMLTools.getUniqueChild(gadgetElement, "path", false);
if (pathElt != null)
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2009-12-18 14:12:44 UTC (rev 1069)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2009-12-18 14:38:58 UTC (rev 1070)
@@ -116,7 +116,7 @@
{
if (registry.getGadget(name) != null)
{
- System.out.println("Cannot import existing gagdet " + name);
+ log.debug("Will not import existing gagdet " + name);
return;
}
@@ -124,7 +124,7 @@
byte[] bytes = getGadgetBytes();
if (bytes == null)
{
- System.out.println("Coult not import gadget " + gadgetPath);
+ log.error("Cannot import gadget " + gadgetPath + " because its data could not be found");
return;
}
15 years
gatein SVN: r1069 - in portal/branches/wsrp-integration/component/wsrp: src/test and 3 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-12-18 09:12:44 -0500 (Fri, 18 Dec 2009)
New Revision: 1069
Added:
portal/branches/wsrp-integration/component/wsrp/src/test/resources/
portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/
portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/consumers-configuration-nodetypes.xml
portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml
Modified:
portal/branches/wsrp-integration/component/wsrp/pom.xml
portal/branches/wsrp-integration/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java
Log:
- Started modifying test to make it work.
Modified: portal/branches/wsrp-integration/component/wsrp/pom.xml
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/pom.xml 2009-12-18 14:11:36 UTC (rev 1068)
+++ portal/branches/wsrp-integration/component/wsrp/pom.xml 2009-12-18 14:12:44 UTC (rev 1069)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
@@ -123,9 +124,9 @@
<!-- tests -->
<dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.exo</artifactId>
- <version>${version.chromattic}</version>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.jcr</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: portal/branches/wsrp-integration/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2009-12-18 14:11:36 UTC (rev 1068)
+++ portal/branches/wsrp-integration/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2009-12-18 14:12:44 UTC (rev 1069)
@@ -22,7 +22,10 @@
package org.gatein.portal.wsrp.state.consumer;
-import junit.framework.TestCase;
+import org.exoplatform.component.test.AbstractGateInTest;
+import org.exoplatform.component.test.ConfigurationUnit;
+import org.exoplatform.component.test.ConfiguredBy;
+import org.exoplatform.component.test.ContainerScope;
import org.gatein.pc.federation.impl.FederatingPortletInvokerService;
import org.gatein.wsrp.WSRPConsumer;
import org.gatein.wsrp.consumer.ConsumerException;
@@ -39,14 +42,18 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public class ConsumerRegistryTestCase extends TestCase
+@ConfiguredBy({
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml")
+})
+public class ConsumerRegistryTestCase extends AbstractGateInTest
{
private JCRConsumerRegistry registry;
@Override
protected void setUp() throws Exception
{
-// registry = new JCRConsumerRegistry();
+ registry = new JCRConsumerRegistry(getContainer());
registry.setFederatingPortletInvoker(new FederatingPortletInvokerService());
}
Copied: portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/consumers-configuration-nodetypes.xml (from rev 1041, portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml)
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/consumers-configuration-nodetypes.xml (rev 0)
+++ portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/consumers-configuration-nodetypes.xml 2009-12-18 14:12:44 UTC (rev 1069)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2009, 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.
+ -->
+
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+ xmlns:jcr="http://www.jcp.org/jcr/1.0">
+
+ <nodeType name="wsrp:producerinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="wsrp:producerinfo" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:producerinfo</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:producerinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="producerid" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="cache" requiredType="Integer" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="active" requiredType="boolean" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="endpoint" defaultPrimaryType="wsrp:endpointinfo" autoCreated="true"
+ mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:endpointinfo</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="registration" defaultPrimaryType="wsrp:registrationinfo" autoCreated="true"
+ mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:registrationinfo</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:endpointinfo" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="wsdlurl" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:registrationinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="consumername" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationproperty" autoCreated="false"
+ mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:registrationproperty</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="status" requiredType="Integer" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true"
+ primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+</nodeTypes>
\ No newline at end of file
Copied: portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml (from rev 1041, portal/branches/wsrp-integration/component/common/src/test/resources/conf/test-configuration.xml)
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml (rev 0)
+++ portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml 2009-12-18 14:12:44 UTC (rev 1069)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
+ <component-plugin>
+ <name>add.namespaces</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ <init-params>
+ <properties-param>
+ <name>namespaces</name>
+ <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>add.nodeType</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ <init-params>
+ <values-param>
+ <name>autoCreatedInNewRepository</name>
+ <description>Node types configuration file</description>
+ <value>jar:/conf/consumers-configuration-nodetypes.xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+ <external-component-plugins>
+ <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
+ <component-plugin>
+ <name>chromattic</name>
+ <set-method>addLifeCycle</set-method>
+ <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
+ <init-params>
+ <value-param>
+ <name>name</name>
+ <value>wsrp</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+ <value>org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping</value>
+ <value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfoMapping</value>
+ <value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfosMapping</value>
+ <value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationInfoMapping</value>
+ <value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationPropertyMapping</value>
+ <value>org.gatein.portal.wsrp.state.consumer.mapping.EndpointInfoMapping</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
15 years
gatein SVN: r1068 - in portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state: consumer and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-12-18 09:11:36 -0500 (Fri, 18 Dec 2009)
New Revision: 1068
Modified:
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
Log:
- Yet another non-working version of JCRPersister committed for backup purpose.
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2009-12-18 13:08:05 UTC (rev 1067)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2009-12-18 14:11:36 UTC (rev 1068)
@@ -29,8 +29,8 @@
import org.chromattic.api.format.ObjectFormatter;
import org.chromattic.spi.jcr.SessionLifeCycle;
import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.services.jcr.RepositoryService;
-import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.ext.common.SessionProvider;
@@ -46,29 +46,11 @@
public class JCRPersister
{
private Chromattic chrome;
- public static final String WSRP_SERVICES_PATH = "wsrp:";
- private final SessionProvider provider;
- private final ManageableRepository repository;
- private final String workspaceName;
+ private static final String WORKSPACE_NAME = "wsrp-system";
+ private static final String REPOSITORY_NAME = "repository";
- static ThreadLocal<JCRPersister> PERSISTER = new ThreadLocal<JCRPersister>();
-
- public JCRPersister(ExoContainer container) throws RepositoryException
+ public JCRPersister(ExoContainer container)
{
- try
- {
- RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
- repository = repoService.getRepository("repository");
- }
- catch (RepositoryConfigurationException e)
- {
- throw new RepositoryException(e);
- }
-
- //
- this.provider = SessionProvider.createSystemProvider();
- this.workspaceName = "wsrp-system";
- PERSISTER.set(this);
}
public void initializeBuilderFor(List<Class> mappingClasses) throws Exception
@@ -102,15 +84,38 @@
public static class WSRPSessionLifeCycle implements SessionLifeCycle
{
+ private static boolean initialized = false;
+ private static ManageableRepository repository;
+ private static SessionProvider provider;
public WSRPSessionLifeCycle()
{
+ init();
}
+ private static void init()
+ {
+ if (!initialized)
+ {
+ try
+ {
+ ExoContainer container = ExoContainerContext.getCurrentContainer();
+ RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
+ repository = repoService.getRepository(REPOSITORY_NAME);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ provider = SessionProvider.createSystemProvider();
+ initialized = true;
+ }
+ }
+
public Session login() throws RepositoryException
{
- JCRPersister persister = PERSISTER.get();
- return persister.provider.getSession(persister.workspaceName, persister.repository);
+ return provider.getSession(WORKSPACE_NAME, repository);
}
public Session login(String s) throws RepositoryException
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2009-12-18 13:08:05 UTC (rev 1067)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2009-12-18 14:11:36 UTC (rev 1068)
@@ -26,7 +26,6 @@
import org.chromattic.api.ChromatticSession;
import org.exoplatform.container.ExoContainer;
import org.gatein.portal.wsrp.state.JCRPersister;
-import org.gatein.portal.wsrp.state.NewJCRPersister;
import org.gatein.portal.wsrp.state.consumer.mapping.EndpointInfoMapping;
import org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfoMapping;
import org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfosMapping;
@@ -49,19 +48,20 @@
*/
public class JCRConsumerRegistry extends AbstractConsumerRegistry
{
- private NewJCRPersister persister;
+// private NewJCRPersister persister;
+ private JCRPersister persister;
private static final String PRODUCER_INFOS_PATH = ProducerInfosMapping.NODE_NAME;
public JCRConsumerRegistry(ExoContainer container) throws Exception
{
- /*List<Class> mappingClasses = new ArrayList<Class>(6);
+ List<Class> mappingClasses = new ArrayList<Class>(6);
Collections.addAll(mappingClasses, ProducerInfosMapping.class, ProducerInfoMapping.class,
EndpointInfoMapping.class, RegistrationInfoMapping.class, RegistrationPropertyMapping.class,
RegistrationPropertyDescriptionMapping.class);
persister = new JCRPersister(container);
- persister.initializeBuilderFor(mappingClasses);*/
- persister = NewJCRPersister.getInstance(container);
+ persister.initializeBuilderFor(mappingClasses);
+// persister = NewJCRPersister.getInstance(container);
}
@Override
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java 2009-12-18 13:08:05 UTC (rev 1067)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java 2009-12-18 14:11:36 UTC (rev 1068)
@@ -25,7 +25,6 @@
import org.chromattic.api.ChromatticSession;
import org.exoplatform.container.ExoContainer;
import org.gatein.portal.wsrp.state.JCRPersister;
-import org.gatein.portal.wsrp.state.NewJCRPersister;
import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping;
import org.gatein.portal.wsrp.state.producer.configuration.mapping.ProducerConfigurationMapping;
import org.gatein.portal.wsrp.state.producer.configuration.mapping.RegistrationRequirementsMapping;
@@ -47,18 +46,19 @@
private static String PRODUCER_CONFIGURATION_PATH = ProducerConfigurationMapping.NODE_NAME;
private InputStream defaultConfigurationIS;
- private NewJCRPersister persister;
+// private NewJCRPersister persister;
+ private JCRPersister persister;
public JCRProducerConfigurationService(ExoContainer container) throws Exception
{
- /*List<Class> mappingClasses = new ArrayList<Class>(3);
+ List<Class> mappingClasses = new ArrayList<Class>(3);
Collections.addAll(mappingClasses, ProducerConfigurationMapping.class, RegistrationRequirementsMapping.class,
RegistrationPropertyDescriptionMapping.class);
persister = new JCRPersister(container);
- persister.initializeBuilderFor(mappingClasses);*/
+ persister.initializeBuilderFor(mappingClasses);
- persister = NewJCRPersister.getInstance(container);
+// persister = NewJCRPersister.getInstance(container);
}
/**
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2009-12-18 13:08:05 UTC (rev 1067)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2009-12-18 14:11:36 UTC (rev 1068)
@@ -25,7 +25,6 @@
import org.chromattic.api.ChromatticSession;
import org.exoplatform.container.ExoContainer;
import org.gatein.portal.wsrp.state.JCRPersister;
-import org.gatein.portal.wsrp.state.NewJCRPersister;
import org.gatein.portal.wsrp.state.producer.registrations.mapping.ConsumerCapabilitiesMapping;
import org.gatein.portal.wsrp.state.producer.registrations.mapping.ConsumerGroupMapping;
import org.gatein.portal.wsrp.state.producer.registrations.mapping.ConsumerMapping;
@@ -50,20 +49,21 @@
*/
public class JCRRegistrationPersistenceManager extends RegistrationPersistenceManagerImpl
{
- private NewJCRPersister persister;
+// private NewJCRPersister persister;
+ private JCRPersister persister;
private ConsumersAndGroupsMapping mappings;
public JCRRegistrationPersistenceManager(ExoContainer container) throws Exception
{
- /*persister = new JCRPersister(container);
+ persister = new JCRPersister(container);
List<Class> mappingClasses = new ArrayList<Class>(5);
Collections.addAll(mappingClasses, ConsumersAndGroupsMapping.class, ConsumerMapping.class, ConsumerGroupMapping.class,
RegistrationMapping.class, ConsumerCapabilitiesMapping.class);
- persister.initializeBuilderFor(mappingClasses);*/
+ persister.initializeBuilderFor(mappingClasses);
- persister = NewJCRPersister.getInstance(container);
+// persister = NewJCRPersister.getInstance(container);
ChromatticSession session = persister.getSession();
mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME);
15 years
gatein SVN: r1067 - tools/packager/trunk/src/main/javascript/eXo/server.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-18 08:08:05 -0500 (Fri, 18 Dec 2009)
New Revision: 1067
Modified:
tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js
Log:
Looks like we add then remove dependencies !?
Modified: tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js
===================================================================
--- tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js 2009-12-18 13:02:11 UTC (rev 1066)
+++ tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js 2009-12-18 13:08:05 UTC (rev 1067)
@@ -86,8 +86,8 @@
// Above 2.5 we don't bundle JOTM anymore
//var version = product.version;
//if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0) {
- // product.removeDependency(new Project("jotm", "jotm_jrmp_stubs", "jar", "2.0.10"));
- // product.removeDependency(new Project("jotm", "jotm", "jar", "2.0.10"));
+ product.removeDependency(new Project("jotm", "jotm_jrmp_stubs", "jar", "2.0.10"));
+ product.removeDependency(new Project("jotm", "jotm", "jar", "2.0.10"));
//}
// Remove hibernate libs for JBoss AS5
15 years
gatein SVN: r1066 - tools/packager/trunk/src/main/javascript/eXo/server.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-18 08:02:11 -0500 (Fri, 18 Dec 2009)
New Revision: 1066
Modified:
tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js
Log:
GTNPORTAL-274: Remove slf4j-*.jar from gatein.ear in jboss packaging
Also removed unused JOTM declaration
Modified: tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js
===================================================================
--- tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js 2009-12-18 12:27:23 UTC (rev 1065)
+++ tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js 2009-12-18 13:02:11 UTC (rev 1066)
@@ -76,19 +76,19 @@
// product.removeDependency(new Project("quartz", "quartz", "jar",
// "1.5.0-RC2"));
- var version = product.version;
- if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0
- && version.indexOf("2.5") != 0) {
- product.addDependencies(new Project("org.slf4j", "slf4j-api", "jar", "1.5.6"));
- product.addDependencies(new Project("org.slf4j", "slf4j-log4j12", "jar", "1.5.6"));
- }
+ //var version = product.version;
+ //if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0
+ // && version.indexOf("2.5") != 0) {
+ // product.addDependencies(new Project("org.slf4j", "slf4j-api", "jar", "1.5.6"));
+ // product.addDependencies(new Project("org.slf4j", "slf4j-log4j12", "jar", "1.5.6"));
+ //}
// Above 2.5 we don't bundle JOTM anymore
- var version = product.version;
- if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0) {
- product.removeDependency(new Project("jotm", "jotm_jrmp_stubs", "jar", "2.0.10"));
- product.removeDependency(new Project("jotm", "jotm", "jar", "2.0.10"));
- }
+ //var version = product.version;
+ //if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0) {
+ // product.removeDependency(new Project("jotm", "jotm_jrmp_stubs", "jar", "2.0.10"));
+ // product.removeDependency(new Project("jotm", "jotm", "jar", "2.0.10"));
+ //}
// Remove hibernate libs for JBoss AS5
if (this.exoJBoss5) {
15 years
gatein SVN: r1065 - in components/wci/trunk: exo and 12 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-18 07:27:23 -0500 (Fri, 18 Dec 2009)
New Revision: 1065
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/servers/jboss42/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/exo/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/jetty/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.0.0-CR02</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.0.0-CR02</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.0.0-CR02</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/core/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss42/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/servers/jboss42/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss42</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/servers/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/tomcat/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2009-12-18 12:26:52 UTC (rev 1064)
+++ components/wci/trunk/wci/pom.xml 2009-12-18 12:27:23 UTC (rev 1065)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
15 years
gatein SVN: r1064 - components/wci/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-18 07:26:52 -0500 (Fri, 18 Dec 2009)
New Revision: 1064
Added:
components/wci/tags/2.0.0-CR02/
Log:
[maven-scm] copy for tag 2.0.0-CR02
Copied: components/wci/tags/2.0.0-CR02 (from rev 1063, components/wci/trunk)
15 years
gatein SVN: r1063 - in components/wci/trunk: exo and 12 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-18 07:26:28 -0500 (Fri, 18 Dec 2009)
New Revision: 1063
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/servers/jboss42/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-CR02
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/exo/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/jetty/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.0.0-CR02</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.0.0-CR02</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.0.0-CR02</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/core/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss42/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/servers/jboss42/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss42</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/servers/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/tomcat/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2009-12-18 12:19:50 UTC (rev 1062)
+++ components/wci/trunk/wci/pom.xml 2009-12-18 12:26:28 UTC (rev 1063)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
15 years