You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/05 03:30:43 UTC
svn commit: r492867 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/alt/config/
main/java/org/apache/openejb/assembler/classic/
main/java/org/apache/openejb/assembler/spring/ test/java/org/apache/openejb/
Author: dblevins
Date: Thu Jan 4 18:30:42 2007
New Revision: 492867
URL: http://svn.apache.org/viewvc?view=rev&rev=492867
Log:
Moved securityRoles, methodPermissions, and methodTransactions from ContainerSystemInfo to EjbJarInfo
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationPrinter.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/DeploymentsFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/OpenEjbConfigToSpring.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java Thu Jan 4 18:30:42 2007
@@ -238,14 +238,10 @@
sys.containerSystem.applications.addAll(appInfos);
- SecurityRoleInfo defaultRole = new SecurityRoleInfo();
- defaultRole.description = "The role applied to recurity references that are not linked.";
- defaultRole.roleName = EjbJarInfoBuilder.DEFAULT_SECURITY_ROLE;
- ejbJarInfoBuilder.getSecurityRoleInfos().add(defaultRole);
-
- sys.containerSystem.securityRoles.addAll(ejbJarInfoBuilder.getSecurityRoleInfos());
- sys.containerSystem.methodPermissions.addAll(ejbJarInfoBuilder.getMethodPermissionInfos());
- sys.containerSystem.methodTransactions.addAll(ejbJarInfoBuilder.getMethodTransactionInfos());
+// SecurityRoleInfo defaultRole = new SecurityRoleInfo();
+// defaultRole.description = "The role applied to recurity references that are not linked.";
+// defaultRole.roleName = EjbJarInfoBuilder.DEFAULT_SECURITY_ROLE;
+// ejbJarInfoBuilder.getSecurityRoleInfos().add(defaultRole);
initSecutityService(openejb, sys.facilities);
@@ -316,12 +312,13 @@
configLocation,
ssp);
- for (SecurityRoleInfo role : sys.containerSystem.securityRoles) {
- RoleMappingInfo roleMappingInfo = new RoleMappingInfo();
- roleMappingInfo.logicalRoleNames.add(role.roleName);
- roleMappingInfo.physicalRoleNames.add(role.roleName);
- ssi.roleMappings.add(roleMappingInfo);
- }
+// DMB: commented out 1/4/07
+// for (SecurityRoleInfo role : sys.containerSystem.securityRoles) {
+// RoleMappingInfo roleMappingInfo = new RoleMappingInfo();
+// roleMappingInfo.logicalRoleNames.add(role.roleName);
+// roleMappingInfo.physicalRoleNames.add(role.roleName);
+// ssi.roleMappings.add(roleMappingInfo);
+// }
facilities.securityService = ssi;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationPrinter.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationPrinter.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationPrinter.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationPrinter.java Thu Jan 4 18:30:42 2007
@@ -28,6 +28,8 @@
import org.apache.openejb.assembler.classic.JndiEncInfo;
import org.apache.openejb.assembler.classic.SecurityRoleInfo;
import org.apache.openejb.assembler.classic.ContainerInfo;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
import java.util.ListIterator;
@@ -105,72 +107,76 @@
}
}
- if (conf.containerSystem.securityRoles != null) {
- out(0, "--Security Roles------------");
- for (ListIterator<SecurityRoleInfo> iterator = conf.containerSystem.securityRoles.listIterator(); iterator.hasNext();) {
- SecurityRoleInfo securityRole = iterator.next();
- out(1, "--[" + iterator.previousIndex() + "]----------------------");
- out(1, " ", securityRole);
- out(1, "description ", securityRole.description);
- out(1, "roleName ", securityRole.roleName);
- }
- }
-
- if (conf.containerSystem.methodPermissions != null) {
- out(0, "--Method Permissions--------");
- for (ListIterator<MethodPermissionInfo> iterator = conf.containerSystem.methodPermissions.listIterator(); iterator.hasNext();) {
- MethodPermissionInfo methodPermission = iterator.next();
-
- out(1, "--[" + iterator.previousIndex() + "]----------------------");
- out(1, " ", methodPermission);
- out(1, "description ", methodPermission.description);
- out(1, "roleNames ", methodPermission.roleNames);
- if (methodPermission.roleNames != null) {
- for (ListIterator<String> roleNameIterator = methodPermission.roleNames.listIterator(); roleNameIterator.hasNext();) {
- String roleName = roleNameIterator.next();
- out(1, "roleName[" + roleNameIterator.previousIndex() + "] ", roleName);
+ for (AppInfo app : conf.containerSystem.applications) {
+ for (EjbJarInfo ejbJar : app.ejbJars) {
+ if (!ejbJar.securityRoles.isEmpty()) {
+ out(0, "--Security Roles------------");
+ for (ListIterator<SecurityRoleInfo> iterator = ejbJar.securityRoles.listIterator(); iterator.hasNext();) {
+ SecurityRoleInfo securityRole = iterator.next();
+ out(1, "--[" + iterator.previousIndex() + "]----------------------");
+ out(1, " ", securityRole);
+ out(1, "description ", securityRole.description);
+ out(1, "roleName ", securityRole.roleName);
}
}
- out(1, "methods ", methodPermission.methods);
- if (methodPermission.methods != null) {
- for (MethodInfo methodInfo : methodPermission.methods) {
- out(2, "description ", methodInfo.description);
- out(2, "ejbDeploymentId", methodInfo.ejbDeploymentId);
- out(2, "methodIntf ", methodInfo.methodIntf);
- out(2, "methodName ", methodInfo.methodName);
- if (methodInfo.methodParams != null) {
- out(2, "methodParams ", methodInfo.methodParams);
- for (ListIterator<String> paramIterator = methodInfo.methodParams.listIterator(); paramIterator.hasNext();) {
- String methodParam = paramIterator.next();
- out(3, "param[" + paramIterator.previousIndex() + "]", methodParam);
+
+ if (!ejbJar.methodPermissions.isEmpty()) {
+ out(0, "--Method Permissions--------");
+ for (ListIterator<MethodPermissionInfo> iterator = ejbJar.methodPermissions.listIterator(); iterator.hasNext();) {
+ MethodPermissionInfo methodPermission = iterator.next();
+
+ out(1, "--[" + iterator.previousIndex() + "]----------------------");
+ out(1, " ", methodPermission);
+ out(1, "description ", methodPermission.description);
+ out(1, "roleNames ", methodPermission.roleNames);
+ if (methodPermission.roleNames != null) {
+ for (ListIterator<String> roleNameIterator = methodPermission.roleNames.listIterator(); roleNameIterator.hasNext();) {
+ String roleName = roleNameIterator.next();
+ out(1, "roleName[" + roleNameIterator.previousIndex() + "] ", roleName);
+ }
+ }
+ out(1, "methods ", methodPermission.methods);
+ if (methodPermission.methods != null) {
+ for (MethodInfo methodInfo : methodPermission.methods) {
+ out(2, "description ", methodInfo.description);
+ out(2, "ejbDeploymentId", methodInfo.ejbDeploymentId);
+ out(2, "methodIntf ", methodInfo.methodIntf);
+ out(2, "methodName ", methodInfo.methodName);
+ if (methodInfo.methodParams != null) {
+ out(2, "methodParams ", methodInfo.methodParams);
+ for (ListIterator<String> paramIterator = methodInfo.methodParams.listIterator(); paramIterator.hasNext();) {
+ String methodParam = paramIterator.next();
+ out(3, "param[" + paramIterator.previousIndex() + "]", methodParam);
+ }
+ }
}
}
}
}
- }
- }
- if (!conf.containerSystem.methodTransactions.isEmpty()) {
- out(0, "--Method Transactions-------");
+ if (!ejbJar.methodTransactions.isEmpty()) {
+ out(0, "--Method Transactions-------");
- for (ListIterator<MethodTransactionInfo> iterator = conf.containerSystem.methodTransactions.listIterator(); iterator.hasNext();) {
- MethodTransactionInfo methodTransaction = iterator.next();
+ for (ListIterator<MethodTransactionInfo> iterator = ejbJar.methodTransactions.listIterator(); iterator.hasNext();) {
+ MethodTransactionInfo methodTransaction = iterator.next();
- out(1, "--[" + iterator.previousIndex() + "]----------------------");
- out(1, " ", methodTransaction);
- out(1, "description ", methodTransaction.description);
- out(1, "transAttribute ", methodTransaction.transAttribute);
- out(1, "methods ", methodTransaction.methods);
- for (MethodInfo methodInfo : methodTransaction.methods) {
- out(2, "description ", methodInfo.description);
- out(2, "ejbDeploymentId", methodInfo.ejbDeploymentId);
- out(2, "methodIntf ", methodInfo.methodIntf);
- out(2, "methodName ", methodInfo.methodName);
- if (methodInfo.methodParams != null) {
- out(2, "methodParams ", methodInfo.methodParams);
- for (ListIterator<String> paramIterator = methodInfo.methodParams.listIterator(); paramIterator.hasNext();) {
- String methodParam = paramIterator.next();
- out(3, "param[" + paramIterator.previousIndex() + "]", methodParam);
+ out(1, "--[" + iterator.previousIndex() + "]----------------------");
+ out(1, " ", methodTransaction);
+ out(1, "description ", methodTransaction.description);
+ out(1, "transAttribute ", methodTransaction.transAttribute);
+ out(1, "methods ", methodTransaction.methods);
+ for (MethodInfo methodInfo : methodTransaction.methods) {
+ out(2, "description ", methodInfo.description);
+ out(2, "ejbDeploymentId", methodInfo.ejbDeploymentId);
+ out(2, "methodIntf ", methodInfo.methodIntf);
+ out(2, "methodName ", methodInfo.methodName);
+ if (methodInfo.methodParams != null) {
+ out(2, "methodParams ", methodInfo.methodParams);
+ for (ListIterator<String> paramIterator = methodInfo.methodParams.listIterator(); paramIterator.hasNext();) {
+ String methodParam = paramIterator.next();
+ out(3, "param[" + paramIterator.previousIndex() + "]", methodParam);
+ }
+ }
}
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java Thu Jan 4 18:30:42 2007
@@ -83,9 +83,6 @@
public static final String DEFAULT_SECURITY_ROLE = "openejb.default.security.role";
public static List<String> deploymentIds = new ArrayList<String>();
public static List<String> securityRoles = new ArrayList<String>();
- private List<MethodPermissionInfo> methodPermissionInfos = new ArrayList<MethodPermissionInfo>();
- private List<MethodTransactionInfo> methodTransactionInfos = new ArrayList<MethodTransactionInfo>();
- private List<SecurityRoleInfo> securityRoleInfos = new ArrayList<SecurityRoleInfo>();
public EjbJarInfo buildInfo(EjbModule jar) throws OpenEJBException {
@@ -144,9 +141,9 @@
if (jar.getEjbJar().getAssemblyDescriptor() != null) {
initInterceptors(jar, ejbJar, infos);
- initSecurityRoles(jar);
- initMethodPermissions(jar, ejbds);
- initMethodTransactions(jar, ejbds);
+ initSecurityRoles(jar, ejbJar);
+ initMethodPermissions(jar, ejbds, ejbJar);
+ initMethodTransactions(jar, ejbds, ejbJar);
for (EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) {
resolveRoleLinks(jar, bean, items.get(bean.ejbName));
@@ -317,7 +314,7 @@
}
}
- private void initMethodTransactions(EjbModule jar, Map ejbds) {
+ private void initMethodTransactions(EjbModule jar, Map ejbds, EjbJarInfo ejbJarInfo) {
List<ContainerTransaction> containerTransactions = jar.getEjbJar().getAssemblyDescriptor().getContainerTransaction();
List<MethodTransactionInfo> infos = new ArrayList<MethodTransactionInfo>();
@@ -327,15 +324,13 @@
info.description = cTx.getDescription();
info.transAttribute = cTx.getTransAttribute().toString();
info.methods.addAll(getMethodInfos(cTx.getMethod(), ejbds));
- infos.add(info);
+ ejbJarInfo.methodTransactions.add(info);
}
- getMethodTransactionInfos().addAll(infos);
}
- private void initSecurityRoles(EjbModule jar) {
+ private void initSecurityRoles(EjbModule jar, EjbJarInfo ejbJarInfo) {
List<SecurityRole> roles = jar.getEjbJar().getAssemblyDescriptor().getSecurityRole();
- List<SecurityRoleInfo> infos = new ArrayList<SecurityRoleInfo>();
for (SecurityRole sr : roles) {
SecurityRoleInfo info = new SecurityRoleInfo();
@@ -348,15 +343,13 @@
} else {
securityRoles.add(sr.getRoleName());
}
- infos.add(info);
+ ejbJarInfo.securityRoles.add(info);
}
- getSecurityRoleInfos().addAll(infos);
}
- private void initMethodPermissions(EjbModule jar, Map ejbds) {
+ private void initMethodPermissions(EjbModule jar, Map ejbds, EjbJarInfo ejbJarInfo) {
List<MethodPermission> methodPermissions = jar.getEjbJar().getAssemblyDescriptor().getMethodPermission();
- List<MethodPermissionInfo> infos = new ArrayList<MethodPermissionInfo>();
for (MethodPermission mp : methodPermissions) {
MethodPermissionInfo info = new MethodPermissionInfo();
@@ -365,10 +358,8 @@
info.roleNames.addAll(mp.getRoleName());
info.methods.addAll(getMethodInfos(mp.getMethod(), ejbds));
- infos.add(info);
+ ejbJarInfo.methodPermissions.add(info);
}
-
- getMethodPermissionInfos().addAll(infos);
}
private void resolveRoleLinks(EjbModule jar, EnterpriseBeanInfo bean, JndiConsumer item) {
@@ -573,17 +564,5 @@
}
}
return bean;
- }
-
- public List<MethodPermissionInfo> getMethodPermissionInfos() {
- return methodPermissionInfos;
- }
-
- public List<MethodTransactionInfo> getMethodTransactionInfos() {
- return methodTransactionInfos;
- }
-
- public List<SecurityRoleInfo> getSecurityRoleInfos() {
- return securityRoleInfos;
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Jan 4 18:30:42 2007
@@ -254,6 +254,7 @@
}
};
+ AssemblerTool.RoleMapping roleMapping = new AssemblerTool.RoleMapping(configInfo.facilities.securityService.roleMappings);
HashMap<String, DeploymentInfo> deployments2 = new HashMap<String, DeploymentInfo>();
for (AppInfo appInfo : containerSystemInfo.applications) {
@@ -299,7 +300,16 @@
// EJB
EjbJarBuilder ejbJarBuilder = new EjbJarBuilder(classLoader);
for (EjbJarInfo ejbJar : appInfo.ejbJars) {
- deployments2.putAll(ejbJarBuilder.build(ejbJar,allFactories));
+ HashMap<String, DeploymentInfo> deployments = ejbJarBuilder.build(ejbJar, allFactories);
+ deployments2.putAll(deployments);
+ for (DeploymentInfo deploymentInfo : deployments.values()) {
+ applyMethodPermissions((org.apache.openejb.core.CoreDeploymentInfo) deploymentInfo, ejbJar.methodPermissions, roleMapping);
+ applyTransactionAttributes((org.apache.openejb.core.CoreDeploymentInfo) deploymentInfo, ejbJar.methodTransactions);
+ }
+ for (EnterpriseBeanInfo beanInfo : ejbJar.enterpriseBeans) {
+ CoreDeploymentInfo deployment = (CoreDeploymentInfo) deployments.get(beanInfo.ejbDeploymentId);
+ applySecurityRoleReference(deployment, beanInfo, roleMapping);
+ }
}
// App Client
@@ -341,22 +351,6 @@
CoreDeploymentInfo deployment = (CoreDeploymentInfo) deployments1[j];
containerSystem.addDeployment(deployment);
jndiBuilder.bind(deployment);
- }
- }
-
- // Security - roleMapping used later in buildMethodPermissions
- AssemblerTool.RoleMapping roleMapping = new AssemblerTool.RoleMapping(configInfo.facilities.securityService.roleMappings);
- org.apache.openejb.DeploymentInfo [] deployments = containerSystem.deployments();
- for (int i = 0; i < deployments.length; i++) {
- applyMethodPermissions((org.apache.openejb.core.CoreDeploymentInfo) deployments[i], containerSystemInfo.methodPermissions, roleMapping);
- applyTransactionAttributes((org.apache.openejb.core.CoreDeploymentInfo) deployments[i], containerSystemInfo.methodTransactions);
- }
-
- // Security - apply role mappings
- for (ContainerInfo container : containerSystemInfo.containers) {
- for (EnterpriseBeanInfo beanInfo : container.ejbeans) {
- CoreDeploymentInfo deployment = (CoreDeploymentInfo) containerSystem.getDeploymentInfo(beanInfo.ejbDeploymentId);
- applySecurityRoleReference(deployment, beanInfo, roleMapping);
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java Thu Jan 4 18:30:42 2007
@@ -143,7 +143,7 @@
}
}
- public void applyTransactionAttributes(CoreDeploymentInfo deploymentInfo, List<MethodTransactionInfo> mtis) throws OpenEJBException {
+ public static void applyTransactionAttributes(CoreDeploymentInfo deploymentInfo, List<MethodTransactionInfo> mtis) throws OpenEJBException {
/*TODO: Add better exception handling. This method doesn't throws any exceptions!!
there is a lot of complex code here, I'm sure something could go wrong the user
might want to know about.
@@ -197,7 +197,7 @@
}
}
- public void applyMethodPermissions(CoreDeploymentInfo deployment, List<MethodPermissionInfo> permissions) {
+ public static void applyMethodPermissions(CoreDeploymentInfo deployment, List<MethodPermissionInfo> permissions) {
/*TODO: Add better exception handling. This method doesn't throws any exceptions!!
there is a lot of complex code here, I'm sure something could go wrong the user
might want to know about.
@@ -218,7 +218,7 @@
}
}
- public void applyMethodPermissions(CoreDeploymentInfo deployment, List<MethodPermissionInfo> permissions, AssemblerTool.RoleMapping roleMapping) {
+ public static void applyMethodPermissions(CoreDeploymentInfo deployment, List<MethodPermissionInfo> permissions, AssemblerTool.RoleMapping roleMapping) {
/*TODO: Add better exception handling. This method doesn't throws any exceptions!!
there is a lot of complex code here, I'm sure something could go wrong the user
might want to know about.
@@ -241,7 +241,7 @@
* @see org.apache.openejb.assembler.classic.MethodPermissionInfo
* @see org.apache.openejb.assembler.classic.AssemblerTool.RoleMapping
*/
- public void applyRoleMappings(MethodPermissionInfo methodPermission,
+ public static void applyRoleMappings(MethodPermissionInfo methodPermission,
AssemblerTool.RoleMapping roleMapping) {
/*TODO: Add better exception handling. This method doesn't throws any exceptions!!
there is a lot of complex code here, I'm sure something could go wrong the user
@@ -288,7 +288,7 @@
}
- protected List<Method> resolveMethodInfo(MethodInfo methodInfo, org.apache.openejb.core.CoreDeploymentInfo di) {
+ protected static List<Method> resolveMethodInfo(MethodInfo methodInfo, org.apache.openejb.core.CoreDeploymentInfo di) {
/*TODO: Add better exception handling. This method doesn't throws any exceptions!!
there is a lot of complex code here, I'm sure something could go wrong the user
might want to know about.
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ContainerSystemInfo.java Thu Jan 4 18:30:42 2007
@@ -31,7 +31,4 @@
public final List<StatelessSessionContainerInfo> statelessContainers = new ArrayList<StatelessSessionContainerInfo>();
public final List<StatefulSessionContainerInfo> statefulContainers = new ArrayList<StatefulSessionContainerInfo>();
public final List<MdbContainerInfo> mdbContainers = new ArrayList<MdbContainerInfo>();
- public final List<SecurityRoleInfo> securityRoles = new ArrayList<SecurityRoleInfo>();
- public final List<MethodPermissionInfo> methodPermissions= new ArrayList<MethodPermissionInfo>();
- public final List<MethodTransactionInfo> methodTransactions = new ArrayList<MethodTransactionInfo>();
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarInfo.java Thu Jan 4 18:30:42 2007
@@ -23,4 +23,8 @@
public String jarPath;
public final List<EnterpriseBeanInfo> enterpriseBeans = new ArrayList<EnterpriseBeanInfo>();
public final List<InterceptorInfo> defaultInterceptors = new ArrayList<InterceptorInfo>();
+
+ public final List<SecurityRoleInfo> securityRoles = new ArrayList<SecurityRoleInfo>();
+ public final List<MethodPermissionInfo> methodPermissions= new ArrayList<MethodPermissionInfo>();
+ public final List<MethodTransactionInfo> methodTransactions = new ArrayList<MethodTransactionInfo>();
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/DeploymentsFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/DeploymentsFactory.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/DeploymentsFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/DeploymentsFactory.java Thu Jan 4 18:30:42 2007
@@ -148,8 +148,8 @@
continue;
}
- transferMethodTransactionInfos(infoBuilder);
- transferMethodPermissionInfos(infoBuilder);
+ transferMethodTransactionInfos(jarInfo);
+ transferMethodPermissionInfos(jarInfo);
HashMap<String, DeploymentInfo> ejbs = builder.build(jarInfo,allFactories);
@@ -163,23 +163,23 @@
return deployments;
}
- private void transferMethodTransactionInfos(EjbJarInfoBuilder infoBuilder) {
+ private void transferMethodTransactionInfos(EjbJarInfo jarInfo) {
List<MethodTransactionInfo> infos = new ArrayList<MethodTransactionInfo>();
if (assembly.getMethodTransactions() != null){
infos.addAll(Arrays.asList(assembly.getMethodTransactions()));
}
- for (org.apache.openejb.assembler.classic.MethodTransactionInfo info : infoBuilder.getMethodTransactionInfos()) {
+ for (org.apache.openejb.assembler.classic.MethodTransactionInfo info : jarInfo.methodTransactions) {
infos.add(new MethodTransactionInfo(info));
}
assembly.setMethodTransactions(infos.toArray(new MethodTransactionInfo[]{}));
}
- private void transferMethodPermissionInfos(EjbJarInfoBuilder infoBuilder) {
+ private void transferMethodPermissionInfos(EjbJarInfo jarInfo) {
List<MethodPermissionInfo> infos = new ArrayList<MethodPermissionInfo>();
if (assembly.getMethodPermissions() != null){
infos.addAll(Arrays.asList(assembly.getMethodPermissions()));
}
- for (org.apache.openejb.assembler.classic.MethodPermissionInfo info : infoBuilder.getMethodPermissionInfos()) {
+ for (org.apache.openejb.assembler.classic.MethodPermissionInfo info : jarInfo.methodPermissions) {
infos.add(new MethodPermissionInfo(info));
}
assembly.setMethodPermissions(infos.toArray(new MethodPermissionInfo[]{}));
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/OpenEjbConfigToSpring.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/OpenEjbConfigToSpring.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/OpenEjbConfigToSpring.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/OpenEjbConfigToSpring.java Thu Jan 4 18:30:42 2007
@@ -282,19 +282,6 @@
writer.endElement();
}
- for (MethodPermissionInfo permissionInfo : configInfo.containerSystem.methodPermissions) {
- writer.startElement("o:permission");
- writer.addAttribute("roleNames", createCsv(permissionInfo.roleNames));
- writeMethodInfos(permissionInfo.methods);
- writer.endElement();
- }
-
- for (MethodTransactionInfo transactionInfo : configInfo.containerSystem.methodTransactions) {
- writer.startElement("o:transaction");
- writer.addAttribute("transAttribute", transactionInfo.transAttribute);
- writeMethodInfos(transactionInfo.methods);
- writer.endElement();
- }
writer.endElement();
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java?view=diff&rev=492867&r1=492866&r2=492867
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java Thu Jan 4 18:30:42 2007
@@ -57,7 +57,7 @@
// Nothing may depend on the Assembler except the config code or spring assembler
String springAssembler = "org.apache.openejb.assembler.spring";
- assertNotDependentOn("org.apache.openejb", "org.apache.openejb.assembler.classic", "org.apache.openejb.alt.config", springAssembler);
+ assertNotDependentOn("org.apache.openejb", "org.apache.openejb.assembler.classic", "org.apache.openejb.alt.config", springAssembler, "org.apache.openejb.assembler.dynamic");
// Nothing may depend on the Spring Assembler
assertNotDependentOn("org.apache.openejb", springAssembler);