User: stark
Date: 01/02/27 08:37:53
Modified: src/main/org/jboss/metadata BeanMetaData.java
ApplicationMetaData.java
Log:
Add support for security proxy config and security domain name.
Revision Changes Path
1.15 +9 -4 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BeanMetaData.java 2000/12/07 15:45:00 1.14
+++ BeanMetaData.java 2001/02/27 16:37:53 1.15
@@ -25,7 +25,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public abstract class BeanMetaData extends MetaData {
// Constants -----------------------------------------------------
@@ -53,7 +53,7 @@
private String jndiName;
protected String configurationName;
private ConfigurationMetaData configuration;
-
+ private String securityProxy;
// Static --------------------------------------------------------
@@ -111,7 +111,9 @@
}
return configuration;
}
-
+
+ public String getSecurityProxy() { return securityProxy; }
+
public ApplicationMetaData getApplicationMetaData() { return application; }
public abstract String getDefaultConfigurationName();
@@ -240,7 +242,10 @@
if (configurationName != null &&
getApplicationMetaData().getConfigurationMetaDataByName(configurationName) == null) {
throw new DeploymentException("configuration '" +
configurationName + "' not found in standardjboss.xml or jboss.xml");
}
-
+
+ // Get the security proxy
+ securityProxy = getElementContent(getOptionalChild(element,
"security-proxy"), securityProxy);
+
// update the resource references (optional)
Iterator iterator = getChildrenByTagName(element, "resource-ref");
while (iterator.hasNext()) {
1.13 +15 -5 jboss/src/main/org/jboss/metadata/ApplicationMetaData.java
Index: ApplicationMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/metadata/ApplicationMetaData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApplicationMetaData.java 2000/12/07 15:45:00 1.12
+++ ApplicationMetaData.java 2001/02/27 16:37:53 1.13
@@ -27,7 +27,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author Peter Antman ([EMAIL PROTECTED])
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class ApplicationMetaData extends MetaData {
// Constants -----------------------------------------------------
@@ -39,8 +39,8 @@
private ArrayList securityRoles = new ArrayList();
private HashMap configurations = new HashMap();
private HashMap resources = new HashMap();
- private HashMap plugins = new HashMap();
-
+ private HashMap plugins = new HashMap();
+ private String securityDomain;
// Static --------------------------------------------------------
@@ -92,7 +92,12 @@
public Object getPluginData(String pluginName) {
return plugins.get(pluginName);
}
-
+
+ public String getSecurityDomain()
+ {
+ return securityDomain;
+ }
+
public void importEjbJarXml (Element element) throws DeploymentException {
// find the beans
@@ -243,7 +248,12 @@
Iterator iterator;
// all the tags are optional
-
+
+ // Get the security domain name
+ Element securityDomainElement = getOptionalChild(element, "security-domain");
+ if( securityDomainElement != null )
+ securityDomain = getElementContent(securityDomainElement);
+
// find the container configurations (we need them first to use them in the
beans)
Element confs = getOptionalChild(element, "container-configurations");
if (confs != null) {
