exo-jcr SVN: r2626 - jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/kernel.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-06-16 04:52:38 -0400 (Wed, 16 Jun 2010)
New Revision: 2626
Modified:
jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml
Log:
EXOJCR-782: Implementation based on component-plugins
Modified: jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml
===================================================================
--- jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml 2010-06-16 08:52:15 UTC (rev 2625)
+++ jcr/trunk/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml 2010-06-16 08:52:38 UTC (rev 2626)
@@ -560,7 +560,7 @@
</external-component-plugins></programlisting></para>
<table>
- <title>Descriptions of the fields of
+ <title>Descriptions of the fields of a
<envar>PortalContainerDefinition</envar> when it is used to define a
new portal container</title>
@@ -703,7 +703,7 @@
</table>
<table>
- <title>Descriptions of the fields of
+ <title>Descriptions of the fields of a
<envar>PortalContainerDefinition</envar> when it is used to define
the default portal container</title>
@@ -1000,6 +1000,457 @@
<emphasis>"foo"</emphasis> will be <emphasis>value of the portal
container "foo"</emphasis>.</para>
</section>
+
+ <section>
+ <title>Add dynamically settings and/or dependencies to a
+ <envar>PortalContainer</envar></title>
+
+ <para>It is possible to use <envar>component-plugin</envar> elements
+ in order to dynamically change a PortalContainerDefinition. In the
+ example below, we add the dependency <envar>foo</envar> to the default
+ portal container and to the portal containers called
+ <envar>foo1</envar> and <envar>foo2</envar>:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <values-param>
+ <name>apply.specific</name>
+ <value>foo1</value>
+ <value>foo2</value>
+ </values-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+
+ <table>
+ <title>Descriptions of the fields of a
+ <envar>PortalContainerDefinitionChangePlugin</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>apply.all</entry>
+
+ <entry>Indicates whether the changes have to be applied to all
+ the portal containers or not. The default value of this field
+ is <envar>false</envar>. This field is a
+ <envar>ValueParam</envar> and is not mandatory.</entry>
+ </row>
+
+ <row>
+ <entry>apply.default</entry>
+
+ <entry>Indicates whether the changes have to be applied to the
+ default portal container or not. The default value of this
+ field is <envar>false</envar>. This field is a
+ <envar>ValueParam</envar> and is not mandatory.</entry>
+ </row>
+
+ <row>
+ <entry>apply.specific</entry>
+
+ <entry>A set of specific portal container names to which we
+ want to apply the changes. This field is a
+ <envar>ValuesParam</envar> and is not mandatory.</entry>
+ </row>
+
+ <row>
+ <entry><envar>Rest of the expected parameters </envar></entry>
+
+ <entry>The rest of the expected paramaters are
+ <envar>ObjectParam</envar> of type
+ <envar>PortalContainerDefinitionChange</envar>. Those
+ parameters are in fact the list of changes that we want to
+ apply to one or several portal containers. If the list of
+ changes is empty, the component plugin will be ignored. The
+ supported implementations of PortalContainerDefinitionChange
+ are described later in this section.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>To identify the portal containers to which the changes have to
+ be applied, we use the follwing algorithm:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>The parameter <envar>apply.all</envar> has been set to
+ <envar>true</envar>. The corresponding changes will be applied to
+ all the portal containers. The other parameters will be
+ ignored.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>true</envar> and the parameter
+ <envar>apply.specific</envar> is <envar>null</envar>. The
+ corresponding changes will be applied to the default portal
+ container only.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>true</envar> and the parameter
+ <envar>apply.specific</envar> is not <envar>null</envar>. The
+ corresponding changes will be applied to the default portal
+ container and the given list of specific portal containers.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>false</envar> or has not been set and the parameter
+ <envar>apply.specific</envar> is <envar>null</envar>. The
+ corresponding changes will be applied to the default portal
+ container only.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>false</envar> or has not been set and the parameter
+ <envar>apply.specific</envar> is not <envar>null</envar>. The
+ corresponding changes will be applied to the given list of
+ specific portal containers.</para>
+ </listitem>
+ </orderedlist>
+
+ <section>
+ <title>The existing implementations of
+ <envar>PortalContainerDefinitionChange</envar></title>
+
+ <para>The modifications that can be applied to a
+ <envar>PortalContainerDefinition</envar> must be a class of type
+ <envar>PortalContainerDefinitionChange</envar>. The product proposes
+ out of the box some implementations that we describe in the next sub
+ sections. </para>
+
+ <section>
+ <title><envar>AddDependencies</envar></title>
+
+ <para>This modification adds a list of dependencies at the end of
+ the list of dependencies defined into the
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddDependencies</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>dependencies</entry>
+
+ <entry>A list of <emphasis>String</emphasis> corresponding
+ to the list of name of the dependencies to add. If the
+ value of this field is empty, the change will be
+ ignored.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add <envar>foo</envar> at
+ the end of the dependency list of the default portal
+ container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+
+ <section>
+ <title><envar>AddDependenciesBefore</envar></title>
+
+ <para>This modification adds a list of dependencies before a given
+ target dependency defined into the list of dependencies of the
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddDependenciesBefore</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>dependencies</entry>
+
+ <entry>A list of <emphasis>String</emphasis> corresponding
+ to the list of name of the dependencies to add. If the
+ value of this field is empty, the change will be
+ ignored.</entry>
+ </row>
+
+ <row>
+ <entry>target</entry>
+
+ <entry>The name of the dependency before which we would
+ like to add the new dependencies. If this field is
+ <envar>null</envar> or the target dependency cannot be
+ found in the list of dependencies defined into the
+ <envar>PortalContainerDefinition</envar>, the new
+ dependencies will be added in first position to the
+ list.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add <envar>foo</envar>
+ before <envar>foo2</envar> in the dependency list of the default
+ portal container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+
+ <section>
+ <title><envar>AddDependenciesAfter</envar></title>
+
+ <para>This modification adds a list of dependencies before a given
+ target dependency defined into the list of dependencies of the
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddDependenciesAfter</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>dependencies</entry>
+
+ <entry>A list of <emphasis>String</emphasis> corresponding
+ to the list of name of the dependencies to add. If the
+ value of this field is empty, the change will be
+ ignored.</entry>
+ </row>
+
+ <row>
+ <entry>target</entry>
+
+ <entry>The name of the dependency after which we would
+ like to add the new dependencies. If this field is
+ <envar>null</envar> or the target dependency cannot be
+ found in the list of dependencies defined into the
+ <envar>PortalContainerDefinition</envar>, the new
+ dependencies will be added in last position to the
+ list.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add <envar>foo</envar> after
+ <envar>foo2</envar> in the dependency list of the default portal
+ container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+
+ <section>
+ <title><envar>AddSettings</envar></title>
+
+ <para>This modification adds new settings to a
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddSettings</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddSettings</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>settings</entry>
+
+ <entry>A map of <emphasis><String,
+ Object></emphasis> corresponding to the settings to
+ add. If the value of this field is empty, the change will
+ be ignored.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add the settings
+ <envar>string</envar> and <envar>stringX</envar> to the settings
+ of the default portal container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddSettings">
+ <!-- The settings to add to the to the portal containers -->
+ <field name="settings">
+ <map type="java.util.HashMap">
+ <entry>
+ <key>
+ <string>string</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ <entry>
+ <key>
+ <string>stringX</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ </map>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+ </section>
+ </section>
</section>
</section>
14 years
- 1
- 0
exo-jcr SVN: r2625 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container/definition and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-06-16 04:52:15 -0400 (Wed, 16 Jun 2010)
New Revision: 2625
Added:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml
Log:
EXOJCR-782: Implementation based on component-plugins
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-06-16 08:50:49 UTC (rev 2624)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-06-16 08:52:15 UTC (rev 2625)
@@ -121,6 +121,11 @@
Collections.unmodifiableMap(new HashMap<String, PortalContainerDefinition>());
/**
+ * The list of all the changes to apply to the registered {@link PortalContainerDefinition}
+ */
+ private List<PortalContainerDefinitionChangePlugin> changes = new ArrayList<PortalContainerDefinitionChangePlugin>();
+
+ /**
* The configuration manager
*/
private final ConfigurationManager cm;
@@ -569,6 +574,26 @@
}
/**
+ * Allow to define a set of changes to apply to the registered {@link PortalContainerDefinition}
+ * @param plugin the plugin that defines the changes to apply
+ */
+ public void registerChangePlugin(PortalContainerDefinitionChangePlugin plugin)
+ {
+ final List<PortalContainerDefinitionChange> lchanges = plugin.getChanges();
+ if (lchanges != null && !lchanges.isEmpty())
+ {
+ synchronized (this)
+ {
+ if (initialized)
+ {
+ throw new IllegalStateException("The PortalContainerConfig has already been initialized");
+ }
+ changes.add(plugin);
+ }
+ }
+ }
+
+ /**
* Construct the scopes of all the web applications from the given {@link PortalContainerDefinition}
* @param definition the definition of a {@link PortalContainer} that contains the dependencies with
* the web application
@@ -976,6 +1001,8 @@
hasChanged = true;
}
}
+ // Apply the changes corresponding to the given definition
+ applyChanges(definition);
registerDependencies(definition, mScopes);
if (hasChanged)
{
@@ -983,18 +1010,81 @@
}
initializeSettings(definition, true);
}
- if (!mDefinitions.containsKey(defaultDefinition.getName()) && defaultDefinition.getDependencies() != null
- && !defaultDefinition.getDependencies().isEmpty())
+ if (!mDefinitions.containsKey(defaultDefinition.getName()))
{
- // The default portal container has not been defined and some default
- // dependencies have been defined
- registerDependencies(defaultDefinition, mScopes);
+ // Apply the changes corresponding to the default definition
+ applyChanges(defaultDefinition);
+ initializeSettings(defaultDefinition, false);
+ if (defaultDefinition.getDependencies() != null && !defaultDefinition.getDependencies().isEmpty())
+ {
+ // The default portal container has not been defined and some default
+ // dependencies have been defined
+ registerDependencies(defaultDefinition, mScopes);
+ }
}
this.portalContainerNames = Collections.unmodifiableList(lPortalContainerNames);
this.scopes = Collections.unmodifiableMap(mScopes);
+ // clear the changes
+ changes.clear();
}
/**
+ * Apply the changes corresponding to the give {@link PortalContainerDefinition}
+ * @param definition
+ */
+ private void applyChanges(PortalContainerDefinition definition)
+ {
+ for (PortalContainerDefinitionChangePlugin plugin : changes)
+ {
+ if (matches(definition, plugin))
+ {
+ // The definition matches with the scope of the changes
+ for (PortalContainerDefinitionChange change : plugin.getChanges())
+ {
+ try
+ {
+ // Secure access to definition's info
+ change.apply(new SafePortalContainerDefinition(definition, defaultDefinition));
+ }
+ catch (Exception e)
+ {
+ log.warn("Cannot apply the change " + change, e);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Indicates whether the given definition matches with the scope of the {@link PortalContainerDefinitionChangePlugin}
+ * @param definition the {@link PortalContainerDefinition} to test.
+ * @param plugin the {@link PortalContainerDefinitionChangePlugin} from which we extract the scopes
+ * of the embedded actions
+ * @return <code>true</code> if it matches, <code>false</code> otherwise
+ */
+ private boolean matches(PortalContainerDefinition definition, PortalContainerDefinitionChangePlugin plugin)
+ {
+ if (plugin.isAll())
+ {
+ // The changes have to be applied to all the portal containers
+ return true;
+ }
+ if ((plugin.getNames() == null || plugin.isDefault()) && defaultDefinition.getName().equals(definition.getName()))
+ {
+ // The changes have to be applied to the default portal container and the given definition is
+ // the definition of the default portal container
+ return true;
+ }
+ if (plugin.getNames() != null && plugin.getNames().contains(definition.getName()))
+ {
+ // The changes have to be applied to a specific list of portal containers and the given
+ // definition is the a definition of one of them
+ return true;
+ }
+ return false;
+ }
+
+ /**
* {@inheritDoc}
*/
public void start()
Added: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java (rev 0)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java 2010-06-16 08:52:15 UTC (rev 2625)
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.container.definition;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This interface describes the change that cans be applied on a given {@link PortalContainerDefinition}
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 11 juin 2010
+ */
+public interface PortalContainerDefinitionChange
+{
+
+ /**
+ * Apply the corresponding change of the given {@link PortalContainerDefinition}
+ * @param pcd the {@link PortalContainerDefinition} on which the change has to be applied
+ */
+ void apply(PortalContainerDefinition pcd);
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add the nested dependencies
+ * at the end of the dependency list of the {@link PortalContainerDefinition}. If the nested
+ * dependency list is empty, this change will be ignored.
+ */
+ public static class AddDependencies implements PortalContainerDefinitionChange
+ {
+ /**
+ * The list of name of the dependencies to add
+ */
+ public List<String> dependencies;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ return;
+ }
+ pcd.getDependencies().addAll(dependencies);
+ }
+ }
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add the nested dependencies
+ * before a target dependency to the dependency list of the {@link PortalContainerDefinition}.
+ * If the target dependency is empty or cannot be found, the nested dependencies will be added at
+ * the head of the dependency list. If the nested dependency list is empty, this change will be ignored.
+ */
+ public static class AddDependenciesBefore implements PortalContainerDefinitionChange
+ {
+ /**
+ * The list of name of the dependencies to add
+ */
+ public List<String> dependencies;
+
+ /**
+ * The name of the target dependency
+ */
+ public String target;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ return;
+ }
+ if (target != null && target.length() > 0)
+ {
+ List<String> lDependencies = pcd.getDependencies();
+ for (int i = lDependencies.size() - 1; i >= 0; i--)
+ {
+ String dep = lDependencies.get(i);
+ if (target.equals(dep))
+ {
+ // The target could be found
+ lDependencies.addAll(i, dependencies);
+ return;
+ }
+ }
+ }
+ // The target is empty or cannot be found
+ pcd.getDependencies().addAll(0, dependencies);
+ }
+ }
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add the nested dependencies
+ * after a target dependency to the dependency list of the {@link PortalContainerDefinition}.
+ * If the target dependency is empty or cannot be found, the nested dependencies will be added at
+ * the end of the dependency list. If the nested dependency list is empty, this change will be ignored.
+ */
+ public static class AddDependenciesAfter implements PortalContainerDefinitionChange
+ {
+ /**
+ * The list of name of the dependencies to add
+ */
+ public List<String> dependencies;
+
+ /**
+ * The name of the target dependency
+ */
+ public String target;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ return;
+ }
+ if (target != null && target.length() > 0)
+ {
+ List<String> lDependencies = pcd.getDependencies();
+ for (int i = 0, length = lDependencies.size(); i < length; i++)
+ {
+ String dep = lDependencies.get(i);
+ if (target.equals(dep))
+ {
+ // The target could be found
+ lDependencies.addAll(i + 1, dependencies);
+ return;
+ }
+ }
+ }
+ // The target is empty or cannot be found
+ pcd.getDependencies().addAll(dependencies);
+ }
+ }
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add new internal settings
+ * to the {@link PortalContainerDefinition}. If the nested settings are empty, this change will
+ * be ignored.
+ */
+ public static class AddSettings implements PortalContainerDefinitionChange
+ {
+ /**
+ * The settings to add to the internal settings
+ */
+ public Map<String, Object> settings;
+
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (settings == null || settings.isEmpty())
+ {
+ return;
+ }
+ pcd.getSettings().putAll(settings);
+ }
+ }
+}
Added: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java (rev 0)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java 2010-06-16 08:52:15 UTC (rev 2625)
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.container.definition;
+
+import org.exoplatform.container.component.BaseComponentPlugin;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ValueParam;
+import org.exoplatform.container.xml.ValuesParam;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * This class allows you to dynamically apply a list of changes to one or several portal containers.
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 11 juin 2010
+ */
+public class PortalContainerDefinitionChangePlugin extends BaseComponentPlugin
+{
+
+ /**
+ * Indicates whether the changes have to be applied to all the portal containers or not.
+ */
+ private boolean all;
+
+ /**
+ * Indicates whether the changes have to be applied to the default portal container or not.
+ */
+ private boolean bDefault;
+
+ /**
+ * A set of specific portal container names on which we want to apply the changes.
+ */
+ private Set<String> names;
+
+ /**
+ * The list of changes to apply
+ */
+ private List<PortalContainerDefinitionChange> changes;
+
+ @SuppressWarnings("unchecked")
+ public PortalContainerDefinitionChangePlugin(InitParams params)
+ {
+ ValueParam vp = params.getValueParam("apply.all");
+ if (vp != null && vp.getValue().length() > 0)
+ {
+ this.all = Boolean.valueOf(vp.getValue());
+ }
+ vp = params.getValueParam("apply.default");
+ if (vp != null && vp.getValue().length() > 0)
+ {
+ this.bDefault = Boolean.valueOf(vp.getValue());
+ }
+ ValuesParam vsp = params.getValuesParam("apply.specific");
+ if (vsp != null && !vsp.getValues().isEmpty())
+ {
+ this.names = new HashSet<String>(vsp.getValues());
+ }
+ this.changes = params.getObjectParamValues(PortalContainerDefinitionChange.class);
+ }
+
+ public boolean isAll()
+ {
+ return all;
+ }
+
+ public boolean isDefault()
+ {
+ return bDefault;
+ }
+
+ public Set<String> getNames()
+ {
+ return names;
+ }
+
+ public List<PortalContainerDefinitionChange> getChanges()
+ {
+ return changes;
+ }
+}
Added: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java (rev 0)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java 2010-06-16 08:52:15 UTC (rev 2625)
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.container.definition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This class is a decorator used to protect the nested {@link PortalContainerDefinition}. It mainly
+ * forbid access to setter. If a setter is called an {@link UnsupportedOperationException} will be thrown.
+ * This class is mainly used to prevent any unsupported {@link PortalContainerDefinitionChange}.
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 8 sept. 2009
+ */
+public class SafePortalContainerDefinition extends PortalContainerDefinition
+{
+
+ /**
+ * The {@link PortalContainerDefinition} to protected
+ */
+ private final PortalContainerDefinition definition;
+
+ /**
+ * The default {@link PortalContainerDefinition}
+ */
+ private final PortalContainerDefinition defaultDefinition;
+
+ /**
+ * Default constructor
+ */
+ public SafePortalContainerDefinition(PortalContainerDefinition definition,
+ PortalContainerDefinition defaultDefinition)
+ {
+ this.definition = definition;
+ this.defaultDefinition = defaultDefinition;
+ }
+
+ public String getName()
+ {
+ return definition.getName();
+ }
+
+ public void setName(String name)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public List<String> getDependencies()
+ {
+ // We ensure that the dependency list is not null to simplify the code in
+ // all instances of PortalContainerDefinitionChange
+ List<String> dependencies = definition.getDependencies();
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ // Try to get the default dependencies
+ dependencies = defaultDefinition.getDependencies();
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ dependencies = new ArrayList<String>();
+ }
+ else
+ {
+ dependencies = new ArrayList<String>(dependencies);
+ }
+ definition.setDependencies(dependencies);
+ }
+ return dependencies;
+ }
+
+ public void setDependencies(List<String> dependencies)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getRealmName()
+ {
+ return definition.getRealmName();
+ }
+
+ public void setRealmName(String realmName)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getRestContextName()
+ {
+ return definition.getRestContextName();
+ }
+
+ public void setRestContextName(String restContextName)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<String, Object> getSettings()
+ {
+ // We ensure that the settings are not null to simplify the code in
+ // all instances of PortalContainerDefinitionChange
+ Map<String, Object> settings = definition.getSettings();
+ if (settings == null)
+ {
+ settings = new HashMap<String, Object>();
+ }
+ else
+ {
+ settings = new HashMap<String, Object>(settings);
+ }
+ definition.setSettings(settings);
+ return settings;
+ }
+
+ public void setSettings(Map<String, Object> settings)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getExternalSettingsPath()
+ {
+ return definition.getExternalSettingsPath();
+ }
+
+ public void setExternalSettingsPath(String externalSettingsPath)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2010-06-16 08:50:49 UTC (rev 2624)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2010-06-16 08:52:15 UTC (rev 2625)
@@ -20,7 +20,11 @@
import org.exoplatform.container.jmx.AbstractTestContainer;
import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Created by The eXo Platform SAS
@@ -95,7 +99,7 @@
assertEquals("myRest-pcdef", config.getDefaultRestContext());
assertEquals("my-exo-domain-pcdef", config.getDefaultRealmName());
assertTrue(config.hasDefinition());
-
+
rootContainer = createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
@@ -103,19 +107,74 @@
assertEquals("myRest", config.getDefaultRestContext());
assertEquals("my-exo-domain", config.getDefaultRealmName());
assertTrue(config.hasDefinition());
-
+
rootContainer = createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs2.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertEquals("myPortal-pcdef", config.getDefaultPortalContainer());
assertEquals("myRest-pcdef", config.getDefaultRestContext());
assertEquals("my-exo-domain-pcdef", config.getDefaultRealmName());
- assertTrue(config.hasDefinition());
+ assertTrue(config.hasDefinition());
}
+ public void testChanges()
+ {
+ Set<String> s;
+ try
+ {
+ createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs.xml");
+ s = TestPortalContainerDefinitionChange.NAMES.get("change1");
+ assertNotNull(s);
+ assertEquals(2, s.size());
+ assertTrue(s.contains("portal"));
+ assertTrue(s.contains("myPortal-pcdef"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change2");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("portal"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change3");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("myPortal-pcdef"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change4");
+ assertNotNull(s);
+ assertEquals(2, s.size());
+ assertTrue(s.contains("portal"));
+ assertTrue(s.contains("myPortal-pcdef"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change5");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("portal"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change6");
+ assertNull(s);
+ }
+ finally
+ {
+ TestPortalContainerDefinitionChange.NAMES.clear();
+ }
+
+ try
+ {
+ createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs.xml", "change6");
+ s = TestPortalContainerDefinitionChange.NAMES.get("change6");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("portal"));
+ }
+ finally
+ {
+ TestPortalContainerDefinitionChange.NAMES.clear();
+ }
+ }
+
public void testDependencies()
{
-
+
// Empty
RootContainer rootContainer = createRootContainer("portal-container-config-with-no-default-values.xml");
PortalContainerConfig config =
@@ -144,19 +203,65 @@
assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("myPortal-pcdef"));
assertFalse(config.isPortalContainerName("foo"));
assertFalse(config.isPortalContainerName("myPortal"));
- assertFalse(config.isPortalContainerName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("myPortal-pcdef"));
assertTrue(config.isPortalContainerName(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME));
// Needed for backward compatibility
assertTrue(config.isScopeValid("foo", "foo"));
assertTrue(config.isScopeValid("myPortal", "foo"));
assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
assertFalse(config.hasDefinition());
-
+
+ // Empty with AddDependencies, AddDependenciesBefore and AddDependenciesAfter
+ String[] profiles =
+ {"AddDependencies", "AddDependenciesBefore-No-Target", "AddDependenciesBefore-With-Fake-Target",
+ "AddDependenciesAfter-No-Target", "AddDependenciesAfter-With-Fake-Target"};
+
+ List<String> deps;
+ for (String profile : profiles)
+ {
+ rootContainer = createRootContainer("portal-container-config-with-no-default-values2.xml", profile);
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ deps = config.getDependencies(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME);
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ deps = config.getDependencies("foo");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ deps = config.getDependencies("myPortal");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ deps = config.getDependencies("myPortal-pcdef");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ names = config.getPortalContainerNames("foo");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0));
+ names = config.getPortalContainerNames("myPortal");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0));
+ names = config.getPortalContainerNames("myPortal-pcdef");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getPortalContainerName("foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getPortalContainerName("myPortal"));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config
+ .getPortalContainerName("myPortal-pcdef"));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("myPortal"));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("myPortal-pcdef"));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("myPortal"));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("foo"));
+ assertFalse(config.isPortalContainerName("myPortal"));
+ assertFalse(config.isPortalContainerName("myPortal-pcdef"));
+ assertTrue(config.isPortalContainerName(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME));
+ // Needed for backward compatibility
+ assertFalse(config.isScopeValid("foo", "foo"));
+ assertFalse(config.isScopeValid("myPortal", "foo"));
+ assertFalse(config.isScopeValid("myPortal-pcdef", "foo"));
+ assertTrue(config.isScopeValid(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, "foo"));
+ assertFalse(config.hasDefinition());
+ }
// Without dependencies
- rootContainer =
- createRootContainer("portal-container-config-with-default-values-and-with-portal-def.xml");
- config =
- (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def.xml");
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertNull(config.getDependencies("foo"));
assertNull(config.getDependencies("myPortal"));
assertNull(config.getDependencies("myPortal-pcdef"));
@@ -249,9 +354,10 @@
assertTrue(config.hasDefinition());
// Without dependencies and with default portal container definition
- rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml");
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
- List<String> deps = config.getDependencies("foo");
+ deps = config.getDependencies("foo");
assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
deps = config.getDependencies("myPortal");
assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
@@ -289,6 +395,68 @@
assertTrue(config.isScopeValid("myPortal-pcdef", "fooX"));
assertTrue(config.hasDefinition());
+ profiles =
+ new String[]{"AddDependencies", "AddDependenciesBefore-No-Target", "AddDependenciesBefore-With-Fake-Target",
+ "AddDependenciesBefore-With-Target", "AddDependenciesAfter-No-Target",
+ "AddDependenciesAfter-With-Fake-Target", "AddDependenciesAfter-With-Target"};
+
+ for (String profile : profiles)
+ {
+ rootContainer =
+ createRootContainer(
+ "portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml",
+ "with-profiles", profile);
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ deps = config.getDependencies("foo");
+ assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo"));
+ int index = deps.indexOf("foo");
+ if (profile.equals("AddDependenciesBefore-No-Target")
+ || profile.equals("AddDependenciesBefore-With-Fake-Target")
+ || profile.equals("AddDependenciesBefore-With-Target"))
+ {
+ assertEquals(0, index);
+ }
+ else
+ {
+ assertEquals(1, index);
+ }
+ deps = config.getDependencies("myPortal");
+ assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo"));
+ deps = config.getDependencies("myPortal-pcdef");
+ assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo"));
+ names = config.getPortalContainerNames("fooX");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("myPortal-dpcdef"));
+ assertTrue(names.contains("myPortal-pcdef"));
+ names = config.getPortalContainerNames("foo");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(1, names.size());
+ assertEquals("myPortal-dpcdef", names.get(0));
+ names = config.getPortalContainerNames("myPortal");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-dpcdef", names.get(0));
+ names = config.getPortalContainerNames("myPortal-pcdef");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-pcdef", names.get(0));
+ assertEquals("myPortal-dpcdef", config.getPortalContainerName("foo"));
+ assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal"));
+ assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef"));
+ assertEquals("myRest-dpcdef", config.getRestContextName("foo"));
+ assertEquals("myRest-dpcdef", config.getRestContextName("myPortal"));
+ assertEquals("myRest-pcdef", config.getRestContextName("myPortal-pcdef"));
+ assertEquals("my-exo-domain-dpcdef", config.getRealmName("foo"));
+ assertEquals("my-exo-domain-dpcdef", config.getRealmName("myPortal"));
+ assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("foo"));
+ assertFalse(config.isPortalContainerName("myPortal"));
+ assertTrue(config.isPortalContainerName("myPortal-pcdef"));
+ assertFalse(config.isScopeValid("foo", "fooX"));
+ assertFalse(config.isScopeValid("myPortal", "fooX"));
+ assertTrue(config.isScopeValid("myPortal-pcdef", "fooX"));
+ assertTrue(config.hasDefinition());
+ }
+
// With dependencies
rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def2.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
@@ -321,9 +489,66 @@
assertFalse(config.isScopeValid("myPortal", "foo"));
assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
assertTrue(config.hasDefinition());
-
+
+ for (String profile : profiles)
+ {
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-portal-def2.xml",
+ "with-profiles", profile);
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ deps = config.getDependencies("foo");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
+ deps = config.getDependencies("myPortal");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
+ deps = config.getDependencies("myPortal-pcdef");
+ assertTrue(deps != null && deps.size() == 4);
+ int index = deps.indexOf("fooX");
+ if (profile.equals("AddDependenciesBefore-No-Target") || profile.equals("AddDependenciesBefore-With-Fake-Target"))
+ {
+ assertEquals(0, index);
+ }
+ else if (profile.equals("AddDependenciesBefore-With-Target"))
+ {
+ assertEquals(1, index);
+ }
+ else if (profile.equals("AddDependenciesAfter-With-Target"))
+ {
+ assertEquals(2, index);
+ }
+ else
+ {
+ assertEquals(3, index);
+ }
+ names = config.getPortalContainerNames("foo");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-pcdef", names.get(0));
+ names = config.getPortalContainerNames("myPortal");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal", names.get(0));
+ names = config.getPortalContainerNames("myPortal-pcdef");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-pcdef", names.get(0));
+ assertEquals("myPortal-pcdef", config.getPortalContainerName("foo"));
+ assertEquals("myPortal", config.getPortalContainerName("myPortal"));
+ assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef"));
+ assertEquals("myRest", config.getRestContextName("foo"));
+ assertEquals("myRest", config.getRestContextName("myPortal"));
+ assertEquals("myRest-pcdef", config.getRestContextName("myPortal-pcdef"));
+ assertEquals("my-exo-domain", config.getRealmName("foo"));
+ assertEquals("my-exo-domain", config.getRealmName("myPortal"));
+ assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("foo"));
+ assertTrue(config.isPortalContainerName("myPortal"));
+ assertTrue(config.isPortalContainerName("myPortal-pcdef"));
+ assertFalse(config.isScopeValid("foo", "foo"));
+ assertFalse(config.isScopeValid("myPortal", "foo"));
+ assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
+ assertTrue(config.hasDefinition());
+ }
+
// With dependencies and with default portal container definition
- rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml");
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
deps = config.getDependencies("foo");
assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
@@ -360,7 +585,7 @@
assertFalse(config.isScopeValid("foo", "foo"));
assertFalse(config.isScopeValid("myPortal", "foo"));
assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
- assertTrue(config.hasDefinition());
+ assertTrue(config.hasDefinition());
}
public void testSettings()
@@ -391,6 +616,33 @@
assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("myPortal-pcdef",
PortalContainerConfig.REALM_SETTING_NAME));
+ rootContainer = createRootContainer("portal-container-config-with-no-default-values.xml", "with-profiles");
+ config =
+ (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ assertNull(config.getSetting("foo", "foo"));
+ assertNull(config.getSetting("myPortal", "foo"));
+ assertNull(config.getSetting("myPortal-pcdef", "foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getSetting("foo",
+ PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getSetting("myPortal",
+ PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getSetting("foo",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getSetting("myPortal",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("foo",
+ PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("myPortal",
+ PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals("value1", config.getSetting("foo", "string"));
+ assertEquals("value1", config.getSetting("foo", "stringX"));
+
// Without settings and without portal definition
rootContainer = createRootContainer("portal-container-config-with-default-values.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
@@ -593,8 +845,9 @@
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertEquals("../gatein/data", config.getSetting("portal", "gatein.data.dir"));
assertEquals("../gatein/data/db", config.getSetting("portal", "gatein.db.data.dir"));
- assertEquals("jdbc:hsqldb:file:../gatein/data/db/data/jdbcjcr_portal", config.getSetting("portal", "gatein.jcr.datasource.url"));
-
+ assertEquals("jdbc:hsqldb:file:../gatein/data/db/data/jdbcjcr_portal", config.getSetting("portal",
+ "gatein.jcr.datasource.url"));
+
// With external settings, with several portal container definitions and with
// default portal container definition
rootContainer =
@@ -721,7 +974,8 @@
assertEquals("2001", config.getSetting("myPortal", "long"));
assertEquals("2001", config.getSetting("myPortal", "double"));
assertEquals("false", config.getSetting("myPortal", "boolean"));
- assertEquals("myPortal-myRest-my-exo-domain-value01-new value01", config.getSetting("myPortal", "complex-value2"));
+ assertEquals("myPortal-myRest-my-exo-domain-value01-new value01", config.getSetting("myPortal",
+ "complex-value2"));
assertEquals("new value01", config.getSetting("myPortal0", "string"));
assertEquals("2001", config.getSetting("myPortal0", "int"));
assertEquals("2001", config.getSetting("myPortal0", "long"));
@@ -751,10 +1005,12 @@
PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
assertEquals("myRest", config.getSetting("foo", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("myRest", config.getSetting("myPortal", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
- assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("foo", PortalContainerConfig.REALM_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("myPortal", PortalContainerConfig.REALM_SETTING_NAME));
- assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REALM_SETTING_NAME));
}
finally
@@ -799,7 +1055,8 @@
System.setProperty("TestPortalContainerConfig-string", "system value");
System.setProperty("TestPortalContainerConfig-int", "50");
// With both settings internal and external and default portal container definition
- rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml");
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertEquals("value0", config.getSetting("foo", "foo"));
assertEquals("value0", config.getSetting("myPortal", "foo"));
@@ -864,10 +1121,12 @@
PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
assertEquals("myRest", config.getSetting("foo", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("myRest", config.getSetting("myPortal", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
- assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("foo", PortalContainerConfig.REALM_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("myPortal", PortalContainerConfig.REALM_SETTING_NAME));
- assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REALM_SETTING_NAME));
}
finally
{
@@ -894,4 +1153,24 @@
assertEquals("my-exo-domain", config.getSetting("myPortal", PortalContainerConfig.REALM_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("myPortal-pcdef", PortalContainerConfig.REALM_SETTING_NAME));
}
+
+ public static class TestPortalContainerDefinitionChange implements PortalContainerDefinitionChange
+ {
+
+ public String name;
+
+ public static Map<String, Set<String>> NAMES = new HashMap<String, Set<String>>();
+
+ public void apply(PortalContainerDefinition pcd)
+ {
+ Set<String> names = NAMES.get(name);
+ if (names == null)
+ {
+ names = new HashSet<String>();
+ NAMES.put(name, names);
+ }
+ names.add(pcd.getName());
+ }
+
+ }
}
Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java 2010-06-16 08:50:49 UTC (rev 2624)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java 2010-06-16 08:52:15 UTC (rev 2625)
@@ -37,4 +37,11 @@
assertNotNull(url);
return new ContainerBuilder().withRoot(url).build();
}
+
+ public RootContainer createRootContainer(String relativeConfigurationFile, String... profiles)
+ {
+ URL url = getClass().getResource(relativeConfigurationFile);
+ assertNotNull(url);
+ return new ContainerBuilder().withRoot(url).profiledBy(profiles).build();
+ }
}
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-06-16 08:50:49 UTC (rev 2624)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-06-16 08:52:15 UTC (rev 2625)
@@ -92,5 +92,131 @@
</object-param>
</init-params>
</component-plugin>
+ <component-plugin profiles="with-profiles">
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <values-param>
+ <name>apply.specific</name>
+ <value>fake</value>
+ <value>myPortal-dpcdef</value>
+ </values-param>
+ <object-param profiles="AddDependencies">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fooX</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fooX</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
</external-component-plugins>
</configuration>
\ No newline at end of file
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2010-06-16 08:50:49 UTC (rev 2624)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2010-06-16 08:52:15 UTC (rev 2625)
@@ -74,5 +74,126 @@
</object-param>
</init-params>
</component-plugin>
+ <component-plugin profiles="with-profiles">
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.all</name>
+ <value>true</value>
+ </value-param>
+ <object-param profiles="AddDependencies">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
</external-component-plugins>
</configuration>
\ No newline at end of file
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml 2010-06-16 08:50:49 UTC (rev 2624)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml 2010-06-16 08:52:15 UTC (rev 2625)
@@ -58,6 +58,142 @@
</object>
</object-param>
</init-params>
- </component-plugin>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.all</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change1</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change1</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change2</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <values-param>
+ <name>apply.specific</name>
+ <value>fake</value>
+ <value>myPortal-pcdef</value>
+ </values-param>
+ <object-param>
+ <name>change3</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change3</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <values-param>
+ <name>apply.specific</name>
+ <value>fake</value>
+ <value>myPortal-pcdef</value>
+ </values-param>
+ <object-param>
+ <name>change4</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change4</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <object-param>
+ <name>change5</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change5</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <object-param profiles="change6">
+ <name>change6</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change6</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
</external-component-plugins>
</configuration>
\ No newline at end of file
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml 2010-06-16 08:50:49 UTC (rev 2624)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml 2010-06-16 08:52:15 UTC (rev 2625)
@@ -1,30 +1,59 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+ <!--
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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>
- <type>org.exoplatform.container.definition.PortalContainerConfig</type>
- </component>
-
+ Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+ <type>org.exoplatform.container.definition.PortalContainerConfig</type>
+ </component>
+ <external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin profiles="with-profiles">
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.all</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddSettings">
+ <!-- The settings to add to the internal settings -->
+ <field name="settings">
+ <map type="java.util.HashMap">
+ <entry>
+ <key>
+ <string>string</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ <entry>
+ <key>
+ <string>stringX</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ </map>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
</configuration>
\ No newline at end of file
Added: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml (rev 0)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml 2010-06-16 08:52:15 UTC (rev 2625)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+ <!--
+
+ Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+ <type>org.exoplatform.container.definition.PortalContainerConfig</type>
+ </component>
+ <external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param profiles="AddDependencies">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
\ No newline at end of file
14 years
- 1
- 0
exo-jcr SVN: r2624 - jcr/trunk/exo.jcr.component.core.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-06-16 04:50:49 -0400 (Wed, 16 Jun 2010)
New Revision: 2624
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
Log:
EXOJCR-790 echo cleanup
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-16 08:11:35 UTC (rev 2623)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-16 08:50:49 UTC (rev 2624)
@@ -474,15 +474,9 @@
<configuration>
<tasks>
<echo>Creating Access Policy for tests</echo>
-
<makeurl file="${settings.localRepository}" property="localRepositoryURL"/>
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL"/>
<makeurl file="${project.build.testOutputDirectory}" property="testOutputDirectoryURL"/>
-
- <echo message="Local repository URL: ${localRepositoryURL}"/>
- <echo message="Output directory URL: ${outputDirectoryURL}"/>
- <echo message="Test output directory URL: ${testOutputDirectoryURL}"/>
-
<copy todir="${project.build.testOutputDirectory}" overwrite="true">
<fileset dir="${project.basedir}/src/test/resources/">
<include name="test.policy"/>
14 years
- 1
- 0
exo-jcr SVN: r2623 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-06-16 04:11:35 -0400 (Wed, 16 Jun 2010)
New Revision: 2623
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java
Log:
EXOJCR-756: fix TestSecurityRepositoryManagement
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2010-06-16 08:06:34 UTC (rev 2622)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2010-06-16 08:11:35 UTC (rev 2623)
@@ -32,8 +32,6 @@
*/
public class TestSecurityRepositoryManagment extends BaseSecurityTest
{
- private static String testWorkspaceName = "testWorkspace";
-
public void testGetSystemSessionSuccess()
{
PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>()
@@ -260,7 +258,7 @@
{
public Object run() throws Exception
{
- repository.createWorkspace(testWorkspaceName);
+ repository.createWorkspace("testCreateWorkspaceFail");
return null;
}
@@ -281,13 +279,27 @@
}
}
- public void testInternalRemoveWorkspaceSuccess()
+ public void testInternalRemoveWorkspaceSuccess() throws Exception
{
+ WorkspaceEntry defConfig =
+ (WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
+
+ WorkspaceEntry wsConfig = new WorkspaceEntry();
+ wsConfig.setName("testInternalRemoveWorkspaceSuccess");
+
+ wsConfig.setAccessManager(defConfig.getAccessManager());
+ wsConfig.setCache(defConfig.getCache());
+ wsConfig.setContainer(defConfig.getContainer());
+ wsConfig.setLockManager(defConfig.getLockManager());
+
+ repository.configWorkspace(wsConfig);
+ repository.createWorkspace("testInternalRemoveWorkspaceSuccess");
+
PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>()
{
public Object run() throws Exception
{
- repository.internalRemoveWorkspace(testWorkspaceName);
+ repository.internalRemoveWorkspace("testInternalRemoveWorkspaceSuccess");
return null;
}
14 years
- 1
- 0
exo-jcr SVN: r2622 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-06-16 04:06:34 -0400 (Wed, 16 Jun 2010)
New Revision: 2622
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java
Log:
EXOJCR-756: fix TestSecurityRepositoryManagement
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2010-06-16 08:02:53 UTC (rev 2621)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2010-06-16 08:06:34 UTC (rev 2622)
@@ -150,7 +150,7 @@
(WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
WorkspaceEntry wsConfig = new WorkspaceEntry();
- wsConfig.setName(testWorkspaceName);
+ wsConfig.setName("testConfigWorkspaceSuccess");
wsConfig.setAccessManager(defConfig.getAccessManager());
wsConfig.setCache(defConfig.getCache());
@@ -187,7 +187,7 @@
(WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
WorkspaceEntry wsConfig = new WorkspaceEntry();
- wsConfig.setName(testWorkspaceName);
+ wsConfig.setName("testConfigWorkspaceFail");
wsConfig.setAccessManager(defConfig.getAccessManager());
wsConfig.setCache(defConfig.getCache());
@@ -215,13 +215,26 @@
}
}
- public void testCreateWorkspaceSuccess()
+ public void testCreateWorkspaceSuccess() throws Exception
{
+ WorkspaceEntry defConfig =
+ (WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
+
+ WorkspaceEntry wsConfig = new WorkspaceEntry();
+ wsConfig.setName("testCreateWorkspaceSuccess");
+
+ wsConfig.setAccessManager(defConfig.getAccessManager());
+ wsConfig.setCache(defConfig.getCache());
+ wsConfig.setContainer(defConfig.getContainer());
+ wsConfig.setLockManager(defConfig.getLockManager());
+
+ repository.configWorkspace(wsConfig);
+
PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>()
{
public Object run() throws Exception
{
- repository.createWorkspace(testWorkspaceName);
+ repository.createWorkspace("testCreateWorkspaceSuccess");
return null;
}
@@ -300,7 +313,7 @@
{
public Object run() throws Exception
{
- repository.internalRemoveWorkspace(testWorkspaceName);
+ repository.internalRemoveWorkspace("testInternalRemoveWorkspaceFail");
return null;
}
14 years
- 1
- 0
exo-jcr SVN: r2621 - jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/kernel.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-06-16 04:02:53 -0400 (Wed, 16 Jun 2010)
New Revision: 2621
Modified:
jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml
Log:
EXOJCR-782: Implementation based on component-plugins
Modified: jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml
===================================================================
--- jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml 2010-06-16 08:01:20 UTC (rev 2620)
+++ jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/kernel/configuration.xml 2010-06-16 08:02:53 UTC (rev 2621)
@@ -560,7 +560,7 @@
</external-component-plugins></programlisting></para>
<table>
- <title>Descriptions of the fields of
+ <title>Descriptions of the fields of a
<envar>PortalContainerDefinition</envar> when it is used to define a
new portal container</title>
@@ -703,7 +703,7 @@
</table>
<table>
- <title>Descriptions of the fields of
+ <title>Descriptions of the fields of a
<envar>PortalContainerDefinition</envar> when it is used to define
the default portal container</title>
@@ -1000,6 +1000,457 @@
<emphasis>"foo"</emphasis> will be <emphasis>value of the portal
container "foo"</emphasis>.</para>
</section>
+
+ <section>
+ <title>Add dynamically settings and/or dependencies to a
+ <envar>PortalContainer</envar></title>
+
+ <para>It is possible to use <envar>component-plugin</envar> elements
+ in order to dynamically change a PortalContainerDefinition. In the
+ example below, we add the dependency <envar>foo</envar> to the default
+ portal container and to the portal containers called
+ <envar>foo1</envar> and <envar>foo2</envar>:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <values-param>
+ <name>apply.specific</name>
+ <value>foo1</value>
+ <value>foo2</value>
+ </values-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+
+ <table>
+ <title>Descriptions of the fields of a
+ <envar>PortalContainerDefinitionChangePlugin</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>apply.all</entry>
+
+ <entry>Indicates whether the changes have to be applied to all
+ the portal containers or not. The default value of this field
+ is <envar>false</envar>. This field is a
+ <envar>ValueParam</envar> and is not mandatory.</entry>
+ </row>
+
+ <row>
+ <entry>apply.default</entry>
+
+ <entry>Indicates whether the changes have to be applied to the
+ default portal container or not. The default value of this
+ field is <envar>false</envar>. This field is a
+ <envar>ValueParam</envar> and is not mandatory.</entry>
+ </row>
+
+ <row>
+ <entry>apply.specific</entry>
+
+ <entry>A set of specific portal container names to which we
+ want to apply the changes. This field is a
+ <envar>ValuesParam</envar> and is not mandatory.</entry>
+ </row>
+
+ <row>
+ <entry><envar>Rest of the expected parameters </envar></entry>
+
+ <entry>The rest of the expected paramaters are
+ <envar>ObjectParam</envar> of type
+ <envar>PortalContainerDefinitionChange</envar>. Those
+ parameters are in fact the list of changes that we want to
+ apply to one or several portal containers. If the list of
+ changes is empty, the component plugin will be ignored. The
+ supported implementations of PortalContainerDefinitionChange
+ are described later in this section.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>To identify the portal containers to which the changes have to
+ be applied, we use the follwing algorithm:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>The parameter <envar>apply.all</envar> has been set to
+ <envar>true</envar>. The corresponding changes will be applied to
+ all the portal containers. The other parameters will be
+ ignored.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>true</envar> and the parameter
+ <envar>apply.specific</envar> is <envar>null</envar>. The
+ corresponding changes will be applied to the default portal
+ container only.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>true</envar> and the parameter
+ <envar>apply.specific</envar> is not <envar>null</envar>. The
+ corresponding changes will be applied to the default portal
+ container and the given list of specific portal containers.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>false</envar> or has not been set and the parameter
+ <envar>apply.specific</envar> is <envar>null</envar>. The
+ corresponding changes will be applied to the default portal
+ container only.</para>
+ </listitem>
+
+ <listitem>
+ <para>The parameter <envar>apply.default</envar> has been set to
+ <envar>false</envar> or has not been set and the parameter
+ <envar>apply.specific</envar> is not <envar>null</envar>. The
+ corresponding changes will be applied to the given list of
+ specific portal containers.</para>
+ </listitem>
+ </orderedlist>
+
+ <section>
+ <title>The existing implementations of
+ <envar>PortalContainerDefinitionChange</envar></title>
+
+ <para>The modifications that can be applied to a
+ <envar>PortalContainerDefinition</envar> must be a class of type
+ <envar>PortalContainerDefinitionChange</envar>. The product proposes
+ out of the box some implementations that we describe in the next sub
+ sections. </para>
+
+ <section>
+ <title><envar>AddDependencies</envar></title>
+
+ <para>This modification adds a list of dependencies at the end of
+ the list of dependencies defined into the
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddDependencies</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>dependencies</entry>
+
+ <entry>A list of <emphasis>String</emphasis> corresponding
+ to the list of name of the dependencies to add. If the
+ value of this field is empty, the change will be
+ ignored.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add <envar>foo</envar> at
+ the end of the dependency list of the default portal
+ container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+
+ <section>
+ <title><envar>AddDependenciesBefore</envar></title>
+
+ <para>This modification adds a list of dependencies before a given
+ target dependency defined into the list of dependencies of the
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddDependenciesBefore</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>dependencies</entry>
+
+ <entry>A list of <emphasis>String</emphasis> corresponding
+ to the list of name of the dependencies to add. If the
+ value of this field is empty, the change will be
+ ignored.</entry>
+ </row>
+
+ <row>
+ <entry>target</entry>
+
+ <entry>The name of the dependency before which we would
+ like to add the new dependencies. If this field is
+ <envar>null</envar> or the target dependency cannot be
+ found in the list of dependencies defined into the
+ <envar>PortalContainerDefinition</envar>, the new
+ dependencies will be added in first position to the
+ list.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add <envar>foo</envar>
+ before <envar>foo2</envar> in the dependency list of the default
+ portal container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+
+ <section>
+ <title><envar>AddDependenciesAfter</envar></title>
+
+ <para>This modification adds a list of dependencies before a given
+ target dependency defined into the list of dependencies of the
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddDependenciesAfter</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>dependencies</entry>
+
+ <entry>A list of <emphasis>String</emphasis> corresponding
+ to the list of name of the dependencies to add. If the
+ value of this field is empty, the change will be
+ ignored.</entry>
+ </row>
+
+ <row>
+ <entry>target</entry>
+
+ <entry>The name of the dependency after which we would
+ like to add the new dependencies. If this field is
+ <envar>null</envar> or the target dependency cannot be
+ found in the list of dependencies defined into the
+ <envar>PortalContainerDefinition</envar>, the new
+ dependencies will be added in last position to the
+ list.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add <envar>foo</envar> after
+ <envar>foo2</envar> in the dependency list of the default portal
+ container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+
+ <section>
+ <title><envar>AddSettings</envar></title>
+
+ <para>This modification adds new settings to a
+ <envar>PortalContainerDefinition</envar>. The full qualified name
+ is
+ <emphasis>org.exoplatform.container.definition.PortalContainerDefinitionChange$AddSettings</emphasis>.</para>
+
+ <table>
+ <title>Descriptions of the fields of an
+ <envar>AddSettings</envar></title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>settings</entry>
+
+ <entry>A map of <emphasis><String,
+ Object></emphasis> corresponding to the settings to
+ add. If the value of this field is empty, the change will
+ be ignored.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>See an example below, that will add the settings
+ <envar>string</envar> and <envar>stringX</envar> to the settings
+ of the default portal container:</para>
+
+ <programlisting><external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddSettings">
+ <!-- The settings to add to the to the portal containers -->
+ <field name="settings">
+ <map type="java.util.HashMap">
+ <entry>
+ <key>
+ <string>string</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ <entry>
+ <key>
+ <string>stringX</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ </map>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+</external-component-plugins></programlisting>
+ </section>
+ </section>
+ </section>
</section>
</section>
14 years
- 1
- 0
exo-jcr SVN: r2620 - in kernel/branches/2.2.x/exo.kernel.container/src: test/java/org/exoplatform/container/definition and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-06-16 04:01:20 -0400 (Wed, 16 Jun 2010)
New Revision: 2620
Added:
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java
kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml
Modified:
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java
kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml
kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml
kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml
kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml
Log:
EXOJCR-782: Implementation based on component-plugins
Modified: kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-06-16 07:53:43 UTC (rev 2619)
+++ kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-06-16 08:01:20 UTC (rev 2620)
@@ -121,6 +121,11 @@
Collections.unmodifiableMap(new HashMap<String, PortalContainerDefinition>());
/**
+ * The list of all the changes to apply to the registered {@link PortalContainerDefinition}
+ */
+ private List<PortalContainerDefinitionChangePlugin> changes = new ArrayList<PortalContainerDefinitionChangePlugin>();
+
+ /**
* The configuration manager
*/
private final ConfigurationManager cm;
@@ -569,6 +574,26 @@
}
/**
+ * Allow to define a set of changes to apply to the registered {@link PortalContainerDefinition}
+ * @param plugin the plugin that defines the changes to apply
+ */
+ public void registerChangePlugin(PortalContainerDefinitionChangePlugin plugin)
+ {
+ final List<PortalContainerDefinitionChange> lchanges = plugin.getChanges();
+ if (lchanges != null && !lchanges.isEmpty())
+ {
+ synchronized (this)
+ {
+ if (initialized)
+ {
+ throw new IllegalStateException("The PortalContainerConfig has already been initialized");
+ }
+ changes.add(plugin);
+ }
+ }
+ }
+
+ /**
* Construct the scopes of all the web applications from the given {@link PortalContainerDefinition}
* @param definition the definition of a {@link PortalContainer} that contains the dependencies with
* the web application
@@ -976,6 +1001,8 @@
hasChanged = true;
}
}
+ // Apply the changes corresponding to the given definition
+ applyChanges(definition);
registerDependencies(definition, mScopes);
if (hasChanged)
{
@@ -983,18 +1010,81 @@
}
initializeSettings(definition, true);
}
- if (!mDefinitions.containsKey(defaultDefinition.getName()) && defaultDefinition.getDependencies() != null
- && !defaultDefinition.getDependencies().isEmpty())
+ if (!mDefinitions.containsKey(defaultDefinition.getName()))
{
- // The default portal container has not been defined and some default
- // dependencies have been defined
- registerDependencies(defaultDefinition, mScopes);
+ // Apply the changes corresponding to the default definition
+ applyChanges(defaultDefinition);
+ initializeSettings(defaultDefinition, false);
+ if (defaultDefinition.getDependencies() != null && !defaultDefinition.getDependencies().isEmpty())
+ {
+ // The default portal container has not been defined and some default
+ // dependencies have been defined
+ registerDependencies(defaultDefinition, mScopes);
+ }
}
this.portalContainerNames = Collections.unmodifiableList(lPortalContainerNames);
this.scopes = Collections.unmodifiableMap(mScopes);
+ // clear the changes
+ changes.clear();
}
/**
+ * Apply the changes corresponding to the give {@link PortalContainerDefinition}
+ * @param definition
+ */
+ private void applyChanges(PortalContainerDefinition definition)
+ {
+ for (PortalContainerDefinitionChangePlugin plugin : changes)
+ {
+ if (matches(definition, plugin))
+ {
+ // The definition matches with the scope of the changes
+ for (PortalContainerDefinitionChange change : plugin.getChanges())
+ {
+ try
+ {
+ // Secure access to definition's info
+ change.apply(new SafePortalContainerDefinition(definition, defaultDefinition));
+ }
+ catch (Exception e)
+ {
+ log.warn("Cannot apply the change " + change, e);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Indicates whether the given definition matches with the scope of the {@link PortalContainerDefinitionChangePlugin}
+ * @param definition the {@link PortalContainerDefinition} to test.
+ * @param plugin the {@link PortalContainerDefinitionChangePlugin} from which we extract the scopes
+ * of the embedded actions
+ * @return <code>true</code> if it matches, <code>false</code> otherwise
+ */
+ private boolean matches(PortalContainerDefinition definition, PortalContainerDefinitionChangePlugin plugin)
+ {
+ if (plugin.isAll())
+ {
+ // The changes have to be applied to all the portal containers
+ return true;
+ }
+ if ((plugin.getNames() == null || plugin.isDefault()) && defaultDefinition.getName().equals(definition.getName()))
+ {
+ // The changes have to be applied to the default portal container and the given definition is
+ // the definition of the default portal container
+ return true;
+ }
+ if (plugin.getNames() != null && plugin.getNames().contains(definition.getName()))
+ {
+ // The changes have to be applied to a specific list of portal containers and the given
+ // definition is the a definition of one of them
+ return true;
+ }
+ return false;
+ }
+
+ /**
* {@inheritDoc}
*/
public void start()
Added: kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java (rev 0)
+++ kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChange.java 2010-06-16 08:01:20 UTC (rev 2620)
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.container.definition;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This interface describes the change that cans be applied on a given {@link PortalContainerDefinition}
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 11 juin 2010
+ */
+public interface PortalContainerDefinitionChange
+{
+
+ /**
+ * Apply the corresponding change of the given {@link PortalContainerDefinition}
+ * @param pcd the {@link PortalContainerDefinition} on which the change has to be applied
+ */
+ void apply(PortalContainerDefinition pcd);
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add the nested dependencies
+ * at the end of the dependency list of the {@link PortalContainerDefinition}. If the nested
+ * dependency list is empty, this change will be ignored.
+ */
+ public static class AddDependencies implements PortalContainerDefinitionChange
+ {
+ /**
+ * The list of name of the dependencies to add
+ */
+ public List<String> dependencies;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ return;
+ }
+ pcd.getDependencies().addAll(dependencies);
+ }
+ }
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add the nested dependencies
+ * before a target dependency to the dependency list of the {@link PortalContainerDefinition}.
+ * If the target dependency is empty or cannot be found, the nested dependencies will be added at
+ * the head of the dependency list. If the nested dependency list is empty, this change will be ignored.
+ */
+ public static class AddDependenciesBefore implements PortalContainerDefinitionChange
+ {
+ /**
+ * The list of name of the dependencies to add
+ */
+ public List<String> dependencies;
+
+ /**
+ * The name of the target dependency
+ */
+ public String target;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ return;
+ }
+ if (target != null && target.length() > 0)
+ {
+ List<String> lDependencies = pcd.getDependencies();
+ for (int i = lDependencies.size() - 1; i >= 0; i--)
+ {
+ String dep = lDependencies.get(i);
+ if (target.equals(dep))
+ {
+ // The target could be found
+ lDependencies.addAll(i, dependencies);
+ return;
+ }
+ }
+ }
+ // The target is empty or cannot be found
+ pcd.getDependencies().addAll(0, dependencies);
+ }
+ }
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add the nested dependencies
+ * after a target dependency to the dependency list of the {@link PortalContainerDefinition}.
+ * If the target dependency is empty or cannot be found, the nested dependencies will be added at
+ * the end of the dependency list. If the nested dependency list is empty, this change will be ignored.
+ */
+ public static class AddDependenciesAfter implements PortalContainerDefinitionChange
+ {
+ /**
+ * The list of name of the dependencies to add
+ */
+ public List<String> dependencies;
+
+ /**
+ * The name of the target dependency
+ */
+ public String target;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ return;
+ }
+ if (target != null && target.length() > 0)
+ {
+ List<String> lDependencies = pcd.getDependencies();
+ for (int i = 0, length = lDependencies.size(); i < length; i++)
+ {
+ String dep = lDependencies.get(i);
+ if (target.equals(dep))
+ {
+ // The target could be found
+ lDependencies.addAll(i + 1, dependencies);
+ return;
+ }
+ }
+ }
+ // The target is empty or cannot be found
+ pcd.getDependencies().addAll(dependencies);
+ }
+ }
+
+ /**
+ * This class is an {@link PortalContainerDefinitionChange} that will add new internal settings
+ * to the {@link PortalContainerDefinition}. If the nested settings are empty, this change will
+ * be ignored.
+ */
+ public static class AddSettings implements PortalContainerDefinitionChange
+ {
+ /**
+ * The settings to add to the internal settings
+ */
+ public Map<String, Object> settings;
+
+ public void apply(PortalContainerDefinition pcd)
+ {
+ if (settings == null || settings.isEmpty())
+ {
+ return;
+ }
+ pcd.getSettings().putAll(settings);
+ }
+ }
+}
Added: kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java (rev 0)
+++ kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerDefinitionChangePlugin.java 2010-06-16 08:01:20 UTC (rev 2620)
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.container.definition;
+
+import org.exoplatform.container.component.BaseComponentPlugin;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ValueParam;
+import org.exoplatform.container.xml.ValuesParam;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * This class allows you to dynamically apply a list of changes to one or several portal containers.
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 11 juin 2010
+ */
+public class PortalContainerDefinitionChangePlugin extends BaseComponentPlugin
+{
+
+ /**
+ * Indicates whether the changes have to be applied to all the portal containers or not.
+ */
+ private boolean all;
+
+ /**
+ * Indicates whether the changes have to be applied to the default portal container or not.
+ */
+ private boolean bDefault;
+
+ /**
+ * A set of specific portal container names on which we want to apply the changes.
+ */
+ private Set<String> names;
+
+ /**
+ * The list of changes to apply
+ */
+ private List<PortalContainerDefinitionChange> changes;
+
+ @SuppressWarnings("unchecked")
+ public PortalContainerDefinitionChangePlugin(InitParams params)
+ {
+ ValueParam vp = params.getValueParam("apply.all");
+ if (vp != null && vp.getValue().length() > 0)
+ {
+ this.all = Boolean.valueOf(vp.getValue());
+ }
+ vp = params.getValueParam("apply.default");
+ if (vp != null && vp.getValue().length() > 0)
+ {
+ this.bDefault = Boolean.valueOf(vp.getValue());
+ }
+ ValuesParam vsp = params.getValuesParam("apply.specific");
+ if (vsp != null && !vsp.getValues().isEmpty())
+ {
+ this.names = new HashSet<String>(vsp.getValues());
+ }
+ this.changes = params.getObjectParamValues(PortalContainerDefinitionChange.class);
+ }
+
+ public boolean isAll()
+ {
+ return all;
+ }
+
+ public boolean isDefault()
+ {
+ return bDefault;
+ }
+
+ public Set<String> getNames()
+ {
+ return names;
+ }
+
+ public List<PortalContainerDefinitionChange> getChanges()
+ {
+ return changes;
+ }
+}
Added: kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java (rev 0)
+++ kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/definition/SafePortalContainerDefinition.java 2010-06-16 08:01:20 UTC (rev 2620)
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.container.definition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This class is a decorator used to protect the nested {@link PortalContainerDefinition}. It mainly
+ * forbid access to setter. If a setter is called an {@link UnsupportedOperationException} will be thrown.
+ * This class is mainly used to prevent any unsupported {@link PortalContainerDefinitionChange}.
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 8 sept. 2009
+ */
+public class SafePortalContainerDefinition extends PortalContainerDefinition
+{
+
+ /**
+ * The {@link PortalContainerDefinition} to protected
+ */
+ private final PortalContainerDefinition definition;
+
+ /**
+ * The default {@link PortalContainerDefinition}
+ */
+ private final PortalContainerDefinition defaultDefinition;
+
+ /**
+ * Default constructor
+ */
+ public SafePortalContainerDefinition(PortalContainerDefinition definition,
+ PortalContainerDefinition defaultDefinition)
+ {
+ this.definition = definition;
+ this.defaultDefinition = defaultDefinition;
+ }
+
+ public String getName()
+ {
+ return definition.getName();
+ }
+
+ public void setName(String name)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public List<String> getDependencies()
+ {
+ // We ensure that the dependency list is not null to simplify the code in
+ // all instances of PortalContainerDefinitionChange
+ List<String> dependencies = definition.getDependencies();
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ // Try to get the default dependencies
+ dependencies = defaultDefinition.getDependencies();
+ if (dependencies == null || dependencies.isEmpty())
+ {
+ dependencies = new ArrayList<String>();
+ }
+ else
+ {
+ dependencies = new ArrayList<String>(dependencies);
+ }
+ definition.setDependencies(dependencies);
+ }
+ return dependencies;
+ }
+
+ public void setDependencies(List<String> dependencies)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getRealmName()
+ {
+ return definition.getRealmName();
+ }
+
+ public void setRealmName(String realmName)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getRestContextName()
+ {
+ return definition.getRestContextName();
+ }
+
+ public void setRestContextName(String restContextName)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<String, Object> getSettings()
+ {
+ // We ensure that the settings are not null to simplify the code in
+ // all instances of PortalContainerDefinitionChange
+ Map<String, Object> settings = definition.getSettings();
+ if (settings == null)
+ {
+ settings = new HashMap<String, Object>();
+ }
+ else
+ {
+ settings = new HashMap<String, Object>(settings);
+ }
+ definition.setSettings(settings);
+ return settings;
+ }
+
+ public void setSettings(Map<String, Object> settings)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getExternalSettingsPath()
+ {
+ return definition.getExternalSettingsPath();
+ }
+
+ public void setExternalSettingsPath(String externalSettingsPath)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2010-06-16 07:53:43 UTC (rev 2619)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2010-06-16 08:01:20 UTC (rev 2620)
@@ -20,7 +20,11 @@
import org.exoplatform.container.jmx.AbstractTestContainer;
import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Created by The eXo Platform SAS
@@ -95,7 +99,7 @@
assertEquals("myRest-pcdef", config.getDefaultRestContext());
assertEquals("my-exo-domain-pcdef", config.getDefaultRealmName());
assertTrue(config.hasDefinition());
-
+
rootContainer = createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
@@ -103,19 +107,74 @@
assertEquals("myRest", config.getDefaultRestContext());
assertEquals("my-exo-domain", config.getDefaultRealmName());
assertTrue(config.hasDefinition());
-
+
rootContainer = createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs2.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertEquals("myPortal-pcdef", config.getDefaultPortalContainer());
assertEquals("myRest-pcdef", config.getDefaultRestContext());
assertEquals("my-exo-domain-pcdef", config.getDefaultRealmName());
- assertTrue(config.hasDefinition());
+ assertTrue(config.hasDefinition());
}
+ public void testChanges()
+ {
+ Set<String> s;
+ try
+ {
+ createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs.xml");
+ s = TestPortalContainerDefinitionChange.NAMES.get("change1");
+ assertNotNull(s);
+ assertEquals(2, s.size());
+ assertTrue(s.contains("portal"));
+ assertTrue(s.contains("myPortal-pcdef"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change2");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("portal"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change3");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("myPortal-pcdef"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change4");
+ assertNotNull(s);
+ assertEquals(2, s.size());
+ assertTrue(s.contains("portal"));
+ assertTrue(s.contains("myPortal-pcdef"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change5");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("portal"));
+
+ s = TestPortalContainerDefinitionChange.NAMES.get("change6");
+ assertNull(s);
+ }
+ finally
+ {
+ TestPortalContainerDefinitionChange.NAMES.clear();
+ }
+
+ try
+ {
+ createRootContainer("portal-container-config-with-no-default-values-but-with-portal-defs.xml", "change6");
+ s = TestPortalContainerDefinitionChange.NAMES.get("change6");
+ assertNotNull(s);
+ assertEquals(1, s.size());
+ assertTrue(s.contains("portal"));
+ }
+ finally
+ {
+ TestPortalContainerDefinitionChange.NAMES.clear();
+ }
+ }
+
public void testDependencies()
{
-
+
// Empty
RootContainer rootContainer = createRootContainer("portal-container-config-with-no-default-values.xml");
PortalContainerConfig config =
@@ -144,19 +203,65 @@
assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("myPortal-pcdef"));
assertFalse(config.isPortalContainerName("foo"));
assertFalse(config.isPortalContainerName("myPortal"));
- assertFalse(config.isPortalContainerName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("myPortal-pcdef"));
assertTrue(config.isPortalContainerName(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME));
// Needed for backward compatibility
assertTrue(config.isScopeValid("foo", "foo"));
assertTrue(config.isScopeValid("myPortal", "foo"));
assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
assertFalse(config.hasDefinition());
-
+
+ // Empty with AddDependencies, AddDependenciesBefore and AddDependenciesAfter
+ String[] profiles =
+ {"AddDependencies", "AddDependenciesBefore-No-Target", "AddDependenciesBefore-With-Fake-Target",
+ "AddDependenciesAfter-No-Target", "AddDependenciesAfter-With-Fake-Target"};
+
+ List<String> deps;
+ for (String profile : profiles)
+ {
+ rootContainer = createRootContainer("portal-container-config-with-no-default-values2.xml", profile);
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ deps = config.getDependencies(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME);
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ deps = config.getDependencies("foo");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ deps = config.getDependencies("myPortal");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ deps = config.getDependencies("myPortal-pcdef");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("foo"));
+ names = config.getPortalContainerNames("foo");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0));
+ names = config.getPortalContainerNames("myPortal");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0));
+ names = config.getPortalContainerNames("myPortal-pcdef");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getPortalContainerName("foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getPortalContainerName("myPortal"));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config
+ .getPortalContainerName("myPortal-pcdef"));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("myPortal"));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("myPortal-pcdef"));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("myPortal"));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getRealmName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("foo"));
+ assertFalse(config.isPortalContainerName("myPortal"));
+ assertFalse(config.isPortalContainerName("myPortal-pcdef"));
+ assertTrue(config.isPortalContainerName(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME));
+ // Needed for backward compatibility
+ assertFalse(config.isScopeValid("foo", "foo"));
+ assertFalse(config.isScopeValid("myPortal", "foo"));
+ assertFalse(config.isScopeValid("myPortal-pcdef", "foo"));
+ assertTrue(config.isScopeValid(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, "foo"));
+ assertFalse(config.hasDefinition());
+ }
// Without dependencies
- rootContainer =
- createRootContainer("portal-container-config-with-default-values-and-with-portal-def.xml");
- config =
- (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def.xml");
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertNull(config.getDependencies("foo"));
assertNull(config.getDependencies("myPortal"));
assertNull(config.getDependencies("myPortal-pcdef"));
@@ -249,9 +354,10 @@
assertTrue(config.hasDefinition());
// Without dependencies and with default portal container definition
- rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml");
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
- List<String> deps = config.getDependencies("foo");
+ deps = config.getDependencies("foo");
assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
deps = config.getDependencies("myPortal");
assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
@@ -289,6 +395,68 @@
assertTrue(config.isScopeValid("myPortal-pcdef", "fooX"));
assertTrue(config.hasDefinition());
+ profiles =
+ new String[]{"AddDependencies", "AddDependenciesBefore-No-Target", "AddDependenciesBefore-With-Fake-Target",
+ "AddDependenciesBefore-With-Target", "AddDependenciesAfter-No-Target",
+ "AddDependenciesAfter-With-Fake-Target", "AddDependenciesAfter-With-Target"};
+
+ for (String profile : profiles)
+ {
+ rootContainer =
+ createRootContainer(
+ "portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml",
+ "with-profiles", profile);
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ deps = config.getDependencies("foo");
+ assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo"));
+ int index = deps.indexOf("foo");
+ if (profile.equals("AddDependenciesBefore-No-Target")
+ || profile.equals("AddDependenciesBefore-With-Fake-Target")
+ || profile.equals("AddDependenciesBefore-With-Target"))
+ {
+ assertEquals(0, index);
+ }
+ else
+ {
+ assertEquals(1, index);
+ }
+ deps = config.getDependencies("myPortal");
+ assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo"));
+ deps = config.getDependencies("myPortal-pcdef");
+ assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo"));
+ names = config.getPortalContainerNames("fooX");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(2, names.size());
+ assertTrue(names.contains("myPortal-dpcdef"));
+ assertTrue(names.contains("myPortal-pcdef"));
+ names = config.getPortalContainerNames("foo");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals(1, names.size());
+ assertEquals("myPortal-dpcdef", names.get(0));
+ names = config.getPortalContainerNames("myPortal");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-dpcdef", names.get(0));
+ names = config.getPortalContainerNames("myPortal-pcdef");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-pcdef", names.get(0));
+ assertEquals("myPortal-dpcdef", config.getPortalContainerName("foo"));
+ assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal"));
+ assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef"));
+ assertEquals("myRest-dpcdef", config.getRestContextName("foo"));
+ assertEquals("myRest-dpcdef", config.getRestContextName("myPortal"));
+ assertEquals("myRest-pcdef", config.getRestContextName("myPortal-pcdef"));
+ assertEquals("my-exo-domain-dpcdef", config.getRealmName("foo"));
+ assertEquals("my-exo-domain-dpcdef", config.getRealmName("myPortal"));
+ assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("foo"));
+ assertFalse(config.isPortalContainerName("myPortal"));
+ assertTrue(config.isPortalContainerName("myPortal-pcdef"));
+ assertFalse(config.isScopeValid("foo", "fooX"));
+ assertFalse(config.isScopeValid("myPortal", "fooX"));
+ assertTrue(config.isScopeValid("myPortal-pcdef", "fooX"));
+ assertTrue(config.hasDefinition());
+ }
+
// With dependencies
rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def2.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
@@ -321,9 +489,66 @@
assertFalse(config.isScopeValid("myPortal", "foo"));
assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
assertTrue(config.hasDefinition());
-
+
+ for (String profile : profiles)
+ {
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-portal-def2.xml",
+ "with-profiles", profile);
+ config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ deps = config.getDependencies("foo");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
+ deps = config.getDependencies("myPortal");
+ assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
+ deps = config.getDependencies("myPortal-pcdef");
+ assertTrue(deps != null && deps.size() == 4);
+ int index = deps.indexOf("fooX");
+ if (profile.equals("AddDependenciesBefore-No-Target") || profile.equals("AddDependenciesBefore-With-Fake-Target"))
+ {
+ assertEquals(0, index);
+ }
+ else if (profile.equals("AddDependenciesBefore-With-Target"))
+ {
+ assertEquals(1, index);
+ }
+ else if (profile.equals("AddDependenciesAfter-With-Target"))
+ {
+ assertEquals(2, index);
+ }
+ else
+ {
+ assertEquals(3, index);
+ }
+ names = config.getPortalContainerNames("foo");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-pcdef", names.get(0));
+ names = config.getPortalContainerNames("myPortal");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal", names.get(0));
+ names = config.getPortalContainerNames("myPortal-pcdef");
+ assertTrue(names != null && !names.isEmpty());
+ assertEquals("myPortal-pcdef", names.get(0));
+ assertEquals("myPortal-pcdef", config.getPortalContainerName("foo"));
+ assertEquals("myPortal", config.getPortalContainerName("myPortal"));
+ assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef"));
+ assertEquals("myRest", config.getRestContextName("foo"));
+ assertEquals("myRest", config.getRestContextName("myPortal"));
+ assertEquals("myRest-pcdef", config.getRestContextName("myPortal-pcdef"));
+ assertEquals("my-exo-domain", config.getRealmName("foo"));
+ assertEquals("my-exo-domain", config.getRealmName("myPortal"));
+ assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef"));
+ assertFalse(config.isPortalContainerName("foo"));
+ assertTrue(config.isPortalContainerName("myPortal"));
+ assertTrue(config.isPortalContainerName("myPortal-pcdef"));
+ assertFalse(config.isScopeValid("foo", "foo"));
+ assertFalse(config.isScopeValid("myPortal", "foo"));
+ assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
+ assertTrue(config.hasDefinition());
+ }
+
// With dependencies and with default portal container definition
- rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml");
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
deps = config.getDependencies("foo");
assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
@@ -360,7 +585,7 @@
assertFalse(config.isScopeValid("foo", "foo"));
assertFalse(config.isScopeValid("myPortal", "foo"));
assertTrue(config.isScopeValid("myPortal-pcdef", "foo"));
- assertTrue(config.hasDefinition());
+ assertTrue(config.hasDefinition());
}
public void testSettings()
@@ -391,6 +616,33 @@
assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("myPortal-pcdef",
PortalContainerConfig.REALM_SETTING_NAME));
+ rootContainer = createRootContainer("portal-container-config-with-no-default-values.xml", "with-profiles");
+ config =
+ (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
+ assertNull(config.getSetting("foo", "foo"));
+ assertNull(config.getSetting("myPortal", "foo"));
+ assertNull(config.getSetting("myPortal-pcdef", "foo"));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getSetting("foo",
+ PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getSetting("myPortal",
+ PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getSetting("foo",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getSetting("myPortal",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("foo",
+ PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("myPortal",
+ PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals("value1", config.getSetting("foo", "string"));
+ assertEquals("value1", config.getSetting("foo", "stringX"));
+
// Without settings and without portal definition
rootContainer = createRootContainer("portal-container-config-with-default-values.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
@@ -593,8 +845,9 @@
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertEquals("../gatein/data", config.getSetting("portal", "gatein.data.dir"));
assertEquals("../gatein/data/db", config.getSetting("portal", "gatein.db.data.dir"));
- assertEquals("jdbc:hsqldb:file:../gatein/data/db/data/jdbcjcr_portal", config.getSetting("portal", "gatein.jcr.datasource.url"));
-
+ assertEquals("jdbc:hsqldb:file:../gatein/data/db/data/jdbcjcr_portal", config.getSetting("portal",
+ "gatein.jcr.datasource.url"));
+
// With external settings, with several portal container definitions and with
// default portal container definition
rootContainer =
@@ -721,7 +974,8 @@
assertEquals("2001", config.getSetting("myPortal", "long"));
assertEquals("2001", config.getSetting("myPortal", "double"));
assertEquals("false", config.getSetting("myPortal", "boolean"));
- assertEquals("myPortal-myRest-my-exo-domain-value01-new value01", config.getSetting("myPortal", "complex-value2"));
+ assertEquals("myPortal-myRest-my-exo-domain-value01-new value01", config.getSetting("myPortal",
+ "complex-value2"));
assertEquals("new value01", config.getSetting("myPortal0", "string"));
assertEquals("2001", config.getSetting("myPortal0", "int"));
assertEquals("2001", config.getSetting("myPortal0", "long"));
@@ -751,10 +1005,12 @@
PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
assertEquals("myRest", config.getSetting("foo", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("myRest", config.getSetting("myPortal", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
- assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("foo", PortalContainerConfig.REALM_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("myPortal", PortalContainerConfig.REALM_SETTING_NAME));
- assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REALM_SETTING_NAME));
}
finally
@@ -799,7 +1055,8 @@
System.setProperty("TestPortalContainerConfig-string", "system value");
System.setProperty("TestPortalContainerConfig-int", "50");
// With both settings internal and external and default portal container definition
- rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml");
+ rootContainer =
+ createRootContainer("portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml");
config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class);
assertEquals("value0", config.getSetting("foo", "foo"));
assertEquals("value0", config.getSetting("myPortal", "foo"));
@@ -864,10 +1121,12 @@
PortalContainerConfig.PORTAL_CONTAINER_SETTING_NAME));
assertEquals("myRest", config.getSetting("foo", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("myRest", config.getSetting("myPortal", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
- assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
+ assertEquals("myRest-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REST_CONTEXT_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("foo", PortalContainerConfig.REALM_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("myPortal", PortalContainerConfig.REALM_SETTING_NAME));
- assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REALM_SETTING_NAME));
+ assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef",
+ PortalContainerConfig.REALM_SETTING_NAME));
}
finally
{
@@ -894,4 +1153,24 @@
assertEquals("my-exo-domain", config.getSetting("myPortal", PortalContainerConfig.REALM_SETTING_NAME));
assertEquals("my-exo-domain", config.getSetting("myPortal-pcdef", PortalContainerConfig.REALM_SETTING_NAME));
}
+
+ public static class TestPortalContainerDefinitionChange implements PortalContainerDefinitionChange
+ {
+
+ public String name;
+
+ public static Map<String, Set<String>> NAMES = new HashMap<String, Set<String>>();
+
+ public void apply(PortalContainerDefinition pcd)
+ {
+ Set<String> names = NAMES.get(name);
+ if (names == null)
+ {
+ names = new HashSet<String>();
+ NAMES.put(name, names);
+ }
+ names.add(pcd.getName());
+ }
+
+ }
}
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java 2010-06-16 07:53:43 UTC (rev 2619)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/jmx/AbstractTestContainer.java 2010-06-16 08:01:20 UTC (rev 2620)
@@ -37,4 +37,11 @@
assertNotNull(url);
return new ContainerBuilder().withRoot(url).build();
}
+
+ public RootContainer createRootContainer(String relativeConfigurationFile, String... profiles)
+ {
+ URL url = getClass().getResource(relativeConfigurationFile);
+ assertNotNull(url);
+ return new ContainerBuilder().withRoot(url).profiledBy(profiles).build();
+ }
}
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-06-16 07:53:43 UTC (rev 2619)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-06-16 08:01:20 UTC (rev 2620)
@@ -92,5 +92,131 @@
</object-param>
</init-params>
</component-plugin>
+ <component-plugin profiles="with-profiles">
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <values-param>
+ <name>apply.specific</name>
+ <value>fake</value>
+ <value>myPortal-dpcdef</value>
+ </values-param>
+ <object-param profiles="AddDependencies">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fooX</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fooX</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
</external-component-plugins>
</configuration>
\ No newline at end of file
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2010-06-16 07:53:43 UTC (rev 2619)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2010-06-16 08:01:20 UTC (rev 2620)
@@ -74,5 +74,126 @@
</object-param>
</init-params>
</component-plugin>
+ <component-plugin profiles="with-profiles">
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.all</name>
+ <value>true</value>
+ </value-param>
+ <object-param profiles="AddDependencies">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>fooX</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>foo2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
</external-component-plugins>
</configuration>
\ No newline at end of file
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml 2010-06-16 07:53:43 UTC (rev 2619)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values-but-with-portal-defs.xml 2010-06-16 08:01:20 UTC (rev 2620)
@@ -58,6 +58,142 @@
</object>
</object-param>
</init-params>
- </component-plugin>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.all</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change1</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change1</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change2</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change2</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <values-param>
+ <name>apply.specific</name>
+ <value>fake</value>
+ <value>myPortal-pcdef</value>
+ </values-param>
+ <object-param>
+ <name>change3</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change3</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <values-param>
+ <name>apply.specific</name>
+ <value>fake</value>
+ <value>myPortal-pcdef</value>
+ </values-param>
+ <object-param>
+ <name>change4</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change4</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <object-param>
+ <name>change5</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change5</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <object-param profiles="change6">
+ <name>change6</name>
+ <object type="org.exoplatform.container.definition.TestPortalContainerConfig$TestPortalContainerDefinitionChange">
+ <!-- The name of the portal container -->
+ <field name="name">
+ <string>change6</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
</external-component-plugins>
</configuration>
\ No newline at end of file
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml 2010-06-16 07:53:43 UTC (rev 2619)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values.xml 2010-06-16 08:01:20 UTC (rev 2620)
@@ -1,30 +1,59 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+ <!--
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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>
- <type>org.exoplatform.container.definition.PortalContainerConfig</type>
- </component>
-
+ Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+ <type>org.exoplatform.container.definition.PortalContainerConfig</type>
+ </component>
+ <external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin profiles="with-profiles">
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.all</name>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddSettings">
+ <!-- The settings to add to the internal settings -->
+ <field name="settings">
+ <map type="java.util.HashMap">
+ <entry>
+ <key>
+ <string>string</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ <entry>
+ <key>
+ <string>stringX</string>
+ </key>
+ <value>
+ <string>value1</string>
+ </value>
+ </entry>
+ </map>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
</configuration>
\ No newline at end of file
Added: kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml (rev 0)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-no-default-values2.xml 2010-06-16 08:01:20 UTC (rev 2620)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+ <!--
+
+ Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+ <type>org.exoplatform.container.definition.PortalContainerConfig</type>
+ </component>
+ <external-component-plugins>
+ <!-- The full qualified name of the PortalContainerConfig -->
+ <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component>
+ <component-plugin>
+ <!-- The name of the plugin -->
+ <name>Change PortalContainer Definitions</name>
+ <!-- The name of the method to call on the PortalContainerConfig in order to register the changes on the PortalContainerDefinitions -->
+ <set-method>registerChangePlugin</set-method>
+ <!-- The full qualified name of the PortalContainerDefinitionChangePlugin -->
+ <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
+ <init-params>
+ <value-param>
+ <name>apply.default</name>
+ <value>true</value>
+ </value-param>
+ <object-param profiles="AddDependencies">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesBefore-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesBefore">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-No-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param profiles="AddDependenciesAfter-With-Fake-Target">
+ <name>change</name>
+ <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependenciesAfter">
+ <!-- The list of name of the dependencies to add -->
+ <field name="dependencies">
+ <collection type="java.util.ArrayList">
+ <value>
+ <string>foo</string>
+ </value>
+ </collection>
+ </field>
+ <!-- The name of the target dependency -->
+ <field name="target">
+ <string>fake</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
\ No newline at end of file
14 years
- 1
- 0
exo-jcr SVN: r2619 - in kernel/trunk: exo.kernel.component.cache/src/main/resources/conf/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-06-16 03:53:43 -0400 (Wed, 16 Jun 2010)
New Revision: 2619
Modified:
kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml
kernel/trunk/pom.xml
Log:
EOXJCR-746 exo.kernel.component.remote removed from reactor pom; CommunicationService removed from configuration
Modified: kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml 2010-06-16 07:53:12 UTC (rev 2618)
+++ kernel/trunk/exo.kernel.component.cache/src/main/resources/conf/portal/configuration.xml 2010-06-16 07:53:43 UTC (rev 2619)
@@ -53,13 +53,4 @@
<type>org.exoplatform.container.PropertyManagerManaged</type>
</component -->
- <!-- external-component-plugins>
- <target-component>org.exoplatform.services.remote.group.CommunicationService</target-component>
- <component-plugin>
- <name>synchronize.cache.handler</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.cache.impl.SynchronizeCacheMessageHandler</type>
- <description>synchronize the cache</description>
- </component-plugin>
- </external-component-plugins -->
</configuration>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2010-06-16 07:53:12 UTC (rev 2618)
+++ kernel/trunk/pom.xml 2010-06-16 07:53:43 UTC (rev 2619)
@@ -52,7 +52,6 @@
<module>exo.kernel.container</module>
<module>exo.kernel.commons</module>
<module>exo.kernel.component.common</module>
- <module>exo.kernel.component.remote</module>
<module>exo.kernel.component.cache</module>
<module>exo.kernel.component.ext.cache.impl.jboss.v3</module>
<module>exo.kernel.component.command</module>
@@ -79,11 +78,6 @@
</dependency>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.component.cache</artifactId>
<version>${project.version}</version>
</dependency>
14 years
- 1
- 0
exo-jcr SVN: r2618 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-06-16 03:53:12 -0400 (Wed, 16 Jun 2010)
New Revision: 2618
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
Log:
EXOJCR-758: indexer updates
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2010-06-16 07:51:17 UTC (rev 2617)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2010-06-16 07:53:12 UTC (rev 2618)
@@ -34,6 +34,7 @@
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.LocationFactory;
import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl;
+import org.exoplatform.services.jcr.impl.util.SecurityHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +42,7 @@
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
+import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -186,7 +188,7 @@
protected Document createDoc() throws RepositoryException
{
doNotUseInExcerpt.clear();
- Document doc = new Document();
+ final Document doc = new Document();
doc.setBoost(getNodeBoost());
@@ -214,7 +216,7 @@
// unknown uri<->prefix mappings
}
- for (PropertyData prop : stateProvider.listChildPropertiesData(node))
+ for (final PropertyData prop : stateProvider.listChildPropertiesData(node))
{
// add each property to the _PROPERTIES_SET for searching
@@ -224,7 +226,14 @@
addPropertyName(doc, prop.getQPath().getName());
}
- addValues(doc, prop);
+ SecurityHelper.doPriviledgedRepositoryExceptionAction(new PrivilegedExceptionAction<Object>()
+ {
+ public Object run() throws Exception
+ {
+ addValues(doc, prop);
+ return null;
+ }
+ });
}
@@ -311,7 +320,9 @@
data = propData.getValues();
if (data == null)
+ {
log.warn("null value found at property " + prop.getQPath().getAsString());
+ }
// check the jcr:encoding property
PropertyData encProp =
@@ -420,7 +431,9 @@
.getIdentifier())).getValues();
if (data == null)
+ {
log.warn("null value found at property " + prop.getQPath().getAsString());
+ }
ExtendedValue val = null;
InternalQName name = prop.getQPath().getName();
@@ -504,8 +517,10 @@
}
}
if (data.size() > 1)
+ {
// real multi-valued
addMVPName(doc, prop.getQPath().getName());
+ }
}
catch (RepositoryException e)
{
@@ -673,6 +688,7 @@
* @deprecated Use {@link #addStringValue(Document, String, Object, boolean)
* addStringValue(Document, String, Object, boolean)} instead.
*/
+ @Deprecated
protected void addStringValue(Document doc, String fieldName, Object internalValue)
{
addStringValue(doc, fieldName, internalValue, true, true, DEFAULT_BOOST);
@@ -711,6 +727,7 @@
* @param boost the boost value for this string field.
* @deprecated use {@link #addStringValue(Document, String, Object, boolean, boolean, float, boolean)} instead.
*/
+ @Deprecated
protected void addStringValue(Document doc, String fieldName, Object internalValue, boolean tokenized,
boolean includeInNodeIndex, float boost)
{
@@ -794,6 +811,7 @@
* @return a lucene field.
* @deprecated use {@link #createFulltextField(String, boolean, boolean)} instead.
*/
+ @Deprecated
protected Field createFulltextField(String value)
{
return createFulltextField(value, supportHighlighting, supportHighlighting);
14 years
- 1
- 0
exo-jcr SVN: r2617 - kernel/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-06-16 03:51:17 -0400 (Wed, 16 Jun 2010)
New Revision: 2617
Removed:
kernel/trunk/exo.kernel.component.remote/
Log:
EXOJCR-746 exo.kernel.component.remote removed because it is useless.
14 years
- 1
- 0