[portal-commits] JBoss Portal SVN: r5930 - in trunk/wsrp: . src/main/org/jboss/portal/test/wsrp/config src/main/org/jboss/portal/test/wsrp/framework src/main/org/jboss/portal/wsrp src/main/org/jboss/portal/wsrp/deployment src/main/org/jboss/portal/wsrp/producer/config src/main/org/jboss/portal/wsrp/producer/config/impl src/resources/portal-wsrp-sar src/resources/portal-wsrp-sar/META-INF src/resources/portal-wsrp-sar/conf src/resources/tests src/resources/tests/test-producer-configuration-lib-jar

Author: chris.laprun(a)jboss.com Date: 2006-12-22 16:16:44 -0500 (Fri, 22 Dec 2006) New Revision: 5930 Added: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml Removed: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/RegistrationConfigurationTestCase.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/RegistrationConfigurationFactory.java trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar/ Modified: trunk/wsrp/build.xml trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationService.java trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml Log: Re-factored producer configuration code and tests (registration-configuration -> producer-configuration). Modified: trunk/wsrp/build.xml =================================================================== --- trunk/wsrp/build.xml 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/build.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -346,10 +346,10 @@ </jar> </target> - <target name="package-registration-configuration-test" - description="Generates the registration configuration test artifacts" depends="compile"> - <jar jarfile="${build.lib.test}/test-registration-configuration-lib.jar"> - <fileset dir="${build.resources.test}/test-registration-configuration-lib-jar"/> + <target name="package-producer-configuration-test" + description="Generates the producer configuration test artifacts" depends="compile"> + <jar jarfile="${build.lib.test}/test-producer-configuration-lib.jar"> + <fileset dir="${build.resources.test}/test-producer-configuration-lib-jar"/> <fileset dir="${build.classes}/"> <include name="org/jboss/portal/test/wsrp/config/**"/> </fileset> @@ -523,7 +523,7 @@ <!-- Packages all the test related artifacts. Note that compilation should have been already executed --> <target name="package-tests" depends="package-consumer-test, package-deployment-test, package-other-test, - package-producer-test, package-registration-configuration-test" + package-producer-test, package-producer-configuration-test" description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before calling this task."/> @@ -545,7 +545,7 @@ <antcall target="consumer-test"/> <antcall target="deployment-test"/> <antcall target="other-test"/> - <antcall target="registration-configuration-test"/> + <antcall target="producer-configuration-test"/> <antcall target="agent-undeploy"/> <server:stop name="default"/> <antcall target="reports"/> @@ -556,7 +556,7 @@ <antcall target="consumer-test"/> <antcall target="deployment-test"/> <antcall target="other-test"/> - <antcall target="registration-configuration-test"/> + <antcall target="producer-configuration-test"/> </target> <!-- WSRP Producer tests --> @@ -642,10 +642,10 @@ </target> <!-- Producer registration configuration tests --> - <target name="registration-configuration-test" depends="package-registration-configuration-test"> + <target name="producer-configuration-test" depends="package-producer-configuration-test"> <execute-tests> <x-test> - <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.config.RegistrationConfigurationTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.config.ProducerConfigurationTestCase"/> </x-test> <x-sysproperty> <!--<jvmarg value="-Xdebug"/> @@ -656,7 +656,7 @@ </x-sysproperty> <x-classpath> <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/> - <fileset dir="${build.lib.test}" includes="test-registration-configuration-lib.jar"/> + <fileset dir="${build.lib.test}" includes="test-producer-configuration-lib.jar"/> <path refid="jboss.microcontainer.classpath"/> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> Copied: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java (from rev 5917, trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/RegistrationConfigurationTestCase.java) =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/RegistrationConfigurationTestCase.java 2006-12-20 22:09:59 UTC (rev 5917) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -0,0 +1,111 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.jboss.portal.test.wsrp.config; + +import junit.framework.TestCase; +import org.jboss.portal.wsrp.producer.config.LocalizedString; +import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; +import org.jboss.portal.wsrp.producer.config.ProducerConfigurationFactory; +import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; +import org.jboss.portal.wsrp.producer.config.RegistrationPropertyDescription; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; + +import javax.xml.namespace.QName; +import java.net.URL; +import java.util.Locale; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6 + */ +public class ProducerConfigurationTestCase extends TestCase +{ + private Unmarshaller unmarshaller; + private ObjectModelFactory factory; + + + protected void setUp() throws Exception + { + unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + factory = new ProducerConfigurationFactory(); + } + + public void testExtendedUnmarshalling() throws Exception + { + URL wsrpXMLLocation = Thread.currentThread().getContextClassLoader().getResource("extended.xml"); + assertNotNull(wsrpXMLLocation); + + Object o = unmarshaller.unmarshal(wsrpXMLLocation.openStream(), factory, null); + assertNotNull(o); + assertTrue(o instanceof ProducerConfiguration); + ProducerRegistrationRequirements requirements = ((ProducerConfiguration)o).getRegistrationRequirements(); + assertNotNull(requirements); + assertTrue(requirements.requiresRegistration()); + assertTrue(requirements.fullServiceDescriptionRequiresRegistration()); + Map properties = requirements.getRegistrationProperties(); + assertNotNull(properties); + assertEquals(2, properties.size()); + + checkRegistrationProperty(requirements, 1); + checkRegistrationProperty(requirements, 2); + } + + public void testMinimalUnmarshalling() throws Exception + { + URL wsrpXMLLocation = Thread.currentThread().getContextClassLoader().getResource("minimal.xml"); + assertNotNull(wsrpXMLLocation); + Object o = unmarshaller.unmarshal(wsrpXMLLocation.openStream(), factory, null); + assertNotNull(o); + assertTrue(o instanceof ProducerConfiguration); + ProducerRegistrationRequirements requirements = ((ProducerConfiguration)o).getRegistrationRequirements(); + assertNotNull(requirements); + assertTrue(requirements.requiresRegistration()); + assertTrue(!requirements.fullServiceDescriptionRequiresRegistration()); + Map properties = requirements.getRegistrationProperties(); + assertNotNull(properties); + assertTrue(properties.isEmpty()); + } + + private void checkRegistrationProperty(ProducerRegistrationRequirements requirements, int index) + { + RegistrationPropertyDescription desc = requirements.getRegistrationPropertyWith("name" + index); + assertNotNull(desc); + assertEquals(new QName("name" + index), desc.getName()); + assertEquals(new QName("xsd:string"), desc.getType()); + + LocalizedString localizedString = new LocalizedString("hint" + index, Locale.ENGLISH); + localizedString.setResourceName("resource.hint" + index); + localizedString.setValue("hint" + index); + assertEquals(localizedString, desc.getHint()); + + localizedString = new LocalizedString("label" + index, Locale.ENGLISH); + localizedString.setResourceName("resource.label" + index); + localizedString.setValue("label" + index); + assertEquals(localizedString, desc.getLabel()); + } +} Deleted: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/RegistrationConfigurationTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/RegistrationConfigurationTestCase.java 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/RegistrationConfigurationTestCase.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -1,108 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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.jboss.portal.test.wsrp.config; - -import junit.framework.TestCase; -import org.jboss.portal.wsrp.producer.config.LocalizedString; -import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; -import org.jboss.portal.wsrp.producer.config.RegistrationConfigurationFactory; -import org.jboss.portal.wsrp.producer.config.RegistrationPropertyDescription; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; - -import javax.xml.namespace.QName; -import java.net.URL; -import java.util.Locale; -import java.util.Map; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - * @since 2.6 - */ -public class RegistrationConfigurationTestCase extends TestCase -{ - private Unmarshaller unmarshaller; - private ObjectModelFactory factory; - - - protected void setUp() throws Exception - { - unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - factory = new RegistrationConfigurationFactory(); - } - - public void testExtendedUnmarshalling() throws Exception - { - URL wsrpXMLLocation = Thread.currentThread().getContextClassLoader().getResource("extended.xml"); - assertNotNull(wsrpXMLLocation); - - Object o = unmarshaller.unmarshal(wsrpXMLLocation.openStream(), factory, null); - assertNotNull(o); - assertTrue(o instanceof ProducerRegistrationRequirements); - ProducerRegistrationRequirements requirements = (ProducerRegistrationRequirements)o; - assertTrue(requirements.requiresRegistration()); - assertTrue(requirements.fullServiceDescriptionRequiresRegistration()); - Map properties = requirements.getRegistrationProperties(); - assertNotNull(properties); - assertEquals(2, properties.size()); - - checkRegistrationProperty(requirements, 1); - checkRegistrationProperty(requirements, 2); - } - - public void testMinimalUnmarshalling() throws Exception - { - URL wsrpXMLLocation = Thread.currentThread().getContextClassLoader().getResource("minimal.xml"); - assertNotNull(wsrpXMLLocation); - Object o = unmarshaller.unmarshal(wsrpXMLLocation.openStream(), factory, null); - assertNotNull(o); - assertTrue(o instanceof ProducerRegistrationRequirements); - ProducerRegistrationRequirements requirements = (ProducerRegistrationRequirements)o; - assertTrue(requirements.requiresRegistration()); - assertTrue(!requirements.fullServiceDescriptionRequiresRegistration()); - Map properties = requirements.getRegistrationProperties(); - assertNotNull(properties); - assertTrue(properties.isEmpty()); - } - - private void checkRegistrationProperty(ProducerRegistrationRequirements requirements, int index) - { - RegistrationPropertyDescription desc = requirements.getRegistrationPropertyWith("name" + index); - assertNotNull(desc); - assertEquals(new QName("name" + index), desc.getName()); - assertEquals(new QName("xsd:string"), desc.getType()); - - LocalizedString localizedString = new LocalizedString("hint" + index, Locale.ENGLISH); - localizedString.setResourceName("resource.hint" + index); - localizedString.setValue("hint" + index); - assertEquals(localizedString, desc.getHint()); - - localizedString = new LocalizedString("label" + index, Locale.ENGLISH); - localizedString.setResourceName("resource.label" + index); - localizedString.setValue("label" + index); - assertEquals(localizedString, desc.getLabel()); - } -} Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -72,6 +72,7 @@ import org.jboss.portal.wsrp.core.UnsupportedMimeTypeFault; import org.jboss.portal.wsrp.core.UnsupportedModeFault; import org.jboss.portal.wsrp.core.UnsupportedWindowStateFault; +import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; import javax.servlet.http.Cookie; @@ -370,4 +371,15 @@ { throw new UnsupportedOperationException("getRegistrationManager not implemented"); } + + + public ProducerConfiguration getProducerConfiguration() + { + throw new UnsupportedOperationException("getProducerConfiguration not implemented"); + } + + public void setProducerConfiguration(ProducerConfiguration producerConfiguration) + { + throw new UnsupportedOperationException("setProducerConfiguration not implemented"); + } } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -29,6 +29,7 @@ import org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType; import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType; import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType; +import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; /** @@ -90,7 +91,27 @@ */ void setSessionExpirationTime(int sessionExpirationTime); + /** + * @return + * @since 2.6 + */ ProducerRegistrationRequirements getProducerRegistrationRequirements(); + /** + * @return + * @since 2.6 + */ RegistrationManager getRegistrationManager(); + + /** + * @return + * @since 2.6 + */ + ProducerConfiguration getProducerConfiguration(); + + /** + * @param producerConfiguration + * @since 2.6 + */ + void setProducerConfiguration(ProducerConfiguration producerConfiguration); } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.wsrp.deployment; -import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; import org.jboss.system.ServiceMBeanSupport; import java.util.ArrayList; @@ -36,7 +34,6 @@ public class WSRPDeployment extends ServiceMBeanSupport implements WSRPDeploymentMBean { private final List services; - private ProducerRegistrationRequirements registrationRequirements; public WSRPDeployment() { @@ -47,15 +44,4 @@ { return services; } - - public ProducerRegistrationRequirements getRegistrationRequirements() - { - return registrationRequirements; - } - - public void setRegistrationRequirements(ProducerRegistrationRequirements registrationRequirements) - { - ParameterValidation.throwIllegalArgExceptionIfNull(registrationRequirements, "Registration requirements"); - this.registrationRequirements = registrationRequirements; - } } Copied: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java (from rev 5917, trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/RegistrationConfigurationFactory.java) =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/RegistrationConfigurationFactory.java 2006-12-20 22:09:59 UTC (rev 5917) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -0,0 +1,211 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.jboss.portal.wsrp.producer.config; + +import org.jboss.portal.common.util.LocaleInfo; +import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.wsrp.producer.config.impl.ProducerConfigurationImpl; +import org.jboss.portal.wsrp.producer.config.impl.ProducerRegistrationRequirementsImpl; +import org.jboss.util.StringPropertyReplacer; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +import javax.xml.namespace.QName; +import java.util.Locale; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6 + */ +public class ProducerConfigurationFactory implements ObjectModelFactory +{ + private static final String REGISTRATION_CONFIG = "registration-configuration"; + private static final boolean DEBUG = false; + + public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + if (DEBUG) + { + System.out.println("newRoot " + localName); + } + + if ("producer-configuration".equals(localName)) + { + return new ProducerConfigurationImpl(); + } + throw new IllegalArgumentException("The processed file doesn't seem to have the proper format"); + } + + public Object newChild(ProducerConfigurationImpl producerConfiguration, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + if (DEBUG) + { + System.out.println("newChild prodConf " + localName); + } + + if (REGISTRATION_CONFIG.equals(localName)) + { + ProducerRegistrationRequirements registrationRequirements = new ProducerRegistrationRequirementsImpl(); + registrationRequirements.setRequiresRegistration(true); + String descRequiresRegistration = attrs.getValue("fullServiceDescriptionRequiresRegistration"); + if ("true".equals(descRequiresRegistration)) + { + registrationRequirements.setFullServiceDescriptionRequiresRegistration(true); + } + return registrationRequirements; + } + return null; + } + + public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName) + { + return root; + } + + public Object newChild(ProducerRegistrationRequirementsImpl regReq, UnmarshallingContext nav, String nsURI, + String localName, Attributes attrs) + { + if (DEBUG) + { + System.out.println("newChild regReq " + localName); + } + + if ("registration-property-description".equals(localName)) + { + return new RegistrationPropertyDescription(); + } + else + { + return null; + } + } + + public void setValue(RegistrationPropertyDescription desc, UnmarshallingContext nav, String nsURI, + String localName, String value) + { + if (DEBUG) + { + System.out.println("setvalue desc " + localName); + } + + if ("name".equals(localName)) + { + value = StringPropertyReplacer.replaceProperties(value); + desc.setName(new QName(value)); + } + else if ("type".equals(localName)) + { + value = StringPropertyReplacer.replaceProperties(value); + desc.setType(new QName(value)); + } + } + + public Object newChild(RegistrationPropertyDescription desc, UnmarshallingContext nav, String nsURI, String localName, + Attributes attrs) + { + if (DEBUG) + { + System.out.println("newchild desc " + localName); + } + + if ("hint".equals(localName) || "label".equals(localName)) + { + String lang = attrs.getValue("xml:lang"); + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(lang, "xml:lang", localName); + Locale locale = LocaleInfo.decodeLocaleInfo(lang).getLocale(); + + String resourceName = attrs.getValue("resourceName"); + + LocalizedString string = new LocalizedString(); + string.setLocale(locale); + + if (resourceName != null && resourceName.length() > 0) + { + string.setResourceName(resourceName); + } + + return string; + } + + return null; + } + + public void setValue(LocalizedString string, UnmarshallingContext nav, String nsURI, String localName, String value) + { + if (DEBUG) + { + System.out.println("setvalue string " + localName); + } + + value = StringPropertyReplacer.replaceProperties(value); + string.setValue(value); + } + + public void addChild(ProducerConfigurationImpl conf, ProducerRegistrationRequirementsImpl regReq, + UnmarshallingContext nav, String nsURI, String localName) + { + if (DEBUG) + { + System.out.println("addchild conf regReq " + localName); + } + + if (conf.getRegistrationRequirements() != null) + { + throw new IllegalStateException("ProducerConfiguration already has registration information set!"); + } + + conf.setRegistrationRequirements(regReq); + } + + public void addChild(ProducerRegistrationRequirementsImpl regReq, RegistrationPropertyDescription desc, + UnmarshallingContext nav, String nsURI, String localName) + { + if (DEBUG) + { + System.out.println("addchild regreq desc " + localName); + } + + regReq.addRegistrationProperty(desc); + } + + public void addChild(RegistrationPropertyDescription desc, LocalizedString string, UnmarshallingContext nav, + String nsURI, String localName) + { + if (DEBUG) + { + System.out.println("addchild desc string " + localName); + } + + if ("hint".equals(localName)) + { + desc.setHint(string); + } + else if ("label".equals(localName)) + { + desc.setLabel(string); + } + } +} Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationService.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationService.java 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationService.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -25,6 +25,7 @@ import org.jboss.portal.common.util.URLTools; import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.wsrp.WSRPProducer; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; @@ -36,16 +37,11 @@ * @version $Revision$ * @since 2.6 */ -public class ProducerConfigurationService extends AbstractJBossService implements ProducerConfiguration +public class ProducerConfigurationService extends AbstractJBossService { - private ProducerRegistrationRequirements requirements; private String configLocation; + private WSRPProducer producer; - public ProducerRegistrationRequirements getRegistrationRequirements() - { - return requirements; - } - public String getConfigLocation() { return configLocation; @@ -56,9 +52,18 @@ this.configLocation = configLocation; } + public WSRPProducer getProducer() + { + return producer; + } - protected void createService() throws Exception + public void setProducer(WSRPProducer producer) { + this.producer = producer; + } + + protected void startService() throws Exception + { // Setup URLs if (configLocation == null) { @@ -75,7 +80,7 @@ } Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new RegistrationConfigurationFactory(); - requirements = (ProducerRegistrationRequirements)unmarshaller.unmarshal(configURL.openStream(), factory, null); + ObjectModelFactory factory = new ProducerConfigurationFactory(); + producer.setProducerConfiguration((ProducerConfiguration)unmarshaller.unmarshal(configURL.openStream(), factory, null)); } } Deleted: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/RegistrationConfigurationFactory.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/RegistrationConfigurationFactory.java 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/RegistrationConfigurationFactory.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -1,175 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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.jboss.portal.wsrp.producer.config; - -import org.jboss.portal.common.util.LocaleInfo; -import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.wsrp.producer.config.impl.ProducerRegistrationRequirementsImpl; -import org.jboss.util.StringPropertyReplacer; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -import javax.xml.namespace.QName; -import java.util.Locale; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - * @since 2.6 - */ -public class RegistrationConfigurationFactory implements ObjectModelFactory -{ - private static final String REGISTRATION_CONFIG = "registration-configuration"; - private static final boolean DEBUG = false; - - public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) - { - if (REGISTRATION_CONFIG.equals(localName)) - { - ProducerRegistrationRequirements registrationRequirements = new ProducerRegistrationRequirementsImpl(); - registrationRequirements.setRequiresRegistration(true); - String descRequiresRegistration = attrs.getValue("fullServiceDescriptionRequiresRegistration"); - if ("true".equals(descRequiresRegistration)) - { - registrationRequirements.setFullServiceDescriptionRequiresRegistration(true); - } - return registrationRequirements; - } - throw new IllegalArgumentException("The processed file doesn't seem to have the proper format"); - } - - public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName) - { - return root; - } - - public Object newChild(ProducerRegistrationRequirementsImpl regReq, UnmarshallingContext nav, String nsURI, - String localName, Attributes attrs) - { - if (DEBUG) - { - System.out.println("newChild regReq " + localName); - } - - if ("registration-property-description".equals(localName)) - { - return new RegistrationPropertyDescription(); - } - else - { - return null; - } - } - - public void setValue(RegistrationPropertyDescription desc, UnmarshallingContext nav, String nsURI, - String localName, String value) - { - if (DEBUG) - { - System.out.println("setvalue desc " + localName); - } - - if ("name".equals(localName)) - { - value = StringPropertyReplacer.replaceProperties(value); - desc.setName(new QName(value)); - } - else if ("type".equals(localName)) - { - value = StringPropertyReplacer.replaceProperties(value); - desc.setType(new QName(value)); - } - } - - public Object newChild(RegistrationPropertyDescription desc, UnmarshallingContext nav, String nsURI, String localName, - Attributes attrs) - { - if (DEBUG) - { - System.out.println("newchild desc " + localName); - } - - if ("hint".equals(localName) || "label".equals(localName)) - { - String lang = attrs.getValue("xml:lang"); - ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(lang, "xml:lang", localName); - Locale locale = LocaleInfo.decodeLocaleInfo(lang).getLocale(); - - String resourceName = attrs.getValue("resourceName"); - - LocalizedString string = new LocalizedString(); - string.setLocale(locale); - - if (resourceName != null && resourceName.length() > 0) - { - string.setResourceName(resourceName); - } - - return string; - } - - return null; - } - - public void setValue(LocalizedString string, UnmarshallingContext nav, String nsURI, String localName, String value) - { - if (DEBUG) - { - System.out.println("setvalue string " + localName); - } - - value = StringPropertyReplacer.replaceProperties(value); - string.setValue(value); - } - - public void addChild(ProducerRegistrationRequirementsImpl regReq, RegistrationPropertyDescription desc, - UnmarshallingContext nav, String nsURI, String localName) - { - if (DEBUG) - { - System.out.println("addchild regreq desc " + localName); - } - - regReq.addRegistrationProperty(desc); - } - - public void addChild(RegistrationPropertyDescription desc, LocalizedString string, UnmarshallingContext nav, - String nsURI, String localName) - { - if (DEBUG) - { - System.out.println("addchild desc string " + localName); - } - - if ("hint".equals(localName)) - { - desc.setHint(string); - } - else if ("label".equals(localName)) - { - desc.setLabel(string); - } - } -} Added: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2006-12-22 21:16:44 UTC (rev 5930) @@ -0,0 +1,47 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.jboss.portal.wsrp.producer.config.impl; + +import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; +import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6 + */ +public class ProducerConfigurationImpl implements ProducerConfiguration +{ + private ProducerRegistrationRequirements requirements; + + public ProducerRegistrationRequirements getRegistrationRequirements() + { + return requirements; + } + + public void setRegistrationRequirements(ProducerRegistrationRequirements requirements) + { + this.requirements = requirements; + } +} Property changes on: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -79,7 +79,6 @@ <xmbean/> <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=WSRPProducer</depends> - <depends optional-attribute-name="ProducerConfiguration" proxy-type="attribute">portal.wsrp:service=ProducerConfiguration</depends> <depends optional-attribute-name="RegistrationManager" proxy-type="attribute">portal.wsrp:service=RegistrationManager</depends> </mbean> @@ -106,12 +105,13 @@ <xmbean/> </mbean> - <!-- Registration configuration service --> + <!-- Producer configuration service --> <mbean code="org.jboss.portal.wsrp.producer.config.ProducerConfigurationService" name="portal.wsrp:service=ProducerConfiguration" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="ConfigLocation">conf/config.xml</attribute> + <depends optional-attribute-name="Producer" proxy-type="attribute">portal.wsrp:service=WSRPProducer</depends> </mbean> <!-- Configure a consumer that is the portal itself --> Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -21,4 +21,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<registration-configuration fullServiceDescriptionRequiresRegistration="true"/> +<producer-configuration> + <registration-configuration fullServiceDescriptionRequiresRegistration="true"/> +</producer-configuration> + Modified: trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -40,35 +40,35 @@ <registration-data/> </wsrp-producer> </deployment> - <!--<deployment> + <deployment> <wsrp-producer> <producer-id>NetUnity</producer-id> <expiration-cache>120</expiration-cache> <endpoint-wsdl-url>http://wsrp.netunitysoftware.com/WSRPTestService/WSR... <registration-data/> </wsrp-producer> - </deployment>--> - <!--<deployment> - <wsrp-producer> - <producer-id>vignette</producer-id> - <expiration-cache>120</expiration-cache> - <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> + </deployment> + <deployment> <wsrp-producer> + <producer-id>vignette</producer-id> + <expiration-cache>120</expiration-cache> + <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> <producer-id>bea</producer-id> <expiration-cache>120</expiration-cache> <endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url> @@ -80,13 +80,13 @@ </property> </registration-data> </wsrp-producer> - </deployment>--> - <!--<deployment> + </deployment> + <deployment> <wsrp-producer> <producer-id>oracle</producer-id> <expiration-cache>120</expiration-cache> <endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlet... <registration-data/> </wsrp-producer> - </deployment>--> + </deployment> </deployments> \ No newline at end of file Copied: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar (from rev 5917, trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar) Deleted: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar/extended.xml 2006-12-20 22:09:59 UTC (rev 5917) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -1,37 +0,0 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<registration-configuration fullServiceDescriptionRequiresRegistration="true"> - <registration-property-description> - <name>name1</name> - <type>xsd:string</type> - <hint xml:lang="en" resourceName="resource.hint1">hint1</hint> - <label xml:lang="en" resourceName="resource.label1">label1</label> - </registration-property-description> - <registration-property-description> - <name>name2</name> - <type>xsd:string</type> - <hint xml:lang="en" resourceName="resource.hint2">hint2</hint> - <label xml:lang="en" resourceName="resource.label2">label2</label> - </registration-property-description> -</registration-configuration> Copied: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml (from rev 5929, trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar/extended.xml) =================================================================== --- trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar/extended.xml 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -0,0 +1,39 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<producer-configuration> + <registration-configuration fullServiceDescriptionRequiresRegistration="true"> + <registration-property-description> + <name>name1</name> + <type>xsd:string</type> + <hint xml:lang="en" resourceName="resource.hint1">hint1</hint> + <label xml:lang="en" resourceName="resource.label1">label1</label> + </registration-property-description> + <registration-property-description> + <name>name2</name> + <type>xsd:string</type> + <hint xml:lang="en" resourceName="resource.hint2">hint2</hint> + <label xml:lang="en" resourceName="resource.label2">label2</label> + </registration-property-description> + </registration-configuration> +</producer-configuration> Deleted: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar/minimal.xml 2006-12-20 22:09:59 UTC (rev 5917) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -1,24 +0,0 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<registration-configuration/> Copied: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml (from rev 5929, trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar/minimal.xml) =================================================================== --- trunk/wsrp/src/resources/tests/test-registration-configuration-lib-jar/minimal.xml 2006-12-22 20:15:42 UTC (rev 5929) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml 2006-12-22 21:16:44 UTC (rev 5930) @@ -0,0 +1,25 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<producer-configuration><registration-configuration/></producer-configuration> +