[jboss-cvs] JBossAS SVN: r65905 - in projects/ejb3/trunk/locator/src: test/java/org/jboss/ejb3/test/locator/client/jndihostconfigparsing and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 7 23:59:35 EDT 2007
Author: ALRubinger
Date: 2007-10-07 23:59:34 -0400 (Sun, 07 Oct 2007)
New Revision: 65905
Added:
projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostConfigurationParser.java
projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-default.xml
projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_collision.xml
projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_defined.xml
projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-multiplehosts.xml
Removed:
projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostMetadataParser.java
projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator.xml
Modified:
projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/ServiceLocatorFactory.java
projects/ejb3/trunk/locator/src/test/java/org/jboss/ejb3/test/locator/client/jndihostconfigparsing/JndiHostParsingTestCase.java
Log:
Enhanced default parsing logic, included more exhaustive test cases
Added: projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostConfigurationParser.java
===================================================================
--- projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostConfigurationParser.java (rev 0)
+++ projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostConfigurationParser.java 2007-10-08 03:59:34 UTC (rev 65905)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.ejb3.locator.client;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.digester.Digester;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.validator.GenericValidator;
+import org.xml.sax.SAXException;
+
+public class JndiHostConfigurationParser
+{
+
+ // Class Members
+ private static final Log logger = LogFactory.getLog(JndiHostConfigurationParser.class);
+
+ private static JndiHostConfigurationParser instance = null;
+
+ public static final String DEFAULT_JNDI_HOST_ID_PREFIX = "JNDIHOST-";
+
+ // Internal Constructor
+ private JndiHostConfigurationParser()
+ {
+
+ }
+
+ // Singleton Accessor
+ public static synchronized JndiHostConfigurationParser getInstance()
+ {
+ // Ensure instanciated
+ if (JndiHostConfigurationParser.instance == null)
+ {
+ JndiHostConfigurationParser.instance = new JndiHostConfigurationParser();
+ }
+
+ // Return
+ return JndiHostConfigurationParser.instance;
+ }
+
+ // Functional Methods
+
+ @SuppressWarnings(value = "unchecked")
+ public List<JndiHost> parse(InputStream inStream)
+ {
+ // Initialize
+ Digester jndiHostDefinitionsDigester = new Digester();
+ // Add Rules for parsing configuration
+ this.addJndiHostDefinitionsParsingRules(jndiHostDefinitionsDigester);
+
+ // Parse
+ List<JndiHost> jndiHosts = null;
+ try
+ {
+ // Parse
+ jndiHosts = (List<JndiHost>) jndiHostDefinitionsDigester.parse(inStream);
+ }
+ catch (IOException e)
+ {
+ throw new ServiceLocatorException(e);
+ }
+ catch (SAXException e)
+ {
+ throw new ServiceLocatorException(e);
+ }
+
+ // Assign each JNDI Host a unique ID, if not assigned
+ int id = 0;
+ List<String> ids = new ArrayList<String>();
+ for (JndiHost jndiHost : jndiHosts)
+ {
+ // No ID specified for this host, assign one
+ if (GenericValidator.isBlankOrNull(jndiHost.getId()))
+ {
+ jndiHost.setId(JndiHostConfigurationParser.DEFAULT_JNDI_HOST_ID_PREFIX + Integer.toString((id++)));
+ }
+
+ // Check for multiple IDs
+ if (ids.contains(jndiHost.getId()))
+ {
+ throw new ServiceLocatorException("JNDI Host with address " + jndiHost.getAddress()
+ + " has conflicting/duplicate ID of " + jndiHost.getId());
+ }
+ else
+ {
+ // Add to list of IDs
+ ids.add(jndiHost.getId());
+ }
+ }
+ return jndiHosts;
+ }
+
+ // Internal Helper Methods
+
+ /**
+ * Adds parsing rules for reading configuration specifying JNDI Hosts
+ *
+ * @param digester
+ */
+ private void addJndiHostDefinitionsParsingRules(Digester digester)
+ {
+
+ // When the root is encountered, create a List
+ // to hold the JNP Host Definitions
+ digester.addObjectCreate("service-locator/jndi-hosts", ArrayList.class);
+
+ // When a new host definition is encountered,
+ // create a new JNP Host
+ digester.addObjectCreate("service-locator/jndi-hosts/jndi-host", JndiHost.class);
+
+ // Set all properties (in this case, "name")
+ // from the "host" entry to the "JnpHost.name"
+ // object
+ digester.addSetProperties("service-locator/jndi-hosts/jndi-host");
+
+ // Set the ID
+ digester.addCallMethod("service-locator/jndi-hosts/jndi-host/id", "setId", 1);
+ digester.addCallParam("service-locator/jndi-hosts/jndi-host/id", 0);
+
+ // Set the address
+ digester.addCallMethod("service-locator/jndi-hosts/jndi-host/address", "setAddress", 1);
+ digester.addCallParam("service-locator/jndi-hosts/jndi-host/address", 0);
+
+ // Set the port
+ digester.addCallMethod("service-locator/jndi-hosts/jndi-host/port", "setPort", 1, new Class[]
+ {Integer.class});
+ digester.addCallParam("service-locator/jndi-hosts/jndi-host/port", 0);
+
+ // Add the JNP Host to the List
+ digester.addSetNext("service-locator/jndi-hosts/jndi-host", "add");
+
+ }
+
+}
Property changes on: projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostConfigurationParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostMetadataParser.java
===================================================================
--- projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostMetadataParser.java 2007-10-07 13:43:41 UTC (rev 65904)
+++ projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/JndiHostMetadataParser.java 2007-10-08 03:59:34 UTC (rev 65905)
@@ -1,153 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.ejb3.locator.client;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.validator.GenericValidator;
-import org.xml.sax.SAXException;
-
-public class JndiHostMetadataParser
-{
-
- // Class Members
- private static final Log logger = LogFactory.getLog(JndiHostMetadataParser.class);
-
- private static JndiHostMetadataParser instance = null;
-
- private static final String DEFAULT_JNDI_HOST_ID_PREFIX = "JNDIHOST-";
-
- // Internal Constructor
- private JndiHostMetadataParser()
- {
-
- }
-
- // Singleton Accessor
- public static synchronized JndiHostMetadataParser getInstance()
- {
- // Ensure instanciated
- if (JndiHostMetadataParser.instance == null)
- {
- JndiHostMetadataParser.instance = new JndiHostMetadataParser();
- }
-
- // Return
- return JndiHostMetadataParser.instance;
- }
-
- // Functional Methods
-
- @SuppressWarnings(value = "unchecked")
- public List<JndiHost> parse(InputStream inStream)
- {
- // Initialize
- Digester jndiHostDefinitionsDigester = new Digester();
- // Add Rules for parsing configuration
- this.addJnpHostDefinitionsParsingRules(jndiHostDefinitionsDigester);
-
- // Parse
- List<JndiHost> jndiHosts = null;
- try
- {
- // Parse
- jndiHosts = (List<JndiHost>) jndiHostDefinitionsDigester.parse(inStream);
- }
- catch (IOException e)
- {
- throw new ServiceLocatorException(e);
- }
- catch (SAXException e)
- {
- throw new ServiceLocatorException(e);
- }
-
- // Assign each JNDI Host a unique ID, if not assigned
- int id = 0;
- List<String> ids = new ArrayList<String>();
- for (JndiHost jndiHost : jndiHosts)
- {
- // No ID specified for this host, assign one
- if (GenericValidator.isBlankOrNull(jndiHost.getId()))
- {
- jndiHost.setId(JndiHostMetadataParser.DEFAULT_JNDI_HOST_ID_PREFIX + Integer.toString((id++)));
- }
-
- // Check for multiple IDs
- if (ids.contains(jndiHost.getId()))
- {
- throw new ServiceLocatorException("JNDI Host with address " + jndiHost.getAddress()
- + " has conflicting/duplicate ID of " + jndiHost.getId());
- }
- else
- {
- // Add to list of IDs
- ids.add(jndiHost.getId());
- }
- }
- return jndiHosts;
- }
-
- // Internal Helper Methods
-
- /**
- * Adds parsing rules for reading configuration specifying JNDI Hosts
- *
- * @param digester
- */
- private void addJnpHostDefinitionsParsingRules(Digester digester)
- {
-
- // When the root is encountered, create a List
- // to hold the JNP Host Definitions
- digester.addObjectCreate("service-locator/jndi-hosts", ArrayList.class);
-
- // When a new host definition is encountered,
- // create a new JNP Host
- digester.addObjectCreate("service-locator/jndi-hosts/jndi-host", JndiHost.class);
-
- // Set all properties (in this case, "name")
- // from the "host" entry to the "JnpHost.name"
- // object
- digester.addSetProperties("service-locator/jndi-hosts/jndi-host");
-
- // Set the address
- digester.addCallMethod("service-locator/jndi-hosts/jndi-host/address", "setAddress", 1);
- digester.addCallParam("service-locator/jndi-hosts/jndi-host/address", 0);
-
- // Set the port
- digester.addCallMethod("service-locator/jndi-hosts/jndi-host/port", "setPort", 1, new Class[]
- {Integer.class});
- digester.addCallParam("service-locator/jndi-hosts/jndi-host/port", 0);
-
- // Add the JNP Host to the List
- digester.addSetNext("service-locator/jndi-hosts/jndi-host", "add");
-
- }
-
-}
Modified: projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/ServiceLocatorFactory.java
===================================================================
--- projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/ServiceLocatorFactory.java 2007-10-07 13:43:41 UTC (rev 65904)
+++ projects/ejb3/trunk/locator/src/main/java/org/jboss/ejb3/locator/client/ServiceLocatorFactory.java 2007-10-08 03:59:34 UTC (rev 65905)
@@ -24,33 +24,67 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
public class ServiceLocatorFactory
{
// Class Members
private static ServiceLocator serviceLocator = null;
+
+ private static final String CONFIGURATION_FILE_USER_OVERRIDE_FILENAME_SYSTEM_PROPERTY_KEY = "jboss.servicelocator.location";
+
+ private static final String CONFIGURATION_FILE_USER_OVERRIDE_JAR_SYSTEM_PROPERTY_KEY = "jboss.servicelocator.classloader";
+ private static final String CONFIGURATION_FILE_DEFAULT_FILENAME = "jboss-servicelocator.xml";
+
+ private static final String CONFIGURATION_FILE_DEFAULT_INCONTAINER_URI = System
+ .getProperty("jboss.server.config.url")
+ + ServiceLocatorFactory.CONFIGURATION_FILE_DEFAULT_FILENAME;
+
+ private static final String CONFIGURATION_FILE_DEFAULT_OUTCONTAINER_LOCATION = "META-INF/"
+ + ServiceLocatorFactory.CONFIGURATION_FILE_DEFAULT_FILENAME;
+
/*
* Initialize Service Locator depending upon external configuration of JNDI
* Hosts
*/
static
{
- // Obatin Metadata and parse
- // TODO Needs to follow rules, order of finding config file
- File jndiHostConfigFile = new File("IMPLEMENT.xml");
+
+ // Initialize
+ InputStream configuration = null;
+
+ // Attempt to obtain default in-container file
try
{
- ServiceLocatorFactory.serviceLocator = new JndiCachingServiceLocator(JndiHostMetadataParser.getInstance()
- .parse(new FileInputStream(jndiHostConfigFile)));
+ configuration = new FileInputStream(new File(new URI(
+ ServiceLocatorFactory.CONFIGURATION_FILE_DEFAULT_INCONTAINER_URI)));
}
- catch (FileNotFoundException e)
+ catch (FileNotFoundException fnfe)
{
- // TODO Add more elegant error message
+ // Not defined as default in-container location
+ }
+ catch (URISyntaxException e)
+ {
throw new ServiceLocatorException(e);
}
+ // Not found as default in-container file, attempt for default in-JAR file
+ configuration = Thread.currentThread().getContextClassLoader().getResourceAsStream(
+ ServiceLocatorFactory.CONFIGURATION_FILE_DEFAULT_OUTCONTAINER_LOCATION);
+
+ // If default in-JAR file is not found
+ if(configuration==null)
+ {
+ //TODO
+ }
+
+ // Parse
+ ServiceLocatorFactory.serviceLocator = new JndiCachingServiceLocator(JndiHostConfigurationParser.getInstance()
+ .parse(configuration));
}
/**
Modified: projects/ejb3/trunk/locator/src/test/java/org/jboss/ejb3/test/locator/client/jndihostconfigparsing/JndiHostParsingTestCase.java
===================================================================
--- projects/ejb3/trunk/locator/src/test/java/org/jboss/ejb3/test/locator/client/jndihostconfigparsing/JndiHostParsingTestCase.java 2007-10-07 13:43:41 UTC (rev 65904)
+++ projects/ejb3/trunk/locator/src/test/java/org/jboss/ejb3/test/locator/client/jndihostconfigparsing/JndiHostParsingTestCase.java 2007-10-08 03:59:34 UTC (rev 65905)
@@ -13,7 +13,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.ejb3.locator.client.JndiHost;
-import org.jboss.ejb3.locator.client.JndiHostMetadataParser;
+import org.jboss.ejb3.locator.client.JndiHostConfigurationParser;
+import org.jboss.ejb3.locator.client.ServiceLocatorException;
public class JndiHostParsingTestCase extends TestCase
{
@@ -21,8 +22,14 @@
private static final Log logger = LogFactory.getLog(JndiHostParsingTestCase.class);
- private static final String FILE_NAME_CONFIGURATION_DEFAULT = "jboss-ejb3-servicelocator.xml";
+ private static final String FILE_NAME_CONFIGURATION_DEFAULT = "jboss-ejb3-servicelocator-default.xml";
+ private static final String FILE_NAME_CONFIGURATION_MULTIPLE_HOSTS = "jboss-ejb3-servicelocator-multiplehosts.xml";
+
+ private static final String FILE_NAME_CONFIGURATION_ID_DEFINED = "jboss-ejb3-servicelocator-id_defined.xml";
+
+ private static final String FILE_NAME_CONFIGURATION_ID_COLLISION = "jboss-ejb3-servicelocator-id_collision.xml";
+
// Overridden Implementations
/**
* Setup
@@ -34,15 +41,20 @@
}
// Test Methods
- public void testParse()
+ /**
+ * Tests a config file of one host may be parsed, with values defined as expected
+ */
+ public void testParseOneHost()
{
// Initialize
boolean noParseErrors = true;
+ List<JndiHost> hosts = null;
+
try
{
// Parse
- this.getConfigurationFromConfigFile(JndiHostParsingTestCase.FILE_NAME_CONFIGURATION_DEFAULT);
+ hosts = this.getConfigurationFromConfigFile(JndiHostParsingTestCase.FILE_NAME_CONFIGURATION_DEFAULT);
}
catch (Exception e)
{
@@ -52,15 +64,77 @@
// Test
assertTrue(noParseErrors);
+ assertNotNull(hosts);
+ assertTrue(hosts.size() == 1);
+ JndiHost host = hosts.get(0);
+ assertEquals(host.getAddress(), "localhost");
+ assertEquals(host.getPort(), 1099);
+ assertNotNull(host.getId());
+ assertTrue(host.getId().startsWith(JndiHostConfigurationParser.DEFAULT_JNDI_HOST_ID_PREFIX));
}
+ /**
+ * Tests a config file with many hosts may be parsed, with values defined as expected
+ */
+ public void testParseMultipleHosts()
+ {
+ // Parse
+ List<JndiHost> hosts = this
+ .getConfigurationFromConfigFile(JndiHostParsingTestCase.FILE_NAME_CONFIGURATION_MULTIPLE_HOSTS);
+
+ // Test
+ assertNotNull(hosts);
+ assertTrue(hosts.size() == 3);
+ JndiHost host1 = hosts.get(0);
+ JndiHost host2 = hosts.get(1);
+ assertEquals(host1.getPort(), 1099);
+ assertEquals(host2.getPort(), 1199);
+ }
+
+ /**
+ * Tests a config file with one host, specifying own ID
+ */
+ public void testParseWithIdDefined()
+ {
+ // Parse
+ List<JndiHost> hosts = this
+ .getConfigurationFromConfigFile(JndiHostParsingTestCase.FILE_NAME_CONFIGURATION_ID_DEFINED);
+
+ // Test
+ assertNotNull(hosts);
+ assertTrue(hosts.size() == 1);
+ JndiHost host = hosts.get(0);
+ assertEquals(host.getId(), "MyID1");
+ }
+
+ /**
+ * Tests a config file with one host, specifying own ID
+ */
+ public void testParseWithIdCollisions()
+ {
+ // Parse
+ try
+ {
+ this.getConfigurationFromConfigFile(JndiHostParsingTestCase.FILE_NAME_CONFIGURATION_ID_COLLISION);
+ }
+ catch (ServiceLocatorException sle)
+ {
+ // Expected, return
+ return;
+ }
+
+ // Should have thrown a parse error, fail
+ fail("ID Collisions within the configuration file are not allowed");
+ }
+
// Internal Helper Methods
/**
* Obtains the configuration parsed from the specified file name
*/
private List<JndiHost> getConfigurationFromConfigFile(String fileName)
{
- return JndiHostMetadataParser.getInstance().parse(
+ return JndiHostConfigurationParser.getInstance().parse(
Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName));
}
+
}
Added: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-default.xml
===================================================================
--- projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-default.xml (rev 0)
+++ projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-default.xml 2007-10-08 03:59:34 UTC (rev 65905)
@@ -0,0 +1,12 @@
+<service-locator>
+
+ <jndi-hosts>
+
+ <jndi-host>
+ <address>localhost</address>
+ <port>1099</port>
+ </jndi-host>
+
+ </jndi-hosts>
+
+</service-locator>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-default.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_collision.xml
===================================================================
--- projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_collision.xml (rev 0)
+++ projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_collision.xml 2007-10-08 03:59:34 UTC (rev 65905)
@@ -0,0 +1,20 @@
+<service-locator>
+
+ <jndi-hosts>
+
+ <jndi-host>
+ <id>MyID1</id>
+ <address>localhost</address>
+ <port>1099</port>
+ </jndi-host>
+
+ <!-- Collision, invalid entry -->
+ <jndi-host>
+ <id>MyID1</id>
+ <address>localhost</address>
+ <port>1099</port>
+ </jndi-host>
+
+ </jndi-hosts>
+
+</service-locator>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_collision.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_defined.xml
===================================================================
--- projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_defined.xml (rev 0)
+++ projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_defined.xml 2007-10-08 03:59:34 UTC (rev 65905)
@@ -0,0 +1,13 @@
+<service-locator>
+
+ <jndi-hosts>
+
+ <jndi-host>
+ <id>MyID1</id>
+ <address>localhost</address>
+ <port>1099</port>
+ </jndi-host>
+
+ </jndi-hosts>
+
+</service-locator>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-id_defined.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-multiplehosts.xml
===================================================================
--- projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-multiplehosts.xml (rev 0)
+++ projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-multiplehosts.xml 2007-10-08 03:59:34 UTC (rev 65905)
@@ -0,0 +1,22 @@
+<service-locator>
+
+ <jndi-hosts>
+
+ <jndi-host>
+ <address>localhost</address>
+ <port>1099</port>
+ </jndi-host>
+
+ <jndi-host>
+ <address>localhost</address>
+ <port>1199</port>
+ </jndi-host>
+
+ <jndi-host>
+ <address>localhost</address>
+ <port>1299</port>
+ </jndi-host>
+
+ </jndi-hosts>
+
+</service-locator>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator-multiplehosts.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator.xml
===================================================================
--- projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator.xml 2007-10-07 13:43:41 UTC (rev 65904)
+++ projects/ejb3/trunk/locator/src/test/resources/jboss-ejb3-servicelocator.xml 2007-10-08 03:59:34 UTC (rev 65905)
@@ -1,12 +0,0 @@
-<service-locator>
-
- <jndi-hosts>
-
- <jndi-host>
- <address>localhost</address>
- <port>1099</port>
- </jndi-host>
-
- </jndi-hosts>
-
-</service-locator>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list