You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/11/21 03:06:21 UTC
svn commit: r345808 [1/2] - in /geronimo/trunk:
applications/console-ear/src/plan/ applications/console-standard/
applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/
applications/console-standard/src/webapp/WEB-IN...
Author: ammulder
Date: Sun Nov 20 18:06:06 2005
New Revision: 345808
URL: http://svn.apache.org/viewcvs?rev=345808&view=rev
Log:
Add the ability to import database pool settings from JBoss 4 and
WebLogic 8.1.
Added:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java (with props)
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp (with props)
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp (with props)
geronimo/trunk/modules/converter/ (with props)
geronimo/trunk/modules/converter/LICENSE.txt (with props)
geronimo/trunk/modules/converter/NOTICE.txt (with props)
geronimo/trunk/modules/converter/maven.xml (with props)
geronimo/trunk/modules/converter/project.properties (with props)
geronimo/trunk/modules/converter/project.xml (with props)
geronimo/trunk/modules/converter/src/
geronimo/trunk/modules/converter/src/java/
geronimo/trunk/modules/converter/src/java/org/
geronimo/trunk/modules/converter/src/java/org/apache/
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/AbstractDatabasePool.java (with props)
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DOMUtils.java (with props)
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DatabaseConversionStatus.java (with props)
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/JDBCPool.java (with props)
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/XADatabasePool.java (with props)
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/bea/
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/bea/WebLogic81DatabaseConverter.java (with props)
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/jboss/
geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/jboss/JBoss4DatabaseConverter.java (with props)
Modified:
geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
geronimo/trunk/applications/console-standard/project.xml
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp
geronimo/trunk/configs/console-jetty/project.xml
geronimo/trunk/configs/console-tomcat/project.xml
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml
geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml
Modified: geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml Sun Nov 20 18:06:06 2005
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/trunk/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/project.xml?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/project.xml (original)
+++ geronimo/trunk/applications/console-standard/project.xml Sun Nov 20 18:06:06 2005
@@ -42,6 +42,11 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-tomcat</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java Sun Nov 20 18:06:06 2005
@@ -86,7 +86,7 @@
this.url = url;
this.driverClass = driverClass;
xa = false;
- rarPath = TRANQL_RAR_NAME;
+ rarPath = getDefaultRARPath();
}
public DatabaseInfo(String name, String url, String driverClass, int defaultPort) {
@@ -95,7 +95,7 @@
this.driverClass = driverClass;
this.defaultPort = defaultPort;
xa = false;
- rarPath = TRANQL_RAR_NAME;
+ rarPath = getDefaultRARPath();
}
public DatabaseInfo(String name, String rarPath) {
@@ -135,5 +135,9 @@
list.add(url.substring(m.start()+1, m.end()-1));
}
return (String[]) list.toArray(new String[list.size()]);
+ }
+
+ public static String getDefaultRARPath() {
+ return TRANQL_RAR_NAME;
}
}
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Sun Nov 20 18:06:06 2005
@@ -25,6 +25,7 @@
import java.io.FileOutputStream;
import java.io.StringReader;
import java.io.ByteArrayOutputStream;
+import java.io.FileReader;
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
@@ -84,8 +85,15 @@
import org.apache.geronimo.connector.deployment.jsr88.ConnectionManager;
import org.apache.geronimo.connector.deployment.jsr88.SinglePool;
import org.apache.geronimo.connector.outbound.PoolingAttributes;
+import org.apache.geronimo.converter.DatabaseConversionStatus;
+import org.apache.geronimo.converter.JDBCPool;
+import org.apache.geronimo.converter.bea.WebLogic81DatabaseConverter;
+import org.apache.geronimo.converter.jboss.JBoss4DatabaseConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.FileItem;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -111,6 +119,8 @@
private static final String TEST_CONNECTION_VIEW = "/WEB-INF/view/dbwizard/testConnection.jsp";
private static final String DOWNLOAD_VIEW = "/WEB-INF/view/dbwizard/selectDownload.jsp";
private static final String SHOW_PLAN_VIEW = "/WEB-INF/view/dbwizard/showPlan.jsp";
+ private static final String IMPORT_UPLOAD_VIEW = "/WEB-INF/view/dbwizard/importUpload.jsp";
+ private static final String IMPORT_STATUS_VIEW = "/WEB-INF/view/dbwizard/importStatus.jsp";
private static final String LIST_MODE = "list";
private static final String EDIT_MODE = "edit";
private static final String SELECT_RDBMS_MODE = "rdbms";
@@ -121,6 +131,11 @@
private static final String DOWNLOAD_MODE = "download";
private static final String EDIT_EXISTING_MODE = "editExisting";
private static final String SAVE_MODE = "save";
+ private static final String IMPORT_START_MODE = "startImport";
+ private static final String IMPORT_UPLOAD_MODE = "importUpload";
+ private static final String IMPORT_STATUS_MODE = "importStatus";
+ private static final String IMPORT_COMPLETE_MODE = "importComplete";
+ private static final String IMPORT_EDIT_MODE = "importEdit";
private static final String MODE_KEY = "mode";
private PortletRequestDispatcher listView;
@@ -131,6 +146,8 @@
private PortletRequestDispatcher testConnectionView;
private PortletRequestDispatcher downloadView;
private PortletRequestDispatcher planView;
+ private PortletRequestDispatcher importUploadView;
+ private PortletRequestDispatcher importStatusView;
public void init(PortletConfig portletConfig) throws PortletException {
super.init(portletConfig);
@@ -142,6 +159,8 @@
testConnectionView = portletConfig.getPortletContext().getRequestDispatcher(TEST_CONNECTION_VIEW);
downloadView = portletConfig.getPortletContext().getRequestDispatcher(DOWNLOAD_VIEW);
planView = portletConfig.getPortletContext().getRequestDispatcher(SHOW_PLAN_VIEW);
+ importUploadView = portletConfig.getPortletContext().getRequestDispatcher(IMPORT_UPLOAD_VIEW);
+ importStatusView = portletConfig.getPortletContext().getRequestDispatcher(IMPORT_STATUS_VIEW);
}
public void destroy() {
@@ -153,6 +172,8 @@
testConnectionView = null;
downloadView = null;
planView = null;
+ importUploadView = null;
+ importStatusView = null;
super.destroy();
}
@@ -206,6 +227,11 @@
public void processAction(ActionRequest actionRequest,
ActionResponse actionResponse) throws PortletException, IOException {
String mode = actionRequest.getParameter(MODE_KEY);
+ if(mode.equals(IMPORT_UPLOAD_MODE)) {
+ processImportUpload(actionRequest, actionResponse);
+ actionResponse.setRenderParameter(MODE_KEY, IMPORT_STATUS_MODE);
+ return;
+ }
PoolData data = new PoolData();
data.load(actionRequest);
if(mode.equals("process-"+SELECT_RDBMS_MODE)) {
@@ -300,12 +326,12 @@
actionRequest.getPortletSession(true).setAttribute("connectError", stack);
actionResponse.setRenderParameter(MODE_KEY, TEST_CONNECTION_MODE);
} else {
- save(actionRequest, data, false);
+ save(actionRequest, actionResponse, data, false);
}
} else if(mode.equals(SAVE_MODE)) {
- save(actionRequest, data, false);
+ save(actionRequest, actionResponse, data, false);
} else if(mode.equals(SHOW_PLAN_MODE)) {
- String plan = save(actionRequest, data, true);
+ String plan = save(actionRequest, actionResponse, data, true);
actionRequest.getPortletSession(true).setAttribute("deploymentPlan", plan);
actionResponse.setRenderParameter(MODE_KEY, SHOW_PLAN_MODE);
} else if(mode.equals(EDIT_EXISTING_MODE)) {
@@ -318,12 +344,104 @@
data.adapterDisplayName = "TranQL Generic JDBC Resource Adapter";
}
actionResponse.setRenderParameter(MODE_KEY, mode);
+ } else if(mode.equals(IMPORT_START_MODE)) {
+ actionResponse.setRenderParameter("from", actionRequest.getParameter("from"));
+ actionResponse.setRenderParameter(MODE_KEY, mode);
+ } else if(mode.equals(IMPORT_EDIT_MODE)) {
+ ImportStatus status = getImportStatus(actionRequest);
+ int index = Integer.parseInt(actionRequest.getParameter("importIndex"));
+ status.setCurrentPoolIndex(index);
+ loadImportedData(data, status.getCurrentPool());
+ actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
+ } else if(mode.equals(IMPORT_COMPLETE_MODE)) {
+ ImportStatus status = getImportStatus(actionRequest);
+ log.warn("Import Results:"); //todo: create a screen for this
+ log.warn(" "+status.getSkippedCount()+" ignored");
+ log.warn(" "+status.getStartedCount()+" reviewed but not deployed");
+ log.warn(" "+status.getPendingCount()+" not reviewed");
+ log.warn(" "+status.getFinishedCount()+" deployed");
+ actionRequest.getPortletSession().removeAttribute("ImportStatus");
} else {
actionResponse.setRenderParameter(MODE_KEY, mode);
}
data.store(actionResponse);
}
+ private void loadImportedData(PoolData data, ImportStatus.PoolProgress progress) {
+ if(!progress.getType().equals(ImportStatus.PoolProgress.TYPE_XA)) {
+ JDBCPool pool = (JDBCPool) progress.getPool();
+ data.dbtype = "Other";
+ data.adapterDisplayName = "TranQL Generic JDBC Resource Adapter";
+ data.blockingTimeout = getImportString(pool.getBlockingTimeoutMillis());
+ data.driverClass = pool.getDriverClass();
+ data.idleTimeout = pool.getIdleTimeoutMillis() == null ? null : Integer.toString(pool.getIdleTimeoutMillis().intValue() / (60 * 1000));
+ data.maxSize = getImportString(pool.getMaxSize());
+ data.minSize = getImportString(pool.getMinSize());
+ data.name = pool.getName();
+ data.password = pool.getPassword();
+ data.url = pool.getJdbcURL();
+ data.user = pool.getUsername();
+ if(pool.getDriverClass() != null) {
+ DatabaseInfo info = getDatabaseInfoFromDriver(data);
+ if(info != null) {
+ data.rarPath = info.getRarPath();
+ data.urlPrototype = info.getUrl();
+ } else {
+ log.warn("Don't recognize database driver "+data.driverClass+"; Using default RAR file");
+ data.rarPath = DatabaseInfo.getDefaultRARPath();
+ }
+ }
+ } else {
+ //todo: handle XA
+ }
+ }
+
+ private static String getImportString(Integer value) {
+ return value == null ? null : value.toString();
+ }
+
+ private boolean processImportUpload(ActionRequest request, ActionResponse response) throws PortletException {
+ String type = request.getParameter("importSource");
+ response.setRenderParameter("importSource", type);
+ if (!PortletFileUpload.isMultipartContent(request)) {
+ throw new PortletException("Expected file upload");
+ }
+
+ PortletFileUpload uploader = new PortletFileUpload(new DiskFileItemFactory());
+ try {
+ List items = uploader.parseRequest(request);
+ for (Iterator i = items.iterator(); i.hasNext();) {
+ FileItem item = (FileItem) i.next();
+ if (!item.isFormField()) {
+ File file = File.createTempFile("geronimo-import", "");
+ file.deleteOnExit();
+ log.debug("Writing database pool import file to "+file.getAbsolutePath());
+ item.write(file);
+ DatabaseConversionStatus status = processImport(file, type);
+ request.getPortletSession(true).setAttribute("ImportStatus", new ImportStatus(status));
+ return true;
+ } else {
+ throw new PortletException("Not expecting any form fields");
+ }
+ }
+ } catch(PortletException e) {
+ throw e;
+ } catch(Exception e) {
+ throw new PortletException(e);
+ }
+ return false;
+ }
+
+ private DatabaseConversionStatus processImport(File importFile, String type) throws PortletException, IOException {
+ if(type.equals("JBoss 4")) {
+ return JBoss4DatabaseConverter.convert(new FileReader(importFile));
+ } else if(type.equals("WebLogic 8.1")) {
+ return WebLogic81DatabaseConverter.convert(new FileReader(importFile));
+ } else {
+ throw new PortletException("Unknown import type '"+type+"'");
+ }
+ }
+
private ResourceAdapterParams loadConfigPropertiesByPath(PortletRequest request, String rarPath) {
DeploymentManager mgr = PortletManager.getDeploymentManager(request);
try {
@@ -469,9 +587,15 @@
PoolData data = new PoolData();
data.load(renderRequest);
renderRequest.setAttribute("pool", data);
+ // If not headed anywhere in particular, send to list
if(mode == null || mode.equals("")) {
mode = LIST_MODE;
}
+ // If headed to list but there's an import in progress, redirect to import status
+ if(mode.equals(LIST_MODE) && getImportStatus(renderRequest) != null) {
+ mode = IMPORT_STATUS_MODE;
+ }
+
if(mode.equals(LIST_MODE)) {
renderList(renderRequest, renderResponse);
} else if(mode.equals(EDIT_MODE)) {
@@ -488,13 +612,33 @@
renderTestConnection(renderRequest, renderResponse);
} else if(mode.equals(SHOW_PLAN_MODE)) {
renderPlan(renderRequest, renderResponse);
+ } else if(mode.equals(IMPORT_START_MODE)) {
+ renderImportUploadForm(renderRequest, renderResponse);
+ } else if(mode.equals(IMPORT_STATUS_MODE)) {
+ renderImportStatus(renderRequest, renderResponse);
}
} catch (Throwable e) {
log.error("Unable to render portlet", e);
}
}
+ private void renderImportStatus(RenderRequest request, RenderResponse response) throws IOException, PortletException {
+ request.setAttribute("status", getImportStatus(request));
+ populatePoolList(request);
+ importStatusView.include(request, response);
+ }
+
+ private void renderImportUploadForm(RenderRequest request, RenderResponse response) throws IOException, PortletException {
+ request.setAttribute("from", request.getParameter("from"));
+ importUploadView.include(request, response);
+ }
+
private void renderList(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
+ populatePoolList(renderRequest);
+ listView.include(renderRequest, renderResponse);
+ }
+
+ private void populatePoolList(PortletRequest renderRequest) {
ResourceAdapterModule[] modules = PortletManager.getOutboundRAModules(renderRequest, "javax.sql.DataSource");
List list = new ArrayList();
for (int i = 0; i < modules.length; i++) {
@@ -504,7 +648,6 @@
JCAManagedConnectionFactory db = databases[j];
try {
ObjectName name = ObjectName.getInstance(db.getObjectName());
-
list.add(new ConnectionPool(ObjectName.getInstance(module.getObjectName()), db.getObjectName(), name.getKeyProperty(NameFactory.J2EE_NAME), ((GeronimoManagedBean)db).getState()));
} catch (MalformedObjectNameException e) {
e.printStackTrace();
@@ -513,7 +656,6 @@
}
Collections.sort(list);
renderRequest.setAttribute("pools", list);
- listView.include(renderRequest, renderResponse);
}
private void renderEdit(RenderRequest renderRequest, RenderResponse renderResponse, PoolData data) throws IOException, PortletException {
@@ -634,7 +776,8 @@
} else throw new SQLException("Driver "+data.getDriverClass()+" does not accept URL "+data.url);
}
- private static String save(PortletRequest request, PoolData data, boolean planOnly) {
+ private static String save(PortletRequest request, ActionResponse response, PoolData data, boolean planOnly) {
+ ImportStatus status = getImportStatus(request);
if(data.objectName == null || data.objectName.equals("")) { // we're creating a new pool
data.name = data.name.replaceAll("\\s", "");
DeploymentManager mgr = PortletManager.getDeploymentManager(request);
@@ -736,6 +879,13 @@
po = mgr.start(ids);
waitForProgress(po);
if(po.getDeploymentStatus().isCompleted()) {
+ ids = po.getResultTargetModuleIDs();
+ if(status != null) {
+ status.getCurrentPool().setName(data.getName());
+ status.getCurrentPool().setConfigurationName(ids[0].getModuleID());
+ status.getCurrentPool().setFinished(true);
+ response.setRenderParameter(MODE_KEY, IMPORT_STATUS_MODE);
+ }
System.out.println("Deployment completed successfully!");
}
}
@@ -784,6 +934,10 @@
}
}
+ private static ImportStatus getImportStatus(PortletRequest request) {
+ return (ImportStatus) request.getPortletSession(true).getAttribute("ImportStatus");
+ }
+
private static URL getRAR(PortletRequest request, String rarPath) {
try {
URI uri = new URI(rarPath);
@@ -813,9 +967,9 @@
private static Class attemptDriverLoad(PortletRequest request, PoolData data) {
List list = new ArrayList();
try {
- URI one = new URI(data.getJar1());
- URI two = new URI(data.getJar2());
- URI three = new URI(data.getJar3());
+ URI one = data.getJar1() == null ? null : new URI(data.getJar1());
+ URI two = data.getJar2() == null ? null : new URI(data.getJar2());
+ URI three = data.getJar3() == null ? null : new URI(data.getJar3());
ListableRepository[] repos = PortletManager.getListableRepositories(request);
for (int i = 0; i < repos.length; i++) {
@@ -893,6 +1047,18 @@
return info;
}
+ private static DatabaseInfo getDatabaseInfoFromDriver(PoolData data) {
+ DatabaseInfo info = null;
+ for (int i = 0; i < DatabaseInfo.ALL_DATABASES.length; i++) {
+ DatabaseInfo next = DatabaseInfo.ALL_DATABASES[i];
+ if(next.getDriverClass() != null && next.getDriverClass().equals(data.getDriverClass())) {
+ info = next;
+ break;
+ }
+ }
+ return info;
+ }
+
public static class PoolData implements Serializable {
private String name;
private String dbtype;
@@ -915,26 +1081,47 @@
private String adapterDisplayName;
private String adapterDescription;
private String rarPath;
+ private String importSource;
public void load(PortletRequest request) {
name = request.getParameter("name");
+ if(name != null && name.equals("")) name = null;
driverClass = request.getParameter("driverClass");
+ if(driverClass != null && driverClass.equals("")) driverClass = null;
dbtype = request.getParameter("dbtype");
+ if(dbtype != null && dbtype.equals("")) dbtype = null;
user = request.getParameter("user");
+ if(user != null && user.equals("")) user = null;
password = request.getParameter("password");
+ if(password != null && password.equals("")) password = null;
url = request.getParameter("url");
+ if(url != null && url.equals("")) url = null;
urlPrototype = request.getParameter("urlPrototype");
+ if(urlPrototype != null && urlPrototype.equals("")) urlPrototype = null;
jar1 = request.getParameter("jar1");
+ if(jar1 != null && jar1.equals("")) jar1 = null;
jar2 = request.getParameter("jar2");
+ if(jar2 != null && jar2.equals("")) jar2 = null;
jar3 = request.getParameter("jar3");
+ if(jar3 != null && jar3.equals("")) jar3 = null;
minSize = request.getParameter("minSize");
+ if(minSize != null && minSize.equals("")) minSize = null;
maxSize = request.getParameter("maxSize");
+ if(maxSize != null && maxSize.equals("")) maxSize = null;
blockingTimeout = request.getParameter("blockingTimeout");
+ if(blockingTimeout != null && blockingTimeout.equals("")) blockingTimeout = null;
idleTimeout = request.getParameter("idleTimeout");
+ if(idleTimeout != null && idleTimeout.equals("")) idleTimeout = null;
objectName = request.getParameter("objectName");
+ if(objectName != null && objectName.equals("")) objectName = null;
adapterDisplayName = request.getParameter("adapterDisplayName");
+ if(adapterDisplayName != null && adapterDisplayName.equals("")) adapterDisplayName = null;
adapterDescription = request.getParameter("adapterDescription");
+ if(adapterDescription != null && adapterDescription.equals("")) adapterDescription = null;
rarPath = request.getParameter("rarPath");
+ if(rarPath != null && rarPath.equals("")) rarPath = null;
+ importSource = request.getParameter("importSource");
+ if(importSource != null && importSource.equals("")) importSource = null;
Map map = request.getParameterMap();
propertyNames = new HashMap();
for (Iterator it = map.keySet().iterator(); it.hasNext();) {
@@ -998,6 +1185,7 @@
if(objectName != null) response.setRenderParameter("objectName", objectName);
if(adapterDisplayName != null) response.setRenderParameter("adapterDisplayName", adapterDisplayName);
if(adapterDescription != null) response.setRenderParameter("adapterDescription", adapterDescription);
+ if(importSource != null) response.setRenderParameter("importSource", importSource);
if(rarPath != null) response.setRenderParameter("rarPath", rarPath);
for (Iterator it = urlProperties.entrySet().iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry) it.next();
@@ -1100,6 +1288,10 @@
public boolean isGeneric() {
//todo: is there any better way to tell?
return adapterDisplayName == null || adapterDisplayName.equals("TranQL Generic JDBC Resource Adapter");
+ }
+
+ public String getImportSource() {
+ return importSource;
}
}
Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java (added)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java Sun Nov 20 18:06:06 2005
@@ -0,0 +1,204 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.databasemanager.wizard;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.geronimo.converter.DatabaseConversionStatus;
+import org.apache.geronimo.converter.AbstractDatabasePool;
+import org.apache.geronimo.converter.JDBCPool;
+import org.apache.geronimo.converter.XADatabasePool;
+
+/**
+ * Tracks the progress of a database pool import operation.
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class ImportStatus implements Serializable {
+ private DatabaseConversionStatus original;
+ private int currentPool = -1;
+ private PoolProgress[] pools;
+
+ public ImportStatus(DatabaseConversionStatus original) {
+ this.original = original;
+ List list = new ArrayList();
+ for (int i = 0; i < original.getNoTXPools().length; i++) {
+ JDBCPool pool = original.getNoTXPools()[i];
+ list.add(new PoolProgress(pool, PoolProgress.TYPE_NOTX));
+ }
+ for (int i = 0; i < original.getJdbcPools().length; i++) {
+ JDBCPool pool = original.getJdbcPools()[i];
+ list.add(new PoolProgress(pool, PoolProgress.TYPE_LOCAL));
+ }
+ for (int i = 0; i < original.getXaPools().length; i++) {
+ XADatabasePool pool = original.getXaPools()[i];
+ final PoolProgress progress = new PoolProgress(pool, PoolProgress.TYPE_XA);
+ if(pool.getXaDataSourceClass().indexOf("apache.derby") < 0) {
+ progress.setSkipped(true);
+ }
+ list.add(progress);
+ }
+ pools = (PoolProgress[]) list.toArray(new PoolProgress[list.size()]);
+ }
+
+ public boolean isFinished() {
+ for (int i = 0; i < pools.length; i++) {
+ PoolProgress pool = pools[i];
+ if(!pool.isFinished() && !pool.isSkipped()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void setCurrentPoolIndex(int currentPool) {
+ this.currentPool = currentPool;
+ getCurrentPool().setStarted(true);
+ }
+
+ public DatabaseConversionStatus getOriginal() {
+ return original;
+ }
+
+ public int getCurrentPoolIndex() {
+ return currentPool;
+ }
+
+ public PoolProgress getCurrentPool() {
+ return currentPool > -1 ? pools[currentPool] : null;
+ }
+
+ public PoolProgress[] getPools() {
+ return pools;
+ }
+
+ public int getPendingCount() {
+ int count = 0;
+ for (int i = 0; i < pools.length; i++) {
+ PoolProgress pool = pools[i];
+ if(!pool.isSkipped() && !pool.isStarted()) {
+ ++count;
+ }
+ }
+ return count;
+ }
+
+ public int getStartedCount() {
+ int count = 0;
+ for (int i = 0; i < pools.length; i++) {
+ PoolProgress pool = pools[i];
+ if(pool.isStarted() && !pool.isFinished() && !pool.isSkipped()) {
+ ++count;
+ }
+ }
+ return count;
+ }
+
+ public int getFinishedCount() {
+ int count = 0;
+ for (int i = 0; i < pools.length; i++) {
+ PoolProgress pool = pools[i];
+ if(!pool.isSkipped() && pool.isFinished()) {
+ ++count;
+ }
+ }
+ return count;
+ }
+
+ public int getSkippedCount() {
+ int count = 0;
+ for (int i = 0; i < pools.length; i++) {
+ PoolProgress pool = pools[i];
+ if(pool.isSkipped()) {
+ ++count;
+ }
+ }
+ return count;
+ }
+
+ public final static class PoolProgress {
+ public final static String TYPE_NOTX = "NoTX";
+ public final static String TYPE_LOCAL = "JDBC";
+ public final static String TYPE_XA = "XA";
+
+ private AbstractDatabasePool pool;
+ private boolean started;
+ private boolean finished;
+ private boolean skipped;
+ private String type;
+ private String name; // Once in Geronimo
+ private String configurationName; // Once in Geronimo
+
+ public PoolProgress(AbstractDatabasePool pool, String type) {
+ this.pool = pool;
+ this.type = type;
+ }
+
+ public AbstractDatabasePool getPool() {
+ return pool;
+ }
+
+ public boolean isStarted() {
+ return started;
+ }
+
+ public void setStarted(boolean started) {
+ this.started = started;
+ }
+
+ public boolean isFinished() {
+ return finished;
+ }
+
+ public void setFinished(boolean finished) {
+ this.finished = finished;
+ }
+
+ public boolean isSkipped() {
+ return skipped;
+ }
+
+ public void setSkipped(boolean skipped) {
+ this.skipped = skipped;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getConfigurationName() {
+ return configurationName;
+ }
+
+ public void setConfigurationName(String configurationName) {
+ this.configurationName = configurationName;
+ }
+
+ public String getStatus() {
+ return isSkipped() ? "Ignored" : isFinished() ? "Deployed as "+name : isStarted() ? "Started" : "Pending";
+ }
+ }
+}
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp Sun Nov 20 18:06:06 2005
@@ -0,0 +1,68 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Import Database Pools</b> -- Step 2: Review Imported Data</p>
+
+<p>The list of recognized database pools appears below. You can deploy any pools to
+ Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has
+ a supported XA adapter. Below the pool list is the list of status messages from
+ the import process.</p>
+
+<c:choose>
+ <c:when test="${empty(status.pools)}"><p><i>The import failed or did not discover any usable database pools!</i></p></c:when>
+ <c:otherwise>
+<table width="100%">
+ <tr>
+ <td class="DarkBackground">Original Name</td>
+ <td class="DarkBackground" align="center">Original JNDI</td>
+ <td class="DarkBackground" align="center">Import Status</td>
+ <td class="DarkBackground" align="center">Actions</td>
+ </tr>
+<c:forEach var="pool" items="${status.pools}" varStatus="loop" >
+ <tr>
+ <td>${pool.pool.name}</td>
+ <td>${pool.pool.jndiName}</td>
+ <td>${pool.status}</td>
+ <td>
+ <c:choose>
+ <c:when test="${pool.skipped || pool.finished}">
+ </c:when>
+ <c:otherwise>
+ <a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="importEdit" />
+ <portlet:param name="importIndex" value="${loop.index}" />
+ </portlet:actionURL>">Confirm and Deploy</a>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+</c:forEach>
+ <tr>
+ <td colspan="4" align="center">
+ <a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="importComplete" />
+ </portlet:actionURL>"><c:choose><c:when test="${status.finished}">Finish</c:when><c:otherwise>Skip Remaining Pools</c:otherwise></c:choose></a>
+ </td>
+ </tr>
+</table>
+ </c:otherwise>
+</c:choose>
+
+<hr />
+
+<p>Current Pools in Server:</p>
+<ul>
+<c:forEach var="pool" items="${pools}">
+ <li>${pool.name}</li>
+</c:forEach>
+</ul>
+
+<hr />
+
+<p>Import Messages:</p>
+<ul>
+<c:forEach var="message" items="${status.original.messages}">
+ <li>${message}</li>
+</c:forEach>
+</ul>
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp Sun Nov 20 18:06:06 2005
@@ -0,0 +1,38 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+
+<p><b>Import Database Pools</b> -- Step 1: Upload Configuration File</p>
+
+<p>This page starts the process of importing database pools from another application server.
+To do the import, you'll need to upload a configuration file from the other server using the
+fields below. After that, we'll convert the values we can, and ask you to confirm the
+configuration for each pool we find in the configuration.</p>
+
+<form enctype="multipart/form-data" method="POST" name="<portlet:namespace/>ImportForm"
+ action="<portlet:actionURL><portlet:param name="mode" value="importUpload"/><portlet:param name="importSource" value="${pool.importSource}"/></portlet:actionURL>">
+ <table width="100%">
+ <tr>
+ <td class="DarkBackground" colspan="2">${pool.importSource} Import</td>
+ </tr>
+ <tr>
+ <th align="right">Config File:</th>
+ <td><input type="file" name="configFile" /></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>Please select the ${from}.</td>
+ </tr>
+ <!-- SUBMIT BUTTON -->
+ <tr>
+ <td></td>
+ <td><input type="submit" value="Next" /></td>
+ </tr>
+ </table>
+</form>
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="list" />
+ </portlet:actionURL>">Cancel</a></p>
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp Sun Nov 20 18:06:06 2005
@@ -68,6 +68,19 @@
</c:otherwise>
</c:choose>
-<p><a href="<portlet:actionURL portletMode="view">
+<p>Create a new database pool:</p>
+<ul>
+ <li><a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="rdbms" />
- </portlet:actionURL>">Add new database pool</a></p>
+ </portlet:actionURL>">Using the Geronimo database pool wizard</a></li>
+ <li><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="startImport" />
+ <portlet:param name="importSource" value="JBoss 4" />
+ <portlet:param name="from" value="<tt>*-ds.xml</tt> file from the <tt>jboss4/server/name/deploy</tt> directory" />
+ </portlet:actionURL>">Import from JBoss 4</a></li>
+ <li><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="startImport" />
+ <portlet:param name="importSource" value="WebLogic 8.1" />
+ <portlet:param name="from" value="<tt>config.xml</tt> file from the WebLogic domain directory" />
+ </portlet:actionURL>">Import from WebLogic 8.1</a></li>
+</ul>
\ No newline at end of file
Modified: geronimo/trunk/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.xml?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.xml (original)
+++ geronimo/trunk/configs/console-jetty/project.xml Sun Nov 20 18:06:06 2005
@@ -148,6 +148,14 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<!-- Keystore dependency -->
<dependency>
Modified: geronimo/trunk/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.xml?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.xml (original)
+++ geronimo/trunk/configs/console-tomcat/project.xml Sun Nov 20 18:06:06 2005
@@ -155,6 +155,14 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<!-- Keystore dependency -->
<dependency>
Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Sun Nov 20 18:06:06 2005
@@ -269,6 +269,15 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
<version>${pom.currentVersion}</version>
<properties>
Modified: geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml Sun Nov 20 18:06:06 2005
@@ -75,6 +75,11 @@
<artifactId>activemq-gbean-management</artifactId>
<version>${activemq_version}</version>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
<!-- Keystore dependency -->
<dependency>
Modified: geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml?rev=345808&r1=345807&r2=345808&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml Sun Nov 20 18:06:06 2005
@@ -75,6 +75,11 @@
<artifactId>activemq-gbean-management</artifactId>
<version>${activemq_version}</version>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
<!-- Keystore dependency -->
<dependency>
Propchange: geronimo/trunk/modules/converter/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 20 18:06:06 2005
@@ -0,0 +1,2 @@
+target
+*.iml
Added: geronimo/trunk/modules/converter/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/LICENSE.txt?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/LICENSE.txt (added)
+++ geronimo/trunk/modules/converter/LICENSE.txt Sun Nov 20 18:06:06 2005
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange: geronimo/trunk/modules/converter/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/NOTICE.txt?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/NOTICE.txt (added)
+++ geronimo/trunk/modules/converter/NOTICE.txt Sun Nov 20 18:06:06 2005
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: geronimo/trunk/modules/converter/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/maven.xml?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/maven.xml (added)
+++ geronimo/trunk/modules/converter/maven.xml Sun Nov 20 18:06:06 2005
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+<!-- $Rev: 56771 $ $Date: 2004-11-06 14:58:54 -0500 (Sat, 06 Nov 2004) $ -->
+
+<project default="default">
+
+</project>
Propchange: geronimo/trunk/modules/converter/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/project.properties?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/project.properties (added)
+++ geronimo/trunk/modules/converter/project.properties Sun Nov 20 18:06:06 2005
@@ -0,0 +1,3 @@
+##
+## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+##
Propchange: geronimo/trunk/modules/converter/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/project.xml?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/project.xml (added)
+++ geronimo/trunk/modules/converter/project.xml Sun Nov 20 18:06:06 2005
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 57362 $ $Date: 2004-11-10 15:40:05 -0500 (Wed, 10 Nov 2004) $ -->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>Geronimo :: Configuration Converter</name>
+ <id>geronimo-converter</id>
+ <shortDescription>Geronimo Configuration Converter</shortDescription>
+ <description>Utilities for converting configurations from other application
+ server into something that Geronimo can use.</description>
+ <url>http://incubator.apache.org/projects/geronimo/deployment/</url>
+ <siteDirectory>/www/incubator.apache.org/projects/geronimo/deployment</siteDirectory>
+ <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/deployment/</distributionDirectory>
+
+ <package>org.apache.geronimo.converter</package>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ </resources>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+ </build>
+</project>
Propchange: geronimo/trunk/modules/converter/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/AbstractDatabasePool.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/AbstractDatabasePool.java?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/AbstractDatabasePool.java (added)
+++ geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/AbstractDatabasePool.java Sun Nov 20 18:06:06 2005
@@ -0,0 +1,121 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.converter;
+
+import java.io.Serializable;
+
+/**
+ * A common intermediate format for a database connection pool
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public abstract class AbstractDatabasePool implements Serializable {
+ public final static String VENDOR_ORACLE = "Oracle";
+ public final static String VENDOR_MYSQL = "MySQL";
+ public final static String VENDOR_SYBASE = "Sybase";
+ public final static String VENDOR_INFORMIX = "Informix";
+ private String name;
+ private String jndiName;
+ private Integer minSize;
+ private Integer maxSize;
+ private Integer blockingTimeoutMillis;
+ private Integer idleTimeoutMillis;
+ private String newConnectionSQL;
+ private String testConnectionSQL;
+ private String vendor;
+ private Integer statementCacheSize;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getJndiName() {
+ return jndiName;
+ }
+
+ public void setJndiName(String jndiName) {
+ this.jndiName = jndiName;
+ }
+
+ public String getNewConnectionSQL() {
+ return newConnectionSQL;
+ }
+
+ public void setNewConnectionSQL(String newConnectionSQL) {
+ this.newConnectionSQL = newConnectionSQL;
+ }
+
+ public String getTestConnectionSQL() {
+ return testConnectionSQL;
+ }
+
+ public void setTestConnectionSQL(String testConnectionSQL) {
+ this.testConnectionSQL = testConnectionSQL;
+ }
+
+ public String getVendor() {
+ return vendor;
+ }
+
+ public void setVendor(String vendor) {
+ this.vendor = vendor;
+ }
+
+ public Integer getMinSize() {
+ return minSize;
+ }
+
+ public void setMinSize(Integer minSize) {
+ this.minSize = minSize;
+ }
+
+ public Integer getMaxSize() {
+ return maxSize;
+ }
+
+ public void setMaxSize(Integer maxSize) {
+ this.maxSize = maxSize;
+ }
+
+ public Integer getBlockingTimeoutMillis() {
+ return blockingTimeoutMillis;
+ }
+
+ public void setBlockingTimeoutMillis(Integer blockingTimeoutMillis) {
+ this.blockingTimeoutMillis = blockingTimeoutMillis;
+ }
+
+ public Integer getIdleTimeoutMillis() {
+ return idleTimeoutMillis;
+ }
+
+ public void setIdleTimeoutMillis(Integer idleTimeoutMillis) {
+ this.idleTimeoutMillis = idleTimeoutMillis;
+ }
+
+ public Integer getStatementCacheSize() {
+ return statementCacheSize;
+ }
+
+ public void setStatementCacheSize(Integer statementCacheSize) {
+ this.statementCacheSize = statementCacheSize;
+ }
+}
Propchange: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/AbstractDatabasePool.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DOMUtils.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DOMUtils.java?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DOMUtils.java (added)
+++ geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DOMUtils.java Sun Nov 20 18:06:06 2005
@@ -0,0 +1,53 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.converter;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+
+/**
+ * Some helper methods for reading DOM trees. Have I written this like 8 times or what?
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class DOMUtils {
+ public static String getChildText(Element parent, String childName) {
+ NodeList list = parent.getElementsByTagName(childName);
+ if(list.getLength() > 1) {
+ throw new IllegalStateException();
+ } else if(list.getLength() == 0) {
+ return null;
+ }
+ Element child = (Element) list.item(0);
+ return getText(child);
+ }
+
+ public static String getText(Element element) {
+ StringBuffer buf = new StringBuffer();
+ NodeList list = element.getChildNodes();
+ boolean found = false;
+ for(int i=0; i<list.getLength(); i++) {
+ Node node = list.item(i);
+ if(node.getNodeType() == Node.TEXT_NODE) {
+ buf.append(node.getNodeValue());
+ found = true;
+ }
+ }
+ return found ? buf.toString() : null;
+ }
+}
Propchange: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DOMUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DatabaseConversionStatus.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DatabaseConversionStatus.java?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DatabaseConversionStatus.java (added)
+++ geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DatabaseConversionStatus.java Sun Nov 20 18:06:06 2005
@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.converter;
+
+import java.io.Serializable;
+
+/**
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class DatabaseConversionStatus implements Serializable {
+ private String[] messages;
+ private JDBCPool[] noTXPools;
+ private JDBCPool[] jdbcPools;
+ private XADatabasePool[] xaPools;
+
+ public String[] getMessages() {
+ return messages;
+ }
+
+ public void setMessages(String[] messages) {
+ this.messages = messages;
+ }
+
+ public JDBCPool[] getNoTXPools() {
+ return noTXPools;
+ }
+
+ public void setNoTXPools(JDBCPool[] noTXPools) {
+ this.noTXPools = noTXPools;
+ }
+
+ public JDBCPool[] getJdbcPools() {
+ return jdbcPools;
+ }
+
+ public void setJdbcPools(JDBCPool[] jdbcPools) {
+ this.jdbcPools = jdbcPools;
+ }
+
+ public XADatabasePool[] getXaPools() {
+ return xaPools;
+ }
+
+ public void setXaPools(XADatabasePool[] xaPools) {
+ this.xaPools = xaPools;
+ }
+}
Propchange: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/DatabaseConversionStatus.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/JDBCPool.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/JDBCPool.java?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/JDBCPool.java (added)
+++ geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/JDBCPool.java Sun Nov 20 18:06:06 2005
@@ -0,0 +1,72 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.converter;
+
+import java.util.Properties;
+
+/**
+ * A common intermediate format for a non-XA JDBC pool
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class JDBCPool extends AbstractDatabasePool {
+ private String driverClass;
+ private String jdbcURL;
+ private String username;
+ private String password;
+ private Properties connectionProperties = new Properties();
+
+ public String getDriverClass() {
+ return driverClass;
+ }
+
+ public void setDriverClass(String driverClass) {
+ this.driverClass = driverClass;
+ }
+
+ public String getJdbcURL() {
+ return jdbcURL;
+ }
+
+ public void setJdbcURL(String jdbcURL) {
+ this.jdbcURL = jdbcURL;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public Properties getConnectionProperties() {
+ return connectionProperties;
+ }
+
+ public void setConnectionProperties(Properties connectionProperties) {
+ this.connectionProperties = connectionProperties;
+ }
+}
Propchange: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/JDBCPool.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/XADatabasePool.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/XADatabasePool.java?rev=345808&view=auto
==============================================================================
--- geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/XADatabasePool.java (added)
+++ geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/XADatabasePool.java Sun Nov 20 18:06:06 2005
@@ -0,0 +1,43 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.converter;
+
+import java.util.Properties;
+
+/**
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class XADatabasePool extends AbstractDatabasePool {
+ private String xaDataSourceClass;
+ private Properties properties = new Properties();
+
+ public String getXaDataSourceClass() {
+ return xaDataSourceClass;
+ }
+
+ public void setXaDataSourceClass(String xaDataSourceClass) {
+ this.xaDataSourceClass = xaDataSourceClass;
+ }
+
+ public Properties getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Properties properties) {
+ this.properties = properties;
+ }
+}
Propchange: geronimo/trunk/modules/converter/src/java/org/apache/geronimo/converter/XADatabasePool.java
------------------------------------------------------------------------------
svn:eol-style = native