[exo-jcr-commits] exo-jcr SVN: r5328 - in jcr/trunk/exo.jcr.component.ext/src: test/resources/conf/standalone and 1 other directory.
Author: andrew.plotnikov
Date: 2011-12-14 03:32:40 -0500 (Wed, 14 Dec 2011)
New Revision: 5328
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
Log:
EXOJCR-1673: value-param has been changed values-param
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java
===================================================================
---
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-12-14
07:46:15 UTC (rev 5327)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-12-14
08:32:40 UTC (rev 5328)
@@ -25,6 +25,7 @@
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.container.xml.PropertiesParam;
import org.exoplatform.container.xml.ValueParam;
+import org.exoplatform.container.xml.ValuesParam;
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
@@ -45,6 +46,7 @@
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -110,7 +112,7 @@
protected final RepositoryService repositoryService;
- protected final String[] mixinNames;
+ protected final List<String> mixinNames;
// TODO temporary flag to have start() run once
protected boolean started = false;
@@ -140,14 +142,14 @@
throw new RepositoryConfigurationException("Property parameters
'locations' expected");
}
- ValueParam mixinValue = params.getValueParam("mixin-names");
- if (mixinValue != null)
+ ValuesParam mixinValues = params.getValuesParam("mixin-names");
+ if (mixinValues != null)
{
- this.mixinNames = mixinValue.getValue().split(",");
+ this.mixinNames = params.getValuesParam("mixin-names").getValues();
}
else
{
- this.mixinNames = new String[0];
+ this.mixinNames = new ArrayList<String>();
}
}
Modified:
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2011-12-14
07:46:15 UTC (rev 5327)
+++
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2011-12-14
08:32:40 UTC (rev 5328)
@@ -181,10 +181,11 @@
</component-plugin>
</component-plugins>
<init-params>
- <value-param>
+ <values-param>
<name>mixin-names</name>
- <value>exo:testFirstHideable,exo:testSecondHideable</value>
- </value-param>
+ <value>exo:testFirstHideable</value>
+ <value>exo:testSecondHideable</value>
+ </values-param>
<properties-param>
<name>locations</name>
<property name="db1" value="ws2" />