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 2006/10/26 08:01:44 UTC
svn commit: r467881 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config:
AutoConfigAndDeploy.java AutoDeployer.java DeploymentLoader.java
DynamicDeployer.java
Author: dblevins
Date: Wed Oct 25 23:01:43 2006
New Revision: 467881
URL: http://svn.apache.org/viewvc?view=rev&rev=467881
Log:
deploy method now accepts EjbModule and returns EjbModule. deploy methods can now be chained
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DynamicDeployer.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java?view=diff&rev=467881&r1=467880&r2=467881
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java Wed Oct 25 23:01:43 2006
@@ -48,18 +48,18 @@
public void init() throws OpenEJBException {
}
- public EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
- this.jarLocation = jarLocation;
- this.classLoader = classLoader;
+ public EjbModule deploy(EjbModule ejbModule) throws OpenEJBException {
+ this.jarLocation = ejbModule.getJarURI();
+ this.classLoader = ejbModule.getClassLoader();
OpenejbJar openejbJar;
- if (ejbJarUtils.getOpenejbJar() != null) {
- openejbJar = ejbJarUtils.getOpenejbJar();
+ if (ejbModule.getOpenejbJar() != null) {
+ openejbJar = ejbModule.getOpenejbJar();
} else {
openejbJar = new OpenejbJar();
}
- Bean[] beans = EjbJarUtils.getBeans(ejbJarUtils.getEjbJar());
+ Bean[] beans = EjbJarUtils.getBeans(ejbModule.getEjbJar());
for (int i = 0; i < beans.length; i++) {
final Bean bean = beans[i];
@@ -141,7 +141,7 @@
}
- return new EjbModule(jarLocation, ejbJarUtils.getEjbJar(), openejbJar);
+ return new EjbModule(this.jarLocation, ejbModule.getEjbJar(), openejbJar);
}
private Map<String, Connector> getConnectorsById() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java?view=diff&rev=467881&r1=467880&r2=467881
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoDeployer.java Wed Oct 25 23:01:43 2006
@@ -46,21 +46,22 @@
public void init() throws OpenEJBException {
}
- public EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
- if (ejbJarUtils.getOpenejbJar() != null){
- return new EjbModule(jarLocation, ejbJarUtils.getEjbJar(), ejbJarUtils.getOpenejbJar());
+ public EjbModule deploy(EjbModule ejbModule) throws OpenEJBException {
+ if (ejbModule.getOpenejbJar() != null){
+ return new EjbModule(ejbModule.getJarURI(), ejbModule.getEjbJar(), ejbModule.getOpenejbJar());
}
- this.jarLocation = jarLocation;
- this.classLoader = classLoader;
+ this.jarLocation = ejbModule.getJarURI();
+ this.classLoader = ejbModule.getClassLoader();
OpenejbJar openejbJar = new OpenejbJar();
- Bean[] beans = EjbJarUtils.getBeans(ejbJarUtils.getEjbJar());;
+ Bean[] beans = EjbJarUtils.getBeans(ejbModule.getEjbJar());
+ ;
for (int i = 0; i < beans.length; i++) {
- openejbJar.getEjbDeployment().add(deployBean(beans[i], jarLocation));
+ openejbJar.getEjbDeployment().add(deployBean(beans[i], this.jarLocation));
}
- return new EjbModule(jarLocation, ejbJarUtils.getEjbJar(), openejbJar);
+ return new EjbModule(this.jarLocation, ejbModule.getEjbJar(), openejbJar);
}
private EjbDeployment deployBean(Bean bean, String jarLocation) throws OpenEJBException {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java?view=diff&rev=467881&r1=467880&r2=467881
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java Wed Oct 25 23:01:43 2006
@@ -128,8 +128,8 @@
public List<EjbModule> loadDeploymentsList(List<Deployments> deployments, DynamicDeployer deployer) throws OpenEJBException {
if (deployer == null){
deployer = new DynamicDeployer(){
- public EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
- return new EjbModule(jarLocation, ejbJarUtils.getEjbJar(), ejbJarUtils.getOpenejbJar());
+ public EjbModule deploy(EjbModule ejbModule) throws OpenEJBException {
+ return ejbModule;
}
};
}
@@ -182,7 +182,8 @@
classLoader = tempCodebase.getClassLoader();
}
- EjbModule ejbModule = deployer.deploy(ejbJarUtils, jarLocation, classLoader);
+ EjbModule undeployedModule = new EjbModule(classLoader, jarLocation, ejbJarUtils.getEjbJar(), ejbJarUtils.getOpenejbJar());
+ EjbModule ejbModule = deployer.deploy(undeployedModule);
EjbSet set = validator.validateJar(ejbJarUtils, classLoader);
if (set.hasErrors() || set.hasFailures()) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DynamicDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DynamicDeployer.java?view=diff&rev=467881&r1=467880&r2=467881
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DynamicDeployer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DynamicDeployer.java Wed Oct 25 23:01:43 2006
@@ -23,5 +23,5 @@
* @version $Revision$ $Date$
*/
public interface DynamicDeployer {
- EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException;
+ EjbModule deploy(EjbModule ejbModule) throws OpenEJBException;
}