Diff
Modified: trunk/openejb2/modules/core/src/java/org/openejb/AbstractEjbDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/AbstractEjbDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/AbstractEjbDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -101,6 +101,7 @@
protected final SortedMap transactionPolicies;
protected final SystemMethodIndices systemMethodIndices;
protected final BasicTimerServiceImpl timerService;
+ protected final boolean securityEnabled;
public AbstractEjbDeployment(String containerId,
String ejbName,
@@ -111,6 +112,7 @@
EjbContainer ejbContainer,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -137,6 +139,7 @@
this.ejbContainer = ejbContainer;
+ this.securityEnabled = securityEnabled;
this.policyContextId = policyContextId;
this.runAs = runAs;
@@ -347,4 +350,8 @@
throw new ClassNotFoundException("Unable to load " + description + " " + className);
}
}
+
+ public boolean isSecurityEnabled() {
+ return securityEnabled;
+ }
}
Modified: trunk/openejb2/modules/core/src/java/org/openejb/AbstractRpcDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/AbstractRpcDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/AbstractRpcDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -101,6 +101,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -120,6 +121,7 @@
classLoader,
signatureIndexBuilder,
ejbContainer,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
Modified: trunk/openejb2/modules/core/src/java/org/openejb/BmpEjbDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/BmpEjbDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/BmpEjbDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -103,6 +103,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -133,6 +134,7 @@
ejbContainer,
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -161,6 +163,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -195,6 +198,7 @@
ejbContainer,
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -303,6 +307,7 @@
infoFactory.addAttribute("jndiNames", String[].class, true);
infoFactory.addAttribute("localJndiNames", String[].class, true);
+ infoFactory.addAttribute("securityEnabled", boolean.class, true);
infoFactory.addAttribute("policyContextId", String.class, true);
infoFactory.addAttribute("defaultPrincipal", DefaultPrincipal.class, true);
infoFactory.addAttribute("runAs", Subject.class, true);
@@ -337,6 +342,7 @@
"jndiNames",
"localJndiNames",
+ "securityEnabled",
"policyContextId",
"defaultPrincipal",
"runAs",
Modified: trunk/openejb2/modules/core/src/java/org/openejb/CmpEjbDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/CmpEjbDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/CmpEjbDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -117,6 +117,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -149,6 +150,7 @@
ejbContainer,
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -179,6 +181,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -215,6 +218,7 @@
ejbContainer,
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -402,6 +406,7 @@
infoFactory.addAttribute("jndiNames", String[].class, true);
infoFactory.addAttribute("localJndiNames", String[].class, true);
+ infoFactory.addAttribute("securityEnabled", boolean.class, true);
infoFactory.addAttribute("policyContextId", String.class, true);
infoFactory.addAttribute("defaultPrincipal", DefaultPrincipal.class, true);
infoFactory.addAttribute("runAs", Subject.class, true);
@@ -438,6 +443,7 @@
"jndiNames",
"localJndiNames",
+ "securityEnabled",
"policyContextId",
"defaultPrincipal",
"runAs",
Modified: trunk/openejb2/modules/core/src/java/org/openejb/ExtendedEjbDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/ExtendedEjbDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/ExtendedEjbDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -65,6 +65,8 @@
VirtualOperation getVirtualOperation(int methodIndex);
+ boolean isSecurityEnabled();
+
String getPolicyContextId();
PermissionManager getPermissionManager();
Modified: trunk/openejb2/modules/core/src/java/org/openejb/RpcEjbDeploymentFactory.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/RpcEjbDeploymentFactory.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/RpcEjbDeploymentFactory.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -67,6 +67,7 @@
protected EjbContainer ejbContainer;
protected String[] jndiNames;
protected String[] localJndiNames;
+ protected boolean securityEnabled;
protected String policyContextId;
protected DefaultPrincipal defaultPrincipal;
protected Subject runAs;
@@ -158,6 +159,14 @@
this.localJndiNames = localJndiNames;
}
+ public boolean isSecurityEnabled() {
+ return securityEnabled;
+ }
+
+ public void setSecurityEnabled(boolean securityEnabled) {
+ this.securityEnabled = securityEnabled;
+ }
+
public String getPolicyContextId() {
return policyContextId;
}
Modified: trunk/openejb2/modules/core/src/java/org/openejb/StatefulEjbDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/StatefulEjbDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/StatefulEjbDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -106,6 +106,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -142,6 +143,7 @@
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -176,6 +178,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -222,6 +225,7 @@
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -362,6 +366,7 @@
infoFactory.addAttribute("jndiNames", String[].class, true);
infoFactory.addAttribute("localJndiNames", String[].class, true);
+ infoFactory.addAttribute("securityEnabled", boolean.class, true);
infoFactory.addAttribute("policyContextId", String.class, true);
infoFactory.addAttribute("defaultPrincipal", DefaultPrincipal.class, true);
infoFactory.addAttribute("runAs", Subject.class, true);
@@ -396,6 +401,7 @@
"jndiNames",
"localJndiNames",
+ "securityEnabled",
"policyContextId",
"defaultPrincipal",
"runAs",
Modified: trunk/openejb2/modules/core/src/java/org/openejb/StatefulEjbDeploymentFactory.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/StatefulEjbDeploymentFactory.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/StatefulEjbDeploymentFactory.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -89,9 +89,12 @@
(StatefulEjbContainer) ejbContainer,
jndiNames,
localJndiNames,
+
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
+
beanManagedTransactions,
transactionPolicies,
componentContext,
Modified: trunk/openejb2/modules/core/src/java/org/openejb/StatelessEjbDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/StatelessEjbDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/StatelessEjbDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -103,6 +103,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -135,6 +136,7 @@
ejbContainer,
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -164,6 +166,7 @@
String[] jndiNames,
String[] localJndiNames,
+ boolean securityEnabled,
String policyContextId,
DefaultPrincipal defaultPrincipal,
Subject runAs,
@@ -200,6 +203,7 @@
ejbContainer,
jndiNames,
localJndiNames,
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
@@ -309,6 +313,7 @@
infoFactory.addAttribute("jndiNames", String[].class, true);
infoFactory.addAttribute("localJndiNames", String[].class, true);
+ infoFactory.addAttribute("securityEnabled", boolean.class, true);
infoFactory.addAttribute("policyContextId", String.class, true);
infoFactory.addAttribute("defaultPrincipal", DefaultPrincipal.class, true);
infoFactory.addAttribute("runAs", Subject.class, true);
@@ -344,6 +349,7 @@
"jndiNames",
"localJndiNames",
+ "securityEnabled",
"policyContextId",
"defaultPrincipal",
"runAs",
Modified: trunk/openejb2/modules/core/src/java/org/openejb/StatelessEjbDeploymentFactory.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/StatelessEjbDeploymentFactory.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/StatelessEjbDeploymentFactory.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -106,6 +106,8 @@
(StatelessEjbContainer) ejbContainer,
jndiNames,
localJndiNames,
+
+ securityEnabled,
policyContextId,
defaultPrincipal,
runAs,
Modified: trunk/openejb2/modules/core/src/java/org/openejb/mdb/MdbDeployment.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/mdb/MdbDeployment.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/mdb/MdbDeployment.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -179,6 +179,7 @@
classLoader,
new MdbSignatureIndexBuilder(endpointInterface, beanClass),
ejbContainer,
+ false,
policyContextId,
null,
runAs,
Modified: trunk/openejb2/modules/core/src/java/org/openejb/security/EjbSecurityInterceptor.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/java/org/openejb/security/EjbSecurityInterceptor.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/java/org/openejb/security/EjbSecurityInterceptor.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -60,8 +60,8 @@
import org.apache.geronimo.core.service.InvocationResult;
import org.apache.geronimo.security.ContextManager;
import org.openejb.EJBContextImpl;
+import org.openejb.EjbInvocation;
import org.openejb.ExtendedEjbDeployment;
-import org.openejb.EjbInvocation;
/**
@@ -79,8 +79,12 @@
public InvocationResult invoke(Invocation invocation) throws Throwable {
EjbInvocation ejbInvocation = ((EjbInvocation) invocation);
- ExtendedEjbDeployment deployment = (ExtendedEjbDeployment) ejbInvocation.getEjbDeployment();
+ ExtendedEjbDeployment deployment = ejbInvocation.getEjbDeployment();
+ if (!deployment.isSecurityEnabled()) {
+ return next.invoke(invocation);
+ }
+
EJBContextImpl context = ejbInvocation.getEJBInstanceContext().getEJBContextImpl();
Subject oldCaller = context.getCallerSubject();
Modified: trunk/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java (2415 => 2416)
--- trunk/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java 2006-02-02 05:33:19 UTC (rev 2415)
+++ trunk/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java 2006-02-02 07:21:24 UTC (rev 2416)
@@ -277,6 +277,10 @@
return new InterfaceMethodSignature[] { new InterfaceMethodSignature("ejbTimeout", new Class[]{Timer.class}, false)};
}
+ public boolean isSecurityEnabled() {
+ return false;
+ }
+
public Subject getDefaultSubject() {
return null;
}
