Please Adrian,

If possible use mergefromtrunk

Thanks

Jacques

From: <[email protected]>
Author: adrianc
Date: Wed May  6 19:57:28 2009
New Revision: 772411

URL: http://svn.apache.org/viewvc?rev=772411&view=rev
Log:
Applied fix from trunk rev 769576.

Modified:
   ofbiz/branches/release09.04/applications/content/servicedef/mca.xml
   
ofbiz/branches/release09.04/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
   ofbiz/branches/release09.04/framework/webslinger/entitydef/entitymodel.xml
   ofbiz/branches/release09.04/framework/webslinger/ofbiz-component.xml
   ofbiz/branches/release09.04/specialpurpose/cmssite/widget/CmssiteScreens.xml
   
ofbiz/branches/release09.04/specialpurpose/cmssite/widget/OfbizsiteScreens.xml
   
ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml
   ofbiz/branches/release09.04/specialpurpose/ldap/ofbiz-component.xml
   ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services.xml
   
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_manager.xml
   
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_payment.xml
   
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_promo.xml

Modified: ofbiz/branches/release09.04/applications/content/servicedef/mca.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/content/servicedef/mca.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/content/servicedef/mca.xml 
(original)
+++ ofbiz/branches/release09.04/applications/content/servicedef/mca.xml Wed May 
 6 19:57:28 2009
@@ -19,7 +19,7 @@
-->

<service-mca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/service-mca.xsd";>
+    
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-mca.xsd";>

    <mca mail-rule-name="processIncomingEmail">
        <action service="storeIncomingEmail" mode="sync"/>

Modified: 
ofbiz/branches/release09.04/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
 (original)
+++ 
ofbiz/branches/release09.04/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
 Wed May  6 19:57:28 2009
@@ -19,7 +19,7 @@
-->

<simple-map-processors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-        
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd";>
+        
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";>
    <!-- ContactMech map procs -->

    <simple-map-processor name="newEmail">

Modified: 
ofbiz/branches/release09.04/framework/webslinger/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webslinger/entitydef/entitymodel.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/webslinger/entitydef/entitymodel.xml 
(original)
+++ ofbiz/branches/release09.04/framework/webslinger/entitydef/entitymodel.xml 
Wed May  6 19:57:28 2009
@@ -18,7 +18,7 @@
under the License.
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/entitymodel.xsd";>
+    
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd";>
    <title></title>
    <description></description>
    <copyright></copyright>

Modified: ofbiz/branches/release09.04/framework/webslinger/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webslinger/ofbiz-component.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/webslinger/ofbiz-component.xml 
(original)
+++ ofbiz/branches/release09.04/framework/webslinger/ofbiz-component.xml Wed 
May  6 19:57:28 2009
@@ -19,7 +19,7 @@
-->
<ofbiz-component name="webslinger"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-        
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/ofbiz-component.xsd";>
+        
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd";>
    <resource-loader name="main" type="component"/>
    <classpath type="dir" location="config"/>
    <classpath type="jar" location="lib/*"/>

Modified: 
ofbiz/branches/release09.04/specialpurpose/cmssite/widget/CmssiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/cmssite/widget/CmssiteScreens.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/specialpurpose/cmssite/widget/CmssiteScreens.xml 
(original)
+++ 
ofbiz/branches/release09.04/specialpurpose/cmssite/widget/CmssiteScreens.xml 
Wed May  6 19:57:28 2009
@@ -18,7 +18,7 @@
    under the License.
-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd";>
+    
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>

    <screen name="main-decorator">
        <section>

Modified: 
ofbiz/branches/release09.04/specialpurpose/cmssite/widget/OfbizsiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/cmssite/widget/OfbizsiteScreens.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/specialpurpose/cmssite/widget/OfbizsiteScreens.xml 
(original)
+++ 
ofbiz/branches/release09.04/specialpurpose/cmssite/widget/OfbizsiteScreens.xml 
Wed May  6 19:57:28 2009
@@ -18,7 +18,7 @@
    under the License.
-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd";>
+    
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>

    <screen name="main-decorator">
        <section>

Modified: 
ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml
 (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml Wed May 6 19:57:28 2009
@@ -19,7 +19,7 @@
-->

<simple-map-processors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-        
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd";>
+        
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";>

    <simple-map-processor name="person">
        <process field="firstName">

Modified: ofbiz/branches/release09.04/specialpurpose/ldap/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ldap/ofbiz-component.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ldap/ofbiz-component.xml 
(original)
+++ ofbiz/branches/release09.04/specialpurpose/ldap/ofbiz-component.xml Wed May 
 6 19:57:28 2009
@@ -20,7 +20,7 @@

<ofbiz-component name="ldap"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-        
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/ofbiz-component.xsd";>
+        
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd";>
    <!-- define resource loaders; most common is to use the component resource 
loader -->
    <resource-loader name="main" type="component"/>


Modified: 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services.xml 
(original)
+++ ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services.xml 
Wed May  6 19:57:28 2009
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd";> +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd";>
    <description>Web Pos Services</description>
    <vendor>OFBiz</vendor>
    <version>1.0</version>

Modified: 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_manager.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_manager.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_manager.xml
 (original)
+++ 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_manager.xml
 Wed May  6 19:57:28 2009
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd";> +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd";>
    <description>Web Pos Manager Services</description>
    <vendor>OFBiz</vendor>
    <version>1.0</version>

Modified: 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_payment.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_payment.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_payment.xml
 (original)
+++ 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_payment.xml
 Wed May  6 19:57:28 2009
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd";> +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd";>
    <description>Web Pos Payment Services</description>
    <vendor>OFBiz</vendor>
    <version>1.0</version>

Modified: 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_promo.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_promo.xml?rev=772411&r1=772410&r2=772411&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_promo.xml 
(original)
+++ 
ofbiz/branches/release09.04/specialpurpose/webpos/servicedef/services_promo.xml 
Wed May  6 19:57:28 2009
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd";> +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd";>
    <description>Web Pos Promotions Services</description>
    <vendor>OFBiz</vendor>
    <version>1.0</version>




Reply via email to