Author: julien_viet Date: 2009-12-15 07:00:57 -0500 (Tue, 15 Dec 2009) New Revision: 1055 Modified: kernel/branches/config-branch/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java kernel/branches/config-branch/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml kernel/branches/config-branch/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml Log: rename profile -> profiles Modified: kernel/branches/config-branch/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ProfileDOMFilter.java 2009-12-15 12:00:57 UTC (rev 1055) @@ -39,7 +39,7 @@ { /** . */ - private static final String PROFILE_ATTRIBUTE = "profile"; + private static final String PROFILE_ATTRIBUTE = "profiles"; /** . */ private static final Set<String> kernelURIs = Tools.set(KERNEL_1_0_URI, KERNEL_1_1_URI); Modified: kernel/branches/config-branch/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/main/resources/org/exoplatform/container/configuration/kernel-configuration_1_1.xsd 2009-12-15 12:00:57 UTC (rev 1055) @@ -9,8 +9,8 @@ <xsd:element name="configuration" type="configurationType"/> - <xsd:complexType abstract="true" name="profiledElementType"> - <xsd:attribute name="profile" type="xsd:string"/> + <xsd:complexType abstract="true" name="profilesdElementType"> + <xsd:attribute name="profiles" type="xsd:string"/> </xsd:complexType> <xsd:complexType abstract="true" name="baseObjectType"> @@ -48,7 +48,7 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="baseObjectType"> - <xsd:attribute name="profile" type="xsd:string"/> + <xsd:attribute name="profiles" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -83,7 +83,7 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="fieldType"> - <xsd:attribute name="profile" type="xsd:string"/> + <xsd:attribute name="profiles" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -102,7 +102,7 @@ <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> </xsd:sequence> - <xsd:attribute name="profile" type="xsd:string"/> + <xsd:attribute name="profiles" type="xsd:string"/> </xsd:complexType> <xsd:complexType name="valueParamType"> @@ -163,7 +163,7 @@ <xsd:element name="priority" type="xsd:string" minOccurs="0" maxOccurs="1"/> <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> - <xsd:attribute name="profile" type="xsd:string"/> + <xsd:attribute name="profiles" type="xsd:string"/> </xsd:complexType> <xsd:complexType name="externalComponentPluginType"> @@ -211,7 +211,7 @@ </xsd:element> <xsd:element name="init-params" type="initParamsType" minOccurs="0" maxOccurs="1"/> </xsd:sequence> - <xsd:attribute name="profile" type="xsd:string"/> + <xsd:attribute name="profiles" type="xsd:string"/> </xsd:complexType> <xsd:complexType name="configurationType"> @@ -228,7 +228,7 @@ <xsd:complexType name="importType"> <xsd:simpleContent> <xsd:extension base="xsd:string"> - <xsd:attribute name="profile" type="xsd:string"/> + <xsd:attribute name="profiles" type="xsd:string"/> </xsd:extension> </xsd:simpleContent> </xsd:complexType> Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/collection-configuration.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -34,8 +34,8 @@ <field name="role"> <collection type="java.util.ArrayList"> <value><string>manager</string></value> - <value profile="foo"><string>foo_manager</string></value> - <value profile="foo,bar"><string>foo_bar_manager</string></value> + <value profiles="foo"><string>foo_manager</string></value> + <value profiles="foo,bar"><string>foo_bar_manager</string></value> </collection> </field> </object> Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-configuration.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -24,12 +24,12 @@ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - <component profile="bar"> + <component profiles="bar"> <key>Component</key> <type>ComponentImpl</type> </component> - <component profile="foo"> + <component profiles="foo"> <key>Component</key> <type>FooComponent</type> </component> Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/component-plugin-configuration.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -33,7 +33,7 @@ <set-method>set_method</set-method> <type>PluginA</type> </component-plugin> - <component-plugin profile="foo"> + <component-plugin profiles="foo"> <name>Plugin</name> <set-method>set_method</set-method> <type>PluginA</type> Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/field-configuration.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -36,12 +36,12 @@ <value><string>manager</string></value> </collection> </field> - <field name="role" profile="foo,bar"> + <field name="role" profiles="foo,bar"> <collection type="java.util.ArrayList"> <value><string>foo_bar_manager</string></value> </collection> </field> - <field name="role" profile="foo"> + <field name="role" profiles="foo"> <collection type="java.util.ArrayList"> <value><string>foo_manager</string></value> </collection> Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-configuration.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -25,7 +25,7 @@ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> <import>empty</import> - <import profile="foo">foo</import> - <import profile="bar">bar</import> + <import profiles="foo">foo</import> + <import profiles="bar">bar</import> </configuration> \ No newline at end of file Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/init-param-configuration.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -32,11 +32,11 @@ <name>param</name> <value>empty</value> </value-param> - <value-param profile="foo"> + <value-param profiles="foo"> <name>param</name> <value>foo</value> </value-param> - <value-param profile="bar"> + <value-param profiles="bar"> <name>param</name> <value>bar</value> </value-param> Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/org/exoplatform/container/property-configurator-with-profile-configuration.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -30,7 +30,7 @@ <name>properties</name> <property name="property_1" value="property_value_1"/> </properties-param> - <properties-param profile="foo"> + <properties-param profiles="foo"> <name>properties</name> <property name="property_1" value="property_value_1_foo"/> </properties-param> Modified: kernel/branches/config-branch/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml =================================================================== --- kernel/branches/config-branch/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml 2009-12-15 10:44:57 UTC (rev 1054) +++ kernel/branches/config-branch/exo.kernel.container/src/test/resources/xsd_1_1/sample-configuration-17.xml 2009-12-15 12:00:57 UTC (rev 1055) @@ -29,12 +29,12 @@ <type>org.exoplatform.services.naming.InitialContextInitializer</type> </component> - <component profile="a"> + <component profiles="a"> <key>org.exoplatform.services.naming.InitialContextInitializer</key> <type>org.exoplatform.services.naming.InitialContextInitializer</type> </component> - <component profile="a,b"> + <component profiles="a,b"> <key>org.exoplatform.services.naming.InitialContextInitializer</key> <type>org.exoplatform.services.naming.InitialContextInitializer</type> </component> @@ -47,49 +47,49 @@ <name>object</name> <object type="object"></object> </object-param> - <object-param profile="a"> + <object-param profiles="a"> <name>object</name> <object type="object"></object> </object-param> - <object-param profile="a,b"> + <object-param profiles="a,b"> <name>object</name> <object type="object"></object> </object-param> <properties-param> <name>properties</name> </properties-param> - <properties-param profile="a"> + <properties-param profiles="a"> <name>properties</name> </properties-param> - <properties-param profile="a,b"> + <properties-param profiles="a,b"> <name>properties</name> </properties-param> <value-param> <name>value</name> <value>value</value> </value-param> - <value-param profile="a"> + <value-param profiles="a"> <name>value</name> <value>value</value> </value-param> - <value-param profile="a,b"> + <value-param profiles="a,b"> <name>value</name> <value>value</value> </value-param> <values-param> <name>values</name> </values-param> - <values-param profile="a"> + <values-param profiles="a"> <name>values</name> </values-param> - <values-param profile="a,b"> + <values-param profiles="a,b"> <name>values</name> </values-param> </init-params> </component> <import>import_1</import> - <import profile="a">import_1</import> - <import profile="a,b">import_1</import> + <import profiles="a">import_1</import> + <import profiles="a,b">import_1</import> </configuration> \ No newline at end of file