Author: chris.laprun(a)jboss.com Date: 2007-02-23 23:49:58 -0500 (Fri, 23 Feb 2007) New Revision: 6390 Added: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java trunk/wsrp/src/resources/portal-wsrp-sar/dtd/ trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd Modified: trunk/wsrp/build.xml trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml Log: - WSRPDeployer now uses an EntityResolver to use DTD validation of configuration files. - Created dtd directory containing DTDs for both consumers and producer configuration. - DTD for *-wsrp.xml format has been renamed to jboss-wsrp-consumer_2_6.dtd. - Updated files and tests to use DTDs. Modified: trunk/wsrp/build.xml =================================================================== --- trunk/wsrp/build.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/build.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -364,6 +364,7 @@ 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="${source.resources}/portal-wsrp-sar/dtd"/> <fileset dir="${build.classes}/"> <include name="org/jboss/portal/test/wsrp/config/**"/> </fileset> Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java 2007-02-24 04:49:58 UTC (rev 6390) @@ -59,6 +59,7 @@ { unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); factory = new ProducerConfigurationFactory(); + unmarshaller.setEntityResolver(new TestEntityResolver()); } public void testCustomPolicyUnmarshalling() throws Exception Added: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java (rev 0) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java 2007-02-24 04:49:58 UTC (rev 6390) @@ -0,0 +1,66 @@ +/* +* 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 org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import java.io.IOException; +import java.io.InputStream; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6 + */ +public class TestEntityResolver implements EntityResolver +{ + private static final String CONSUMER = "-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN"; + private static final String PRODUCER = "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"; + + public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException + { + String dtd; + if (PRODUCER.equals(publicId)) + { + dtd = "jboss-wsrp-producer_2_6.dtd"; + } + else if (CONSUMER.equals(publicId)) + { + dtd = "jboss-wsrp-consumer_2_6.dtd"; + } + else + { + return null; + } + + InputStream dtdStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(dtd); + if (dtdStream != null) + { + return new InputSource(dtdStream); + } + + return null; + } +} Property changes on: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-24 04:49:58 UTC (rev 6390) @@ -26,10 +26,12 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.SubDeployerSupport; import org.jboss.portal.common.util.URLTools; +import org.jboss.portal.common.xml.NullEntityResolver; import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; +import org.xml.sax.EntityResolver; import java.net.URL; import java.util.Iterator; @@ -56,6 +58,18 @@ /** . */ private String defaultWSRPLocation; + private EntityResolver entityResolver; + + public EntityResolver getEntityResolver() + { + return entityResolver; + } + + public void setEntityResolver(EntityResolver entityResolver) + { + this.entityResolver = entityResolver; + } + public ConsumersRegistry getConsumerRegistry() { return consumerRegistry; @@ -84,8 +98,13 @@ { Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); ObjectModelFactory factory = new WSRPDeploymentFactory(consumerRegistry); - WSRPDeployment deployment = (WSRPDeployment)unmarshaller.unmarshal(di.localUrl.openStream(), factory, null); - di.metaData = deployment; + if (entityResolver == null) + { + log.debug("Coult not obtain entity resolver for WSRPDeployer"); + entityResolver = new NullEntityResolver(); + } + unmarshaller.setEntityResolver(entityResolver); + di.metaData = unmarshaller.unmarshal(di.localUrl.openStream(), factory, null); } catch (Exception e) { 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 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -108,11 +108,29 @@ <attribute name="ConfigLocation">conf/producer/config.xml</attribute> </mbean> + <mbean + code="org.jboss.portal.server.impl.xml.EntityResolverService" + name="portal.wsrp:service=EntityResolver" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <attribute name="DTDMapping"> + <properties> + <entry + key="-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN">dtd/jboss-wsrp-consumer_2_6.dtd</entry> + <entry + key="-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN">dtd/jboss-wsrp-producer_2_6.dtd</entry> + </properties> + </attribute> + </mbean> + <!-- Deployer for *-wsrp.xml files. Deploys default-wsrp.xml which contains the 'self' consumer --> <mbean code="org.jboss.portal.wsrp.deployment.WSRPDeployer" name="portal.wsrp:service=WSRPDeployer"> <attribute name="DefaultWSRPLocation">default-wsrp.xml</attribute> <depends optional-attribute-name="ConsumerRegistry" proxy-type="attribute">portal.wsrp:service=ConsumersRegistry</depends> + <depends optional-attribute-name="EntityResolver" + proxy-type="attribute">portal.wsrp:service=EntityResolver</depends> </mbean> <mbean Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -21,6 +21,9 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> + <producer-configuration> <registration-configuration fullServiceDescriptionRequiresRegistration="true"> <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator</registration-property-validator> Modified: trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -23,8 +23,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!--<!DOCTYPE deployments PUBLIC "-//JBoss//DTD WSRP Remote Producer Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/jboss-portal-wsrp.dtd">--> +<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-consumer_2_6.dtd"> <deployments> <deployment> Copied: trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd (from rev 6388, trunk/wsrp/src/resources/jboss-portal-wsrp.dtd) =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd (rev 0) +++ trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd 2007-02-24 04:49:58 UTC (rev 6390) @@ -0,0 +1,85 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!-- +JBoss Portal's WSRP Remote Producer Configuration deployment descriptor for the *-wsrp.xml files used by Portal to be +able to consume WSRP portlets exposed by a remote producer. +author: <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> +version: 1.1 (Portal 2.6) +revision: $Revision$ +--> + +<!-- The root element. Contains deployment elements. --> +<!ELEMENT deployments ( deployment* )> + +<!-- Deployment related information. As of Portal 2.6, the only deployment information relates to WSRP remote producers. --> +<!ELEMENT deployment ( wsrp-producer )> + +<!-- Information on a remote WSRP producer identified by the mandatory producer-id attribute. --> +<!ELEMENT wsrp-producer ( ( endpoint-config | endpoint-wsdl-url ), registration-data? )> + +<!-- The producer identifier. This should be unique for a given Portal deployment. The identifier is used to +identify the portlet provider in the management interface. --> +<!ATTLIST wsrp-producer id CDATA #REQUIRED> + +<!-- The period of producer information (such as list of offered portlets) cache refreshing in seconds. --> +<!ATTLIST wsrp-producer expiration-cache CDATA #IMPLIED> + +<!-- WSRP endpoints configuration information by interface URL. Mutually exclusive with endpoint-wsdl-url. --> +<!ELEMENT endpoint-config ( service-description-url, markup-url, registration-url?, portlet-management-url? )> + +<!-- The URL for the service description interface endpoint on the remote producer. --> +<!ELEMENT service-description-url ( #PCDATA )> + +<!-- The URL for the markup interface endpoint on the remote producer. --> +<!ELEMENT markup-url ( #PCDATA )> + +<!-- The URL for the optional portlet management interface endpoint on the remote producer. --> +<!ELEMENT portlet-management-url ( #PCDATA )> + +<!-- The URL for the optional registration interface endpoint on the remote producer. --> +<!ELEMENT registration-url ( #PCDATA )> + +<!-- The URL of the WSDL description of the producer's WSRP services. Mutally exclusive with endpoint-config. --> +<!ELEMENT endpoint-wsdl-url ( #PCDATA )> + +<!-- Container for registration information. --> +<!ELEMENT registration-data ( consumer-name?, property* )> + +<!-- +An optional name (preferably unique) that identifies the Consumer. An example of such a name would be the Consumer's URL. +If no consumer-name is provided, one will be automatically generated by JBoss Portal. +--> +<!ELEMENT consumer-name ( #PCDATA )> + +<!-- A registration property. --> +<!ELEMENT property ( name, lang, value )> + +<!-- The name of the property. --> +<!ELEMENT name ( #PCDATA )> + +<!-- The language the property is in. --> +<!ELEMENT lang ( #PCDATA )> + +<!-- The value of the property. --> +<!ELEMENT value ( #PCDATA )> \ No newline at end of file Property changes on: trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd ___________________________________________________________________ Name: svn:keywords + LastChangedRevision Added: trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd (rev 0) +++ trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd 2007-02-24 04:49:58 UTC (rev 6390) @@ -0,0 +1,87 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!-- +A DTD for the configuration of Portal's WSRP producer. + +author: <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> +version: 1.0 (Portal 2.6) +revision: $Revision: 5561 $ +--> + +<!-- Root element for the producer configuration. Contains a single registration-configuration as of Portal 2.6 --> +<!ELEMENT producer-configuration ( registration-configuration )> + + +<!-- Allows configuration of whether the producer requires registration or not and how to deal with registrations. --> +<!ELEMENT registration-configuration ( (registration-property-validator | registration-policy)?, registration-property-description* )> + +<!-- +Specifies whether the producer will send a complete service description (that is one including offered portlets) or not +to unregistered consumers. +--> +<!ATTLIST registration-configuration fullServiceDescriptionRequiresRegistration (true | false) "false"> + +<!-- +A fully-qualified class name for a class implementing the RegistrationPropertyValidator interface. Only makes sense when +using the default RegistrationPolicy. +--> +<!ELEMENT registration-property-validator ( #PCDATA )> + +<!-- +A fully-qualified class name for an implementation of the RegistrationPolicy interface, allowing users to customize +the behavior of the producer when handling registration attempts. + --> +<!ELEMENT registration-policy ( #PCDATA )> + +<!-- +The description for a registration property for which the producer will require consumers to provide a value. +Example: +<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> +--> +<!ELEMENT registration-property-description ( name, type, hint, label )> + +<!-- The name of the registration property --> +<!ELEMENT name ( #PCDATA )> + +<!-- The qualified name of the type of the registration property. As of Portal 2.6, only xml:string is supported. --> +<!ELEMENT type ( #PCDATA )> + +<!-- A description of the registration property and its usage targeted at end users. --> +<!ELEMENT hint ( #PCDATA )> +<!-- The language in which the hint is written. --> +<!ATTLIST hint xml:lang CDATA #REQUIRED> +<!-- A resource name identifying the hint in localization bundles (currently unsupported in Portal 2.6). --> +<!ATTLIST hint resourceName CDATA #REQUIRED> + +<!-- A short, human readable name for the property, intended for consumer-generated administration interface. --> +<!ELEMENT label ( #PCDATA )> +<!-- The language in which the label is written. --> +<!ATTLIST hint xml:lang CDATA #REQUIRED> +<!-- A resource name identifying the label in localization bundles (currently unsupported in Portal 2.6). --> +<!ATTLIST hint resourceName CDATA #REQUIRED> Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -20,7 +20,9 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> + <producer-configuration> <registration-configuration> <registration-policy>org.jboss.portal.test.wsrp.config.TestRegistrationPolicy</registration-policy> Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -20,6 +20,8 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> <producer-configuration> <registration-configuration fullServiceDescriptionRequiresRegistration="true"> Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -20,6 +20,8 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> <producer-configuration> <registration-configuration fullServiceDescriptionRequiresRegistration="invalid"/> Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -20,6 +20,8 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> <producer-configuration> <registration-configuration/> Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -20,6 +20,9 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> + <producer-configuration> <registration-configuration> <registration-policy>org.jboss.portal.test.wsrp.config.TestRegistrationPolicy</registration-policy> Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml 2007-02-24 00:43:09 UTC (rev 6389) +++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml 2007-02-24 04:49:58 UTC (rev 6390) @@ -20,6 +20,8 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> <producer-configuration><registration-configuration/></producer-configuration>