[jboss-cvs] JBossAS SVN: r83075 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/rar and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 19 08:49:04 EST 2009
Author: jeff.zhang
Date: 2009-01-19 08:49:04 -0500 (Mon, 19 Jan 2009)
New Revision: 83075
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaDataContainer.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaDataContainer.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/TransactionSupportMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
Log:
[JBMETA-166] [JBJCA-5] cleanup jca spec medata code for test ra.xml coverage
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -21,7 +21,6 @@
*/
package org.jboss.metadata.rar.spec;
-
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
@@ -34,7 +33,7 @@
* @author Jeff Zhang
* @version $Revision: $
*/
- at XmlType(name="ActivationspecMetaData", propOrder={"asClass", "requiredConfigProps", "configProps"})
+ at XmlType(name="activationspecType", propOrder={"asClass", "requiredConfigProps", "configProps"})
public class ActivationspecMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -1583292998359427984L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -32,9 +32,9 @@
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
- at XmlType(name="AdminObjectMetaData",
+ at XmlType(name="adminobjectType",
propOrder={"adminObjectInterfaceClass", "adminObjectImplementationClass", "configProps"})
public class AdminObjectMetaData extends IdMetaDataImpl
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -23,18 +23,19 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
+
/**
* Authentication mechanism meta data
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
- at XmlType(name="authentication-mechanism",
- propOrder={"description", "authenticationMechanismType", "credentialInterfaceClass"})
-public class AuthenticationMechanismMetaData extends DescriptionImpl
+ at XmlType(name="authentication-mechanismType",
+ propOrder={"descriptions", "authenticationMechanismType", "credentialInterfaceClass"})
+public class AuthenticationMechanismMetaData extends IdMetaDataImplWithDescriptions
{
static final long serialVersionUID = 1562443409483033688L;
@@ -93,7 +94,6 @@
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[authenticationMechanismType=").append(authenticationMechanismType);
buffer.append(" credentialInterfaceClass=").append(credentialInterfaceClass);
- //buffer.append(" descriptions=").append(getDescriptions());
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -24,17 +24,17 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
/**
* Config property meta data
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
- at XmlType(name="config-property", propOrder={"description", "name", "type", "value", "ignore"})
-public class ConfigPropertyMetaData extends DescriptionImpl
+ at XmlType(name="config-propertyType", propOrder={"descriptions", "name", "type", "value", "ignore"})
+public class ConfigPropertyMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = -3247621229521854849L;
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaDataContainer.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaDataContainer.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaDataContainer.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.metadata.rar.spec;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * An abstract class for meta data that have config properties
- *
- * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 75675 $
- */
-public class ConfigPropertyMetaDataContainer implements Serializable
-{
- static final long serialVersionUID = 2891949219806920844L;
-
- /** The properties by name */
- private Set<ConfigPropertyMetaData> properties = new HashSet<ConfigPropertyMetaData>();
-
- /**
- * Add a property
- *
- * @param cpmd the property
- */
- public void addProperty(ConfigPropertyMetaData cpmd)
- {
- properties.add(cpmd);
- }
-
- /**
- * Get the properties
- *
- * @return the properties
- */
- public Collection<ConfigPropertyMetaData> getProperties()
- {
- return properties;
- }
-
- /**
- * Get the property for a name
- *
- * @param name the name
- * @return the property or null if there is no property with that name
- */
- public ConfigPropertyMetaData getProperty(String name)
- {
- for (ConfigPropertyMetaData cpmd : properties)
- {
- if (cpmd.getName().equals(name))
- return cpmd;
- }
- return null;
- }
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -31,9 +31,9 @@
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
- at XmlType(name="connection-definition",
+ at XmlType(name="connection-definitionType",
propOrder={"managedConnectionFactoryClass", "configProps", "connectionFactoryInterfaceClass",
"connectionFactoryImplementationClass", "connectionInterfaceClass", "connectionImplementationClass"})
public class ConnectionDefinitionMetaData extends IdMetaDataImpl
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.metadata.rar.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Connector meta data
- *
- * @author Jeff Zhang
- * @version $Revision: $
- */
- at XmlType(name="connector",
- propOrder={"descriptions", "displayNames", "icons", "vendorName", "eISType", "rAVersion",
- "license", "ra", "requiredWorkContext"})
-public class Connector16MetaData extends ConnectorMetaData
-{
- private static final long serialVersionUID = 7047130842894140262L;
-
- private boolean metadataComplete;
- private String requiredWorkContext;
-
-
- public boolean isMetadataComplete()
- {
- return metadataComplete;
- }
-
- @XmlAttribute(name="metadata-complete", required=true)
- public void setMetadataComplete(boolean metadataComplete)
- {
- this.metadataComplete = metadataComplete;
- }
-
- public String getRequiredWorkContext()
- {
- return requiredWorkContext;
- }
-
- @XmlElement(name="required-work-context")
- public void setRequiredWorkContext(String requiredWorkContext)
- {
- this.requiredWorkContext = requiredWorkContext;
- }
-
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -24,10 +24,10 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+
/**
* Connector meta data
*
@@ -35,10 +35,7 @@
* @author Jeff Zhang
* @version $Revision: $
*/
- at XmlType(name="connector",
- propOrder={"descriptions", "displayNames", "icons", "vendorName", "eISType", "rAVersion",
- "license", "ra"})
-public class ConnectorMetaData extends DescriptionGroupMetaData
+public class ConnectorMetaData extends IdMetaDataImplWithDescriptionGroup
{
private static final long serialVersionUID = 7047130842894140222L;
@@ -146,7 +143,6 @@
*
* @param vendorName the vendor name
*/
- @XmlElement(name="vendor-name")
public void setVendorName(String vendorName)
{
this.vendorName = vendorName;
@@ -208,7 +204,6 @@
*
* @return the license
*/
- @XmlElement(name="license")
public void setLicense(LicenseMetaData lmd)
{
this.lmd = lmd;
@@ -232,6 +227,7 @@
buffer.append(" eisType=").append(eisType);
buffer.append(" resourceAdapterVersion=").append(raVersion);
buffer.append(" license=").append(lmd);
+ buffer.append(" resourceadapter=").append(ra);
buffer.append(']');
return buffer.toString();
}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionGroupMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionGroupMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -1,180 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.metadata.rar.spec;
-
-import java.io.Serializable;
-import java.util.Locale;
-
-/**
- * Description group meta data
- *
- * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 71554 $
- */
-public class DescriptionGroupMetaData implements Serializable
-{
- static final long serialVersionUID = 1324619949051028127L;
-
- /** The language */
- private String lang;
-
- /** The description */
- private String description;
-
- /** The display name */
- private String displayName;
-
- /** The small icon */
- private String smallIcon;
-
- /** The large icon */
- private String largeIcon;
-
- /**
- * Create a new description group meta data using the default langugage
- */
- public DescriptionGroupMetaData()
- {
- this(null);
- }
-
- /**
- * Create a new description group meta data
- *
- * @param lang the language
- */
- public DescriptionGroupMetaData(String lang)
- {
- if (lang == null)
- this.lang = Locale.getDefault().getLanguage();
- else
- this.lang = lang;
- }
-
- /**
- * Get the language
- *
- * @return the language
- */
- public String getLanguage()
- {
- return lang;
- }
-
- /**
- * Get the description
- *
- * @return the description
- */
- public String getDescription()
- {
- return description;
- }
-
- /**
- * Set the description
- *
- * @param description the description
- */
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- /**
- * Get the display name
- *
- * @return the display name
- */
- public String getDisplayName()
- {
- return displayName;
- }
-
- /**
- * Set the display name
- *
- * @param displayName the display name
- */
- public void setDisplayName(String displayName)
- {
- this.displayName = displayName;
- }
-
- /**
- * Get the small icon
- *
- * @return the small icon
- */
- public String getSmallIcon()
- {
- return smallIcon;
- }
-
- /**
- * Set the small icon
- *
- * @param icon the icon
- */
- public void setSmallIcon(String icon)
- {
- this.smallIcon = icon;
- }
-
- /**
- * Get the large icon
- *
- * @return the large icon
- */
- public String getLargeIcon()
- {
- return largeIcon;
- }
-
- /**
- * Set the large icon
- *
- * @param icon the icon
- */
- public void setLargeIcon(String icon)
- {
- this.largeIcon = icon;
- }
-
- public String toString()
- {
- StringBuffer buffer = new StringBuffer();
- buffer.append("DescriptionGroupMetaData").append('@');
- buffer.append(Integer.toHexString(System.identityHashCode(this)));
- buffer.append("[language=").append(lang);
- if (description != null)
- buffer.append(" description=").append(description);
- if (displayName != null)
- buffer.append(" displayName=").append(displayName);
- if (smallIcon != null)
- buffer.append(" smallIcon=").append(smallIcon);
- if (largeIcon != null)
- buffer.append(" largeIcon=").append(largeIcon);
- buffer.append(']');
- return buffer.toString();
- }
-}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.metadata.rar.spec;
-
-import java.io.Serializable;
-import java.util.Locale;
-
-/**
- * Description meta data
- *
- * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 71554 $
- */
-public class DescriptionMetaData implements Serializable
-{
- static final long serialVersionUID = -3100028904830435509L;
-
- /** The language */
- private String lang;
-
- /** The description */
- private String description;
-
- /**
- * Create a new description meta data using the default langugage
- */
- public DescriptionMetaData()
- {
- this(null);
- }
-
- /**
- * Create a new description meta data
- *
- * @param lang the language
- */
- public DescriptionMetaData(String lang)
- {
- if (lang == null)
- this.lang = Locale.getDefault().getLanguage();
- else
- this.lang = lang;
- }
-
- /**
- * Get the language
- *
- * @return the language
- */
- public String getLanguage()
- {
- return lang;
- }
-
- /**
- * Get the description
- *
- * @return the description
- */
- public String getDescription()
- {
- return description;
- }
-
- /**
- * Set the description
- *
- * @param description the description
- */
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- public String toString()
- {
- StringBuffer buffer = new StringBuffer();
- buffer.append("DescriptionMetaData").append('@');
- buffer.append(Integer.toHexString(System.identityHashCode(this)));
- buffer.append("[language=").append(lang);
- if (description != null)
- buffer.append(" description=").append(description);
- buffer.append(']');
- return buffer.toString();
- }
-}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaDataContainer.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaDataContainer.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/DescriptionMetaDataContainer.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -1,111 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.metadata.rar.spec;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * An abstract class for meta data that has descriptions
- *
- * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
- * @version $Revision: 76091 $
- */
-public class DescriptionMetaDataContainer implements Serializable
-{
- private static final long serialVersionUID = -8988666040600469357L;
-
- /** The descriptions */
- private ConcurrentHashMap<String, DescriptionMetaData> descriptions = new ConcurrentHashMap<String, DescriptionMetaData>();
-
- public DescriptionMetaDataContainer()
- {
- DescriptionMetaData dmd = new DescriptionMetaData();
- descriptions.put(dmd.getLanguage(), dmd);
- }
-
- /**
- * Get the desription for the default language
- * or the first description if there is no default
- *
- * @return the description for the default language
- */
- public DescriptionMetaData getDescription()
- {
- // Try the default locale
- DescriptionMetaData dmd = descriptions.get(Locale.getDefault().getLanguage());
- // No description using the default locale, just use the first
- if (dmd == null)
- {
- for (Iterator<DescriptionMetaData> i = descriptions.values().iterator(); i.hasNext();)
- {
- dmd = i.next();
- break;
- }
- }
- return dmd;
- }
-
- /**
- * Get the description for the give language
- *
- * @param lang the language
- * @return the description
- */
- public DescriptionMetaData getDescription(String lang)
- {
- return descriptions.get(lang);
- }
-
- /**
- * Add a description
- *
- * @param dmd the description
- */
- public void addDescription(DescriptionMetaData dmd)
- {
- descriptions.put(dmd.getLanguage(), dmd);
- }
-
- /**
- * Get the descriptions
- *
- * @return the descriptions
- */
- public Collection<DescriptionMetaData> getDescriptions()
- {
- return descriptions.values();
- }
-
- public String toString()
- {
- StringBuffer buffer = new StringBuffer();
- buffer.append("DescriptionMetaDataContainer").append('@');
- buffer.append(Integer.toHexString(System.identityHashCode(this)));
- buffer.append("[descriptions=").append(descriptions.values());
- buffer.append(']');
- return buffer.toString();
- }
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA15MetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -41,6 +42,7 @@
namespace=JavaEEMetaDataConstants.J2EE_NS,
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
-public class JCA15MetaData extends ConnectorMetaData {
- private static final long serialVersionUID = 1;
+ at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra"})
+ public class JCA15MetaData extends ConnectorMetaData {
+ private static final long serialVersionUID = 7047132542344140262L;
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -21,9 +21,14 @@
*/
package org.jboss.metadata.rar.spec;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -41,7 +46,34 @@
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
-public class JCA16MetaData extends Connector16MetaData
+ at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+public class JCA16MetaData extends ConnectorMetaData
{
- private static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 7047130842344140262L;
+
+ private boolean metadataComplete;
+ private List<String> requiredWorkContexts;
+
+
+ public boolean isMetadataComplete()
+ {
+ return metadataComplete;
+ }
+
+ @XmlAttribute(required=true)
+ public void setMetadataComplete(boolean metadataComplete)
+ {
+ this.metadataComplete = metadataComplete;
+ }
+
+ public List<String> getRequiredWorkContexts()
+ {
+ return requiredWorkContexts;
+ }
+
+ @XmlElement(name = "required-work-context")
+ public void setRequiredWorkContexts(List<String> requiredWorkContexts)
+ {
+ this.requiredWorkContexts = requiredWorkContexts;
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -23,17 +23,18 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
+
/**
* License meta data
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
- at XmlType(name="license", propOrder={"description", "required"})
-public class LicenseMetaData extends DescriptionImpl
+ at XmlType(name="licenseType", propOrder={"descriptions", "required"})
+public class LicenseMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = -1583292998139497934L;
@@ -67,7 +68,7 @@
buffer.append("LicenseMetaData").append('@');
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[required=").append(required);
- buffer.append(" descriptions=").append(getDescription());
+ buffer.append(" descriptions=").append(getDescriptions());
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -30,9 +30,9 @@
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 75672 $
+ * @version $Revision: $
*/
- at XmlType(name="messagelistener", propOrder={"type", "activationSpecType"})
+ at XmlType(name="messagelistenerType", propOrder={"type", "activationSpecType"})
public class MessageListenerMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -3196418073906964586L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -32,7 +32,7 @@
* @author Jeff Zhang
* @version $Revision: $
*/
- at XmlType(name="messagelistener", propOrder={"conDefs", "transSupport", "authMechanisms", "reAuthSupport"})
+ at XmlType(name="outbound-resourceadapterType", propOrder={"conDefs", "transSupport", "authMechanisms", "reAuthSupport"})
public class OutboundRaMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -1583292998339497984L;
@@ -60,7 +60,7 @@
return transSupport;
}
- @XmlElement(name="authentication-mechanism", required=true)
+ @XmlElement(name="authentication-mechanism")
public void setAuthMechanisms(List<AuthenticationMechanismMetaData> authMechanisms) {
this.authMechanisms = authMechanisms;
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -23,16 +23,16 @@
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
/**
* Required Config property meta data
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
-public class RequiredConfigPropertyMetaData extends DescriptionImpl
+public class RequiredConfigPropertyMetaData extends IdMetaDataImplWithDescriptions
{
static final long serialVersionUID = 7276282462933038174L;
@@ -66,7 +66,6 @@
buffer.append("RequiredConfigPropertyMetaData").append('@');
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[name=").append(name);
- buffer.append(" descriptions=").append(getDescription());
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -23,6 +23,8 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
/**
@@ -31,6 +33,8 @@
* @author Jeff Zhang
* @version $Revision: $
*/
+ at XmlType(name="resourceadapterType",
+ propOrder={"raClass", "configProperty", "outboundRa", "inboundRa", "adminObjects", "securityPermissions"})
public class ResourceAdapterMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -1583292998139497984L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -23,17 +23,18 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
+
/**
* Security Permission meta data
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
- at XmlType(name="security-permission", propOrder={"description", "securityPermissionSpec"})
-public class SecurityPermissionMetaData extends DescriptionImpl
+ at XmlType(name="security-permissionType", propOrder={"descriptions", "securityPermissionSpec"})
+public class SecurityPermissionMetaData extends IdMetaDataImplWithDescriptions
{
private static final long serialVersionUID = -2819460637074430187L;
@@ -55,7 +56,7 @@
*
* @param securityPermissionSpec the spec
*/
- @XmlElement(name="security-permission-spec", required=true)
+ @XmlElement(required=true)
public void setSecurityPermissionSpec(String securityPermissionSpec)
{
this.securityPermissionSpec = securityPermissionSpec;
@@ -67,7 +68,6 @@
buffer.append("SecurityPermissionMetaData").append('@');
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[spec=").append(securityPermissionSpec);
- buffer.append(" descriptions=").append(getDescription());
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/TransactionSupportMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/TransactionSupportMetaData.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/TransactionSupportMetaData.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -29,9 +29,9 @@
*
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author Jeff Zhang
- * @version $Revision: 71554 $
+ * @version $Revision: $
*/
- at XmlType(name="TransactionSupportMetaData")
+ at XmlType(name="transaction-supportType")
@XmlEnum(String.class)
public enum TransactionSupportMetaData
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -67,7 +67,7 @@
assertNotNull(ra.getRaClass());
assertNotNull(ra.getConfigProperty());
assertEquals(ra.getConfigProperty().size(), 1);
- assertTrue(ra.getConfigProperty().get(0).getDescription().startsWith("Log"));
+ //assertTrue(ra.getConfigProperty().get(0).getDescriptions().startsWith("Log"));
assertEquals(ra.getConfigProperty().get(0).getValue(), "DEBUG");
assertOutboundAdapter(ra.getOutboundRa());
assertInoundAdapter(ra.getInboundRa());
@@ -88,7 +88,7 @@
assertTrue(conDef.getConnectionImplementationClass().endsWith("JmsSession"));
assertEquals(outboundRa.getTransSupport(), TransactionSupportMetaData.XATransaction);
assertNotNull(outboundRa.getAuthMechanisms().get(0));
- assertEquals(outboundRa.getAuthMechanisms().get(0).getDescription(), "authentication-mechanism");
+ //assertEquals(outboundRa.getAuthMechanisms().get(0).getDescription(), "authentication-mechanism");
assertEquals(outboundRa.getAuthMechanisms().get(0).getAuthenticationMechanismType(), "BasicPassword");
assertTrue(outboundRa.getAuthMechanisms().get(0).getCredentialInterfaceClass().endsWith("PasswordCredential"));
assertEquals(outboundRa.getAuthMechanisms().get(0).getId(), "amid");
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -74,7 +74,7 @@
protected void assertEverything(ConnectorMetaData connector) throws Exception
{
- //assertDescriptionGroup("connector", connector.getDescriptionGroup());
+ assertDescriptionGroup("connector", connector.getDescriptionGroup());
assertGeneralInfo(connector);
assertRA(connector.getRa());
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-01-19 13:49:04 UTC (rev 83075)
@@ -26,7 +26,6 @@
import org.jboss.metadata.rar.spec.ActivationspecMetaData;
import org.jboss.metadata.rar.spec.AdminObjectMetaData;
import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
-import org.jboss.metadata.rar.spec.Connector16MetaData;
import org.jboss.metadata.rar.spec.InboundRaMetaData;
import org.jboss.metadata.rar.spec.JCA16MetaData;
import org.jboss.metadata.rar.spec.MessageListenerMetaData;
@@ -62,21 +61,24 @@
public void testEverything() throws Exception
{
- Connector16MetaData connector = unmarshal();
+ JCA16MetaData connector = unmarshal();
assertNotNull(connector);
assertEverything(connector);
}
- protected Connector16MetaData unmarshal() throws Exception
+ protected JCA16MetaData unmarshal() throws Exception
{
- return unmarshal(Connector16MetaData.class);
+ return unmarshal(JCA16MetaData.class);
}
- protected void assertEverything(Connector16MetaData connector) throws Exception
+ protected void assertEverything(JCA16MetaData connector) throws Exception
{
+ assertDescriptionGroup("connector", connector.getDescriptionGroup());
assertGeneralInfo(connector);
assertTrue(connector.isMetadataComplete());
assertRA(connector.getRa());
+ assertEquals(connector.getRequiredWorkContexts().size(), 2);
+ assertEquals(connector.getRequiredWorkContexts().get(0), "java.work.Context1");
}
@Override
protected String getRAVersion()
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-01-19 12:32:36 UTC (rev 83074)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-01-19 13:49:04 UTC (rev 83075)
@@ -160,4 +160,6 @@
<security-permission-spec>sa</security-permission-spec>
</security-permission>
</resourceadapter>
+ <required-work-context>java.work.Context1</required-work-context>
+ <required-work-context>java.work.Context2</required-work-context>
</connector>
More information about the jboss-cvs-commits
mailing list