Migrate XML schemas (section 4.1 in Seam Manual 2.3.0.Final)

zanata · Jan 15, 2013 · 3ffc1b5 · 3ffc1b5
1 parent 7221129
commit 3ffc1b5
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 45 deletions.
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<components xmlns="http://jboss.com/products/seam/components"
-    xmlns:core="http://jboss.com/products/seam/core"
-    xmlns:persistence="http://jboss.com/products/seam/persistence"
-    xmlns:international="http://jboss.com/products/seam/international"
-    xmlns:drools="http://jboss.com/products/seam/drools"
-    xmlns:bpm="http://jboss.com/products/seam/bpm"
-    xmlns:security="http://jboss.com/products/seam/security"
-    xmlns:mail="http://jboss.com/products/seam/mail"
-    xmlns:web="http://jboss.com/products/seam/web"
-    xmlns:framework="http://jboss.com/products/seam/framework"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:resteasy="http://jboss.com/products/seam/resteasy"
-    xmlns:async="http://jboss.com/products/seam/async"
-    xsi:schemaLocation=
-        "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
-         http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd
-         http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd
-         http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd
-         http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd
-         http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd
-         http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd
-         http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd
-         http://jboss.com/products/seam/resteasy http://jboss.com/products/seam/resteasy-2.1.xsd
-         http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.1.xsd">
-
+<components xmlns="http://jboss.org/schema/seam/components"
+      xmlns:core="http://jboss.org/schema/seam/core"
+      xmlns:persistence="http://jboss.org/schema/seam/persistence"
+      xmlns:security="http://jboss.org/schema/seam/security"
+      xmlns:theme="http://jboss.org/schema/seam/theme"
+      xmlns:cache="http://jboss.org/schema/seam/cache"
+      xmlns:web="http://jboss.org/schema/seam/web"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation=
+          "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd
+           http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd
+           http://jboss.org/schema/seam/security http://jboss.org/schema/seam/security-2.3.xsd
+           http://jboss.org/schema/seam/theme http://jboss.org/schema/seam/theme-2.3.xsd
+           http://jboss.org/schema/seam/cache http://jboss.org/schema/seam/cache-2.3.xsd
+           http://jboss.org/schema/seam/web http://jboss.org/schema/seam/web-2.3.xsd
+           http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd">
+
   <core:init
       debug="@env.debug@"
       transaction-management-enabled="true"

diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
-    version="1.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" 
+    version="2.0">
 
   <persistence-unit name="${ds.jndi.name}PU" transaction-type="JTA">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>

diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" ?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    version="3.0">
 
 	<!-- sso security -->
 

diff --git a/zanata-war/src/main/webapp/WEB-INF/faces-config.xml b/zanata-war/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,9 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<faces-config
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
-    version="2.0">
+<faces-config version="2.1"
+     xmlns="http://java.sun.com/xml/ns/javaee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd">
 
    <application>
       <locale-config>

diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.2.xsd"
-  no-conversation-view-id="/home.xhtml" login-view-id="/account/login.xhtml">
+<pages xmlns="http://jboss.org/schema/seam/pages"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd"
+       no-conversation-view-id="/home.xhtml" login-view-id="/account/login.xhtml">
 
   <page view-id="*">
     <navigation>

diff --git a/zanata-war/src/main/webapp/WEB-INF/web.xml b/zanata-war/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,8 @@
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-   version="2.5">
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    version="3.0">
 	<display-name>Zanata WebTrans GWT Application (dummy mode)</display-name>
 
     <filter>

diff --git a/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml b/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
-    version="1.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" 
+    version="2.0">
 
 	<persistence-unit name="zanataTestDatasourcePU"
 		transaction-type="RESOURCE_LOCAL">

diff --git a/zanata-war/src/test/resources/META-INF/persistence.xml b/zanata-war/src/test/resources/META-INF/persistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
-    version="1.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" 
+    version="2.0">
 
 	<persistence-unit name="zanataTestDatasourcePU"
 		transaction-type="RESOURCE_LOCAL">