User: salborini
Date: 00/08/14 18:40:58
Modified: src/main/org/jboss/metadata BeanMetaData.java
ResourceRefMetaData.java
Log:
Added support for resource-ref tag in jboss.xml
Revision Changes Path
1.5 +13 -7 jboss/src/main/org/jboss/metadata/BeanMetaData.java
Index: BeanMetaData.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/BeanMetaData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BeanMetaData.java 2000/08/12 00:37:57 1.4
+++ BeanMetaData.java 2000/08/15 01:40:57 1.5
@@ -8,6 +8,7 @@
import java.util.Iterator;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Set;
import org.w3c.dom.Element;
@@ -20,7 +21,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class BeanMetaData extends MetaData {
// Constants -----------------------------------------------------
@@ -38,7 +39,7 @@
private ArrayList ejbReferences = new ArrayList();
private ArrayList environmentEntries = new ArrayList();
private ArrayList securityRoleReferences = new ArrayList();
- private ArrayList resourceReferences = new ArrayList();
+ private HashMap resourceReferences = new HashMap();
private ArrayList permissionMethods = new ArrayList();
private ArrayList transactionMethods = new ArrayList();
@@ -75,7 +76,7 @@
public Iterator getSecurityRoleReferences() { return
securityRoleReferences.iterator(); }
- public Iterator getResourceReferences() { return
resourceReferences.iterator(); }
+ public Iterator getResourceReferences() { return
resourceReferences.values().iterator(); }
public String getJndiName() {
// jndiName may be set in jboss.xml
@@ -192,7 +193,7 @@
ResourceRefMetaData resourceRefMetaData = new
ResourceRefMetaData();
resourceRefMetaData.importEjbJarXml(resourceRef);
- resourceReferences.add(resourceRefMetaData);
+ resourceReferences.put(resourceRefMetaData.getRefName(),
resourceRefMetaData);
}
}
@@ -205,10 +206,15 @@
// set the configuration (optional)
configurationName = getElementContent(getOptionalChild(element,
"configuration-name"));
- // TODO set the resource references (optional)
+ // update the resource references (optional)
Iterator iterator = getChildrenByTagName(element, "resource-ref");
-
-
+ while (iterator.hasNext()) {
+ Element resourceRef = (Element)iterator.next();
+ String resRefName =
getElementContent(getUniqueChild(resourceRef, "res-ref-name"));
+ String resourceName =
getElementContent(getUniqueChild(resourceRef, "resource-name"));
+ ResourceRefMetaData resourceRefMetaData =
(ResourceRefMetaData)resourceReferences.get(resRefName);
+ resourceRefMetaData.setResourceName(resourceName);
+ }
}
1.2 +4 -1 jboss/src/main/org/jboss/metadata/ResourceRefMetaData.java
Index: ResourceRefMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/ResourceRefMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceRefMetaData.java 2000/08/12 00:37:59 1.1
+++ ResourceRefMetaData.java 2000/08/15 01:40:57 1.2
@@ -15,7 +15,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ResourceRefMetaData extends MetaData {
// Constants -----------------------------------------------------
@@ -46,6 +46,9 @@
return name;
}
+ public void setResourceName(String resName) {
+ name = resName;
+ }
public String getType() { return type; }
