Author: chris.laprun(a)jboss.com Date: 2010-03-01 11:50:21 -0500 (Mon, 01 Mar 2010) New Revision: 1917 Added: portal/trunk/component/wsrp/src/test/resources/conf/gatein.portal.component.wsrp-configuration.xml Removed: portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml Modified: portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java Log: - Renamed configuration file to conform to new module name. Modified: portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java =================================================================== --- portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2010-03-01 16:48:48 UTC (rev 1916) +++ portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2010-03-01 16:50:21 UTC (rev 1917) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual + * 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. @@ -23,7 +23,10 @@ package org.gatein.portal.wsrp.state.consumer; -import org.exoplatform.component.test.*; +import org.exoplatform.component.test.AbstractKernelTest; +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; @@ -42,7 +45,7 @@ */ @ConfiguredBy({ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.wsrp-configuration.xml") + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/gatein.portal.component.wsrp-configuration.xml") }) public class ConsumerRegistryTestCase extends AbstractKernelTest { Deleted: portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml =================================================================== --- portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml 2010-03-01 16:48:48 UTC (rev 1916) +++ portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml 2010-03-01 16:50:21 UTC (rev 1917) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<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>domain-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> Copied: portal/trunk/component/wsrp/src/test/resources/conf/gatein.portal.component.wsrp-configuration.xml (from rev 1915, portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml) =================================================================== --- portal/trunk/component/wsrp/src/test/resources/conf/gatein.portal.component.wsrp-configuration.xml (rev 0) +++ portal/trunk/component/wsrp/src/test/resources/conf/gatein.portal.component.wsrp-configuration.xml 2010-03-01 16:50:21 UTC (rev 1917) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ 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. + --> + +<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>domain-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>