You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/04/01 17:34:10 UTC
svn commit: r930005 - in
/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee:
EnterpriseBean.java MessageDrivenBean.java OutboundResourceAdapter.java
RemoteBean.java
Author: djencks
Date: Thu Apr 1 15:34:10 2010
New Revision: 930005
URL: http://svn.apache.org/viewvc?rev=930005&view=rev
Log:
OPENEJB-1242 make reauthentication nullable, mdbs can now have security-role-refs due to imported security context.
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java?rev=930005&r1=930004&r2=930005&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java Thu Apr 1 15:34:10 2010
@@ -17,6 +17,8 @@
*/
package org.apache.openejb.jee;
+import java.util.List;
+
/**
* @version $Revision$ $Date$
*/
@@ -41,6 +43,8 @@ public interface EnterpriseBean extends
public void setEjbClass(Class value);
+ List<SecurityRoleRef> getSecurityRoleRef();
+
public SecurityIdentity getSecurityIdentity();
public void setSecurityIdentity(SecurityIdentity value);
@@ -52,5 +56,4 @@ public interface EnterpriseBean extends
public TransactionType getTransactionType();
public void setTransactionType(TransactionType type);
-
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java?rev=930005&r1=930004&r2=930005&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java Thu Apr 1 15:34:10 2010
@@ -109,6 +109,7 @@ import java.util.Map;
"persistenceUnitRef",
"postConstruct",
"preDestroy",
+ "securityRoleRef",
"securityIdentity"
})
public class MessageDrivenBean implements EnterpriseBean, TimerConsumer {
@@ -162,6 +163,8 @@ public class MessageDrivenBean implement
protected List<LifecycleCallback> postConstruct;
@XmlElement(name = "pre-destroy", required = true)
protected List<LifecycleCallback> preDestroy;
+ @XmlElement(name = "security-role-ref", required = true)
+ protected List<SecurityRoleRef> securityRoleRef;
@XmlElement(name = "security-identity")
protected SecurityIdentity securityIdentity;
@XmlAttribute
@@ -553,6 +556,12 @@ public class MessageDrivenBean implement
getPreDestroy().add(new LifecycleCallback(ejbClass, method));
}
+ public List<SecurityRoleRef> getSecurityRoleRef() {
+ if (securityRoleRef == null) {
+ securityRoleRef = new ArrayList<SecurityRoleRef>();
+ }
+ return this.securityRoleRef;
+ }
public SecurityIdentity getSecurityIdentity() {
return securityIdentity;
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java?rev=930005&r1=930004&r2=930005&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java Thu Apr 1 15:34:10 2010
@@ -58,7 +58,7 @@ public class OutboundResourceAdapter {
@XmlElement(name = "authentication-mechanism")
protected List<AuthenticationMechanism> authenticationMechanism;
@XmlElement(name = "reauthentication-support")
- protected boolean reauthenticationSupport;
+ protected Boolean reauthenticationSupport;
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -89,14 +89,14 @@ public class OutboundResourceAdapter {
/**
* Gets the value of the reauthenticationSupport property.
*/
- public boolean isReauthenticationSupport() {
+ public Boolean isReauthenticationSupport() {
return reauthenticationSupport;
}
/**
* Sets the value of the reauthenticationSupport property.
*/
- public void setReauthenticationSupport(boolean value) {
+ public void setReauthenticationSupport(Boolean value) {
this.reauthenticationSupport = value;
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java?rev=930005&r1=930004&r2=930005&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java Thu Apr 1 15:34:10 2010
@@ -41,8 +41,6 @@ public interface RemoteBean extends Ente
public void setLocal(String value);
- public List<SecurityRoleRef> getSecurityRoleRef();
-
Collection<String> getBusinessLocal();
Collection<String> getBusinessRemote();
Re: MDB Security (Re: svn commit: r930005)
Posted by David Jencks <da...@yahoo.com>.
oops, missed a couple commits.... fixed rev 930982
david jencks
On Apr 5, 2010, at 4:17 PM, David Blevins wrote:
>
> On Apr 1, 2010, at 10:34 AM, djencks@apache.org wrote:
>
>> Author: djencks
>> Date: Thu Apr 1 15:34:10 2010
>> New Revision: 930005
>>
>> URL: http://svn.apache.org/viewvc?rev=930005&view=rev
>> Log:
>> OPENEJB-1242 make reauthentication nullable, mdbs can now have security-role-refs due to imported security context.
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnterpriseBean.java
>> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java
>> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
>> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java
>>
>
> Looks like we might need to update these tests to match the new functionality.
>
> org.apache.openejb.test.mdb.MdbAllowedOperationsTests
> org.apache.openejb.test.mdb.BmtMdbAllowedOperationsTests
>
>
> -------------------------------------------------------------------------------
> Test set: org.apache.openejb.ApplicationTest
> -------------------------------------------------------------------------------
> Tests run: 1421, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 25.285 sec <<< FAILURE!
> MDB.AllowedOperations.businessMethod(org.apache.openejb.test.NumberedTestCase$NamedTest) Time elapsed: 0.039 sec <<< FAILURE!
> junit.framework.AssertionFailedError: expected:<
> FALSE Context_getEJBHome
> TRUE Context_getCallerPrincipal
> FALSE Context_isCallerInRole
> FALSE Context_getRollbackOnly
> FALSE Context_setRollbackOnly
> TRUE Context_getUserTransaction
> FALSE Context_getEJBObject
> FALSE Context_getPrimaryKey
> TRUE JNDI_access_to_java_comp_env
> FALSE (empty)
> FALSE (empty)
> TRUE Context_lookup
> FALSE Context_getTimerService
> > but was:<
> FALSE Context_getEJBHome
> TRUE Context_getCallerPrincipal
> TRUE Context_isCallerInRole
> FALSE Context_getRollbackOnly
> FALSE Context_setRollbackOnly
> TRUE Context_getUserTransaction
> FALSE Context_getEJBObject
> FALSE Context_getPrimaryKey
> TRUE JNDI_access_to_java_comp_env
> FALSE (empty)
> FALSE (empty)
> TRUE Context_lookup
> FALSE Context_getTimerService
> >
>
MDB Security (Re: svn commit: r930005)
Posted by David Blevins <da...@visi.com>.
On Apr 1, 2010, at 10:34 AM, djencks@apache.org wrote:
> Author: djencks
> Date: Thu Apr 1 15:34:10 2010
> New Revision: 930005
>
> URL: http://svn.apache.org/viewvc?rev=930005&view=rev
> Log:
> OPENEJB-1242 make reauthentication nullable, mdbs can now have
> security-role-refs due to imported security context.
>
> Modified:
> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/
> apache/openejb/jee/EnterpriseBean.java
> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/
> apache/openejb/jee/MessageDrivenBean.java
> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/
> apache/openejb/jee/OutboundResourceAdapter.java
> openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/
> apache/openejb/jee/RemoteBean.java
>
Looks like we might need to update these tests to match the new
functionality.
org.apache.openejb.test.mdb.MdbAllowedOperationsTests
org.apache.openejb.test.mdb.BmtMdbAllowedOperationsTests
-------------------------------------------------------------------------------
Test set: org.apache.openejb.ApplicationTest
-------------------------------------------------------------------------------
Tests run: 1421, Failures: 1, Errors: 0, Skipped: 0, Time elapsed:
25.285 sec <<< FAILURE!
MDB
.AllowedOperations
.businessMethod(org.apache.openejb.test.NumberedTestCase$NamedTest)
Time elapsed: 0.039 sec <<< FAILURE!
junit.framework.AssertionFailedError: expected:<
FALSE Context_getEJBHome
TRUE Context_getCallerPrincipal
FALSE Context_isCallerInRole
FALSE Context_getRollbackOnly
FALSE Context_setRollbackOnly
TRUE Context_getUserTransaction
FALSE Context_getEJBObject
FALSE Context_getPrimaryKey
TRUE JNDI_access_to_java_comp_env
FALSE (empty)
FALSE (empty)
TRUE Context_lookup
FALSE Context_getTimerService
> but was:<
FALSE Context_getEJBHome
TRUE Context_getCallerPrincipal
TRUE Context_isCallerInRole
FALSE Context_getRollbackOnly
FALSE Context_setRollbackOnly
TRUE Context_getUserTransaction
FALSE Context_getEJBObject
FALSE Context_getPrimaryKey
TRUE JNDI_access_to_java_comp_env
FALSE (empty)
FALSE (empty)
TRUE Context_lookup
FALSE Context_getTimerService
>