User: starksm
Date: 01/11/02 00:42:37
Modified: src/main/org/jboss/metadata Tag: Branch_2_4
ApplicationMetaData.java BeanMetaData.java
ConfigurationMetaData.java EjbLocalRefMetaData.java
EjbRefMetaData.java EntityMetaData.java
EnvEntryMetaData.java MessageDrivenMetaData.java
MetaData.java MethodMetaData.java
ResourceEnvRefMetaData.java
ResourceRefMetaData.java
SecurityIdentityMetaData.java
SecurityRoleRefMetaData.java SessionMetaData.java
WebMetaData.java XmlFileLoader.java
Log:
Remove org.jboss.ejb.DeploymentException in favor of
org.jboss.deploymen.DeploymentException
Revision Changes Path
No revision
No revision
1.16.4.2 +3 -3 jboss/src/main/org/jboss/metadata/ApplicationMetaData.java
Index: ApplicationMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/ApplicationMetaData.java,v
retrieving revision 1.16.4.1
retrieving revision 1.16.4.2
diff -u -r1.16.4.1 -r1.16.4.2
--- ApplicationMetaData.java 2001/06/22 04:09:32 1.16.4.1
+++ ApplicationMetaData.java 2001/11/02 08:42:36 1.16.4.2
@@ -17,7 +17,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The top level meta data from the jboss.xml descriptor.
@@ -26,8 +26,8 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>.
- * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
- * @version $Revision: 1.16.4.1 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.16.4.2 $
*/
public class ApplicationMetaData extends MetaData
{
1.23.2.2 +2 -2 jboss/src/main/org/jboss/metadata/BeanMetaData.java
Index: BeanMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/BeanMetaData.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- BeanMetaData.java 2001/09/04 01:52:06 1.23.2.1
+++ BeanMetaData.java 2001/11/02 08:42:36 1.23.2.2
@@ -16,7 +16,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.security.AnybodyPrincipal;
import org.jboss.security.NobodyPrincipal;
import org.jboss.security.SimplePrincipal;
@@ -29,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel OConnor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.23.2.1 $
+ * @version $Revision: 1.23.2.2 $
*/
public abstract class BeanMetaData
extends MetaData
1.14.2.2 +234 -205 jboss/src/main/org/jboss/metadata/ConfigurationMetaData.java
Index: ConfigurationMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/metadata/ConfigurationMetaData.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- ConfigurationMetaData.java 2001/09/04 01:52:06 1.14.2.1
+++ ConfigurationMetaData.java 2001/11/02 08:42:36 1.14.2.2
@@ -8,218 +8,247 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The configuration information for an EJB container.
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.14.2.1 $
+ * @version $Revision: 1.14.2.2 $
*/
-public class ConfigurationMetaData extends MetaData {
-
- // Constants -----------------------------------------------------
- public static final String CMP_13 = "Standard CMP EntityBean";
- public static final String BMP_13 = "Standard BMP EntityBean";
- public static final String STATELESS_13 = "Standard Stateless SessionBean";
- public static final String STATEFUL_13 = "Standard Stateful SessionBean";
- public static final String MESSAGE_DRIVEN_13 = "Standard Message Driven Bean";
- public static final String CMP_12 = "jdk1.2.2 CMP EntityBean";
- public static final String BMP_12 = "jdk1.2.2 BMP EntityBean";
- public static final String STATELESS_12 = "jdk1.2.2 Stateless SessionBean";
- public static final String STATEFUL_12 = "jdk1.2.2 Stateful SessionBean";
- public static final String MESSAGE_DRIVEN_12 = "jdk1.2.2 Message Driven Bean";
-
- public static final byte A_COMMIT_OPTION = 0;
- public static final byte B_COMMIT_OPTION = 1;
- public static final byte C_COMMIT_OPTION = 2;
- /** D_COMMIT_OPTION is a lazy load option. By default it synchronizes every 30
seconds */
- public static final byte D_COMMIT_OPTION = 3;
- public static final String[] commitOptionStrings = { "A", "B", "C", "D"};
-
- // Attributes ----------------------------------------------------
+public class ConfigurationMetaData extends MetaData
+{
+
+ // Constants -----------------------------------------------------
+ public static final String CMP_13 = "Standard CMP EntityBean";
+ public static final String BMP_13 = "Standard BMP EntityBean";
+ public static final String STATELESS_13 = "Standard Stateless SessionBean";
+ public static final String STATEFUL_13 = "Standard Stateful SessionBean";
+ public static final String MESSAGE_DRIVEN_13 = "Standard Message Driven Bean";
+ public static final String CMP_12 = "jdk1.2.2 CMP EntityBean";
+ public static final String BMP_12 = "jdk1.2.2 BMP EntityBean";
+ public static final String STATELESS_12 = "jdk1.2.2 Stateless SessionBean";
+ public static final String STATEFUL_12 = "jdk1.2.2 Stateful SessionBean";
+ public static final String MESSAGE_DRIVEN_12 = "jdk1.2.2 Message Driven Bean";
+
+ public static final byte A_COMMIT_OPTION = 0;
+ public static final byte B_COMMIT_OPTION = 1;
+ public static final byte C_COMMIT_OPTION = 2;
+ /** D_COMMIT_OPTION is a lazy load option. By default it synchronizes every 30
seconds */
+ public static final byte D_COMMIT_OPTION = 3;
+ public static final String[] commitOptionStrings =
+ { "A", "B", "C", "D"};
+
+ // Attributes ----------------------------------------------------
private String lockClass = "org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock";
- private String name;
- private String containerInvoker;
- private String instancePool;
- private String instanceCache;
- private String persistenceManager;
- private String transactionManager;
- private byte commitOption;
- private long optionDRefreshRate = 30000;
- private boolean callLogging;
- private boolean readOnlyGetMethods;
-
- private String securityDomain;
- private String authenticationModule;
- private String roleMappingManager;
-
- private Element containerInvokerConf;
- private Element containerPoolConf;
- private Element containerCacheConf;
- private Element containerInterceptorsConf;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
- public ConfigurationMetaData (String name) {
- this.name = name;
- }
-
- // Public --------------------------------------------------------
-
- public String getName() { return name; }
-
- public String getContainerInvoker() { return containerInvoker; }
-
- public String getInstancePool() { return instancePool; }
-
- public String getInstanceCache() { return instanceCache; }
-
- public String getPersistenceManager() { return persistenceManager; }
-
- public String getSecurityDomain() { return securityDomain; }
- public String getAuthenticationModule() { return authenticationModule; }
-
- public String getRoleMappingManager() { return roleMappingManager; }
-
- public String getTransactionManager() { return transactionManager; }
-
- public String getLockClass() {return lockClass;}
-
- public Element getContainerInvokerConf() { return containerInvokerConf; }
- public Element getContainerPoolConf() { return containerPoolConf; }
- public Element getContainerCacheConf() { return containerCacheConf; }
- public Element getContainerInterceptorsConf() { return
containerInterceptorsConf; }
-
- public boolean getCallLogging() { return callLogging; }
-
- public byte getCommitOption() { return commitOption; }
-
- public long getOptionDRefreshRate() { return optionDRefreshRate; }
-
- public boolean getReadOnlyGetMethods() { return readOnlyGetMethods; }
-
- public void importJbossXml(Element element) throws DeploymentException {
-
- // everything is optional to allow jboss.xml to modify part of a
configuration
- // defined in standardjboss.xml
-
- // set call logging
- callLogging = Boolean.valueOf(getElementContent(getOptionalChild(element,
"call-logging"), String.valueOf(callLogging))).booleanValue();
-
- // set read-only get methods
- readOnlyGetMethods =
Boolean.valueOf(getElementContent(getOptionalChild(element,
"read-only-get-methods"))).booleanValue();
-
- // set the container invoker
- containerInvoker = getElementContent(getOptionalChild(element,
"container-invoker"), containerInvoker);
-
- // set the instance pool
- instancePool = getElementContent(getOptionalChild(element,
"instance-pool"), instancePool);
-
- // set the instance cache
- instanceCache = getElementContent(getOptionalChild(element,
"instance-cache"), instanceCache);
-
- // set the persistence manager
- persistenceManager = getElementContent(getOptionalChild(element,
"persistence-manager"), persistenceManager);
-
- // set the transaction manager
- transactionManager = getElementContent(getOptionalChild(element,
"transaction-manager"), transactionManager);
-
- // set the lock class
- lockClass = getElementContent(getOptionalChild(element, "locking-policy"),
lockClass);
-
- // set the security domain
- securityDomain = getElementContent(getOptionalChild(element,
"security-domain"), securityDomain);
- // set the authentication module
- authenticationModule = getElementContent(getOptionalChild(element,
"authentication-module"), authenticationModule);
- // set the role mapping manager
- roleMappingManager = getElementContent(getOptionalChild(element,
"role-mapping-manager"), roleMappingManager);
+ private String name;
+ private String containerInvoker;
+ private String instancePool;
+ private String instanceCache;
+ private String persistenceManager;
+ private String transactionManager;
+ private byte commitOption;
+ private long optionDRefreshRate = 30000;
+ private boolean callLogging;
+ private boolean readOnlyGetMethods;
+
+ private String securityDomain;
+ private String authenticationModule;
+ private String roleMappingManager;
+
+ private Element containerInvokerConf;
+ private Element containerPoolConf;
+ private Element containerCacheConf;
+ private Element containerInterceptorsConf;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+ public ConfigurationMetaData(String name)
+ {
+ this.name = name;
+ }
+
+ // Public --------------------------------------------------------
+
+ public String getName()
+ { return name; }
+
+ public String getContainerInvoker()
+ { return containerInvoker; }
+
+ public String getInstancePool()
+ { return instancePool; }
+
+ public String getInstanceCache()
+ { return instanceCache; }
+
+ public String getPersistenceManager()
+ { return persistenceManager; }
+
+ public String getSecurityDomain()
+ { return securityDomain; }
+ public String getAuthenticationModule()
+ { return authenticationModule; }
+
+ public String getRoleMappingManager()
+ { return roleMappingManager; }
+
+ public String getTransactionManager()
+ { return transactionManager; }
+
+ public String getLockClass()
+ {return lockClass;}
+
+ public Element getContainerInvokerConf()
+ { return containerInvokerConf; }
+ public Element getContainerPoolConf()
+ { return containerPoolConf; }
+ public Element getContainerCacheConf()
+ { return containerCacheConf; }
+ public Element getContainerInterceptorsConf()
+ { return containerInterceptorsConf; }
+
+ public boolean getCallLogging()
+ { return callLogging; }
+
+ public byte getCommitOption()
+ { return commitOption; }
+
+ public long getOptionDRefreshRate()
+ { return optionDRefreshRate; }
+
+ public boolean getReadOnlyGetMethods()
+ { return readOnlyGetMethods; }
+
+ public void importJbossXml(Element element) throws DeploymentException
+ {
+
+ // everything is optional to allow jboss.xml to modify part of a configuration
+ // defined in standardjboss.xml
+
+ // set call logging
+ callLogging = Boolean.valueOf(getElementContent(getOptionalChild(element,
"call-logging"), String.valueOf(callLogging))).booleanValue();
+
+ // set read-only get methods
+ readOnlyGetMethods =
Boolean.valueOf(getElementContent(getOptionalChild(element,
"read-only-get-methods"))).booleanValue();
+
+ // set the container invoker
+ containerInvoker = getElementContent(getOptionalChild(element,
"container-invoker"), containerInvoker);
+
+ // set the instance pool
+ instancePool = getElementContent(getOptionalChild(element, "instance-pool"),
instancePool);
+
+ // set the instance cache
+ instanceCache = getElementContent(getOptionalChild(element,
"instance-cache"), instanceCache);
+
+ // set the persistence manager
+ persistenceManager = getElementContent(getOptionalChild(element,
"persistence-manager"), persistenceManager);
+
+ // set the transaction manager
+ transactionManager = getElementContent(getOptionalChild(element,
"transaction-manager"), transactionManager);
+
+ // set the lock class
+ lockClass = getElementContent(getOptionalChild(element, "locking-policy"),
lockClass);
+
+ // set the security domain
+ securityDomain = getElementContent(getOptionalChild(element,
"security-domain"), securityDomain);
+ // set the authentication module
+ authenticationModule = getElementContent(getOptionalChild(element,
"authentication-module"), authenticationModule);
+ // set the role mapping manager
+ roleMappingManager = getElementContent(getOptionalChild(element,
"role-mapping-manager"), roleMappingManager);
/* If the authenticationModule == roleMappingManager just set the
securityDomain
as this is the combination of the authentication-module and
role-mapping-manager
behaviors
- */
- if( authenticationModule != null && roleMappingManager != null &&
- roleMappingManager.equals(authenticationModule) )
- {
- securityDomain = authenticationModule;
- authenticationModule = null;
- roleMappingManager = null;
- }
- // Don't allow only a authentication-module or role-mapping-manager
- else if( (authenticationModule == null && roleMappingManager != null)
- || (authenticationModule != null && roleMappingManager == null) )
- {
- String msg = "Either a security-domain or both authentication-module "
- + "and role-mapping-manager must be specified";
- throw new DeploymentException(msg);
- }
-
- // set the commit option
- String commit = getElementContent(getOptionalChild(element,
"commit-option"), commitOptionToString(commitOption));
-
- commitOption = stringToCommitOption(commit);
-
- //get the refresh rate for option D
- String refresh = getElementContent(getOptionalChild(element,
"optiond-refresh-rate"), Long.toString(optionDRefreshRate));
- optionDRefreshRate = stringToRefreshRate(refresh);
-
- // the classes which can understand the following are dynamically loaded
during deployment :
- // We save the Elements for them to use later
-
- // The configuration for the container interceptors
- containerInterceptorsConf = getOptionalChild(element,
"container-interceptors", containerInterceptorsConf);
-
- // configuration for container invoker
- containerInvokerConf = getOptionalChild(element, "container-invoker-conf",
containerInvokerConf);
-
- // configuration for instance pool
- containerPoolConf = getOptionalChild(element, "container-pool-conf",
containerPoolConf);
-
- // configuration for instance cache
- containerCacheConf = getOptionalChild(element, "container-cache-conf",
containerCacheConf);
-
- // DEPRECATED: Remove this in JBoss 4.0
- if
(containerInvoker.equals("org.jboss.ejb.plugins.jrmp12.server.JRMPContainerInvoker") ||
-
containerInvoker.equals("org.jboss.ejb.plugins.jrmp13.server.JRMPContainerInvoker"))
- {
- System.out.println("Deprecated container invoker. Change to
org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker");
- containerInvoker =
"org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker";
- }
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
- private static String commitOptionToString(byte commitOption)
- throws DeploymentException {
-
- try {
- return commitOptionStrings[commitOption];
- } catch( ArrayIndexOutOfBoundsException e ) {
- throw new DeploymentException("Invalid commit option: " +
commitOption);
- }
- }
-
- private static byte stringToCommitOption(String commitOption)
- throws DeploymentException {
-
- for( byte i=0; i<commitOptionStrings.length; ++i )
- if( commitOptionStrings[i].equals(commitOption) )
- return i;
-
- throw new DeploymentException("Invalid commit option: '" + commitOption +
"'");
- }
-
- private static long stringToRefreshRate(String refreshRate) throws
DeploymentException {
- try{
- return Long.parseLong(refreshRate);
- } catch ( Exception e){
- throw new DeploymentException("Invalid optiond-refresh-rate \"" +
refreshRate + "\". Should be a number");
- }
-
- }
-
- // Inner classes -------------------------------------------------
+ */
+ if( authenticationModule != null && roleMappingManager != null &&
+ roleMappingManager.equals(authenticationModule) )
+ {
+ securityDomain = authenticationModule;
+ authenticationModule = null;
+ roleMappingManager = null;
+ }
+ // Don't allow only a authentication-module or role-mapping-manager
+ else if( (authenticationModule == null && roleMappingManager != null)
+ || (authenticationModule != null && roleMappingManager == null) )
+ {
+ String msg = "Either a security-domain or both authentication-module "
+ + "and role-mapping-manager must be specified";
+ throw new DeploymentException(msg);
+ }
+
+ // set the commit option
+ String commit = getElementContent(getOptionalChild(element, "commit-option"),
commitOptionToString(commitOption));
+
+ commitOption = stringToCommitOption(commit);
+
+ //get the refresh rate for option D
+ String refresh = getElementContent(getOptionalChild(element,
"optiond-refresh-rate"), Long.toString(optionDRefreshRate));
+ optionDRefreshRate = stringToRefreshRate(refresh);
+
+ // the classes which can understand the following are dynamically loaded
during deployment :
+ // We save the Elements for them to use later
+
+ // The configuration for the container interceptors
+ containerInterceptorsConf = getOptionalChild(element,
"container-interceptors", containerInterceptorsConf);
+
+ // configuration for container invoker
+ containerInvokerConf = getOptionalChild(element, "container-invoker-conf",
containerInvokerConf);
+
+ // configuration for instance pool
+ containerPoolConf = getOptionalChild(element, "container-pool-conf",
containerPoolConf);
+
+ // configuration for instance cache
+ containerCacheConf = getOptionalChild(element, "container-cache-conf",
containerCacheConf);
+
+ // DEPRECATED: Remove this in JBoss 4.0
+ if
(containerInvoker.equals("org.jboss.ejb.plugins.jrmp12.server.JRMPContainerInvoker") ||
+
containerInvoker.equals("org.jboss.ejb.plugins.jrmp13.server.JRMPContainerInvoker"))
+ {
+ System.out.println("Deprecated container invoker. Change to
org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker");
+ containerInvoker =
"org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker";
+ }
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+ private static String commitOptionToString(byte commitOption)
+ throws DeploymentException
+ {
+
+ try
+ {
+ return commitOptionStrings[commitOption];
+ } catch( ArrayIndexOutOfBoundsException e )
+ {
+ throw new DeploymentException("Invalid commit option: " + commitOption);
+ }
+ }
+
+ private static byte stringToCommitOption(String commitOption)
+ throws DeploymentException
+ {
+
+ for( byte i=0; i<commitOptionStrings.length; ++i )
+ if( commitOptionStrings[i].equals(commitOption) )
+ return i;
+
+ throw new DeploymentException("Invalid commit option: '" + commitOption +
"'");
+ }
+
+ private static long stringToRefreshRate(String refreshRate) throws
DeploymentException
+ {
+ try
+ {
+ return Long.parseLong(refreshRate);
+ } catch ( Exception e)
+ {
+ throw new DeploymentException("Invalid optiond-refresh-rate \"" +
refreshRate + "\". Should be a number");
+ }
+
+ }
+
+ // Inner classes -------------------------------------------------
}
1.2.4.1 +1 -1 jboss/src/main/org/jboss/metadata/EjbLocalRefMetaData.java
Index: EjbLocalRefMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/EjbLocalRefMetaData.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- EjbLocalRefMetaData.java 2001/06/03 20:58:01 1.2
+++ EjbLocalRefMetaData.java 2001/11/02 08:42:36 1.2.4.1
@@ -8,7 +8,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/**
* <description>
1.3.6.1 +2 -2 jboss/src/main/org/jboss/metadata/EjbRefMetaData.java
Index: EjbRefMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/EjbRefMetaData.java,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- EjbRefMetaData.java 2000/12/07 15:45:00 1.3
+++ EjbRefMetaData.java 2001/11/02 08:42:36 1.3.6.1
@@ -8,14 +8,14 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/**
* <description>
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.6.1 $
*/
public class EjbRefMetaData extends MetaData {
// Constants -----------------------------------------------------
1.7.4.1 +3 -3 jboss/src/main/org/jboss/metadata/EntityMetaData.java
Index: EntityMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/EntityMetaData.java,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- EntityMetaData.java 2001/06/10 07:46:16 1.7
+++ EntityMetaData.java 2001/11/02 08:42:36 1.7.4.1
@@ -10,14 +10,14 @@
import java.util.Iterator;
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The meta data information specific to entity beans.
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @author [EMAIL PROTECTED]
- * @version $Revision: 1.7 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.7.4.1 $
*/
public class EntityMetaData extends BeanMetaData {
// Constants -----------------------------------------------------
1.3.4.2 +2 -2 jboss/src/main/org/jboss/metadata/EnvEntryMetaData.java
Index: EnvEntryMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/EnvEntryMetaData.java,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- EnvEntryMetaData.java 2001/06/27 00:23:13 1.3.4.1
+++ EnvEntryMetaData.java 2001/11/02 08:42:36 1.3.4.2
@@ -11,7 +11,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.naming.Util;
/**
@@ -19,7 +19,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @version $Revision: 1.3.4.1 $
+ * @version $Revision: 1.3.4.2 $
*/
public class EnvEntryMetaData extends MetaData {
// Constants -----------------------------------------------------
1.7.4.3 +2 -2 jboss/src/main/org/jboss/metadata/MessageDrivenMetaData.java
Index: MessageDrivenMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/metadata/MessageDrivenMetaData.java,v
retrieving revision 1.7.4.2
retrieving revision 1.7.4.3
diff -u -r1.7.4.2 -r1.7.4.3
--- MessageDrivenMetaData.java 2001/11/02 06:17:06 1.7.4.2
+++ MessageDrivenMetaData.java 2001/11/02 08:42:36 1.7.4.3
@@ -11,7 +11,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/**
* <description>
@@ -31,7 +31,7 @@
* </ul>
* </p>
*
- * @version $Revision: 1.7.4.2 $
+ * @version $Revision: 1.7.4.3 $
*/
public class MessageDrivenMetaData extends BeanMetaData {
// Constants -----------------------------------------------------
1.13.6.1 +2 -2 jboss/src/main/org/jboss/metadata/MetaData.java
Index: MetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/MetaData.java,v
retrieving revision 1.13
retrieving revision 1.13.6.1
diff -u -r1.13 -r1.13.6.1
--- MetaData.java 2001/01/26 12:51:51 1.13
+++ MetaData.java 2001/11/02 08:42:36 1.13.6.1
@@ -14,7 +14,7 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/**
@@ -22,7 +22,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.13.6.1 $
*/
public abstract class MetaData implements XmlLoadable {
// Constants -----------------------------------------------------
1.8.4.2 +223 -186 jboss/src/main/org/jboss/metadata/MethodMetaData.java
Index: MethodMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/MethodMetaData.java,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -r1.8.4.1 -r1.8.4.2
--- MethodMetaData.java 2001/07/04 14:33:26 1.8.4.1
+++ MethodMetaData.java 2001/11/02 08:42:36 1.8.4.2
@@ -12,51 +12,52 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The combination of the method-permission, container-transaction
-<p>
-The method-permission element specifies that one or more security
-roles are allowed to invoke one or more enterprise bean methods. The
-method-permission element consists of an optional description, a list
-of security role names, or an indicator to specify that the methods
-are not to be checked for authorization, and a list of method elements.
-The security roles used in the method-permission element must be
-defined in the security-role element of the deployment descriptor,
-and the methods must be methods defined in the enterprise bean�s component
-and/or home interfaces.
-</p>
-<p>
-The container-transaction element specifies how the container must
-manage transaction scopes for the enterprise bean�s method invocations.
-The element consists of an optional description, a list of
-method elements, and a transaction attribute. The transaction
-attribute is to be applied to all the specified methods.
-</p>
-
+ <p>
+ The method-permission element specifies that one or more security
+ roles are allowed to invoke one or more enterprise bean methods. The
+ method-permission element consists of an optional description, a list
+ of security role names, or an indicator to specify that the methods
+ are not to be checked for authorization, and a list of method elements.
+ The security roles used in the method-permission element must be
+ defined in the security-role element of the deployment descriptor,
+ and the methods must be methods defined in the enterprise bean�s component
+ and/or home interfaces.
+ </p>
+ <p>
+ The container-transaction element specifies how the container must
+ manage transaction scopes for the enterprise bean�s method invocations.
+ The element consists of an optional description, a list of
+ method elements, and a transaction attribute. The transaction
+ attribute is to be applied to all the specified methods.
+ </p>
+
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @author [EMAIL PROTECTED]
- * @version $Revision: 1.8.4.1 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.8.4.2 $
*/
-public class MethodMetaData extends MetaData {
- // Constants -----------------------------------------------------
- public static final char HOME_METHOD = 'H';
- public static final char REMOTE_METHOD = 'R';
- public static final char LOCAL_HOME_METHOD = 'h';
- public static final char LOCAL_METHOD = 'L';
- private static final ArrayList EMPTY_PARAM_LIST = new ArrayList();
-
- // Attributes ----------------------------------------------------
- /** The method-name element contains a name of an enterprise bean method,
+public class MethodMetaData extends MetaData
+{
+ // Constants -----------------------------------------------------
+ public static final char HOME_METHOD = 'H';
+ public static final char REMOTE_METHOD = 'R';
+ public static final char LOCAL_HOME_METHOD = 'h';
+ public static final char LOCAL_METHOD = 'L';
+ private static final ArrayList EMPTY_PARAM_LIST = new ArrayList();
+
+ // Attributes ----------------------------------------------------
+ /** The method-name element contains a name of an enterprise bean method,
or the asterisk (*) character. The asterisk is used when the element
denotes all the methods of an enterprise bean�s component and home
interfaces.
*/
- private String methodName;
- private String ejbName;
-
- /** The method-intf element allows a method element to differentiate
+ private String methodName;
+ private String ejbName;
+
+ /** The method-intf element allows a method element to differentiate
between the methods with the same name and signature that are multiply
defined across the home and component interfaces (e.g., in both an
enterprise bean�s remote and local interfaces, or in both an enter-prise
@@ -66,27 +67,27 @@
<method-intf>Remote</method-intf>
<method-intf>LocalHome</method-intf>
<method-intf>Local</method-intf>
- */
- private boolean intf = false;
- /** One of: HOME_METHOD, REMOTE_METHOD, LOCAL_HOME_METHOD, LOCAL_METHOD */
- private char methodType;
- private boolean param = false;
- /** The unchecked element specifies that a method is not checked for
+ */
+ private boolean intf = false;
+ /** One of: HOME_METHOD, REMOTE_METHOD, LOCAL_HOME_METHOD, LOCAL_METHOD */
+ private char methodType;
+ private boolean param = false;
+ /** The unchecked element specifies that a method is not checked for
authorization by the container prior to invocation of the method.
Used in: method-permission
- */
- private boolean unchecked = false;
- /** The exclude-list element defines a set of methods which the Assembler
+ */
+ private boolean unchecked = false;
+ /** The exclude-list element defines a set of methods which the Assembler
marks to be uncallable. It contains one or more methods. If the method
permission relation contains methods that are in the exclude list, the
Deployer should consider those methods to be uncallable.
- */
- private boolean excluded = false;
- /** The method-params element contains a list of the fully-qualified Java
+ */
+ private boolean excluded = false;
+ /** The method-params element contains a list of the fully-qualified Java
type names of the method parameters.
*/
- private ArrayList paramList = EMPTY_PARAM_LIST;
- /** The trans-attribute element specifies how the container must manage
+ private ArrayList paramList = EMPTY_PARAM_LIST;
+ /** The trans-attribute element specifies how the container must manage
the transaction boundaries when delegating a method invocation to an
enterprise bean�s business method.
The value of trans-attribute must be one of the following:
@@ -97,141 +98,177 @@
<trans-attribute>Mandatory</trans-attribute>
<trans-attribute>Never</trans-attribute>
*/
- private byte transactionType;
-
- private Set permissions;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
- public MethodMetaData () {
- }
-
- // Public --------------------------------------------------------
-
- public String getMethodName() { return methodName; }
-
- public String getEjbName() { return ejbName; }
-
- public boolean isHomeMethod() { return methodType == HOME_METHOD ; }
- public boolean isRemoteMethod() { return methodType == REMOTE_METHOD ; }
- public boolean isLocalHomeMethod() { return methodType == LOCAL_HOME_METHOD ; }
- public boolean isLocalMethod() { return methodType == LOCAL_METHOD ; }
- public boolean isUnchecked() { return unchecked; }
- public boolean isExcluded() { return excluded; }
- public boolean isIntfGiven() { return intf; }
-
- public boolean isParamGiven() { return param; }
-
- public Iterator getParams() { return paramList.iterator(); }
-
- public byte getTransactionType() { return transactionType; }
-
- public void setTransactionType(byte type) {
- transactionType = type;
- }
-
- public Set getRoles() { return permissions; }
-
- public void setRoles(Set perm) { permissions = perm; }
- public void setUnchecked() { unchecked = true; }
- public void setExcluded() { excluded = true; }
-
- public boolean patternMatches(String name, Class[] arg, boolean remote) {
- return patternMatches(name, getClassNames(arg), remote);
- }
-
- public boolean patternMatches(String name, String[] arg, boolean remote) {
-
- // the wildcard matches everything
- if (getMethodName().equals("*"))
- {
- if (isIntfGiven() && (isRemoteMethod() != remote))
- return false;
+ private byte transactionType;
+
+ private Set permissions;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+ public MethodMetaData()
+ {
+ }
+
+ // Public --------------------------------------------------------
+
+ public String getMethodName()
+ { return methodName; }
+
+ public String getEjbName()
+ { return ejbName; }
+
+ public boolean isHomeMethod()
+ { return methodType == HOME_METHOD ; }
+ public boolean isRemoteMethod()
+ { return methodType == REMOTE_METHOD ; }
+ public boolean isLocalHomeMethod()
+ { return methodType == LOCAL_HOME_METHOD ; }
+ public boolean isLocalMethod()
+ { return methodType == LOCAL_METHOD ; }
+ public boolean isUnchecked()
+ { return unchecked; }
+ public boolean isExcluded()
+ { return excluded; }
+ public boolean isIntfGiven()
+ { return intf; }
+
+ public boolean isParamGiven()
+ { return param; }
+
+ public Iterator getParams()
+ { return paramList.iterator(); }
+
+ public byte getTransactionType()
+ { return transactionType; }
+
+ public void setTransactionType(byte type)
+ {
+ transactionType = type;
+ }
+
+ public Set getRoles()
+ { return permissions; }
+
+ public void setRoles(Set perm)
+ { permissions = perm; }
+ public void setUnchecked()
+ { unchecked = true; }
+ public void setExcluded()
+ { excluded = true; }
+
+ public boolean patternMatches(String name, Class[] arg, boolean remote)
+ {
+ return patternMatches(name, getClassNames(arg), remote);
+ }
+
+ public boolean patternMatches(String name, String[] arg, boolean remote)
+ {
+
+ // the wildcard matches everything
+ if (getMethodName().equals("*"))
+ {
+ if (isIntfGiven() && (isRemoteMethod() != remote))
+ return false;
+ return true;
+ }
+
+ if (! getMethodName().equals(name))
+ {
+ // different names -> no
+ return false;
+
+ } else
+ {
+ // we have the same name
+ // next check: home or remote
+ if (isIntfGiven() && (isRemoteMethod() != remote)) return false;
+
+ if (! isParamGiven())
+ {
+ // no param given in descriptor -> ok
return true;
- }
-
- if (! getMethodName().equals(name)) {
- // different names -> no
- return false;
-
- } else {
- // we have the same name
- // next check: home or remote
- if (isIntfGiven() && (isRemoteMethod() != remote)) return
false;
-
- if (! isParamGiven()) {
- // no param given in descriptor -> ok
- return true;
- } else {
- // we *have* to check the parameters
- return sameParams(arg);
- }
- }
- }
-
- /**
- @param a method element
- */
- public void importEjbJarXml(Element element) throws DeploymentException {
- methodName = getElementContent(getUniqueChild(element, "method-name"));
- ejbName = getElementContent(getUniqueChild(element, "ejb-name"));
-
- Element intfElement = getOptionalChild(element, "method-intf");
- if (intfElement != null) {
- intf = true;
- String methodIntf = getElementContent(intfElement);
- if (methodIntf.equals("Home")) {
- methodType = HOME_METHOD;
- } else if (methodIntf.equals("Remote")) {
- methodType = REMOTE_METHOD;
- } else if (methodIntf.equals("LocalHome")) {
- methodType = LOCAL_HOME_METHOD;
- } else if (methodIntf.equals("Local")) {
- methodType = LOCAL_METHOD;
- } else {
- throw new DeploymentException("method-intf tag should
be one of: 'Home', 'Remote', 'LocalHome', 'Local'");
- }
- }
-
- Element paramsElement = getOptionalChild(element, "method-params");
- if (paramsElement != null)
- {
- param = true;
- paramList = new ArrayList();
- Iterator paramsIterator = getChildrenByTagName(paramsElement,
"method-param");
- while (paramsIterator.hasNext()) {
-
paramList.add(getElementContent((Element)paramsIterator.next()));
- }
- }
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
- private static String[] getClassNames(Class[] source) {
- String out[] = new String[source.length];
- for(int i=0; i<out.length; i++) {
- String brackets = "";
- Class cls = source[i];
- while(cls.isArray()) {
- brackets += "[]";
- cls = cls.getComponentType();
- }
- out[i] = cls.getName()+brackets;
- }
- return out;
- }
-
- private boolean sameParams(String[] arg) {
- if(arg.length != paramList.size()) return false;
- for(int i=0; i<arg.length; i++)
- if (!arg[i].equals(paramList.get(i)))
- return false;
- return true;
- }
-
- // Inner classes -------------------------------------------------
+ } else
+ {
+ // we *have* to check the parameters
+ return sameParams(arg);
+ }
+ }
+ }
+
+ /**
+ @param a method element
+ */
+ public void importEjbJarXml(Element element) throws DeploymentException
+ {
+ methodName = getElementContent(getUniqueChild(element, "method-name"));
+ ejbName = getElementContent(getUniqueChild(element, "ejb-name"));
+
+ Element intfElement = getOptionalChild(element, "method-intf");
+ if (intfElement != null)
+ {
+ intf = true;
+ String methodIntf = getElementContent(intfElement);
+ if (methodIntf.equals("Home"))
+ {
+ methodType = HOME_METHOD;
+ } else if (methodIntf.equals("Remote"))
+ {
+ methodType = REMOTE_METHOD;
+ } else if (methodIntf.equals("LocalHome"))
+ {
+ methodType = LOCAL_HOME_METHOD;
+ } else if (methodIntf.equals("Local"))
+ {
+ methodType = LOCAL_METHOD;
+ } else
+ {
+ throw new DeploymentException("method-intf tag should be one of:
'Home', 'Remote', 'LocalHome', 'Local'");
+ }
+ }
+
+ Element paramsElement = getOptionalChild(element, "method-params");
+ if (paramsElement != null)
+ {
+ param = true;
+ paramList = new ArrayList();
+ Iterator paramsIterator = getChildrenByTagName(paramsElement,
"method-param");
+ while (paramsIterator.hasNext())
+ {
+ paramList.add(getElementContent((Element)paramsIterator.next()));
+ }
+ }
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+ private static String[] getClassNames(Class[] source)
+ {
+ String out[] = new String[source.length];
+ for(int i=0; i<out.length; i++)
+ {
+ String brackets = "";
+ Class cls = source[i];
+ while(cls.isArray())
+ {
+ brackets += "[]";
+ cls = cls.getComponentType();
+ }
+ out[i] = cls.getName()+brackets;
+ }
+ return out;
+ }
+
+ private boolean sameParams(String[] arg)
+ {
+ if(arg.length != paramList.size()) return false;
+ for(int i=0; i<arg.length; i++)
+ if (!arg[i].equals(paramList.get(i)))
+ return false;
+ return true;
+ }
+
+ // Inner classes -------------------------------------------------
}
1.1.4.1 +2 -2 jboss/src/main/org/jboss/metadata/ResourceEnvRefMetaData.java
Index: ResourceEnvRefMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/metadata/ResourceEnvRefMetaData.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- ResourceEnvRefMetaData.java 2001/06/10 07:46:16 1.1
+++ ResourceEnvRefMetaData.java 2001/11/02 08:42:36 1.1.4.1
@@ -8,7 +8,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The meta data information for a resource-env-ref element.
The resource-env-ref element contains a declaration of an enterprise
@@ -27,7 +27,7 @@
</resource-env-ref>
@author [EMAIL PROTECTED]
-@version $Revision: 1.1 $
+@version $Revision: 1.1.4.1 $
*/
public class ResourceEnvRefMetaData extends MetaData
{
1.5.4.1 +3 -3 jboss/src/main/org/jboss/metadata/ResourceRefMetaData.java
Index: ResourceRefMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/ResourceRefMetaData.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- ResourceRefMetaData.java 2001/06/10 07:46:16 1.5
+++ ResourceRefMetaData.java 2001/11/02 08:42:36 1.5.4.1
@@ -8,7 +8,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The meta data information for a resource-ref element.
The resource-ref element contains a declaration of enterprise bean�s
@@ -21,8 +21,8 @@
Used in: entity, message-driven, and session
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @author [EMAIL PROTECTED]
- * @version $Revision: 1.5 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.5.4.1 $
*/
public class ResourceRefMetaData extends MetaData {
// Constants -----------------------------------------------------
1.3.2.1 +59 -59 jboss/src/main/org/jboss/metadata/SecurityIdentityMetaData.java
Index: SecurityIdentityMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/metadata/SecurityIdentityMetaData.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SecurityIdentityMetaData.java 2001/06/15 18:51:26 1.3
+++ SecurityIdentityMetaData.java 2001/11/02 08:42:36 1.3.2.1
@@ -8,72 +8,72 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The meta data object for the security-identity element.
-The security-identity element specifies whether the caller�s security
-identity is to be used for the execution of the methods of the enterprise
-bean or whether a specific run-as role is to be used. It
-contains an optional description and a specification of the security
-identity to be used.
-
-Used in: session, entity, message-driven
-
-@author [EMAIL PROTECTED]
-@version $Revision: 1.3 $
-*/
+ The security-identity element specifies whether the caller�s security
+ identity is to be used for the execution of the methods of the enterprise
+ bean or whether a specific run-as role is to be used. It
+ contains an optional description and a specification of the security
+ identity to be used.
+
+ Used in: session, entity, message-driven
+
+ @author [EMAIL PROTECTED]
+ @version $Revision: 1.3.2.1 $
+ */
public class SecurityIdentityMetaData extends MetaData
{
- private String description;
- /** The use-caller-identity element specifies that the caller�s security
+ private String description;
+ /** The use-caller-identity element specifies that the caller�s security
identity be used as the security identity for the execution of the
enterprise bean�s methods.
*/
- private boolean useCallerIdentity;
- /** The run-as/role-name element specifies the run-as security role name
+ private boolean useCallerIdentity;
+ /** The run-as/role-name element specifies the run-as security role name
to be used for the execution of the methods of an enterprise bean.
*/
- private String runAsRoleName;
-
- public String getDescription()
- {
- return description;
- }
-
- /**
- */
- public boolean getUseCallerIdentity()
- {
- return useCallerIdentity;
- }
- /** Get the run-as security identity. This is the principal to be used for
- the run-as identity of an enterprise bean in terms of its security role.
- */
- public String getRunAsRoleName()
- {
- return runAsRoleName;
- }
-
- /**
- @param element, the security-identity element from the ejb-jar
- */
- public void importEjbJarXml(Element element) throws DeploymentException
- {
- description = getElementContent(getOptionalChild(element,
"description"));
- Element callerIdent = getOptionalChild(element, "use-caller-identity");
- Element runAs = getOptionalChild(element, "run-as");
- if( callerIdent == null && runAs == null )
- throw new DeploymentException("security-identity: either
use-caller-identity or run-as must be specified");
- if( callerIdent != null && runAs != null )
- throw new DeploymentException("security-identity: only one of
use-caller-identity or run-as can be specified");
- if( callerIdent != null )
- {
- useCallerIdentity = true;
- }
- else
- {
- runAsRoleName = getElementContent(getUniqueChild(runAs, "role-name"));
- }
- }
-
+ private String runAsRoleName;
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ */
+ public boolean getUseCallerIdentity()
+ {
+ return useCallerIdentity;
+ }
+ /** Get the run-as security identity. This is the principal to be used for
+ the run-as identity of an enterprise bean in terms of its security role.
+ */
+ public String getRunAsRoleName()
+ {
+ return runAsRoleName;
+ }
+
+ /**
+ @param element, the security-identity element from the ejb-jar
+ */
+ public void importEjbJarXml(Element element) throws DeploymentException
+ {
+ description = getElementContent(getOptionalChild(element, "description"));
+ Element callerIdent = getOptionalChild(element, "use-caller-identity");
+ Element runAs = getOptionalChild(element, "run-as");
+ if( callerIdent == null && runAs == null )
+ throw new DeploymentException("security-identity: either
use-caller-identity or run-as must be specified");
+ if( callerIdent != null && runAs != null )
+ throw new DeploymentException("security-identity: only one of
use-caller-identity or run-as can be specified");
+ if( callerIdent != null )
+ {
+ useCallerIdentity = true;
+ }
+ else
+ {
+ runAsRoleName = getElementContent(getUniqueChild(runAs, "role-name"));
+ }
+ }
+
}
1.3.4.1 +47 -41 jboss/src/main/org/jboss/metadata/SecurityRoleRefMetaData.java
Index: SecurityRoleRefMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/metadata/SecurityRoleRefMetaData.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- SecurityRoleRefMetaData.java 2001/06/10 07:46:16 1.3
+++ SecurityRoleRefMetaData.java 2001/11/02 08:42:36 1.3.4.1
@@ -8,49 +8,55 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The metadata object for the security-role-ref element.
-The security-role-ref element contains the declaration of a security
-role reference in the enterprise bean�s code. The declaration con-sists
-of an optional description, the security role name used in the
-code, and an optional link to a defined security role.
-The value of the role-name element must be the String used as the
-parameter to the EJBContext.isCallerInRole(String roleName) method.
-The value of the role-link element must be the name of one of the
-security roles defined in the security-role elements.
-
-Used in: entity and session
-
+ The security-role-ref element contains the declaration of a security
+ role reference in the enterprise bean�s code. The declaration con-sists
+ of an optional description, the security role name used in the
+ code, and an optional link to a defined security role.
+ The value of the role-name element must be the String used as the
+ parameter to the EJBContext.isCallerInRole(String roleName) method.
+ The value of the role-link element must be the name of one of the
+ security roles defined in the security-role elements.
+
+ Used in: entity and session
+
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @author [EMAIL PROTECTED]
- * @version $Revision: 1.3 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.3.4.1 $
*/
-public class SecurityRoleRefMetaData extends MetaData {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
- private String name;
- private String link;
- private String description;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
- public SecurityRoleRefMetaData () {
- }
-
- // Public --------------------------------------------------------
-
- public String getName() { return name; }
-
- public String getLink() { return link; }
- public String getDescription() { return description; }
-
- public void importEjbJarXml(Element element) throws DeploymentException {
- name = getElementContent(getUniqueChild(element, "role-name"));
- link = getElementContent(getOptionalChild(element, "role-link"));
- description = getElementContent(getOptionalChild(element,
"description"));
- }
-
+public class SecurityRoleRefMetaData extends MetaData
+{
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+ private String name;
+ private String link;
+ private String description;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+ public SecurityRoleRefMetaData()
+ {
+ }
+
+ // Public --------------------------------------------------------
+
+ public String getName()
+ { return name; }
+
+ public String getLink()
+ { return link; }
+ public String getDescription()
+ { return description; }
+
+ public void importEjbJarXml(Element element) throws DeploymentException
+ {
+ name = getElementContent(getUniqueChild(element, "role-name"));
+ link = getElementContent(getOptionalChild(element, "role-link"));
+ description = getElementContent(getOptionalChild(element, "description"));
+ }
+
}
1.5.4.1 +2 -2 jboss/src/main/org/jboss/metadata/SessionMetaData.java
Index: SessionMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/SessionMetaData.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- SessionMetaData.java 2001/06/10 07:46:16 1.5
+++ SessionMetaData.java 2001/11/02 08:42:36 1.5.4.1
@@ -9,13 +9,13 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** The meta data information specific to session beans.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.5.4.1 $
*/
public class SessionMetaData extends BeanMetaData {
// Constants -----------------------------------------------------
1.2.6.1 +2 -2 jboss/src/main/org/jboss/metadata/WebMetaData.java
Index: WebMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/WebMetaData.java,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- WebMetaData.java 2001/05/10 03:20:34 1.2
+++ WebMetaData.java 2001/11/02 08:42:36 1.2.6.1
@@ -12,7 +12,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/** A representation of the web-app.xml and jboss-web.xml deployment
* descriptors as used by the AbstractWebContainer web container integration
@@ -22,7 +22,7 @@
* @see org.jboss.web.AbstractWebContainer
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.6.1 $
*/
public class WebMetaData implements XmlLoadable
{
1.15.2.2 +2 -2 jboss/src/main/org/jboss/metadata/XmlFileLoader.java
Index: XmlFileLoader.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/XmlFileLoader.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- XmlFileLoader.java 2001/06/20 18:25:09 1.15.2.1
+++ XmlFileLoader.java 2001/11/02 08:42:36 1.15.2.2
@@ -24,7 +24,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
/**
@@ -37,7 +37,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Wolfgang Werner</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Darius Davidavicius</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
- * @version $Revision: 1.15.2.1 $
+ * @version $Revision: 1.15.2.2 $
*
* Revisions:
* 20010620 Bill Burke: Print an error message when failing to load
standardjboss.xml
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
