[jboss-cvs] JBossAS SVN: r107869 - in projects/cluster/ha-server-ispn/trunk/src: main/java/org/jboss/ha/ispn/config and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 27 19:22:33 EDT 2010
Author: pferraro
Date: 2010-08-27 19:22:32 -0400 (Fri, 27 Aug 2010)
New Revision: 107869
Modified:
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/CacheContainerRegistryConfiguration.java
projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd
projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/SingleCacheManagerRegistryConfigurationSourceTest.java
projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java
projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml
projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml
Log:
JNDI related fixes.
Replace base-jndi-name from schema with jndiNamePrefix property of DefaultCacheContainerRegistry, default to null.
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java 2010-08-27 23:22:32 UTC (rev 107869)
@@ -30,6 +30,8 @@
import javax.naming.Context;
import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.infinispan.manager.CacheContainer;
@@ -58,47 +60,40 @@
private final CacheContainerFactory factory;
private final CacheContainerRegistryConfigurationSource source;
- private final Context context;
private final ConcurrentMap<String, String> aliases = new ConcurrentHashMap<String, String>();
private final ConcurrentMap<String, CacheContainerRegistryEntry> containers = new ConcurrentHashMap<String, CacheContainerRegistryEntry>();
-
+
+ private volatile String jndiNamePrefix = null;
+
private volatile EmbeddedCacheManager defaultContainer;
/**
* Creates a new cache container registry using the specified factory and source.
* @param factory used to create cache container instances from configuration
* @param source source of cache container configurations.
- * @throws NamingException if inital context could not be created
*/
- public DefaultCacheContainerRegistry(CacheContainerFactory factory, CacheContainerRegistryConfigurationSource source) throws NamingException
+ public DefaultCacheContainerRegistry(CacheContainerFactory factory, CacheContainerRegistryConfigurationSource source)
{
- this(factory, source, new InitialContext());
+ this.factory = factory;
+ this.source = source;
}
- /**
- * Creates a new cache container registry using the specified factory and source.
- * @param factory used to create cache container instances from configuration
- * @param source source of cache container configurations.
- * @param context jndi context to which to bind cache containers.
- */
- public DefaultCacheContainerRegistry(CacheContainerFactory factory, CacheContainerRegistryConfigurationSource source, Context context)
+ public String getJndiNamePrefix()
{
- this.factory = factory;
- this.source = source;
- this.context = context;
+ return this.jndiNamePrefix;
}
+ public void setJndiNamePrefix(String jndiNamePrefix)
+ {
+ this.jndiNamePrefix = jndiNamePrefix;
+ }
+
public void start() throws Exception
{
CacheContainerRegistryConfiguration registry = this.source.getRegistryConfiguration();
for (CacheContainerRegistryConfigurationEntry entry: registry.getEntries())
{
- if (entry.getJndiName() == null)
- {
- entry.setJndiName(this.context.composeName(entry.getId(), registry.getBaseJndiName()));
- }
-
this.add(entry);
}
@@ -176,8 +171,14 @@
String jndiName = configEntry.getJndiName();
List<String> aliases = configEntry.getAliases();
- CacheContainerRegistryEntry entry = new CacheContainerRegistryEntry(container, jndiName, aliases);
+ String prefix = this.jndiNamePrefix;
+ if ((prefix != null) && (jndiName == null))
+ {
+ jndiName = prefix + "/" + id;
+ }
+ CacheContainerRegistryEntry entry = new CacheContainerRegistryEntry(id, container, jndiName, aliases);
+
// Store cache containers with jndi name, so they can be unbound during stop()
CacheContainerRegistryEntry existingEntry = this.containers.putIfAbsent(id, entry);
@@ -225,6 +226,7 @@
{
try
{
+ logger.info("Binding " + entry.getId() + " cache container to " + jndiName);
this.bind(jndiName, container);
}
catch (NamingException e)
@@ -242,6 +244,7 @@
{
try
{
+ logger.info("Unbinding " + entry.getId() + " cache container from " + jndiName);
this.unbind(jndiName);
}
catch (NamingException e)
@@ -253,30 +256,56 @@
entry.getContainer().stop();
}
- private void bind(String name, Object value) throws NamingException
+ private void bind(String jndiName, Object value) throws NamingException
{
- NonSerializableFactory.rebind(this.context, name, value);
+ Context context = new InitialContext();
+ Name name = context.getNameParser("").parse(jndiName);
+ int end = name.size();
+
+ for (int i = 1; i < end; ++i)
+ {
+ Name subcontextName = name.getPrefix(i);
+
+ try
+ {
+ context.lookup(subcontextName);
+ }
+ catch (NameNotFoundException e)
+ {
+ logger.trace("Creating subcontext " + subcontextName);
+ context.createSubcontext(subcontextName);
+ }
+ }
+
+ NonSerializableFactory.rebind(context, jndiName, value);
}
private void unbind(String name) throws NamingException
{
- this.context.unbind(name);
+ new InitialContext().unbind(name);
NonSerializableFactory.unbind(name);
}
private static class CacheContainerRegistryEntry
{
+ private final String id;
private final List<String> aliases;
private final String jndiName;
private final EmbeddedCacheManager container;
- public CacheContainerRegistryEntry(EmbeddedCacheManager container, String jndiName, List<String> aliases)
+ public CacheContainerRegistryEntry(String id, EmbeddedCacheManager container, String jndiName, List<String> aliases)
{
+ this.id = id;
this.container = container;
this.jndiName = jndiName;
this.aliases = aliases;
}
+ public String getId()
+ {
+ return this.id;
+ }
+
public EmbeddedCacheManager getContainer()
{
return this.container;
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/CacheContainerRegistryConfiguration.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/CacheContainerRegistryConfiguration.java 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/CacheContainerRegistryConfiguration.java 2010-08-27 23:22:32 UTC (rev 107869)
@@ -44,9 +44,6 @@
@XmlAttribute(name = "default", required = false)
private CacheContainerRegistryConfigurationEntry defaultEntry;
- @XmlAttribute(name = "base-jndi-name", required = false)
- private String baseJndiName = "java:CacheManager";
-
@XmlElement(name = "infinispan-config")
private List<CacheContainerRegistryConfigurationEntry> entries;
@@ -69,14 +66,4 @@
{
this.entries = entries;
}
-
- public String getBaseJndiName()
- {
- return this.baseJndiName;
- }
-
- public void setBaseJndiName(String baseJndiName)
- {
- this.baseJndiName = baseJndiName;
- }
}
Modified: projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd 2010-08-27 23:22:32 UTC (rev 107869)
@@ -10,7 +10,6 @@
<xs:element name="infinispan-config" type="tns:cacheContainerRegistryConfigurationEntry" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="default" type="xs:IDREF"/>
- <xs:attribute name="base-jndi-name" type="xs:string" default="java:CacheManager"/>
</xs:complexType>
<xs:complexType name="cacheContainerRegistryConfigurationEntry">
Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java 2010-08-27 23:22:32 UTC (rev 107869)
@@ -22,12 +22,20 @@
package org.jboss.ha.ispn;
import java.util.Arrays;
+import java.util.Hashtable;
import java.util.List;
import java.util.Set;
import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingException;
import javax.naming.RefAddr;
import javax.naming.Reference;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.InitialContextFactoryBuilder;
+import javax.naming.spi.NamingManager;
import junit.framework.Assert;
@@ -41,6 +49,7 @@
import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationEntry;
import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationSource;
import org.jboss.util.naming.NonSerializableFactory;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -49,6 +58,29 @@
*/
public class DefaultCacheContainerRegistryTest
{
+ static Context context = EasyMock.createNiceMock(Context.class);
+
+ @BeforeClass
+ public static void beforeClass() throws NamingException
+ {
+ InitialContextFactoryBuilder builder = new InitialContextFactoryBuilder()
+ {
+ @Override
+ public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environment) throws NamingException
+ {
+ return new InitialContextFactory()
+ {
+ @Override
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException
+ {
+ return context;
+ }
+ };
+ }
+ };
+ NamingManager.setInitialContextFactoryBuilder(builder);
+ }
+
/**
* Test with unspecified default config and default base jndi name
* @throws Exception
@@ -60,7 +92,9 @@
CacheContainerRegistryConfigurationSource source = EasyMock.createStrictMock(CacheContainerRegistryConfigurationSource.class);
EmbeddedCacheManager defaultContainer = EasyMock.createStrictMock(EmbeddedCacheManager.class);
EmbeddedCacheManager otherContainer = EasyMock.createStrictMock(EmbeddedCacheManager.class);
- Context context = EasyMock.createNiceMock(Context.class);
+ NameParser parser = EasyMock.createStrictMock(NameParser.class);
+ Name name = EasyMock.createStrictMock(Name.class);
+ Name subcontextName = EasyMock.createStrictMock(Name.class);
Capture<Reference> capturedReferences = new Capture<Reference>(CaptureType.ALL);
CacheContainerConfiguration defaultConfig = new CacheContainerConfiguration(new GlobalConfiguration(), new Configuration());
@@ -78,29 +112,41 @@
CacheContainerRegistryConfiguration configRegistry = new CacheContainerRegistryConfiguration();
configRegistry.setEntries(Arrays.asList(defaultEntry, otherEntry));
- DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, source, context);
+ DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, source);
+ registry.setJndiNamePrefix("java:CacheManager");
Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
EasyMock.expect(source.getRegistryConfiguration()).andReturn(configRegistry);
EasyMock.expect(factory.createCacheContainer(EasyMock.same(defaultConfig))).andReturn(defaultContainer);
- EasyMock.expect(context.composeName("default", "java:CacheManager")).andReturn("java:CacheManager/default");
defaultContainer.start();
+
+ EasyMock.expect(context.getNameParser("")).andReturn(parser);
+ EasyMock.expect(parser.parse("java:CacheManager/default")).andReturn(name);
+ EasyMock.expect(name.size()).andReturn(2);
+ EasyMock.expect(name.getPrefix(1)).andReturn(subcontextName);
+ EasyMock.expect(context.lookup(EasyMock.same(subcontextName))).andThrow(new NameNotFoundException());
+ EasyMock.expect(context.createSubcontext(EasyMock.same(subcontextName))).andReturn(null);
context.rebind(EasyMock.eq("java:CacheManager/default"), EasyMock.capture(capturedReferences));
EasyMock.expect(factory.createCacheContainer(EasyMock.same(otherConfig))).andReturn(otherContainer);
- EasyMock.expect(context.composeName("other", "java:CacheManager")).andReturn("java:CacheManager/other");
otherContainer.start();
+
+ EasyMock.expect(context.getNameParser("")).andReturn(parser);
+ EasyMock.expect(parser.parse("java:CacheManager/other")).andReturn(name);
+ EasyMock.expect(name.size()).andReturn(2);
+ EasyMock.expect(name.getPrefix(1)).andReturn(subcontextName);
+ EasyMock.expect(context.lookup(EasyMock.same(subcontextName))).andReturn(null);
context.rebind(EasyMock.eq("java:CacheManager/other"), EasyMock.capture(capturedReferences));
- EasyMock.replay(factory, source, context, defaultContainer, otherContainer);
+ EasyMock.replay(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
registry.start();
- EasyMock.verify(factory, source, context, defaultContainer, otherContainer);
+ EasyMock.verify(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
Set<String> names = registry.getCacheContainers();
Assert.assertEquals(2, names.size());
@@ -128,24 +174,24 @@
Assert.assertSame(defaultContainer, registry.getCacheContainer("unknown"));
Assert.assertSame(otherContainer, registry.getCacheContainer("other"));
- EasyMock.reset(factory, source, context, defaultContainer, otherContainer);
+ EasyMock.reset(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
defaultContainer.stop();
context.unbind("java:CacheManager/default");
otherContainer.stop();
context.unbind("java:CacheManager/other");
- EasyMock.replay(factory, source, context, defaultContainer, otherContainer);
+ EasyMock.replay(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
registry.stop();
- EasyMock.verify(factory, source, context, defaultContainer, otherContainer);
+ EasyMock.verify(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
Assert.assertNull(NonSerializableFactory.lookup("java:CacheManager/default"));
Assert.assertNull(NonSerializableFactory.lookup("java:CacheManager/other"));
- EasyMock.reset(factory, source, context, defaultContainer, otherContainer);
+ EasyMock.reset(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
}
/**
@@ -156,10 +202,12 @@
public void custom() throws Exception
{
CacheContainerFactory factory = EasyMock.createStrictMock(CacheContainerFactory.class);
- CacheContainerRegistryConfigurationSource provider = EasyMock.createStrictMock(CacheContainerRegistryConfigurationSource.class);
+ CacheContainerRegistryConfigurationSource source = EasyMock.createStrictMock(CacheContainerRegistryConfigurationSource.class);
EmbeddedCacheManager defaultContainer = EasyMock.createStrictMock(EmbeddedCacheManager.class);
EmbeddedCacheManager otherContainer = EasyMock.createStrictMock(EmbeddedCacheManager.class);
- Context context = EasyMock.createStrictMock(Context.class);
+ NameParser parser = EasyMock.createStrictMock(NameParser.class);
+ Name name = EasyMock.createStrictMock(Name.class);
+ Name subcontextName = EasyMock.createStrictMock(Name.class);
Capture<Reference> capturedReferences = new Capture<Reference>(CaptureType.ALL);
CacheContainerConfiguration otherConfig = new CacheContainerConfiguration(new GlobalConfiguration(), new Configuration());
@@ -180,30 +228,40 @@
CacheContainerRegistryConfiguration configRegistry = new CacheContainerRegistryConfiguration();
configRegistry.setEntries(Arrays.asList(otherEntry, defaultEntry));
configRegistry.setDefaultEntry(defaultEntry);
- configRegistry.setBaseJndiName("java:Infinispan");
- DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, provider, context);
+ DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, source);
+ registry.setJndiNamePrefix("java:Infinispan");
Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
- EasyMock.expect(provider.getRegistryConfiguration()).andReturn(configRegistry);
+ EasyMock.expect(source.getRegistryConfiguration()).andReturn(configRegistry);
EasyMock.expect(factory.createCacheContainer(EasyMock.same(otherConfig))).andReturn(otherContainer);
otherContainer.start();
+
+ EasyMock.expect(context.getNameParser("")).andReturn(parser);
+ EasyMock.expect(parser.parse("java:other")).andReturn(name);
+ EasyMock.expect(name.size()).andReturn(1);
context.rebind(EasyMock.eq("java:other"), EasyMock.capture(capturedReferences));
EasyMock.expect(factory.createCacheContainer(EasyMock.same(defaultConfig))).andReturn(defaultContainer);
- EasyMock.expect(context.composeName("default", "java:Infinispan")).andReturn("java:Infinispan/default");
defaultContainer.start();
+
+ EasyMock.expect(context.getNameParser("")).andReturn(parser);
+ EasyMock.expect(parser.parse("java:Infinispan/default")).andReturn(name);
+ EasyMock.expect(name.size()).andReturn(2);
+ EasyMock.expect(name.getPrefix(1)).andReturn(subcontextName);
+ EasyMock.expect(context.lookup(EasyMock.same(subcontextName))).andThrow(new NameNotFoundException());
+ EasyMock.expect(context.createSubcontext(EasyMock.same(subcontextName))).andReturn(null);
context.rebind(EasyMock.eq("java:Infinispan/default"), EasyMock.capture(capturedReferences));
- EasyMock.replay(factory, provider, context, defaultContainer, otherContainer);
+ EasyMock.replay(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
registry.start();
- EasyMock.verify(factory, provider, context, defaultContainer, otherContainer);
+ EasyMock.verify(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
Set<String> names = registry.getCacheContainers();
Assert.assertEquals(2, names.size());
@@ -225,7 +283,7 @@
Assert.assertEquals("java:Infinispan/default", addr.getContent());
Assert.assertSame(registry.getCacheContainer("default"), NonSerializableFactory.lookup("java:Infinispan/default"));
- EasyMock.reset(factory, provider, context, defaultContainer, otherContainer);
+ EasyMock.reset(factory, source, context, defaultContainer, otherContainer, parser, name, subcontextName);
Assert.assertSame(defaultContainer, registry.getCacheContainer());
Assert.assertSame(defaultContainer, registry.getCacheContainer(null));
@@ -242,16 +300,16 @@
otherContainer.stop();
context.unbind("java:other");
- EasyMock.replay(factory, context, defaultContainer, otherContainer);
+ EasyMock.replay(factory, context, defaultContainer, otherContainer, parser, name, subcontextName);
registry.stop();
- EasyMock.verify(factory, context, defaultContainer, otherContainer);
+ EasyMock.verify(factory, context, defaultContainer, otherContainer, parser, name, subcontextName);
Assert.assertNull(DefaultCacheContainerRegistry.getInstance());
Assert.assertNull(NonSerializableFactory.lookup("java:other"));
Assert.assertNull(NonSerializableFactory.lookup("java:Infinispan/default"));
- EasyMock.reset(factory, context, defaultContainer, otherContainer);
+ EasyMock.reset(factory, context, defaultContainer, otherContainer, parser, name, subcontextName);
}
}
Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/SingleCacheManagerRegistryConfigurationSourceTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/SingleCacheManagerRegistryConfigurationSourceTest.java 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/SingleCacheManagerRegistryConfigurationSourceTest.java 2010-08-27 23:22:32 UTC (rev 107869)
@@ -14,8 +14,6 @@
CacheContainerRegistryConfiguration configuration = source.getRegistryConfiguration();
- Assert.assertEquals("java:CacheManager", configuration.getBaseJndiName());
-
List<CacheContainerRegistryConfigurationEntry> entries = configuration.getEntries();
Assert.assertEquals(1, entries.size());
@@ -39,8 +37,6 @@
CacheContainerRegistryConfiguration configuration = source.getRegistryConfiguration();
- Assert.assertEquals("java:CacheManager", configuration.getBaseJndiName());
-
List<CacheContainerRegistryConfigurationEntry> entries = configuration.getEntries();
Assert.assertEquals(1, entries.size());
Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java 2010-08-27 23:22:32 UTC (rev 107869)
@@ -19,7 +19,6 @@
CacheContainerRegistryConfiguration configuration = provider.getRegistryConfiguration();
- Assert.assertEquals("java:CacheManager", configuration.getBaseJndiName());
Assert.assertNull(configuration.getDefaultEntry());
List<CacheContainerRegistryConfigurationEntry> entries = configuration.getEntries();
@@ -42,8 +41,6 @@
CacheContainerRegistryConfiguration registry = provider.getRegistryConfiguration();
- Assert.assertEquals("java:CacheContainer", registry.getBaseJndiName());
-
List<CacheContainerRegistryConfigurationEntry> entries = registry.getEntries();
Assert.assertEquals(3, entries.size());
@@ -84,7 +81,7 @@
CacheContainerRegistryConfiguration registry = provider.getRegistryConfiguration();
- Assert.assertEquals("java:CacheContainer", registry.getBaseJndiName());
+// Assert.assertEquals("java:CacheContainer", registry.getBaseJndiName());
List<CacheContainerRegistryConfigurationEntry> entries = registry.getEntries();
Modified: projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml 2010-08-27 23:22:32 UTC (rev 107869)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan-configs default="manager1" base-jndi-name="java:CacheContainer" xmlns="urn:jboss:infinispan-configs:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:infinispan-configs:1.0 ../../src/main/resources/infinispan-configs.xsd">
+<infinispan-configs default="manager1" xmlns="urn:jboss:infinispan-configs:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:infinispan-configs:1.0 ../../src/main/resources/infinispan-configs.xsd">
<infinispan-config name="manager0">
<infinispan xmlns="urn:infinispan:config:4.0"/>
</infinispan-config>
Modified: projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml 2010-08-27 20:19:00 UTC (rev 107868)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml 2010-08-27 23:22:32 UTC (rev 107869)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan-configs default="manager" base-jndi-name="java:CacheContainer" xmlns="urn:jboss:infinispan-configs:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:infinispan-configs:1.0 ../../src/main/resources/infinispan-configs.xsd">
+<infinispan-configs default="manager" xmlns="urn:jboss:infinispan-configs:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:infinispan-configs:1.0 ../../src/main/resources/infinispan-configs.xsd">
<infinispan-config name="manager">
<alias>${known:unexpected}</alias>
<alias>${unknown:expected}</alias>
More information about the jboss-cvs-commits
mailing list