[exo-jcr-commits] exo-jcr SVN: r2048 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container/definition and 1 other directories.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2010-03-10 07:10:39 -0500 (Wed, 10 Mar 2010)
New Revision: 2048

Added:
   kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.properties
   kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.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
Log:
EXOJCR-580: The context used to resolve variables was not updated

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-03-10 10:15:57 UTC (rev 2047)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java	2010-03-10 12:10:39 UTC (rev 2048)
@@ -677,6 +677,7 @@
          String propertyValue = entry.getValue();
          propertyValue = Deserializer.resolveVariables(propertyValue, ctx);
          externalSettings.put(propertyName, propertyValue);
+         ctx.put(propertyName, propertyValue);
       }
    }
 

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-03-10 10:15:57 UTC (rev 2047)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java	2010-03-10 12:10:39 UTC (rev 2048)
@@ -516,6 +516,13 @@
       assertEquals("my-exo-domain", config.getSetting("myPortal", PortalContainerConfig.REALM_SETTING_NAME));
       assertEquals("my-exo-domain-pcdef", config.getSetting("myPortal-pcdef", PortalContainerConfig.REALM_SETTING_NAME));
 
+      // Simple usecase from gatein
+      rootContainer = createRootContainer("sample-gtn-configuration.xml");
+      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"));
+     
       // With external settings, with several portal container definitions and with 
       // default portal container definition
       rootContainer =

Added: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.properties
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.properties	                        (rev 0)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.properties	2010-03-10 12:10:39 UTC (rev 2048)
@@ -0,0 +1,3 @@
+gatein.data.dir=../gatein/data
+gatein.db.data.dir=${gatein.data.dir}/db
+gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name}
\ No newline at end of file

Added: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.xml	                        (rev 0)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/sample-gtn-configuration.xml	2010-03-10 12:10:39 UTC (rev 2048)
@@ -0,0 +1,21 @@
+<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>
+		<!-- The full qualified name of the PortalContainerConfig -->
+		<type>org.exoplatform.container.definition.PortalContainerConfig</type>
+		<init-params>
+			<!-- It cans be used to avoid duplicating configuration -->
+			<object-param>
+				<name>default.portal.definition</name>
+				<object type="org.exoplatform.container.definition.PortalContainerDefinition">
+					<!-- The path to the external properties file -->
+					<field name="externalSettingsPath">
+						<string>sample-gtn-configuration.properties</string>
+					</field>                    
+				</object>
+			</object-param>
+		</init-params>
+	</component>
+</configuration>