geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1172287 - in /geronimo/server/trunk/plugins/system-database: sysdb-console-jetty/src/main/plan/ sysdb-console-tomcat/src/main/plan/ sysdb-portlets/src/main/i18n-resources/ sysdb-portlets/src/main/java/org/apache/geronimo/console/databasema...
Date Sun, 18 Sep 2011 14:06:25 GMT
Author: violalu
Date: Sun Sep 18 14:06:24 2011
New Revision: 1172287

URL: http://svn.apache.org/viewvc?rev=1172287&view=rev
Log:
GERONIMO-5209 add tranql xa for db2 iseries

Modified:
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=1172287&r1=1172286&r2=1172287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
Sun Sep 18 14:06:24 2011
@@ -109,6 +109,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-db2-xa//rar</attribute>
     </gbean>
+     <gbean name="Database2a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">DB2 XA ISeries(JTOpen)</attribute>
+        <attribute name="URLPrototype">jdbc:as400://{Host}/databasename={Database}</attribute>
+        <attribute name="driverClassName">com.ibm.as400.access.AS400JDBCDriver</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-db2ISeries-xa//rar</attribute>
+    </gbean>
     <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">DB2 (DataDirect)</attribute>
         <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=1172287&r1=1172286&r2=1172287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Sun Sep 18 14:06:24 2011
@@ -110,6 +110,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-db2-xa//rar</attribute>
     </gbean>
+    <gbean name="Database2a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">DB2 XA ISeries(JTOpen)</attribute>
+        <attribute name="URLPrototype">jdbc:as400://{Host}/databasename={Database}</attribute>
+        <attribute name="driverClassName">com.ibm.as400.access.AS400JDBCDriver</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-db2ISeries-xa//rar</attribute>
+    </gbean>
     <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">DB2 (DataDirect)</attribute>
         <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties?rev=1172287&r1=1172286&r2=1172287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
Sun Sep 18 14:06:24 2011
@@ -369,6 +369,37 @@ dbwizard.tranql-connector-sqlserver2005-
 dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp           = The IP address of the
SQL Server.
 dbwizard.tranql-connector-sqlserver2005-xa.UserName                = User Name
 dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp             = The case-insensitive
username used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2005-xa.PreparedStatementCacheSize = PreparedStatement
Cache Size
+dbwizard.tranql-connector-sqlserver2005-xa.PreparedStatementCacheSizeExp = The value of PreparedStatementCacheSize.
PreparedStatementCacheSize tells the driver how many prepared statements should be associated
with each connection.  The default is no statement caching.
+dbwizard.tranql-connector-db2ISeries-xa.DatabaseName               = Database Name
+dbwizard.tranql-connector-db2ISeries-xa.DatabaseNameExp            = Specifies the name for
the database server. This name is used as the database portion of the connection URL.
+dbwizard.tranql-connector-db2ISeries-xa.Secure                     = Secure
+dbwizard.tranql-connector-db2ISeries-xa.SecureExp                  = Secure
+dbwizard.tranql-connector-db2ISeries-xa.Trace                      = Trace
+dbwizard.tranql-connector-db2ISeries-xa.TraceExp                   = Name of the server to
connect to.
+dbwizard.tranql-connector-db2ISeries-xa.TrueAutocommit             = AutoCommit
+dbwizard.tranql-connector-db2ISeries-xa.TrueAutocommitExp          = Specifies whether commit
automatically.
+dbwizard.tranql-connector-db2ISeries-xa.Password                   = Password
+dbwizard.tranql-connector-db2ISeries-xa.PasswordExp                = The case-insensitive
password used to connect to your DB2 Server database.
+dbwizard.tranql-connector-db2ISeries-xa.DataSourceName             = DataSource Name
+dbwizard.tranql-connector-db2ISeries-xa.DataSourceExp              = Specifies the DataSource
Name.
+dbwizard.tranql-connector-db2ISeries-xa.PreparedStatementCacheSize = PreparedStatement Cache
Size
+dbwizard.tranql-connector-db2ISeries-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize
specifies the driver how many prepared statements should be associated with each connection.
The default is no statement caching.
+dbwizard.tranql-connector-db2ISeries-xa.Libraries                  = Libraries
+dbwizard.tranql-connector-db2ISeries-xa.LibrariesExp               = Libraries
+dbwizard.tranql-connector-db2ISeries-xa.ServerName                 = Server Name
+dbwizard.tranql-connector-db2ISeries-xa.ServerNameExp              = ServerName is the name
or IP address of the host that the DB2 driver needs to connect to. There is no default value.
+dbwizard.tranql-connector-db2ISeries-xa.Errors                     = Errors
+dbwizard.tranql-connector-db2ISeries-xa.ErrorsExp                  = Errors.
+dbwizard.tranql-connector-db2ISeries-xa.TransactionIsolation       = TransactionIsolation
+dbwizard.tranql-connector-db2ISeries-xa.TransactionIsolationExp    = TransactionIsolation.
+dbwizard.tranql-connector-db2ISeries-xa.User                       = User Name
+dbwizard.tranql-connector-db2ISeries-xa.UserExp                    = The name of the userID
used to connect to the remote database server.
+dbwizard.tranql-connector-db2ISeries-xa.ToolboxTraceCategory       = ToolboxTraceCategory
+dbwizard.tranql-connector-db2ISeries-xa.ToolboxTraceCategoryExp    = ToolboxTraceCategory.
+dbwizard.tranql-connector-db2ISeries-xa.ToolboxTrace               = ToolboxTrace
+dbwizard.tranql-connector-db2ISeries-xa.ToolboxTraceExp            = ToolboxTrace
+
 dbwizard.usage.applicationCode                                     = Application Code
 dbwizard.usage.geronimo_webExp                                     = <p>To point the
