Author: chris.laprun(a)jboss.com Date: 2010-12-07 09:58:26 -0500 (Tue, 07 Dec 2010) New Revision: 5501 Added: components/wsrp/trunk/producer/src/test/resources/xsd/gatein_wsrp_producer_1_0.xsd Removed: components/wsrp/trunk/producer/src/test/resources/xsd/jboss-wsrp-producer_2_7.xsd Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerConfigurationTestCase.java components/wsrp/trunk/producer/src/test/resources/custom-policy.xml components/wsrp/trunk/producer/src/test/resources/extended.xml components/wsrp/trunk/producer/src/test/resources/invalid-type.xml components/wsrp/trunk/producer/src/test/resources/invalid1.xml components/wsrp/trunk/producer/src/test/resources/invalid2.xml components/wsrp/trunk/producer/src/test/resources/invalid3.xml components/wsrp/trunk/producer/src/test/resources/minimal-registration.xml components/wsrp/trunk/producer/src/test/resources/minimal.xml components/wsrp/trunk/producer/src/test/resources/strict-mode.xml Log: - GTNWSRP-172: Fixed producer tests. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/xml/FileSystemXMLProducerConfigurationService.java 2010-12-07 14:58:26 UTC (rev 5501) @@ -60,15 +60,16 @@ private static DefaultSchemaResolver RESOLVER; - private static final String PRODUCER_NAMESPACE = "urn:jboss:portal:wsrp:producer:v2_7"; - private static final String PRODUCER_XSD = "jboss-wsrp-producer_2_7.xsd"; + private static final String PRODUCER_NAMESPACE = "http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0"; + private static final String PRODUCER_XSD = "gatein_wsrp_producer_1_0.xsd"; static { RESOLVER = new DefaultSchemaResolver(); RESOLVER.setCacheResolvedSchemas(true); RESOLVER.addSchemaLocation("http://www.w3.org/XML/1998/namespace";, "xsd/xml.xsd"); - RESOLVER.addSchemaLocation("urn:jboss:portal:wsrp:producer:v2_6", "xsd/jboss-wsrp-producer_2_6.xsd"); + /*RESOLVER.addSchemaLocation("urn:jboss:portal:wsrp:producer:v2_6", "xsd/jboss-wsrp-producer_2_6.xsd"); + RESOLVER.addSchemaLocation("urn:jboss:portal:wsrp:producer:v2_7", "xsd/jboss-wsrp-producer_2_7.xsd");*/ RESOLVER.addSchemaLocation(PRODUCER_NAMESPACE, "xsd/" + PRODUCER_XSD); } Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerConfigurationTestCase.java =================================================================== --- components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerConfigurationTestCase.java 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerConfigurationTestCase.java 2010-12-07 14:58:26 UTC (rev 5501) @@ -76,7 +76,7 @@ RESOLVER = new DefaultSchemaResolver(); RESOLVER.setCacheResolvedSchemas(true); RESOLVER.addSchemaLocation("http://www.w3.org/XML/1998/namespace";, "xsd/xml.xsd"); - RESOLVER.addSchemaLocation("urn:jboss:portal:wsrp:producer:v2_7", "xsd/jboss-wsrp-producer_2_7.xsd"); + RESOLVER.addSchemaLocation("http://www.gatein.org/xml/ns/gatein_wsrp...;, "xsd/gatein_wsrp_producer_1_0.xsd"); } protected void setUp() throws Exception @@ -277,7 +277,7 @@ StringWriter xmlOutput = new StringWriter(); // get the XML Schema source - InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("xsd/jboss-wsrp-producer_2_7.xsd"); + InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("xsd/gatein_wsrp_producer_1_0.xsd"); Reader xsReader = new InputStreamReader(is); @@ -287,15 +287,15 @@ marshaller.setSchemaResolver(RESOLVER); // we need to specify what elements are top most (roots) providing namespace URI, prefix and local name - marshaller.addRootElement("urn:jboss:portal:wsrp:producer:v2_7", "", "producer-configuration"); + marshaller.addRootElement("http://www.gatein.org/xml/ns/gatein_wsrp_...;, "", "producer-configuration"); // declare default namespace - marshaller.declareNamespace("wpc", "urn:jboss:portal:wsrp:producer:v2_7"); + marshaller.declareNamespace("wpc", "http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0"); // add schema location by declaring xsi namespace and adding xsi:schemaLocation attribute marshaller.declareNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance"); marshaller.addAttribute("xsi", "schemaLocation", "string", - "urn:jboss:portal:wsrp:producer:v2_7 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_7.xsd"); + "http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd"); // create an instance of Object Model Provider ObjectModelProvider provider = new ProducerConfigurationProvider(); Modified: components/wsrp/trunk/producer/src/test/resources/custom-policy.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/custom-policy.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/custom-policy.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,30 +1,30 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace"> +<!-- + ~ 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. + --> +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace"> <registration-configuration> <registration-policy>org.gatein.wsrp.producer.config.TestRegistrationPolicy</registration-policy> </registration-configuration> -</wpc:producer-configuration> \ No newline at end of file +</producer-configuration> \ No newline at end of file Modified: components/wsrp/trunk/producer/src/test/resources/extended.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/extended.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/extended.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,30 +1,30 @@ <?xml version="1.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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace"> +<!-- + ~ 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. + --> +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace"> <registration-configuration fullServiceDescriptionRequiresRegistration="true"> <registration-property-validator>org.gatein.registration.policies.DefaultRegistrationPropertyValidator </registration-property-validator> @@ -41,4 +41,4 @@ <hint xml:lang="en" resourceName="resource.hint2">hint2</hint> </registration-property-description> </registration-configuration> -</wpc:producer-configuration> +</producer-configuration> Modified: components/wsrp/trunk/producer/src/test/resources/invalid-type.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/invalid-type.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/invalid-type.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,28 +1,28 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" +<!-- + ~ 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. + --> +<wpc:producer-configuration xmlns:wpc="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" xmlns:xml="http://www.w3.org/XML/1998/namespace"> <registration-configuration> <registration-property-description> Modified: components/wsrp/trunk/producer/src/test/resources/invalid1.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/invalid1.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/invalid1.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,29 +1,29 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace"> +<!-- + ~ 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. + --> +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace"> <registration-configuration fullServiceDescriptionRequiresRegistration="invalid"/> -</wpc:producer-configuration> +</producer-configuration> Modified: components/wsrp/trunk/producer/src/test/resources/invalid2.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/invalid2.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/invalid2.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,30 +1,30 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace"> +<!-- + ~ 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. + --> +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace"> <registration-configuration/> <registration-configuration/> -</wpc:producer-configuration> +</producer-configuration> Modified: components/wsrp/trunk/producer/src/test/resources/invalid3.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/invalid3.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/invalid3.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,31 +1,31 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace"> +<!-- + ~ 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. + --> +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace"> <registration-configuration> - <registration-policy>org.jboss.portal.test.wsrp.config.TestRegistrationPolicy</registration-policy> + <registration-policy>org.gatein.wsrp.producer.config.TestRegistrationPolicy</registration-policy> <registration-property-validator>org.test.package.SomePropertyValidator</registration-property-validator> </registration-configuration> -</wpc:producer-configuration> +</producer-configuration> Modified: components/wsrp/trunk/producer/src/test/resources/minimal-registration.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/minimal-registration.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/minimal-registration.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,28 +1,28 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace"> +<!-- + ~ 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. + --> +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace"> <registration-configuration/> -</wpc:producer-configuration> +</producer-configuration> Modified: components/wsrp/trunk/producer/src/test/resources/minimal.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/minimal.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/minimal.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,27 +1,27 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace"/> +<!-- + ~ 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. + --> +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace"/> Modified: components/wsrp/trunk/producer/src/test/resources/strict-mode.xml =================================================================== --- components/wsrp/trunk/producer/src/test/resources/strict-mode.xml 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/strict-mode.xml 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,29 +1,29 @@ <?xml version="1.0"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2008, 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, 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. + --> -<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 " - xmlns:xml="http://www.w3.org/XML/1998/namespace" - useStrictMode="false"/> \ No newline at end of file +<producer-configuration xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_produce... http://www.jboss.org/portal/xsd/gatein_wsrp_producer_1_0.xsd" + xmlns:xml="http://www.w3.org/XML/1998/namespace" + useStrictMode="false"/> \ No newline at end of file Copied: components/wsrp/trunk/producer/src/test/resources/xsd/gatein_wsrp_producer_1_0.xsd (from rev 5495, components/wsrp/trunk/api/src/main/resources/xsd/gatein_wsrp_producer_1_0.xsd) =================================================================== --- components/wsrp/trunk/producer/src/test/resources/xsd/gatein_wsrp_producer_1_0.xsd (rev 0) +++ components/wsrp/trunk/producer/src/test/resources/xsd/gatein_wsrp_producer_1_0.xsd 2010-12-07 14:58:26 UTC (rev 5501) @@ -0,0 +1,73 @@ +<?xml version="1.0"?> + +<!-- + ~ 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. + --> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1... + xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + xmlns:xml="http://www.w3.org/XML/1998/namespace" + xmlns:wpc="http://www.gatein.org/xml/ns/gatein_wsrp_producer_1_0" + elementFormDefault="qualified" + version="1.0"> + + <xs:import namespace="http://www.w3.org/XML/1998/namespace"/> + + <xs:element name="producer-configuration"> + <xs:complexType> + <xs:sequence> + <xs:element name="registration-configuration" type="wpc:RegistrationConfiguration"/> + </xs:sequence> + <xs:attribute name="useStrictMode" type="xs:boolean" use="optional"/> + </xs:complexType> + </xs:element> + + <xs:complexType name="RegistrationConfiguration"> + <xs:sequence> + <xs:element name="registration-policy" type="xs:string" minOccurs="0"/> + <xs:element name="registration-property-validator" type="xs:string" minOccurs="0"/> + <xs:element name="registration-property-description" type="wpc:RegistrationPropertyDescription" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="fullServiceDescriptionRequiresRegistration" type="xs:boolean" use="optional"/> + </xs:complexType> + + <xs:complexType name="RegistrationPropertyDescription"> + <xs:sequence> + <xs:element name="name" type="xs:QName"/> + <xs:element name="type" type="xs:QName"/> + <xs:element name="label" type="wpc:LocalizedString" minOccurs="0"/> + <xs:element name="hint" type="wpc:LocalizedString" minOccurs="0"/> + <xs:element name="description" type="wpc:LocalizedString" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="LocalizedString"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute ref="xml:lang" use="required"/> + <xs:attribute name="resourceName" type="xs:string" use="optional"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> +</xs:schema> Deleted: components/wsrp/trunk/producer/src/test/resources/xsd/jboss-wsrp-producer_2_7.xsd =================================================================== --- components/wsrp/trunk/producer/src/test/resources/xsd/jboss-wsrp-producer_2_7.xsd 2010-12-07 12:15:45 UTC (rev 5500) +++ components/wsrp/trunk/producer/src/test/resources/xsd/jboss-wsrp-producer_2_7.xsd 2010-12-07 14:58:26 UTC (rev 5501) @@ -1,70 +0,0 @@ -<?xml version="1.0"?> - -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2008, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="urn:jboss:portal:wsrp:producer:v2_7" - xmlns="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xml="http://www.w3.org/XML/1998/namespace" - xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" elementFormDefault="qualified"> - - <xs:import namespace="http://www.w3.org/XML/1998/namespace"/> - - <xs:element name="producer-configuration"> - <xs:complexType> - <xs:sequence> - <xs:element name="registration-configuration" type="wpc:RegistrationConfiguration"/> - </xs:sequence> - <xs:attribute name="useStrictMode" type="xs:boolean" use="optional"/> - </xs:complexType> - </xs:element> - - <xs:complexType name="RegistrationConfiguration"> - <xs:sequence> - <xs:element name="registration-policy" type="xs:string" minOccurs="0"/> - <xs:element name="registration-property-validator" type="xs:string" minOccurs="0"/> - <xs:element name="registration-property-description" type="wpc:RegistrationPropertyDescription" minOccurs="0" - maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="fullServiceDescriptionRequiresRegistration" type="xs:boolean" use="optional"/> - </xs:complexType> - - <xs:complexType name="RegistrationPropertyDescription"> - <xs:sequence> - <xs:element name="name" type="xs:QName"/> - <xs:element name="type" type="xs:QName"/> - <xs:element name="label" type="wpc:LocalizedString" minOccurs="0"/> - <xs:element name="hint" type="wpc:LocalizedString" minOccurs="0"/> - <xs:element name="description" type="wpc:LocalizedString" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="LocalizedString"> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute ref="xml:lang" use="required"/> - <xs:attribute name="resourceName" type="xs:string" use="optional"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> -</xs:schema>