[jboss-cvs] JBossAS SVN: r107724 - in projects/cluster/ha-server-ispn/trunk/src: main/java/org/jboss/ha/ispn/config and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 20 20:30:43 EDT 2010
Author: pferraro
Date: 2010-08-20 20:30:42 -0400 (Fri, 20 Aug 2010)
New Revision: 107724
Added:
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/InfinispanConfigurationAdapter.java
Removed:
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfigurationAdapter.java
Modified:
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
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/CacheContainerRegistryConfigurationEntry.java
projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/SingleCacheContainerRegistryConfigurationSource.java
projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java
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
Log:
Don't be so InfinispanConfiguration oriented - make this a JAXB detail.
Deleted: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java 2010-08-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.jboss.ha.ispn;
-
-import java.util.Collection;
-
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-
-/**
- * Represents an Infinispan cache container configuration.
- * @author Paul Ferraro
- */
-public interface CacheContainerConfiguration
-{
- /**
- * The general configuration shared by all caches.
- * @return a global configuration
- */
- GlobalConfiguration getGlobalConfiguration();
-
- /**
- * The default configuration inherited by any named caches.
- * @return the default cache configuration
- */
- Configuration getDefaultConfiguration();
-
- /**
- * The name cache configurations.
- * @return a collection of named cache configuration
- */
- Collection<Configuration> getConfigurations();
-}
Copied: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java (from rev 107504, projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java)
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java (rev 0)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfiguration.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.jboss.ha.ispn;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+
+/**
+ * Represents an Infinispan cache container configuration.
+ * @author Paul Ferraro
+ */
+public class CacheContainerConfiguration
+{
+ private final GlobalConfiguration globalConfiguration;
+ private final Configuration defaultConfiguration;
+ private final Collection<Configuration> namedConfigurations;
+
+ public CacheContainerConfiguration(GlobalConfiguration globalConfiguration, Configuration defaultConfiguration)
+ {
+ this(globalConfiguration, defaultConfiguration, Collections.<Configuration>emptyList());
+ }
+
+ public CacheContainerConfiguration(GlobalConfiguration globalConfiguration, Configuration defaultConfiguration, Collection<Configuration> namedConfigurations)
+ {
+ this.globalConfiguration = globalConfiguration;
+ this.defaultConfiguration = defaultConfiguration;
+ this.namedConfigurations = namedConfigurations;
+ }
+
+ /**
+ * The general configuration shared by all caches.
+ * @return a global configuration
+ */
+ public GlobalConfiguration getGlobalConfiguration()
+ {
+ return this.globalConfiguration;
+ }
+
+ /**
+ * The default configuration inherited by any named caches.
+ * @return the default cache configuration
+ */
+ public Configuration getDefaultConfiguration()
+ {
+ return this.defaultConfiguration;
+ }
+
+ /**
+ * The name cache configurations.
+ * @return a collection of named cache configuration
+ */
+ public Collection<Configuration> getNamedConfigurations()
+ {
+ return this.namedConfigurations;
+ }
+}
Deleted: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfigurationAdapter.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfigurationAdapter.java 2010-08-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerConfigurationAdapter.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.jboss.ha.ispn;
-
-import java.util.Collection;
-
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.config.InfinispanConfiguration;
-
-/**
- * Adapts an {@link InfinispanConfiguration} to the {@link CacheContainerConfiguration} interface.
- * @author Paul Ferraro
- */
-public class CacheContainerConfigurationAdapter implements CacheContainerConfiguration
-{
- private final InfinispanConfiguration configuration;
-
- public CacheContainerConfigurationAdapter(InfinispanConfiguration configuration)
- {
- this.configuration = configuration;
- }
-
- @Override
- public GlobalConfiguration getGlobalConfiguration()
- {
- return this.configuration.parseGlobalConfiguration();
- }
-
- @Override
- public Configuration getDefaultConfiguration()
- {
- return this.configuration.parseDefaultConfiguration();
- }
-
- @Override
- public Collection<Configuration> getConfigurations()
- {
- return this.configuration.parseNamedConfigurations().values();
- }
-}
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java 2010-08-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -71,7 +71,7 @@
EmbeddedCacheManager manager = new DefaultCacheManager(globalConfiguration, configuration.getDefaultConfiguration(), false);
// Add named configurations
- for (Configuration config: configuration.getConfigurations())
+ for (Configuration config: configuration.getNamedConfigurations())
{
manager.defineConfiguration(config.getName(), config);
}
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-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -175,8 +175,7 @@
public void add(CacheContainerRegistryConfigurationEntry entry) throws NamingException
{
- CacheContainerConfiguration configuration = new CacheContainerConfigurationAdapter(entry.getConfiguration());
- CacheContainer container = this.factory.createCacheContainer(configuration);
+ CacheContainer container = this.factory.createCacheContainer(entry.getConfiguration());
Map<String, String> aliases = this.mapAliases(entry);
if (!aliases.isEmpty())
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/CacheContainerRegistryConfigurationEntry.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/CacheContainerRegistryConfigurationEntry.java 2010-08-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/CacheContainerRegistryConfigurationEntry.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -30,8 +30,10 @@
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.infinispan.config.InfinispanConfiguration;
+import org.jboss.ha.ispn.CacheContainerConfiguration;
/**
* A cache container registry configuration entry.
@@ -50,8 +52,9 @@
@XmlElement(name = "alias")
private List<Alias> aliases;
- @XmlElementRef
- private InfinispanConfiguration configuration;
+ @XmlJavaTypeAdapter(InfinispanConfigurationAdapter.class)
+ @XmlElementRef(type = InfinispanConfiguration.class)
+ private CacheContainerConfiguration configuration;
public String getId()
{
@@ -83,12 +86,12 @@
this.aliases = aliases;
}
- public InfinispanConfiguration getConfiguration()
+ public CacheContainerConfiguration getConfiguration()
{
return this.configuration;
}
- public void setConfiguration(InfinispanConfiguration configuration)
+ public void setConfiguration(CacheContainerConfiguration configuration)
{
this.configuration = configuration;
}
Added: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/InfinispanConfigurationAdapter.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/InfinispanConfigurationAdapter.java (rev 0)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/InfinispanConfigurationAdapter.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.jboss.ha.ispn.config;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+import org.infinispan.config.InfinispanConfiguration;
+import org.jboss.ha.ispn.CacheContainerConfiguration;
+
+/**
+ * Adapts the InfinispanConfiguration object to a CacheContainerConfiguration.
+ * @author Paul Ferraro
+ */
+public class InfinispanConfigurationAdapter extends XmlAdapter<InfinispanConfiguration, CacheContainerConfiguration>
+{
+ /**
+ * {@inheritDoc}
+ * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
+ */
+ @Override
+ public InfinispanConfiguration marshal(CacheContainerConfiguration configuration)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
+ */
+ @Override
+ public CacheContainerConfiguration unmarshal(InfinispanConfiguration configuration)
+ {
+ return new CacheContainerConfiguration(configuration.parseGlobalConfiguration(), configuration.parseDefaultConfiguration(), configuration.parseNamedConfigurations().values());
+ }
+}
Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/SingleCacheContainerRegistryConfigurationSource.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/SingleCacheContainerRegistryConfigurationSource.java 2010-08-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/SingleCacheContainerRegistryConfigurationSource.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -67,10 +67,12 @@
@Override
public CacheContainerRegistryConfiguration getRegistryConfiguration() throws IOException
{
+ InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration(this.resource);
+
CacheContainerRegistryConfigurationEntry entry = new CacheContainerRegistryConfigurationEntry();
entry.setId(this.id);
entry.setJndiName(this.jndiName);
- entry.setConfiguration(InfinispanConfiguration.newInfinispanConfiguration(this.resource));
+ entry.setConfiguration(new InfinispanConfigurationAdapter().unmarshal(configuration));
CacheContainerRegistryConfiguration registry = new CacheContainerRegistryConfiguration();
registry.setDefaultEntry(entry);
Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java 2010-08-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -23,31 +23,22 @@
@Test
public void test() throws Exception
{
- CacheContainerConfiguration configuration = EasyMock.createStrictMock(CacheContainerConfiguration.class);
ChannelFactory channelFactory = EasyMock.createStrictMock(ChannelFactory.class);
+
GlobalConfiguration globalConfiguration = new GlobalConfiguration();
globalConfiguration.setTransportClass(JGroupsTransport.class.getName());
globalConfiguration.setClusterName("mychannel");
Configuration defaultConfiguration = new Configuration();
Configuration namedConfiguration = new NamedConfiguration("custom");
+ CacheContainerConfiguration configuration = new CacheContainerConfiguration(globalConfiguration, defaultConfiguration, Collections.singletonList(namedConfiguration));
CacheContainerFactory factory = new DefaultCacheContainerFactory(channelFactory);
- EasyMock.expect(configuration.getGlobalConfiguration()).andReturn(globalConfiguration);
- EasyMock.expect(configuration.getDefaultConfiguration()).andReturn(defaultConfiguration);
- EasyMock.expect(configuration.getConfigurations()).andReturn(Collections.singletonList(namedConfiguration));
-
- EasyMock.replay(configuration, channelFactory);
-
CacheContainer result = factory.createCacheContainer(configuration);
try
{
- EasyMock.verify(configuration, channelFactory);
-
- EasyMock.reset(configuration, channelFactory);
-
URL url = Thread.currentThread().getContextClassLoader().getResource("config-samples/jgroups-udp.xml");
EasyMock.expect(channelFactory.createMultiplexerChannel(DefaultCacheContainerFactory.ChannelFactoryChannelLookup.DEFAULT_STACK, "mychannel")).andReturn(new JChannel(url));
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-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -1,10 +1,8 @@
package org.jboss.ha.ispn;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.naming.Context;
@@ -18,7 +16,7 @@
import org.easymock.EasyMock;
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.config.InfinispanConfiguration;
+import org.infinispan.config.GlobalConfiguration;
import org.infinispan.manager.CacheContainer;
import org.jboss.ha.ispn.config.Alias;
import org.jboss.ha.ispn.config.CacheContainerRegistryConfiguration;
@@ -41,23 +39,22 @@
CacheContainer defaultCacheManager = EasyMock.createStrictMock(CacheContainer.class);
CacheContainer otherCacheManager = EasyMock.createStrictMock(CacheContainer.class);
Context context = EasyMock.createNiceMock(Context.class);
- Capture<CacheContainerConfiguration> capturedConfiguration = new Capture<CacheContainerConfiguration>(CaptureType.ALL);
Capture<Reference> capturedReferences = new Capture<Reference>(CaptureType.ALL);
- InfinispanConfiguration config = InfinispanConfiguration.newInfinispanConfiguration("config-samples/minimal.xml");
-
- CacheContainerRegistryConfigurationEntry entry1 = new CacheContainerRegistryConfigurationEntry();
+ CacheContainerConfiguration defaultConfig = new CacheContainerConfiguration(new GlobalConfiguration(), new Configuration());
+ CacheContainerRegistryConfigurationEntry defaultEntry = new CacheContainerRegistryConfigurationEntry();
- entry1.setId("default");
- entry1.setConfiguration(config);
+ defaultEntry.setId("default");
+ defaultEntry.setConfiguration(defaultConfig);
- CacheContainerRegistryConfigurationEntry entry2 = new CacheContainerRegistryConfigurationEntry();
+ CacheContainerConfiguration otherConfig = new CacheContainerConfiguration(new GlobalConfiguration(), new Configuration());
+ CacheContainerRegistryConfigurationEntry otherEntry = new CacheContainerRegistryConfigurationEntry();
- entry2.setId("other");
- entry2.setConfiguration(config);
+ otherEntry.setId("other");
+ otherEntry.setConfiguration(otherConfig);
CacheContainerRegistryConfiguration configRegistry = new CacheContainerRegistryConfiguration();
- configRegistry.setEntries(Arrays.asList(entry1, entry2));
+ configRegistry.setEntries(Arrays.asList(defaultEntry, otherEntry));
DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, source, context);
@@ -65,12 +62,12 @@
EasyMock.expect(source.getRegistryConfiguration()).andReturn(configRegistry);
- EasyMock.expect(factory.createCacheContainer(EasyMock.capture(capturedConfiguration))).andReturn(defaultCacheManager);
+ EasyMock.expect(factory.createCacheContainer(EasyMock.same(defaultConfig))).andReturn(defaultCacheManager);
EasyMock.expect(context.composeName("default", "java:CacheManager")).andReturn("java:CacheManager/default");
context.rebind(EasyMock.eq("java:CacheManager/default"), EasyMock.capture(capturedReferences));
- EasyMock.expect(factory.createCacheContainer(EasyMock.capture(capturedConfiguration))).andReturn(otherCacheManager);
+ EasyMock.expect(factory.createCacheContainer(EasyMock.same(otherConfig))).andReturn(otherCacheManager);
EasyMock.expect(context.composeName("other", "java:CacheManager")).andReturn("java:CacheManager/other");
context.rebind(EasyMock.eq("java:CacheManager/other"), EasyMock.capture(capturedReferences));
@@ -92,22 +89,6 @@
Assert.assertSame(defaultCacheManager, registry.getCacheContainer("unknown"));
Assert.assertSame(otherCacheManager, registry.getCacheContainer("other"));
- List<CacheContainerConfiguration> configurations = capturedConfiguration.getValues();
- Assert.assertEquals(2, configurations.size());
-
- for (CacheContainerConfiguration configuration: configurations)
- {
- Assert.assertSame(config.parseGlobalConfiguration(), configuration.getGlobalConfiguration());
- Assert.assertSame(config.parseDefaultConfiguration(), configuration.getDefaultConfiguration());
- Map<String, Configuration> namedConfigurations = config.parseNamedConfigurations();
- Collection<Configuration> configs = configuration.getConfigurations();
- Assert.assertEquals(namedConfigurations.size(), configs.size());
- for (Configuration c: configs)
- {
- Assert.assertSame(namedConfigurations.get(c.getName()), c);
- }
- }
-
Assert.assertSame(registry, DefaultCacheContainerRegistry.getInstance());
List<Reference> references = capturedReferences.getValues();
@@ -156,35 +137,34 @@
CacheContainer defaultCacheManager = EasyMock.createStrictMock(CacheContainer.class);
CacheContainer otherCacheManager = EasyMock.createStrictMock(CacheContainer.class);
Context context = EasyMock.createStrictMock(Context.class);
- Capture<CacheContainerConfiguration> capturedConfiguration = new Capture<CacheContainerConfiguration>(CaptureType.ALL);
Capture<Reference> capturedReferences = new Capture<Reference>(CaptureType.ALL);
- InfinispanConfiguration config = InfinispanConfiguration.newInfinispanConfiguration("config-samples/minimal.xml");
-
- CacheContainerRegistryConfigurationEntry entry1 = new CacheContainerRegistryConfigurationEntry();
+ CacheContainerConfiguration otherConfig = new CacheContainerConfiguration(new GlobalConfiguration(), new Configuration());
+ CacheContainerRegistryConfigurationEntry otherEntry = new CacheContainerRegistryConfigurationEntry();
- entry1.setId("other");
- entry1.setConfiguration(config);
- entry1.setJndiName("java:other");
+ otherEntry.setId("other");
+ otherEntry.setConfiguration(otherConfig);
+ otherEntry.setJndiName("java:other");
- Alias alias1 = new Alias();
- alias1.setName("legacy-other-cache");
- alias1.setTarget("other-cache");
- entry1.setAliases(Collections.singletonList(alias1));
+ Alias otherAlias = new Alias();
+ otherAlias.setName("legacy-other-cache");
+ otherAlias.setTarget("other-cache");
+ otherEntry.setAliases(Collections.singletonList(otherAlias));
- CacheContainerRegistryConfigurationEntry entry2 = new CacheContainerRegistryConfigurationEntry();
+ CacheContainerConfiguration defaultConfig = new CacheContainerConfiguration(new GlobalConfiguration(), new Configuration());
+ CacheContainerRegistryConfigurationEntry defaultEntry = new CacheContainerRegistryConfigurationEntry();
- entry2.setId("default");
- entry2.setConfiguration(config);
+ defaultEntry.setId("default");
+ defaultEntry.setConfiguration(defaultConfig);
- Alias alias2 = new Alias();
- alias2.setName("legacy-default-cache");
- alias2.setTarget("default-cache");
- entry2.setAliases(Collections.singletonList(alias2));
+ Alias defaultAlias = new Alias();
+ defaultAlias.setName("legacy-default-cache");
+ defaultAlias.setTarget("default-cache");
+ defaultEntry.setAliases(Collections.singletonList(defaultAlias));
CacheContainerRegistryConfiguration configRegistry = new CacheContainerRegistryConfiguration();
- configRegistry.setEntries(Arrays.asList(entry1, entry2));
- configRegistry.setDefaultEntry(entry2);
+ configRegistry.setEntries(Arrays.asList(otherEntry, defaultEntry));
+ configRegistry.setDefaultEntry(defaultEntry);
configRegistry.setBaseJndiName("java:Infinispan");
DefaultCacheContainerRegistry registry = new DefaultCacheContainerRegistry(factory, provider, context);
@@ -193,11 +173,11 @@
EasyMock.expect(provider.getRegistryConfiguration()).andReturn(configRegistry);
- EasyMock.expect(factory.createCacheContainer(EasyMock.capture(capturedConfiguration))).andReturn(otherCacheManager);
+ EasyMock.expect(factory.createCacheContainer(EasyMock.same(otherConfig))).andReturn(otherCacheManager);
context.rebind(EasyMock.eq("java:other"), EasyMock.capture(capturedReferences));
- EasyMock.expect(factory.createCacheContainer(EasyMock.capture(capturedConfiguration))).andReturn(defaultCacheManager);
+ EasyMock.expect(factory.createCacheContainer(EasyMock.same(defaultConfig))).andReturn(defaultCacheManager);
EasyMock.expect(context.composeName("default", "java:Infinispan")).andReturn("java:Infinispan/default");
context.rebind(EasyMock.eq("java:Infinispan/default"), EasyMock.capture(capturedReferences));
@@ -223,22 +203,6 @@
Assert.assertNotSame(defaultContainer, otherContainer);
- List<CacheContainerConfiguration> configurations = capturedConfiguration.getValues();
- Assert.assertEquals(2, configurations.size());
-
- for (CacheContainerConfiguration configuration: configurations)
- {
- Assert.assertSame(config.parseGlobalConfiguration(), configuration.getGlobalConfiguration());
- Assert.assertSame(config.parseDefaultConfiguration(), configuration.getDefaultConfiguration());
- Map<String, Configuration> namedConfigurations = config.parseNamedConfigurations();
- Collection<Configuration> configs = configuration.getConfigurations();
- Assert.assertEquals(namedConfigurations.size(), configs.size());
- for (Configuration c: configs)
- {
- Assert.assertSame(namedConfigurations.get(c.getName()), c);
- }
- }
-
Assert.assertSame(registry, DefaultCacheContainerRegistry.getInstance());
List<Reference> references = capturedReferences.getValues();
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-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/SingleCacheManagerRegistryConfigurationSourceTest.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -26,7 +26,7 @@
Assert.assertEquals("default", entry.getId());
Assert.assertNull(entry.getJndiName());
- Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+ Assert.assertEquals(0, entry.getConfiguration().getNamedConfigurations().size());
}
@Test
@@ -51,6 +51,6 @@
Assert.assertEquals("custom", entry.getId());
Assert.assertEquals("java:SingleCacheManager", entry.getJndiName());
- Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+ Assert.assertEquals(0, entry.getConfiguration().getNamedConfigurations().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-20 22:43:21 UTC (rev 107723)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/config/xml/XMLCacheManagerRegistryConfigurationSourceTest.java 2010-08-21 00:30:42 UTC (rev 107724)
@@ -29,7 +29,7 @@
Assert.assertEquals("default", entry.getId());
Assert.assertNull(entry.getJndiName());
- Assert.assertEquals(7, entry.getConfiguration().parseNamedConfigurations().size());
+ Assert.assertEquals(7, entry.getConfiguration().getNamedConfigurations().size());
}
@Test
@@ -50,7 +50,7 @@
Assert.assertEquals("manager0", entry.getId());
Assert.assertNull(entry.getJndiName());
Assert.assertNotSame(entry, registry.getDefaultEntry());
- Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+ Assert.assertEquals(0, entry.getConfiguration().getNamedConfigurations().size());
Assert.assertNull(entry.getAliases());
entry = entries.get(1);
@@ -58,7 +58,7 @@
Assert.assertEquals("manager1", entry.getId());
Assert.assertNull(entry.getJndiName());
Assert.assertSame(entry, registry.getDefaultEntry());
- Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+ Assert.assertEquals(0, entry.getConfiguration().getNamedConfigurations().size());
Assert.assertNotNull(entry.getAliases());
Assert.assertEquals(2, entry.getAliases().size());
Assert.assertEquals("alias1", entry.getAliases().get(0).getName());
@@ -71,7 +71,7 @@
Assert.assertEquals("manager2", entry.getId());
Assert.assertEquals("java:CacheManager", entry.getJndiName());
Assert.assertNotSame(entry, registry.getDefaultEntry());
- Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+ Assert.assertEquals(0, entry.getConfiguration().getNamedConfigurations().size());
Assert.assertNotNull(entry.getAliases());
Assert.assertEquals(2, entry.getAliases().size());
Assert.assertEquals("alias1", entry.getAliases().get(0).getName());
@@ -102,7 +102,7 @@
Assert.assertEquals("manager", entry.getId());
Assert.assertNull(entry.getJndiName());
Assert.assertSame(entry, registry.getDefaultEntry());
- Assert.assertEquals(0, entry.getConfiguration().parseNamedConfigurations().size());
+ Assert.assertEquals(0, entry.getConfiguration().getNamedConfigurations().size());
List<Alias> aliases = entry.getAliases();
Assert.assertNotNull(aliases);
Assert.assertEquals(1, aliases.size());
More information about the jboss-cvs-commits
mailing list