jcscoobyrs 2005/09/19 18:15:13
Modified: modules/webadmin/src/java/org/openejb/webadmin/main
CMPMappingBean.java
Log:
Updated for OPENEJB-58. Updated Castor support to 0.9.9M2. Instructions in
the Jira for working around castor-0.9.9.0.jar not being in Maven.
Revision Changes Path
1.4 +12 -6
openejb1/modules/webadmin/src/java/org/openejb/webadmin/main/CMPMappingBean.java
Index: CMPMappingBean.java
===================================================================
RCS file:
/scm/openejb/openejb1/modules/webadmin/src/java/org/openejb/webadmin/main/CMPMappingBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CMPMappingBean.java 9 Jul 2005 08:51:00 -0000 1.3
+++ CMPMappingBean.java 19 Sep 2005 22:15:13 -0000 1.4
@@ -59,17 +59,18 @@
import javax.rmi.PortableRemoteObject;
import org.exolab.castor.jdo.conf.Database;
+import org.exolab.castor.jdo.conf.DatabaseChoice;
import org.exolab.castor.jdo.conf.Driver;
import org.exolab.castor.jdo.conf.Jndi;
import org.exolab.castor.jdo.conf.Mapping;
import org.exolab.castor.jdo.conf.Param;
import org.exolab.castor.xml.ValidationException;
+import org.openejb.core.EnvProps;
+import org.openejb.loader.SystemInstance;
+import org.openejb.util.FileUtils;
import org.openejb.webadmin.HttpRequest;
import org.openejb.webadmin.HttpResponse;
import org.openejb.webadmin.WebAdminBean;
-import org.openejb.core.EnvProps;
-import org.openejb.util.FileUtils;
-import org.openejb.loader.SystemInstance;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Tim Urberg</a>
@@ -209,7 +210,9 @@
//set the standard variables for the global and local databases
Database globalDatabase = new Database();
+ DatabaseChoice globalDatabaseChoice = new DatabaseChoice();
Database localDatabase = new Database();
+ DatabaseChoice localDatabaseChoice = new DatabaseChoice();
globalDatabase.setName(EnvProps.GLOBAL_TX_DATABASE);
globalDatabase.setEngine(databaseData.getDbEngine());
localDatabase.setName(EnvProps.LOCAL_TX_DATABASE);
@@ -224,7 +227,7 @@
//set up the global specific fields
Jndi jndi = new Jndi();
jndi.setName(databaseData.getJndiName());
- globalDatabase.setJndi(jndi);
+ globalDatabaseChoice.setJndi(jndi);
//set up the local specific fields
Driver driver = new Driver();
@@ -243,7 +246,10 @@
driver.addParam(userNameParam);
driver.addParam(passwordParam);
- localDatabase.setDriver(driver);
+ localDatabaseChoice.setDriver(driver);
+
+ localDatabase.setDatabaseChoice(localDatabaseChoice);
+ globalDatabase.setDatabaseChoice(globalDatabaseChoice);
//validate the two database types again just in case
try {
