Unify 2.0 XML to use display-name instead of title or label

gatein · Jun 26, 2013 · 1d44342 · 1d44342
1 parent 3b6a924
commit 1d44342
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 83 deletions.
diff --git a/component/portal/src/main/java/gatein_objects_2_0.xsd b/component/portal/src/main/java/gatein_objects_2_0.xsd
@@ -77,7 +77,7 @@
   <!-- The group content of a node -->
   <xs:group name="nodeContentGroup">
     <xs:sequence>
-      <xs:element name="label" type="localizedString" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="display-name" type="localizedString" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -90,7 +90,7 @@
   <xs:complexType name="pageType">
     <xs:sequence>
       <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-      <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="display-name" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="layout" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="access-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -110,7 +110,7 @@
   <xs:complexType name="windowType" abstract="true">
     <xs:sequence>
       <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-      <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="display-name" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="access-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -164,4 +164,11 @@
     </xs:sequence>
   </xs:complexType>
 
+  <!-- A site -->
+  <xs:element name="site" type="siteType">
+  </xs:element>
+
+  <xs:complexType name="siteType">
+  </xs:complexType>
+
 </xs:schema>
diff --git a/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelUnmarshaller.java b/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelUnmarshaller.java
@@ -41,7 +41,6 @@
 import org.jibx.runtime.BindingDirectory;
 import org.jibx.runtime.IBindingFactory;
 import org.jibx.runtime.impl.UnmarshallingContext;
-import org.staxnav.Axis;
 import org.staxnav.Naming;
 import org.staxnav.StaxNavigator;
 import org.staxnav.StaxNavigatorFactory;
@@ -105,7 +104,7 @@ public static <T> UnmarshalledObject<T> unmarshall(Class<T> type, byte[] bytes)
 
     enum NavigationElement {
 
-        navigation, node, name, parent_uri, label, icon, start_publication_date, end_publication_date, visibility, page_reference
+        navigation, node, name, parent_uri, display_name, icon, start_publication_date, end_publication_date, visibility, page_reference
 
     }
 
@@ -155,7 +154,7 @@ private static PageNode parseNode(StaxNavigator<NavigationElement> nav) throws P
                 case parent_uri:
                     node.setName(nav.getContent());
                     break;
-                case label:
+                case display_name:
                     String lang = nav.getAttribute(LANG);
                     String value = nav.getContent();
 
