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>