Author: djencks
Date: Sun Apr 4 22:33:42 2010
New Revision: 930761
URL: http://svn.apache.org/viewvc?rev=930761&view=rev
Log:
OPENEJB-1253 allow mdbs to call isCallerInRole()
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java?rev=930761&r1=930760&r2=930761&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
Sun Apr 4 22:33:42 2010
@@ -184,7 +184,7 @@ public class MdbContext extends BaseCont
/**
* Message listener method, business method interceptor method
- * and imeout callback method
+ * and timeout callback method
*/
protected static class BusinessTimeoutMdbState extends State {
@Override
@@ -197,11 +197,6 @@ public class MdbContext extends BaseCont
throw new IllegalStateException();
}
- @Override
- public boolean isCallerInRole(SecurityService securityService, String
roleName) {
- throw new IllegalStateException();
- }
-
}
static {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java?rev=930761&r1=930760&r2=930761&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
Sun Apr 4 22:33:42 2010
@@ -16,10 +16,9 @@
*/
package org.apache.openejb.util;
-import static org.apache.openejb.loader.JarLocation.decode;
-
import java.io.File;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
/**
@@ -43,7 +42,11 @@ public class URLs {
throw new IllegalStateException(e);
}
} else if ("file".equals(url.getProtocol())) {
- return new File(decode(url.getFile()));
+ try {
+ return new File(url.toURI().getPath());
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("bad url " +
url.toExternalForm(), e);
+ }
} else {
throw new IllegalArgumentException("Unsupported URL scheme: " +
url.toExternalForm());
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java?rev=930761&r1=930760&r2=930761&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
Sun Apr 4 22:33:42 2010
@@ -160,7 +160,7 @@ import java.util.Map;
"securityIdentity",
"query"
})
-public class EntityBean implements EnterpriseBean, RemoteBean {
+public class EntityBean implements RemoteBean {
@XmlTransient
protected TextMap description = new TextMap();
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java?rev=930761&r1=930760&r2=930761&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Sun Apr 4 22:33:42 2010
@@ -135,7 +135,7 @@ import java.util.Arrays;
"securityIdentity",
"dependsOn"
})
-public class SessionBean implements EnterpriseBean, RemoteBean, Session,
TimerConsumer {
+public class SessionBean implements RemoteBean, Session, TimerConsumer {
@XmlTransient
protected TextMap description = new TextMap();
@XmlTransient
