[jboss-cvs] JBossAS SVN: r58228 - in trunk/server/src/main/org/jboss: deployment metadata
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 9 04:32:02 EST 2006
Author: alex.loubyansky at jboss.com
Date: 2006-11-09 04:31:59 -0500 (Thu, 09 Nov 2006)
New Revision: 58228
Modified:
trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
trunk/server/src/main/org/jboss/metadata/MessageDrivenMetaData.java
Log:
parse more bean info
Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java 2006-11-09 00:51:23 UTC (rev 58227)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java 2006-11-09 09:31:59 UTC (rev 58228)
@@ -25,15 +25,14 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
-import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.DDObjectFactory;
import org.jboss.metadata.InvokerProxyBindingMetaData;
-import org.jboss.metadata.MessageDestinationMetaData;
-import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metadata.ConfigurationMetaData;
import org.jboss.metadata.ClusterConfigMetaData;
+import org.jboss.metadata.EntityMetaData;
+import org.jboss.metadata.MessageDrivenMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.jboss.mx.util.ObjectNameFactory;
import org.xml.sax.Attributes;
@@ -52,12 +51,8 @@
{
private static DocumentBuilder DOC_BUILDER;
- private static Logger log = Logger.getLogger(JBossEjbObjectFactory.class);
private ApplicationMetaData appMetaData;
- static class EnterpriseBeans
- {
- }
static class BeanHolder
{
String ejbName;
@@ -96,15 +91,9 @@
String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
- log.debug("newChild, "+localName);
- if ((child = newEnvRefGroupChild(localName)) != null)
- return child;
- else if (localName.equals("security-role"))
- child = new SecurityRoleMetaData();
- // TODO
- else if (localName.equals("message-destination"))
+ if(localName.equals("loader-repository"))
{
- child = new MessageDestinationMetaData();
+ // todo
}
else if(localName.equals("invoker-proxy-bindings"))
{
@@ -145,17 +134,18 @@
}
else if(localName.equals("enterprise-beans"))
{
- child = new EnterpriseBeans();
+ child = dd;
}
- return child;
- }
-
- public Object newChild(EnterpriseBeans beans, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
- {
- Object child = null;
- if (localName.equals("entity") || localName.equals("session") || localName.equals("message-driven") )
+ else if (localName.equals("entity") ||
+ localName.equals("session") ||
+ localName.equals("message-driven") )
+ {
child = new BeanHolder();
+ }
+ else if(localName.equals("resource-managers"))
+ {
+ // TODO
+ }
return child;
}
@@ -266,6 +256,10 @@
{
amd.setJmxName(value);
}
+ else if(localName.equals("enforce-ejb-restrictions"))
+ {
+ amd.setEnforceEjbRestrictions(Boolean.parseBoolean(value));
+ }
else if(localName.equals("exception-on-rollback"))
{
boolean flag = Boolean.valueOf(value);
@@ -275,11 +269,14 @@
{
amd.setSecurityDomain(value);
}
+ else if(localName.equals("missing-method-permissions-excluded-mode"))
+ {
+ amd.setExcludeMissingMethods(Boolean.parseBoolean(value));
+ }
else if(localName.equals("unauthenticated-principal"))
{
amd.setUnauthenticatedPrincipal(value);
}
-
}
public void setValue(InvokerProxyBindingMetaData md,
@@ -304,11 +301,16 @@
UnmarshallingContext navigator, String namespaceURI, String localName,
String value)
{
+ // common for entity, session and message-driven
if( localName.equals("ejb-name") )
{
bean.ejbName = value;
// Lookup the metadata
bean.metaData = appMetaData.getBeanByEjbName(value);
+ if(bean.metaData == null)
+ {
+ throw new IllegalStateException("Bean " + value + " not declared in the ejb-jar.xml");
+ }
}
else if( localName.equals("jndi-name") )
{
@@ -318,11 +320,70 @@
{
bean.metaData.setLocalJndiName(value);
}
+ else if(localName.equals("exception-on-rollback"))
+ {
+ bean.metaData.setExceptionRollback(Boolean.parseBoolean(value));
+ }
+ else if(localName.equals("timer-persistence"))
+ {
+ bean.metaData.setTimerPersistence(Boolean.parseBoolean(value));
+ }
+ else if(localName.equals("configuration-name"))
+ {
+ bean.metaData.setConfigurationName(value);
+ }
+ else if(localName.equals("security-proxy"))
+ {
+ bean.metaData.setSecurityProxy(value);
+ }
+ else if(localName.equals("depends"))
+ {
+ bean.metaData.getDepends().add(ObjectNameFactory.create(value));
+ }
+ // session and entity elements
else if( localName.equals("call-by-value") )
{
boolean flag = Boolean.valueOf(value);
bean.metaData.setCallByValue(flag);
}
+ else if(localName.equals("clustered"))
+ {
+ bean.metaData.setClustered(Boolean.parseBoolean(value));
+ }
+ // entity elements
+ else if(localName.equals("read-only"))
+ {
+ ((EntityMetaData)bean.metaData).setReadOnly(Boolean.parseBoolean(value));
+ }
+ else if(localName.equals("cache-invalidation"))
+ {
+ ((EntityMetaData)bean.metaData).setDoDistCachInvalidations(Boolean.parseBoolean(value));
+ }
+ // message-driven elements
+ else if(localName.equals("destination-jndi-name"))
+ {
+ ((MessageDrivenMetaData)bean.metaData).setDestinationJndiName(value);
+ }
+ else if(localName.equals("mdb-user"))
+ {
+ ((MessageDrivenMetaData)bean.metaData).setUser(value);
+ }
+ else if(localName.equals("mdb-passwd"))
+ {
+ ((MessageDrivenMetaData)bean.metaData).setPasswd(value);
+ }
+ else if(localName.equals("mdb-client-id"))
+ {
+ ((MessageDrivenMetaData)bean.metaData).setClientId(value);
+ }
+ else if(localName.equals("mdb-subscription-id"))
+ {
+ ((MessageDrivenMetaData)bean.metaData).setSubscriptionId(value);
+ }
+ else if(localName.equals("resource-adapter-name"))
+ {
+ ((MessageDrivenMetaData)bean.metaData).setResourceAdapterName(value);
+ }
}
public void setValue(ConfigurationMetaData container,
Modified: trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java 2006-11-09 00:51:23 UTC (rev 58227)
+++ trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java 2006-11-09 09:31:59 UTC (rev 58228)
@@ -378,11 +378,21 @@
return enforceEjbRestrictions;
}
+ public void setEnforceEjbRestrictions(boolean enforceEjbRestrictions)
+ {
+ this.enforceEjbRestrictions = enforceEjbRestrictions;
+ }
+
public boolean isExcludeMissingMethods()
{
return excludeMissingMethods;
}
+ public void setExcludeMissingMethods(boolean excludeMissingMethods)
+ {
+ this.excludeMissingMethods = excludeMissingMethods;
+ }
+
public MessageDestinationMetaData getMessageDestination(String name)
{
return assemblyDescriptor.getMessageDestinationMetaData(name);
Modified: trunk/server/src/main/org/jboss/metadata/MessageDrivenMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/MessageDrivenMetaData.java 2006-11-09 00:51:23 UTC (rev 58227)
+++ trunk/server/src/main/org/jboss/metadata/MessageDrivenMetaData.java 2006-11-09 09:31:59 UTC (rev 58228)
@@ -229,27 +229,52 @@
{
return destinationJndiName;
}
-
+
+ public void setDestinationJndiName(String destinationJndiName)
+ {
+ this.destinationJndiName = destinationJndiName;
+ }
+
public String getUser()
{
return user;
}
-
+
+ public void setUser(String user)
+ {
+ this.user = user;
+ }
+
public String getPasswd()
{
return passwd;
}
-
+
+ public void setPasswd(String passwd)
+ {
+ this.passwd = passwd;
+ }
+
public String getClientId()
{
return clientId;
}
-
+
+ public void setClientId(String clientId)
+ {
+ this.clientId = clientId;
+ }
+
public String getSubscriptionId()
{
return subscriptionId;
}
-
+
+ public void setSubscriptionId(String subscriptionId)
+ {
+ this.subscriptionId = subscriptionId;
+ }
+
/**
* Check MDB methods TX type, is cached here
*/
@@ -354,7 +379,12 @@
{
return resourceAdapterName;
}
-
+
+ public void setResourceAdapterName(String resourceAdapterName)
+ {
+ this.resourceAdapterName = resourceAdapterName;
+ }
+
public void importEjbJarXml(Element element) throws DeploymentException
{
super.importEjbJarXml(element);
More information about the jboss-cvs-commits
mailing list