[portal-commits] JBoss Portal SVN: r9461 - in branches/JBoss_Portal_Branch_2_6/wsrp/src: resources/portal-wsrp-sar and 2 other directories.

Author: chris.laprun(a)jboss.com Date: 2008-01-08 20:10:54 -0500 (Tue, 08 Jan 2008) New Revision: 9461 Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml Log: - JBPORTAL-1835: + Added XSD to resolver. + Added schemaLocation to default files. + Fixed addition of schemaLocation attribute via marshaller in ProducerConfigurationServiceImpl (though at this point in time, the method doesn't do anything in XB). Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-01-08 23:59:27 UTC (rev 9460) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-01-09 01:10:54 UTC (rev 9461) @@ -194,7 +194,8 @@ // 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_6"); + marshaller.addAttribute("xsi", "schemaLocation", "string", + "urn:jboss:portal:wsrp:producer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_6.xsd"); // create an instance of Object Model Provider ObjectModelProvider provider = new ProducerConfigurationProvider(); Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-01-08 23:59:27 UTC (rev 9460) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-01-09 01:10:54 UTC (rev 9461) @@ -81,6 +81,8 @@ <entry key="-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN">dtd/jboss-wsrp-producer_2_6.dtd </entry> + <entry key="urn:jboss:portal:wsrp:consumer:v2_6">/xsd/jboss-wsrp-consumer_2_6.xsd</entry> + <entry key="urn:jboss:portal:wsrp:producer:v2_6">/xsd/jboss-wsrp-consumer_2_6.xsd</entry> </properties> </attribute> </mbean> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2008-01-08 23:59:27 UTC (rev 9460) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2008-01-09 01:10:54 UTC (rev 9461) @@ -27,7 +27,9 @@ --> <!-- Configuration using registration with default registration property validator. --> -<producer-configuration xmlns="urn:jboss:portal:wsrp:producer:v2_6"> +<producer-configuration xmlns="urn:jboss:portal:wsrp:producer:v2_6" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_6.xsd"> <registration-configuration fullServiceDescriptionRequiresRegistration="true"> <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator </registration-property-validator> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2008-01-08 23:59:27 UTC (rev 9460) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2008-01-09 01:10:54 UTC (rev 9461) @@ -26,7 +26,8 @@ <!--<!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 xmlns="urn:jboss:portal:wsrp:consumer:v2_6"> +<deployments xmlns="urn:jboss:portal:wsrp:consumer:v2_6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:portal:wsrp:consumer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-consumer_2_6.xsd"> <deployment> <wsrp-producer id="self" expiration-cache="300"> <!--