[jboss-cvs] JBossAS SVN: r63496 - in trunk/system-jmx/src: resources/tests/org/jboss/test/system/metadata/value and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 13 09:27:22 EDT 2007
Author: alesj
Date: 2007-06-13 09:27:22 -0400 (Wed, 13 Jun 2007)
New Revision: 63496
Added:
trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/
trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/
trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasEmpty.xml
trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasMultiple.xml
trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasSingle.xml
trunk/system-jmx/src/tests/org/jboss/test/system/metadata/value/alias/
trunk/system-jmx/src/tests/org/jboss/test/system/metadata/value/alias/test/
trunk/system-jmx/src/tests/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java
Modified:
trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaData.java
trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java
Log:
ServiceMetaData aliases.
Modified: trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaData.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaData.java 2007-06-13 13:27:03 UTC (rev 63495)
+++ trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaData.java 2007-06-13 13:27:22 UTC (rev 63496)
@@ -77,7 +77,9 @@
/** The class loader */
private ObjectName classLoaderName;
-
+
+ private List<String> aliases;
+
/**
* Get the objectName.
*
@@ -308,6 +310,26 @@
this.classLoaderName = classLoaderName;
}
+ /**
+ * Get the aliases.
+ *
+ * @return aliases
+ */
+ public List<String> getAliases()
+ {
+ return aliases;
+ }
+
+ /**
+ * Set the aliases.
+ *
+ * @param aliases the aliases
+ */
+ public void setAliases(List<String> aliases)
+ {
+ this.aliases = aliases;
+ }
+
protected void addChildren(Set<ServiceMetaDataVisitorNode> children)
{
children.addAll(attributes);
Modified: trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java 2007-06-13 13:27:03 UTC (rev 63495)
+++ trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java 2007-06-13 13:27:22 UTC (rev 63496)
@@ -330,6 +330,16 @@
attributes.add(attribute);
}
}
+ else if (element.getTagName().equals("alias"))
+ {
+ List<String> aliases = service.getAliases();
+ if (aliases == null)
+ {
+ aliases = new ArrayList<String>();
+ service.setAliases(aliases);
+ }
+ aliases.add(getElementTextContent(element, true, true));
+ }
}
service.setAttributes(attributes);
Added: trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasEmpty.xml
===================================================================
--- trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasEmpty.xml (rev 0)
+++ trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasEmpty.xml 2007-06-13 13:27:22 UTC (rev 63496)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mbean name="jboss.test:type=BasicMBeanName" code="BasicMBeanCode" />
Added: trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasMultiple.xml
===================================================================
--- trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasMultiple.xml (rev 0)
+++ trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasMultiple.xml 2007-06-13 13:27:22 UTC (rev 63496)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mbean name="jboss.test:type=BasicMBeanName" code="BasicMBeanCode">
+ <alias>Alias#0</alias>
+ <alias>Alias#1</alias>
+ <alias>Alias#2</alias>
+</mbean>
\ No newline at end of file
Added: trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasSingle.xml
===================================================================
--- trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasSingle.xml (rev 0)
+++ trunk/system-jmx/src/resources/tests/org/jboss/test/system/metadata/value/alias/test/AliasSingle.xml 2007-06-13 13:27:22 UTC (rev 63496)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mbean name="jboss.test:type=BasicMBeanName" code="BasicMBeanCode">
+ <alias>SingleAlias</alias>
+</mbean>
\ No newline at end of file
Added: trunk/system-jmx/src/tests/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java (rev 0)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java 2007-06-13 13:27:22 UTC (rev 63496)
@@ -0,0 +1,66 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.test.system.metadata.value.alias.test;
+
+import java.util.List;
+import java.util.Iterator;
+
+import org.jboss.test.system.metadata.test.AbstractMetaDataTest;
+import org.jboss.system.metadata.ServiceMetaData;
+
+/**
+ * Test aliases on XMBeans.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AliasValueUnitTestCase extends AbstractMetaDataTest
+{
+ public AliasValueUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testAliasEmpty() throws Exception
+ {
+ ServiceMetaData service = unmarshalSingleMBean();
+ assertNull(service.getAliases());
+ }
+
+ public void testAliasSingle() throws Exception
+ {
+ ServiceMetaData service = unmarshalSingleMBean();
+ List<String> aliases = service.getAliases();
+ assertNotNull(aliases);
+ assertEquals(1, aliases.size());
+ assertEquals("SingleAlias", aliases.iterator().next());
+ }
+
+ public void testAliasMultiple() throws Exception
+ {
+ ServiceMetaData service = unmarshalSingleMBean();
+ List<String> aliases = service.getAliases();
+ assertNotNull(aliases);
+ assertEquals(3, aliases.size());
+ for(int i = 0; i < aliases.size(); i++)
+ assertEquals("Alias#" + i, aliases.get(i));
+ }
+}
More information about the jboss-cvs-commits
mailing list