[portal-commits] JBoss Portal SVN: r11577 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-sar/dtd and 1 other directories.

Author: bdaw Date: 2008-07-24 10:09:33 -0400 (Thu, 24 Jul 2008) New Revision: 11577 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationAliasBindingMetaData.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowBindingMetaData.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd Log: change <name>-> <id> in xml for <alias-binding> and <parameter-binding> Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationAliasBindingMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationAliasBindingMetaData.java 2008-07-24 14:05:20 UTC (rev 11576) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationAliasBindingMetaData.java 2008-07-24 14:09:33 UTC (rev 11577) @@ -73,7 +73,7 @@ public static CoordinationAliasBindingMetaData buildMetaData(Element bindingElement) { - Element nameElt = XMLTools.getUniqueChild(bindingElement, "name", true); + Element nameElt = XMLTools.getUniqueChild(bindingElement, "id", true); CoordinationAliasBindingMetaData aliasMetaData = new CoordinationAliasBindingMetaData(XMLTools.asString(nameElt)); Iterator qnameIter = XMLTools.getChildrenIterator(bindingElement, "qname"); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowBindingMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowBindingMetaData.java 2008-07-24 14:05:20 UTC (rev 11576) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationWindowBindingMetaData.java 2008-07-24 14:09:33 UTC (rev 11577) @@ -71,7 +71,7 @@ public static CoordinationWindowBindingMetaData buildMetaData(Element bindingElement) { - Element nameElt = XMLTools.getUniqueChild(bindingElement, "name", true); + Element nameElt = XMLTools.getUniqueChild(bindingElement, "id", true); CoordinationWindowBindingMetaData paramMetaData = new CoordinationWindowBindingMetaData(XMLTools.asString(nameElt)); Iterator windowIter = XMLTools.getChildrenIterator(bindingElement, "window-coordination"); Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2008-07-24 14:05:20 UTC (rev 11576) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2008-07-24 14:09:33 UTC (rev 11577) @@ -368,13 +368,13 @@ <!-- Shared parameter binding definition --> -<!ELEMENT parameter-binding (name, window-coordination+)> +<!ELEMENT parameter-binding (id, window-coordination+)> <!-- Alias binding definition --> -<!ELEMENT alias-binding (name, qname+)> +<!ELEMENT alias-binding (id, qname+)> <!-- This element defines window for coordination. It can be either source or destination window for event distribution or @@ -387,4 +387,9 @@ --> <!ELEMENT qname (#PCDATA)> +<!-- +Id +--> +<!ELEMENT id (#PCDATA)> + Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-07-24 14:05:20 UTC (rev 11576) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-07-24 14:09:33 UTC (rev 11577) @@ -291,7 +291,7 @@ <!-- Same foo qname among 3 windows --> <parameter-binding> - <name>binding1</name> + <id>binding1</id> <window-coordination> <window-name>PublicParametersPortletWindow1</window-name> <qname>foo</qname> @@ -308,7 +308,7 @@ <!-- Bind different namespaces --> <parameter-binding> - <name>binding2</name> + <id>binding2</id> <window-coordination> <window-name>PublicParametersPortletWindow1</window-name> <qname>bar1</qname> @@ -377,17 +377,17 @@ <implicit-mode>FALSE</implicit-mode> <alias-binding> - <name>binding1</name> + <id>binding1</id> <qname>foo</qname> </alias-binding> <alias-binding> - <name>binding2</name> + <id>binding2</id> <qname>{urn:jboss:portal:samples:juu}juu</qname> </alias-binding> <alias-binding> - <name>binding3</name> + <id>binding3</id> <qname>bar1</qname> <qname>{urn:jboss:portal:samples:daa2}daa2</qname> </alias-binding> @@ -443,7 +443,7 @@ <implicit-mode>FALSE</implicit-mode> <parameter-binding> - <name>binding1</name> + <id>binding1</id> <window-coordination> <window-name>PublicParametersPortletWindow1</window-name> <qname>foo</qname> @@ -455,7 +455,7 @@ </parameter-binding> <alias-binding> - <name>binding2</name> + <id>binding2</id> <qname>foo</qname> </alias-binding>