resource reference to a specific database pool in Geronimo, the web application needs to have
a <tt>geronimo-web.xml</tt> deployment plan.  That may be packaged in the WAR
in the <tt>WEB-INF</tt> directory, or it may be provided separately on the command
line to the deploy tool.  The <tt>geronimo-web.xml</tt> plan should have a <tt>dependency</tt>
element pointing to the database pool module, and a <tt>resource-ref</tt> block
corresponding to the <tt>web.xml</tt> <tt>resource-ref</tt> above,
which maps the resource reference to a specific database pool.  In that block, the <tt>ref-name</tt>
must match the <tt>res-ref-name</tt> from the <tt>web.xml</tt> (above)
and the <tt>resource-link</tt> must point to the database pool by name.</p>
<p><i>If you have only one pool named {0} deployed in Geronimo, you can point
to it like this.</i></p>
 dbwizard.usage.moreThanOnePool                                     = If you have more than
one pool named {0} (for example, two dependencies that <b>each</b> include a component
named {1}), then you can specify the pool to use more explicitly like this:

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=1172287&r1=1172286&r2=1172287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Sun Sep 18 14:06:24 2011
@@ -108,6 +108,7 @@ import org.apache.geronimo.kernel.reposi
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
 import org.apache.geronimo.kernel.util.XmlUtil;
+import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
 import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
 import org.apache.geronimo.system.plugin.PluginInstallerGBean;
@@ -216,6 +217,7 @@ public class DatabasePoolPortlet extends
         usageView = portletConfig.getPortletContext().getRequestDispatcher(USAGE_VIEW);
         rarPathMap = new HashMap<String, String>();
         rarPathMap.put("TranQL XA Resource Adapter for DB2", "tranql-connector-db2-xa");
+        rarPathMap.put("TranQL XA Resource Adapter for DB2ISeries", "tranql-connector-db2ISeries-xa");
         rarPathMap.put("TranQL Client Local Transaction Resource Adapter for Apache Derby",
"tranql-connector-derby-client-local");
         rarPathMap.put("TranQL Client XA Resource Adapter for Apache Derby", "tranql-connector-derby-client-xa");
         rarPathMap.put("TranQL Embedded Local Transaction Resource Adapter for Apache Derby",
"tranql-connector-derby-embed-local");
@@ -1163,9 +1165,11 @@ public class DatabasePoolPortlet extends
                                 entry.getValue());
                     }
                 }
-                //todo: push the lookup into ManagementHelper
-                /*
-                PoolingAttributes pool = (PoolingAttributes) factory.getConnectionManagerContainer();
+                /*Make pool setting effective after server restart                
+                Jsr77Naming naming = new Jsr77Naming();
+                AbstractName connectionManagerName = naming.createChildName(new AbstractName(URI.create(data.getAbstractName())),
data.getName(), NameFactory.JCA_CONNECTION_MANAGER);
+                PoolingAttributes pool = (PoolingAttributes) PortletManager.getManagedBean(request,
connectionManagerName);
+                
                 pool.setPartitionMinSize(
                         data.minSize == null || data.minSize.equals("") ? 0 : Integer.parseInt(data.minSize));
                 pool.setPartitionMaxSize(
@@ -1175,8 +1179,8 @@ public class DatabasePoolPortlet extends
                                 data.blockingTimeout));
                 pool.setIdleTimeoutMinutes(
                         data.idleTimeout == null || data.idleTimeout.equals("") ? 15 : Integer.parseInt(
-                                data.idleTimeout));
-                                */
+                                data.idleTimeout));*/
+                                
             } catch (Exception e) {
                 log.error("Unable to save connection pool", e);
             }



Mime
View raw message