[jboss-cvs] JBossAS SVN: r66355 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: ejb/jboss and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 23 03:38:09 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-23 03:38:08 -0400 (Tue, 23 Oct 2007)
New Revision: 66355
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SecurityIdentityMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
Log:
Remove the security-identity from the environment into the bean
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -53,7 +53,6 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.support.MappableMetaData;
-import org.jboss.metadata.javaee.support.NamedMetaData;
/**
* Common interface for spec/jboss enterprise bean metadata
@@ -81,7 +80,6 @@
public EnvironmentRefsGroupMetaData getJndiEnvironmentRefsGroup();
public void setJndiEnvironmentRefsGroup(EnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup);
public SecurityIdentityMetaData getSecurityIdentity();
- public void setSecurityIdentity(SecurityIdentityMetaData securityIdentity);
public EJBLocalReferenceMetaData getEjbLocalReferenceByName(String name);
public EJBLocalReferencesMetaData getEjbLocalReferences();
public EJBReferenceMetaData getEjbReferenceByName(String name);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -419,11 +419,6 @@
this.mappedName = mappedName;
}
- public void setSecurityIdentity(SecurityIdentityMetaData securityIdentity)
- {
- this.securityIdentity = securityIdentity;
- }
-
/**
* Whether this is a session bean
*
@@ -944,25 +939,6 @@
}
/**
- * Get the security identity
- *
- * @return the security identity
- */
- @XmlTransient
- public SecurityIdentityMetaData getSecurityIdentity()
- {
- // This is hacky because of the stupid way security identity is included in the environment
- if (getOverridenMetaData() == null)
- {
- if (jndiEnvironmentRefsGroup == null)
- return null;
- else
- return jndiEnvironmentRefsGroup.getSecurityIdentity();
- }
- return jndiEnvironmentRefsGroup.getSecurityIdentity();
- }
-
- /**
* Get the annotations.
*
* @return the annotations.
@@ -1339,6 +1315,29 @@
return getMethodTransactionTimeout(method.getName());
}
+ /**
+ * Get the securityIdentity.
+ *
+ * @return the securityIdentity.
+ */
+ public SecurityIdentityMetaData getSecurityIdentity()
+ {
+ return securityIdentity;
+ }
+
+ /**
+ * Set the securityIdentity.
+ *
+ * @param securityIdentity the securityIdentity.
+ * @throws IllegalArgumentException for a null securityIdentity
+ */
+ public void setSecurityIdentity(SecurityIdentityMetaData securityIdentity)
+ {
+ if (securityIdentity == null)
+ throw new IllegalArgumentException("Null securityIdentity");
+ this.securityIdentity = securityIdentity;
+ }
+
public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original)
{
if(override != null && override.getEjbClass() != null)
@@ -1349,6 +1348,11 @@
setName(override.getName());
else if(original.getName() != null)
setName(original.getName());
+ // transactionType
+ if(override != null && override.transactionType != null)
+ transactionType = override.transactionType;
+ else if(original != null && original.getTransactionType() != null)
+ transactionType = original.getTransactionType();
if(override != null)
{
@@ -1406,15 +1410,14 @@
// Fixup the security identity
SecurityIdentityMetaData jbossSecurityIdentity = null;
- if (override != null && override.jndiEnvironmentRefsGroup != null)
- jbossSecurityIdentity = override.jndiEnvironmentRefsGroup.getSecurityIdentity();
+ if (override != null && override.getSecurityIdentity() != null)
+ jbossSecurityIdentity = override.getSecurityIdentity();
SecurityIdentityMetaData originalSecurityIdentity = null;
if(original != null)
originalSecurityIdentity = original.getSecurityIdentity();
- SecurityIdentityMetaData mergedSecurityIdentity = new SecurityIdentityMetaData();
- mergedSecurityIdentity.merge(jbossSecurityIdentity, originalSecurityIdentity);
- setSecurityIdentity(mergedSecurityIdentity);
- // TODO, all fields
+ if(securityIdentity == null)
+ securityIdentity = new SecurityIdentityMetaData();
+ securityIdentity.merge(jbossSecurityIdentity, originalSecurityIdentity);
}
/**
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -51,9 +51,10 @@
/** The serialVersionUID */
private static final long serialVersionUID = 4642263968653845579L;
- /** The security identity */
+ /** The security identity
// This is only here because historically this was mixed in the environment xml
private SecurityIdentityMetaData securityIdentity;
+ */
/**
* Merge an environment
@@ -283,26 +284,4 @@
this.setPreDestroys(preDestroys);
}
- /**
- * Get the securityIdentity.
- *
- * @return the securityIdentity.
- */
- public SecurityIdentityMetaData getSecurityIdentity()
- {
- return securityIdentity;
- }
-
- /**
- * Set the securityIdentity.
- *
- * @param securityIdentity the securityIdentity.
- * @throws IllegalArgumentException for a null securityIdentity
- */
- public void setSecurityIdentity(SecurityIdentityMetaData securityIdentity)
- {
- if (securityIdentity == null)
- throw new IllegalArgumentException("Null securityIdentity");
- this.securityIdentity = securityIdentity;
- }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -52,9 +52,6 @@
/** The timeout method */
private NamedMethodMetaData timeoutMethod;
- /** The transaction type */
- private TransactionType transactionType;
-
/** The message destination type */
private String messageDestinationType;
@@ -157,14 +154,6 @@
return timeoutMethod;
}
-
- @Override
- public TransactionType getTransactionType()
- {
- return transactionType;
- }
-
-
/**
* Get the messageDestinationType.
*
@@ -460,11 +449,6 @@
timeoutMethod = joverride.timeoutMethod;
else if(soriginal != null && soriginal.getTimeoutMethod() != null)
timeoutMethod = soriginal.getTimeoutMethod();
- // transactionType
- if(joverride != null && joverride.transactionType != null)
- transactionType = joverride.transactionType;
- else if(soriginal != null && soriginal.getTransactionType() != null)
- transactionType = soriginal.getTransactionType();
// messageDestinationType
if(joverride != null && joverride.messageDestinationType != null)
messageDestinationType = joverride.messageDestinationType;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -31,7 +31,6 @@
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.metadata.ejb.spec.SessionType;
-import org.jboss.metadata.ejb.spec.TransactionType;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.PortComponent;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
@@ -85,9 +84,6 @@
/** The remove methods */
private RemoveMethodsMetaData removeMethods;
- /** The transaction type */
- private TransactionType transactionType;
-
/** The around invoke */
private AroundInvokesMetaData aroundInvokes;
@@ -230,11 +226,6 @@
return timeoutMethod;
}
- public TransactionType getTransactionType()
- {
- return transactionType;
- }
-
@Override
public String getDefaultConfigurationName()
{
@@ -571,11 +562,6 @@
removeMethods = joverride.removeMethods;
else if(soriginal != null && soriginal.getRemoveMethods() != null)
removeMethods = soriginal.getRemoveMethods();
- // transactionType
- if(joverride != null && joverride.transactionType != null)
- transactionType = joverride.transactionType;
- else if(soriginal != null && soriginal.getTransactionType() != null)
- transactionType = soriginal.getTransactionType();
// aroundInvokes
if(joverride != null && joverride.aroundInvokes != null)
aroundInvokes = joverride.aroundInvokes;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SecurityIdentityMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SecurityIdentityMetaData.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/SecurityIdentityMetaData.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -157,10 +157,10 @@
if(override != null && override.getUseCallerIdentity() != null)
setUseCallerIdentity(override.getUseCallerIdentity());
else if(original != null && original.getUseCallerIdentity() != null)
- setUseCallerIdentity(original.getUseCallerIdentity());
+ setUseCallerIdentity(original.getUseCallerIdentity());
if(override != null && override.getRunAs() != null)
setRunAs(override.getRunAs());
- else if(override != null && original.getRunAs() != null)
+ else if(original != null && original.getRunAs() != null)
setRunAs(original.getRunAs());
if(override != null && override.getRunAsPrincipal() != null)
setRunAsPrincipal(getRunAsPrincipal());
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -71,4 +71,18 @@
throw new IllegalArgumentException("Null descriptions");
this.descriptions = descriptions;
}
+
+ @Override
+ public void merge(IdMetaDataImpl override, IdMetaDataImpl original)
+ {
+ super.merge(override, original);
+ IdMetaDataImplWithDescriptions id0 = (IdMetaDataImplWithDescriptions) override;
+ IdMetaDataImplWithDescriptions id1 = (IdMetaDataImplWithDescriptions) original;
+ if(id0 != null && id0.descriptions != null)
+ descriptions = id0.descriptions;
+ else if(id1 != null && id1.descriptions != null)
+ descriptions = id1.descriptions;
+ }
+
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-23 07:37:19 UTC (rev 66354)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-23 07:38:08 UTC (rev 66355)
@@ -107,6 +107,8 @@
private String configName;
/** The optional JBossWS config-file */
private String configFile;
+ /** The security identity */
+ private SecurityIdentityMetaData securityIdentity;
/** The web context class loader used to create the java:comp context */
@Deprecated
@@ -719,19 +721,14 @@
*
* @return the security identity
*/
- @XmlTransient
public SecurityIdentityMetaData getSecurityIdentity()
{
- // This is hacky because of the stupid way security identity is included in the environment
- if (getOverridenMetaData() == null)
- {
- if (jndiEnvironmentRefsGroup == null)
- return null;
- else
- return jndiEnvironmentRefsGroup.getSecurityIdentity();
- }
- return getMergedEnvironment().getSecurityIdentity();
+ return securityIdentity;
}
+ public void setSecurityIdentity(SecurityIdentityMetaData securityIdentity)
+ {
+ this.securityIdentity = securityIdentity;
+ }
/**
* Access the RunAsIdentity associated with the given servlet
More information about the jboss-cvs-commits
mailing list