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 07:29:26 UTC
svn commit: r467870 - in /incubator/openejb/trunk/openejb3: ./
container/openejb-core/src/main/java/org/apache/openejb/alt/config/
container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/
container/openejb-core/src/main/java/org/apache...
Author: dblevins
Date: Wed Oct 25 22:29:24 2006
New Revision: 467870
URL: http://svn.apache.org/viewvc?view=rev&rev=467870
Log:
Renamed DeployedJar to EjbModule. Starting to centralize deployment code around it and reduce importance of EjbJarUtils.
Added:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbModule.java (contents, props changed)
- copied, changed from r467507, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeployedJar.java
Removed:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeployedJar.java
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/ConfigurationFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.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
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/alt/config/EjbJarUtils.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.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/cli/Main.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java
incubator/openejb/trunk/openejb3/pom.xml
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=467870&r1=467869&r2=467870
==============================================================================
--- 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 22:29:24 2006
@@ -48,7 +48,7 @@
public void init() throws OpenEJBException {
}
- public OpenejbJar deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
+ public EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
this.jarLocation = jarLocation;
this.classLoader = classLoader;
@@ -59,7 +59,7 @@
openejbJar = new OpenejbJar();
}
- Bean[] beans = ejbJarUtils.getBeans();
+ Bean[] beans = EjbJarUtils.getBeans(ejbJarUtils.getEjbJar());
for (int i = 0; i < beans.length; i++) {
final Bean bean = beans[i];
@@ -141,7 +141,7 @@
}
- return openejbJar;
+ return new EjbModule(jarLocation, ejbJarUtils.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=467870&r1=467869&r2=467870
==============================================================================
--- 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 22:29:24 2006
@@ -46,21 +46,21 @@
public void init() throws OpenEJBException {
}
- public OpenejbJar deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
+ public EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
if (ejbJarUtils.getOpenejbJar() != null){
- return ejbJarUtils.getOpenejbJar();
+ return new EjbModule(jarLocation, ejbJarUtils.getEjbJar(), ejbJarUtils.getOpenejbJar());
}
this.jarLocation = jarLocation;
this.classLoader = classLoader;
OpenejbJar openejbJar = new OpenejbJar();
- Bean[] beans = ejbJarUtils.getBeans();
+ Bean[] beans = EjbJarUtils.getBeans(ejbJarUtils.getEjbJar());;
for (int i = 0; i < beans.length; i++) {
openejbJar.getEjbDeployment().add(deployBean(beans[i], jarLocation));
}
- return openejbJar;
+ return new EjbModule(jarLocation, ejbJarUtils.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/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=467870&r1=467869&r2=467870
==============================================================================
--- 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 Wed Oct 25 22:29:24 2006
@@ -140,9 +140,9 @@
deployments.add(deployment);
}
- List<DeployedJar> deployedJars = new DeploymentLoader().loadDeploymentsList(deployments, deployer);
+ List<EjbModule> deployedJars = new DeploymentLoader().loadDeploymentsList(deployments, deployer);
- DeployedJar[] jars = deployedJars.toArray(new DeployedJar[]{});
+ EjbModule[] jars = deployedJars.toArray(new EjbModule[]{});
sys = new OpenEjbConfiguration();
sys.containerSystem = new ContainerSystemInfo();
@@ -163,7 +163,7 @@
ArrayList ejbs = new ArrayList();
ArrayList ejbJars = new ArrayList();
- for (DeployedJar jar : jars) {
+ for (EjbModule jar : jars) {
try {
EjbJarInfo ejbJarInfo = ejbJarInfoBuilder.buildInfo(jar);
if (ejbJarInfo == null) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java?view=diff&rev=467870&r1=467869&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Deploy.java Wed Oct 25 22:29:24 2006
@@ -53,7 +53,7 @@
private static final String HELP_BASE = "META-INF/org.apache.openejb.cli/";
private static final String DEPLOY_TOOL_MSG_HEADER = "Apache OpenEJB Deploy Tool";
-
+
protected static final Messages _messages = new Messages("org.apache.openejb.alt.util.resources");
private static final String DEPLOYMENT_ID_HELP = "\nDeployment ID ----- \n\nA name for the ejb that is unique not only in this jar, but \nin all the jars in the container system. This name will \nallow OpenEJB to place the bean in a global index and \nreference the bean quickly. OpenEJB will also use this name \nas the global JNDI name for the Remote Server and the Local \nServer. Clients of the Remote or Local servers can use this\nname to perform JNDI lookups.\n\nThe other EJB Server's using OpenEJB as the EJB Container \nSystem may also use this name to as part of a global JNDI \nnamespace available to remote application clients.\n\nExample: /my/acme/bugsBunnyBean";
@@ -100,7 +100,7 @@
public void init() throws OpenEJBException {
init(null);
}
-
+
public void init(String openejbConfigFile) throws OpenEJBException {
try {
@@ -151,7 +151,7 @@
this.jarLocation = jarLocation;
List<String> ejbs = searchForAnnotatedEjbs(jarLocation);
System.out.println("@Stateless-annotated beans count: " + ejbs.size());
-
+
EjbJarUtils ejbJarUtils = new EjbJarUtils(jarLocation);
EjbValidator validator = new EjbValidator();
@@ -179,7 +179,7 @@
OpenejbJar openejbJar = new OpenejbJar();
- Bean[] beans = ejbJarUtils.getBeans();
+ Bean[] beans = EjbJarUtils.getBeans(ejbJarUtils.getEjbJar());;
listBeanNames(beans);
@@ -205,7 +205,7 @@
}
/**
- * @param jarPath path of jar to deploy
+ * @param path path of jar to deploy
*/
private List<String> searchForAnnotatedEjbs(String path) {
File file = new File(path);
@@ -215,7 +215,7 @@
return searchEjbsInJar(file);
}
}
-
+
private List<String> searchEjbsInJar(File file) {
// TODO: Implement it!
return new ArrayList<String>();
@@ -244,7 +244,7 @@
/**
* @param dir directory to look at
- * @return classes as a {@link List} of {@link File}'s
+ * @return classes as a {@link List} of {@link File}'s
*/
private List<File> getClasses(File dir) {
List<File> classes = new ArrayList<File>();
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=467870&r1=467869&r2=467870
==============================================================================
--- 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 22:29:24 2006
@@ -111,7 +111,7 @@
JAR, DIR, CLASSPATH
}
- public List<DeployedJar> load(Type type, Object source) throws OpenEJBException {
+ public List<EjbModule> load(Type type, Object source) throws OpenEJBException {
Deployments deployments = new Deployments();
switch(type){
case JAR: deployments.setJar((String) source); break;
@@ -125,17 +125,17 @@
}
- public List<DeployedJar> loadDeploymentsList(List<Deployments> deployments, DynamicDeployer deployer) throws OpenEJBException {
+ public List<EjbModule> loadDeploymentsList(List<Deployments> deployments, DynamicDeployer deployer) throws OpenEJBException {
if (deployer == null){
deployer = new DynamicDeployer(){
- public OpenejbJar deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
- return ejbJarUtils.getOpenejbJar();
+ public EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException {
+ return new EjbModule(jarLocation, ejbJarUtils.getEjbJar(), ejbJarUtils.getOpenejbJar());
}
};
}
EjbValidator validator = new EjbValidator();
- List<DeployedJar> deployedJars = new ArrayList();
+ List<EjbModule> deployedJars = new ArrayList();
// resolve jar locations ////////////////////////////////////// BEGIN ///////
@@ -164,7 +164,6 @@
String jarLocation = jarsToLoad[i];
try {
EjbJarUtils ejbJarUtils = new EjbJarUtils(jarLocation);
- EjbJar ejbJar = ejbJarUtils.getEjbJar();
ClassLoader classLoader;
@@ -183,7 +182,7 @@
classLoader = tempCodebase.getClassLoader();
}
- OpenejbJar openejbJar = deployer.deploy(ejbJarUtils, jarLocation, classLoader);
+ EjbModule ejbModule = deployer.deploy(ejbJarUtils, jarLocation, classLoader);
EjbSet set = validator.validateJar(ejbJarUtils, classLoader);
if (set.hasErrors() || set.hasFailures()) {
@@ -206,7 +205,7 @@
/* Add it to the Vector ***************/
ConfigurationFactory.logger.info("Loaded EJBs from " + jarLocation);
- deployedJars.add(new DeployedJar(jarLocation, ejbJar, openejbJar));
+ deployedJars.add(ejbModule);
} catch (OpenEJBException e) {
ConfigUtils.logger.i18n.warning("conf.0004", jarLocation, e.getMessage());
}
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=467870&r1=467869&r2=467870
==============================================================================
--- 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 22:29:24 2006
@@ -17,12 +17,11 @@
*/
package org.apache.openejb.alt.config;
-import org.apache.openejb.alt.config.ejb.OpenejbJar;
import org.apache.openejb.OpenEJBException;
/**
* @version $Revision$ $Date$
*/
public interface DynamicDeployer {
- OpenejbJar deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException;
+ EjbModule deploy(EjbJarUtils ejbJarUtils, String jarLocation, ClassLoader classLoader) throws OpenEJBException;
}
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=467870&r1=467869&r2=467870
==============================================================================
--- 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 Wed Oct 25 22:29:24 2006
@@ -77,7 +77,7 @@
private List<SecurityRoleInfo> securityRoleInfos = new ArrayList();
- public EjbJarInfo buildInfo(DeployedJar jar) throws OpenEJBException {
+ public EjbJarInfo buildInfo(EjbModule jar) throws OpenEJBException {
int beansDeployed = jar.getOpenejbJar().getEjbDeploymentCount();
int beansInEjbJar = jar.getEjbJar().getEnterpriseBeans().length;
@@ -257,7 +257,7 @@
return infos.toArray(new EnvEntryInfo[]{});
}
- private void initMethodTransactions(DeployedJar jar, Map ejbds) {
+ private void initMethodTransactions(EjbModule jar, Map ejbds) {
List<ContainerTransaction> containerTransactions = jar.getEjbJar().getAssemblyDescriptor().getContainerTransaction();
List<MethodTransactionInfo> infos = new ArrayList();
@@ -272,7 +272,7 @@
getMethodTransactionInfos().addAll(infos);
}
- private void initSecurityRoles(DeployedJar jar) {
+ private void initSecurityRoles(EjbModule jar) {
List<SecurityRole> roles = jar.getEjbJar().getAssemblyDescriptor().getSecurityRole();
List<SecurityRoleInfo> infos = new ArrayList();
@@ -293,7 +293,7 @@
getSecurityRoleInfos().addAll(infos);
}
- private void initMethodPermissions(DeployedJar jar, Map ejbds) {
+ private void initMethodPermissions(EjbModule jar, Map ejbds) {
List<MethodPermission> methodPermissions = jar.getEjbJar().getAssemblyDescriptor().getMethodPermission();
List<MethodPermissionInfo> infos = new ArrayList();
@@ -311,7 +311,7 @@
getMethodPermissionInfos().addAll(infos);
}
- private void resolveRoleLinks(DeployedJar jar, EnterpriseBeanInfo bean, EnterpriseBean item) {
+ private void resolveRoleLinks(EjbModule jar, EnterpriseBeanInfo bean, EnterpriseBean item) {
if (!(item instanceof RemoteBean)) {
return;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java?view=diff&rev=467870&r1=467869&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarUtils.java Wed Oct 25 22:29:24 2006
@@ -252,7 +252,7 @@
return useableContainers;
}
- public Bean[] getBeans() {
+ public static Bean[] getBeans(EjbJar ejbJar) {
List<Bean> beans = new ArrayList<Bean>();
for (EnterpriseBean enterpriseBean : ejbJar.getEnterpriseBeans()) {
if (enterpriseBean instanceof org.apache.openejb.jee.EntityBean) {
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbModule.java (from r467507, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeployedJar.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbModule.java?view=diff&rev=467870&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeployedJar.java&r1=467507&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbModule.java&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/DeployedJar.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbModule.java Wed Oct 25 22:29:24 2006
@@ -21,20 +21,29 @@
import org.apache.openejb.alt.config.ejb.OpenejbJar;
/**
+ * Class is to remain "dumb" and should not have deployment logic added to it.
+ * Class is intentionally not an interface as that would encourage "smart" implementations
* @version $Revision$ $Date$
*/
-public class DeployedJar {
+public class EjbModule {
+ private ClassLoader classLoader;
private EjbJar ejbJar;
private OpenejbJar openejbJar;
private String jarURI;
- public DeployedJar(String jar, EjbJar ejbJar, OpenejbJar openejbJar) {
+ public EjbModule(String jar, EjbJar ejbJar, OpenejbJar openejbJar) {
this.ejbJar = ejbJar;
this.openejbJar = openejbJar;
this.jarURI = jar;
}
+ public EjbModule(ClassLoader classLoader, String jarURI, EjbJar ejbJar, OpenejbJar openejbJar) {
+ this.classLoader = classLoader;
+ this.ejbJar = ejbJar;
+ this.jarURI = jarURI;
+ this.openejbJar = openejbJar;
+ }
public EjbJar getEjbJar() {
return ejbJar;
@@ -46,5 +55,9 @@
public String getJarURI() {
return jarURI;
+ }
+
+ public ClassLoader getClassLoader() {
+ return classLoader;
}
}
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbModule.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java?view=diff&rev=467870&r1=467869&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbValidator.java Wed Oct 25 22:29:24 2006
@@ -71,7 +71,7 @@
EjbSet set = null;
try {
- set = new EjbSet(ejbJarUtils.getJarLocation(), ejbJarUtils.getEjbJar(), ejbJarUtils.getBeans(), classLoader);
+ set = new EjbSet(ejbJarUtils.getJarLocation(), ejbJarUtils.getEjbJar(), EjbJarUtils.getBeans(ejbJarUtils.getEjbJar()), classLoader);
ValidationRule[] rules = getValidationRules();
for (int i = 0; i < rules.length; i++) {
rules[i].validate(set);
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=467870&r1=467869&r2=467870
==============================================================================
--- 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 Wed Oct 25 22:29:24 2006
@@ -26,7 +26,7 @@
import javax.transaction.TransactionManager;
import org.apache.openejb.DeploymentInfo;
-import org.apache.openejb.alt.config.DeployedJar;
+import org.apache.openejb.alt.config.EjbModule;
import org.apache.openejb.alt.config.DeploymentLoader;
import org.apache.openejb.alt.config.EjbJarInfoBuilder;
import org.apache.openejb.alt.config.ejb.EjbDeployment;
@@ -99,7 +99,7 @@
org.apache.openejb.assembler.classic.Assembler.setContext(context);
DeploymentLoader loader = new DeploymentLoader();
- List<DeployedJar> deployedJars = loader.load(type, value);
+ List<EjbModule> deployedJars = loader.load(type, value);
EjbJarInfoBuilder infoBuilder = new EjbJarInfoBuilder();
@@ -109,7 +109,7 @@
System.out.println("DeploymentsFactory.getObject");
deployments = new HashMap();
- for (DeployedJar jar : deployedJars) {
+ for (EjbModule jar : deployedJars) {
EjbJarInfo jarInfo = infoBuilder.buildInfo(jar);
if (jarInfo == null){
// This means the jar failed validation or otherwise could not be deployed
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Main.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Main.java?view=diff&rev=467870&r1=467869&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Main.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Main.java Wed Oct 25 22:29:24 2006
@@ -83,7 +83,7 @@
/**
* Read commands from BASE_PATH (using XBean's ResourceFinder) and execute the one specified on the command line
- *
+ *
* TODO: There must be a better way to read command line args and spawn a command
*/
public static void main(String[] args) {
@@ -186,7 +186,7 @@
}
argsList.clear();
-
+
int startPoint = 1;
if (help) {
@@ -212,11 +212,16 @@
}
}
+ //DMB: TODO: Delete me
+ public static Enumeration doFindCommands() throws IOException {
+ return Thread.currentThread().getContextClassLoader().getResources(BASE_PATH);
+ }
+
private static void printAvailableCommands() {
System.out.println("COMMANDS:");
try {
- Enumeration commandHomes = finder.doFindCommands();
+ Enumeration commandHomes = doFindCommands();
if (commandHomes != null) {
for (; commandHomes.hasMoreElements();) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java?view=diff&rev=467870&r1=467869&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java Wed Oct 25 22:29:24 2006
@@ -22,7 +22,7 @@
import org.apache.openejb.jee.StatefulBean;
import org.apache.openejb.alt.config.ejb.OpenejbJar;
import org.apache.openejb.alt.config.ejb.EjbDeployment;
-import org.apache.openejb.alt.config.DeployedJar;
+import org.apache.openejb.alt.config.EjbModule;
import org.apache.openejb.alt.config.EjbJarInfoBuilder;
import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.ri.sp.PseudoTransactionService;
@@ -150,7 +150,7 @@
OpenejbJar openejbJar = new OpenejbJar();
openejbJar.addEjbDeployment(new EjbDeployment("Stateful Container", "widget", "widget"));
- DeployedJar jar = new DeployedJar("", ejbJar, openejbJar);
+ EjbModule jar = new EjbModule("", ejbJar, openejbJar);
// Build the DeploymentInfos
@@ -186,7 +186,7 @@
return sb.toString();
}
- private HashMap<String, DeploymentInfo> build(DeployedJar jar) throws OpenEJBException {
+ private HashMap<String, DeploymentInfo> build(EjbModule jar) throws OpenEJBException {
EjbJarInfoBuilder.deploymentIds.clear();
EjbJarInfoBuilder infoBuilder = new EjbJarInfoBuilder();
EjbJarBuilder builder = new EjbJarBuilder(this.getClass().getClassLoader());
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java?view=diff&rev=467870&r1=467869&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java Wed Oct 25 22:29:24 2006
@@ -25,7 +25,7 @@
import org.apache.openejb.util.proxy.ProxyManager;
import org.apache.openejb.util.proxy.Jdk13ProxyFactory;
import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.alt.config.DeployedJar;
+import org.apache.openejb.alt.config.EjbModule;
import org.apache.openejb.alt.config.EjbJarInfoBuilder;
import org.apache.openejb.alt.config.ejb.EjbDeployment;
import org.apache.openejb.alt.config.ejb.OpenejbJar;
@@ -121,7 +121,7 @@
OpenejbJar openejbJar = new OpenejbJar();
openejbJar.addEjbDeployment(new EjbDeployment("Stateless Container", "widget", "widget"));
- DeployedJar jar = new DeployedJar("", ejbJar, openejbJar);
+ EjbModule jar = new EjbModule("", ejbJar, openejbJar);
HashMap<String, DeploymentInfo> ejbs = build(jar);
deploymentInfo = ejbs.get("widget");
@@ -146,7 +146,7 @@
return sb.toString();
}
- private HashMap<String, DeploymentInfo> build(DeployedJar jar) throws OpenEJBException {
+ private HashMap<String, DeploymentInfo> build(EjbModule jar) throws OpenEJBException {
EjbJarInfoBuilder.deploymentIds.clear();
EjbJarInfoBuilder infoBuilder = new EjbJarInfoBuilder();
EjbJarBuilder builder = new EjbJarBuilder(this.getClass().getClassLoader());
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=467870&r1=467869&r2=467870
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Wed Oct 25 22:29:24 2006
@@ -107,7 +107,7 @@
-
- Used in maven-jar-plugin in openejb-core pom.xml and below to declare xbean-finder dependency
-->
- <removePropertyFromCorePomXbeanVersion>2.7</removePropertyFromCorePomXbeanVersion>
+ <removePropertyFromCorePomXbeanVersion>2.8-SNAPSHOT</removePropertyFromCorePomXbeanVersion>
</properties>
<build>