@@ -207,7 +206,7 @@ private static PageNode parseNode(StaxNavigator<NavigationElement> nav) throws P
 
     enum PageElement {
 
-        page_set, page, zone, name, layout, id, portlet, title, description, access_permission, edit_permission,
+        page_set, page, zone, name, layout, id, portlet, display_name, description, access_permission, edit_permission,
         show_info_bar, show_application_state, show_application_mode, application_ref, portlet_ref, preferences,
         preference, value, read_only
 
@@ -253,7 +252,7 @@ public static Page.PageSet parsePageSet(StaxNavigator<PageElement> nav) {
                         StaxNavigator<PageElement> windowNav = zoneNav.fork();
                         validate(windowNav.child(PageElement.name));
                         String windowName = windowNav.getContent();
-                        String windowTitle = windowNav.sibling(PageElement.title) ? windowNav.getContent() : null;
+                        String windowTitle = windowNav.sibling(PageElement.display_name) ? windowNav.getContent() : null;
                         String windowDescription = windowNav.sibling(PageElement.description) ? windowNav.getContent() : null;
                         String windowAccessPermission = windowNav.sibling(PageElement.access_permission) ? windowNav.getContent() : null;
                         String windowEditPermission = windowNav.sibling(PageElement.edit_permission) ? windowNav.getContent() : null;

diff --git a/component/portal/src/test/resources/xml/navigation.xml b/component/portal/src/test/resources/xml/navigation.xml
@@ -23,29 +23,29 @@
     xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_2_0 http://www.gatein.org/xml/ns/gatein_objects_2_0"
     xmlns="http://www.gatein.org/xml/ns/gatein_objects_2_0">
   <node>
-    <label>root_label</label>
+    <display-name>root_label</display-name>
     <page-reference>portal::classic::root</page-reference>
     <node>
       <name>bar</name>
-      <label>bar_label</label>
+      <display-name>bar_label</display-name>
     </node>
   </node>
   <node>
     <node>
       <name>bar</name>
-      <label>bar_label</label>
+      <display-name>bar_label</display-name>
     </node>
     <node>
       <name>foo</name>
-      <label xml:lang="en">foo_label_en</label>
-      <label>foo_label</label>
-      <label xml:lang="fr">foo_label_fr</label>
+      <display-name xml:lang="en">foo_label_en</display-name>
+      <display-name>foo_label</display-name>
+      <display-name xml:lang="fr">foo_label_fr</display-name>
     </node>
     <node>
       <name>juu</name>
-      <label xml:lang="en">juu_label_en</label>
-      <label xml:lang="fr">juu_label_fr</label>
-      <label xml:lang="fr-FR">juu_label_fr_FR</label>
+      <display-name xml:lang="en">juu_label_en</display-name>
+      <display-name xml:lang="fr">juu_label_fr</display-name>
+      <display-name xml:lang="fr-FR">juu_label_fr_FR</display-name>
     </node>
   </node>
 </navigation>
diff --git a/component/portal/src/test/resources/xml/pages.xml b/component/portal/src/test/resources/xml/pages.xml
@@ -28,7 +28,7 @@
       <id>1</id>
       <portlet>
         <name>foobar</name>
-        <title>ezfzef</title>
+        <display-name>ezfzef</display-name>
         <access-permission>zef</access-permission>
         <show-info-bar>false</show-info-bar>
         <show-application-state>false</show-application-state>

diff --git a/portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml b/portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
@@ -25,143 +25,143 @@
     xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_2_0 http://www.gatein.org/xml/ns/gatein_objects_2_0"
     xmlns="http://www.gatein.org/xml/ns/gatein_objects_2_0">
   <node>
-    <label xml:lang="en">Home</label>
-    <label xml:lang="cs">Domů</label>
-    <label xml:lang="fr">Accueil</label>
-    <label xml:lang="es">Inicio</label>
-    <label xml:lang="de">Startseite</label>
-    <label xml:lang="it">Home</label>
-    <label xml:lang="nl">Home</label>
-    <label xml:lang="pt-BR">Principal</label>
-    <label xml:lang="ja">ホーム</label>
-    <label xml:lang="ne">गृह पृष्‍ठ</label>
-    <label xml:lang="ru">Главная</label>
-    <label xml:lang="uk">Додому</label>
-    <label xml:lang="ar">ترحيب</label>
-    <label xml:lang="ko">홈</label>
-    <label xml:lang="vi">Trang chủ</label>
-    <label xml:lang="zh">主页</label>
-    <label xml:lang="zh-TW">首頁</label>
+    <display-name xml:lang="en">Home</display-name>
+    <display-name xml:lang="cs">Domů</display-name>
+    <display-name xml:lang="fr">Accueil</display-name>
+    <display-name xml:lang="es">Inicio</display-name>
+    <display-name xml:lang="de">Startseite</display-name>
+    <display-name xml:lang="it">Home</display-name>
+    <display-name xml:lang="nl">Home</display-name>
+    <display-name xml:lang="pt-BR">Principal</display-name>
+    <display-name xml:lang="ja">ホーム</display-name>
+    <display-name xml:lang="ne">गृह पृष्‍ठ</display-name>
+    <display-name xml:lang="ru">Главная</display-name>
+    <display-name xml:lang="uk">Додому</display-name>
+    <display-name xml:lang="ar">ترحيب</display-name>
+    <display-name xml:lang="ko">홈</display-name>
+    <display-name xml:lang="vi">Trang chủ</display-name>
+    <display-name xml:lang="zh">主页</display-name>
+    <display-name xml:lang="zh-TW">首頁</display-name>
     <page-reference>portal::classic::homepage</page-reference>
     <node>
       <name>demo1</name>
-      <label>Parameter Demo</label>
+      <display-name>Parameter Demo</display-name>
       <visibility>DISPLAYED</visibility>
       <page-reference>portal::classic::demo1</page-reference>
     </node>
     <node>
       <name>demo2</name>
-      <label>Parallel Demo</label>
+      <display-name>Parallel Demo</display-name>
       <visibility>DISPLAYED</visibility>
       <page-reference>portal::classic::demo2</page-reference>
     </node>
     <node>
       <name>sitemap</name>
-      <label xml:lang="en">SiteMap</label>
-      <label xml:lang="cs">Mapa stránek</label>
-      <label xml:lang="fr">SiteMap</label>
-      <label xml:lang="es">Mapa del Sitio</label>
-      <label xml:lang="de">Seitenübersicht</label>
-      <label xml:lang="it">Mappa del Sito</label>
-      <label xml:lang="nl">Sitemap</label>
-      <label xml:lang="pt-BR">Mapa do Site</label>
-      <label xml:lang="ja">サイトマップ</label>
-      <label xml:lang="ne">साईटम्याप</label>
-      <label xml:lang="ru">SiteMap</label>
-      <label xml:lang="ar">خريطة الموقع</label>
-      <label xml:lang="ko">사이트맵</label>
-      <label xml:lang="vi">Sơ đồ</label>
-      <label xml:lang="zh">网站地图</label>
-      <label xml:lang="zh-TW">網站導覽</label>
+      <display-name xml:lang="en">SiteMap</display-name>
+      <display-name xml:lang="cs">Mapa stránek</display-name>
+      <display-name xml:lang="fr">SiteMap</display-name>
+      <display-name xml:lang="es">Mapa del Sitio</display-name>
+      <display-name xml:lang="de">Seitenübersicht</display-name>
+      <display-name xml:lang="it">Mappa del Sito</display-name>
+      <display-name xml:lang="nl">Sitemap</display-name>
+      <display-name xml:lang="pt-BR">Mapa do Site</display-name>
+      <display-name xml:lang="ja">サイトマップ</display-name>
+      <display-name xml:lang="ne">साईटम्याप</display-name>
+      <display-name xml:lang="ru">SiteMap</display-name>
+      <display-name xml:lang="ar">خريطة الموقع</display-name>
+      <display-name xml:lang="ko">사이트맵</display-name>
+      <display-name xml:lang="vi">Sơ đồ</display-name>
+      <display-name xml:lang="zh">网站地图</display-name>
+      <display-name xml:lang="zh-TW">網站導覽</display-name>
       <visibility>DISPLAYED</visibility>
       <page-reference>portal::classic::sitemap</page-reference>
       	<node>
 	      	<name>sitemap_1</name>
-	      	<label xml:lang="en">SiteMap1</label>
+	      	<display-name xml:lang="en">SiteMap1</display-name>
 	      	<visibility>DISPLAYED</visibility>
 	      	<page-reference>portal::classic::sitemap</page-reference>
 	      	<node>
 		      	<name>sitemap_1.1</name>
-		      	<label xml:lang="en">SiteMap1.1</label>
+		      	<display-name xml:lang="en">SiteMap1.1</display-name>
 		      	<visibility>DISPLAYED</visibility>
 		      	<page-reference>portal::classic::sitemap</page-reference>
 		      	<node>
 			      	<name>sitemap_1.1.1</name>
-			      	<label xml:lang="en">SiteMap1.1.1</label>
+			      	<display-name xml:lang="en">SiteMap1.1.1</display-name>
 			      	<visibility>DISPLAYED</visibility>
 			      	<page-reference>portal::classic::sitemap</page-reference>
 			      	<node>
 			      		<name>sitemap_1.1.1.1</name>
-			      		<label xml:lang="en">SiteMap1.1.1.1</label>
+			      		<display-name xml:lang="en">SiteMap1.1.1.1</display-name>
 			      		<visibility>DISPLAYED</visibility>
 			      		<page-reference>portal::classic::sitemap</page-reference>
 	      			</node>
 	      		</node>
 	      		<node>
 			      	<name>sitemap_1.1.2</name>
-			      	<label xml:lang="en">SiteMap1.1.2</label>
+			      	<display-name xml:lang="en">SiteMap1.1.2</display-name>
 			      	<visibility>DISPLAYED</visibility>
 			      	<page-reference>portal::classic::sitemap</page-reference>
 	      		</node>
       		</node>
       		<node>
 		      	<name>sitemap_1.2</name>
-		      	<label xml:lang="en">SiteMap1.2</label>
+		      	<display-name xml:lang="en">SiteMap1.2</display-name>
 		      	<visibility>DISPLAYED</visibility>
 		      	<page-reference>portal::classic::sitemap</page-reference>
 	      	</node>
 	      	<node>
 		      	<name>sitemap_1.3</name>
-		      	<label xml:lang="en">SiteMap1.3</label>
+		      	<display-name xml:lang="en">SiteMap1.3</display-name>
 		      	<visibility>DISPLAYED</visibility>
 		      	<page-reference>portal::classic::sitemap</page-reference>
 	      	</node>
       	</node>
       	<node>
 	      	<name>sitemap_2</name>
-	      	<label xml:lang="en">SiteMap2</label>
+	      	<display-name xml:lang="en">SiteMap2</display-name>
 	      	<visibility>DISPLAYED</visibility>
 	      	<page-reference>portal::classic::sitemap</page-reference>
       	</node>
       	<node>
 	      	<name>sitemap_3</name>
-	      	<label xml:lang="en">SiteMap3</label>
+	      	<display-name xml:lang="en">SiteMap3</display-name>
 	      	<visibility>DISPLAYED</visibility>
 	      	<page-reference>portal::classic::sitemap</page-reference>
       	</node>
     </node>
     <node>
       <name>register</name>
-      <label xml:lang="en">Register</label>
-      <label xml:lang="cs">Registrace</label>
-      <label xml:lang="es">Registrarse</label>
-      <label xml:lang="de">Registrieren</label>
-      <label xml:lang="it">Registrazione</label>
-      <label xml:lang="nl">Registreren</label>
-      <label xml:lang="pt-BR">Cadastrar-se</label>
-      <label xml:lang="ja">登録</label>
-      <label xml:lang="ne">दर्ता</label>
-      <label xml:lang="ko">등록</label>
-      <label xml:lang="vi">Đăng ký</label>
-      <label xml:lang="zh">注册</label>
-      <label xml:lang="zh-TW">註冊</label>
+      <display-name xml:lang="en">Register</display-name>
+      <display-name xml:lang="cs">Registrace</display-name>
+      <display-name xml:lang="es">Registrarse</display-name>
+      <display-name xml:lang="de">Registrieren</display-name>
+      <display-name xml:lang="it">Registrazione</display-name>
+      <display-name xml:lang="nl">Registreren</display-name>
+      <display-name xml:lang="pt-BR">Cadastrar-se</display-name>
+      <display-name xml:lang="ja">登録</display-name>
+      <display-name xml:lang="ne">दर्ता</display-name>
+      <display-name xml:lang="ko">등록</display-name>
+      <display-name xml:lang="vi">Đăng ký</display-name>
+      <display-name xml:lang="zh">注册</display-name>
+      <display-name xml:lang="zh-TW">註冊</display-name>
       <visibility>SYSTEM</visibility>
       <page-reference>portal::classic::register</page-reference>
       	<node>
 	      <name>register_1</name>
-	      <label xml:lang="en">Register1</label>
+	      <display-name xml:lang="en">Register1</display-name>
 	      <visibility>SYSTEM</visibility>
 	      <page-reference>portal::classic::register</page-reference>
     	</node>
     	<node>
 	      <name>register_2</name>
-	      <label xml:lang="en">Register2</label>
+	      <display-name xml:lang="en">Register2</display-name>
 	      <visibility>SYSTEM</visibility>
 	      <page-reference>portal::classic::register</page-reference>
     	</node>
     	<node>
 	      <name>register_3</name>
-	      <label xml:lang="en">Register3</label>
+	      <display-name xml:lang="en">Register3</display-name>
 	      <visibility>SYSTEM</visibility>
 	      <page-reference>portal::classic::register</page-reference>
     	</node>

diff --git a/portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml b/portal/web/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
@@ -27,7 +27,7 @@
 
   <page>
     <name>homepage</name>
-    <title>Home Page</title>
+    <display-name>Home Page</display-name>
     <access-permission>Everyone</access-permission>
     <edit-permission>*:/platform/administrators</edit-permission>
     <zone>
@@ -43,7 +43,7 @@
 
   <page>
     <name>demo1</name>
-    <title>Parameter Demo</title>
+    <display-name>Parameter Demo</display-name>
     <access-permission>Everyone</access-permission>
     <edit-permission>*:/platform/administrators</edit-permission>
     <zone>
@@ -65,7 +65,7 @@
 
   <page>
     <name>demo2</name>
-    <title>Parallel Demo</title>
+    <display-name>Parallel Demo</display-name>
     <access-permission>Everyone</access-permission>
     <edit-permission>*:/platform/administrators</edit-permission>
     <zone>
@@ -93,7 +93,7 @@
 
   <page>
     <name>register</name>
-    <title>Register</title>
+    <display-name>Register</display-name>
     <access-permission>Everyone</access-permission>
     <edit-permission>*:/platform/administrators</edit-permission>
     <zone>
@@ -109,7 +109,7 @@
 
   <page>
     <name>sitemap</name>
-    <title>Site Map</title>
+    <display-name>Site Map</display-name>
     <access-permission>Everyone</access-permission>
     <edit-permission>*:/platform/administrators</edit-permission>
     <zone>