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/15 06:20:49 UTC
svn commit: r496234 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config:
AnnotationDeployer.java AutoConfigAndDeploy.java ConfigurationFactory.java
DeploymentLoader.java
Author: dblevins
Date: Sun Jan 14 21:20:48 2007
New Revision: 496234
URL: http://svn.apache.org/viewvc?view=rev&rev=496234
Log:
Removed commented out code
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AnnotationDeployer.java
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/ConfigurationFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeploymentLoader.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AnnotationDeployer.java?view=diff&rev=496234&r1=496233&r2=496234
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AnnotationDeployer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AnnotationDeployer.java Sun Jan 14 21:20:48 2007
@@ -90,20 +90,6 @@
processAnnotatedBeans = new ProcessAnnotatedBeans();
}
-// public ClientModule deploy(ClientModule clientModule) throws OpenEJBException {
-// clientModule = discoverBeansInClassLoader.deploy(clientModule);
-// clientModule = deployer.deploy(clientModule);
-// clientModule = processAnnotatedBeans.deploy(clientModule);
-// return clientModule;
-// }
-//
-// public EjbModule deploy(EjbModule ejbModule) throws OpenEJBException {
-// ejbModule = discoverBeansInClassLoader.deploy(ejbModule);
-// ejbModule = deployer.deploy(ejbModule);
-// ejbModule = processAnnotatedBeans.deploy(ejbModule);
-// return ejbModule;
-// }
-
public AppModule deploy(AppModule appModule) throws OpenEJBException {
appModule = discoverBeansInClassLoader.deploy(appModule);
appModule = deployer.deploy(appModule);
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=496234&r1=496233&r2=496234
==============================================================================
--- 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 Sun Jan 14 21:20:48 2007
@@ -43,8 +43,6 @@
public static Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
private final Openejb config;
-// private ClassLoader classLoader;
-// private String jarLocation;
public AutoConfigAndDeploy(Openejb config) {
this.config = config;
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=496234&r1=496233&r2=496234
==============================================================================
--- 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 Sun Jan 14 21:20:48 2007
@@ -114,7 +114,7 @@
DynamicDeployer deployer = getDeployer(openejb);
- DeploymentLoader deploymentLoader = new DeploymentLoader(props);
+ DeploymentLoader deploymentLoader = new DeploymentLoader();
List<String> jarList = DeploymentsResolver.resolveAppLocations(openejb.getDeployments());
@@ -127,8 +127,10 @@
try {
- AppModule appModule = deploymentLoader.load(jarFile, deployer);
+ AppModule appModule = deploymentLoader.load(jarFile);
+
deployer.deploy(appModule);
+
appModules.add(appModule);
logger.info("Loaded Module: " + appModule.getJarLocation());
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=496234&r1=496233&r2=496234
==============================================================================
--- 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 Sun Jan 14 21:20:48 2007
@@ -53,13 +53,13 @@
public static Logger logger = Logger.getInstance("OpenEJB.startup", "org.apache.openejb.util.resources");
- public DeploymentLoader(Properties props) {
+ public DeploymentLoader() {
// For some reason intellij won't log to the one we configured statically
logger = EjbJarUtils.logger;
}
- public AppModule load(File jarFile, DynamicDeployer deployer) throws OpenEJBException {
+ public AppModule load(File jarFile) throws OpenEJBException {
ClassLoader classLoader = getClassLoader(jarFile);
URL baseUrl = getFileUrl(jarFile);
@@ -197,8 +197,6 @@
EjbModule ejbModule = new EjbModule(appClassLoader, ejbFile.getAbsolutePath(), ejbJar, openejbJar);
-// ejbModule = deployer.deploy(ejbModule);
-
appModule.getEjbModules().add(ejbModule);
} catch (OpenEJBException e) {
logger.error("Unable to load EJBs from EAR: " + appDir.getAbsolutePath() + ", module: " + moduleName + ". Exception: " + e.getMessage(), e);
@@ -225,8 +223,6 @@
String mainClass = manifest.getMainAttributes().getValue(Attributes.Name.MAIN_CLASS);
ClientModule clientModule = new ClientModule(applicationClient, appClassLoader, clientFile.getAbsolutePath(), mainClass);
-
-// clientModule = deployer.deploy(clientModule);
appModule.getClientModules().add(clientModule);
} catch (Exception e) {