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/12/11 22:48:25 UTC
svn commit: r356038 - in /geronimo/trunk:
applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/
assemblies/j2ee-installer/src/var/log/
assemblies/j2ee-jetty-server/src/var/log/
assemblies/j2ee-tomcat-server/src/var/...
Author: ammulder
Date: Sun Dec 11 13:48:12 2005
New Revision: 356038
URL: http://svn.apache.org/viewcvs?rev=356038&view=rev
Log:
Fix database RAR references to current TranQL version
Adjust logging to squash ActiveMQ shutdown messages
Change SQLLoginModule to accomodate multiple parameters
Modified:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties
geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
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=356038&r1=356037&r2=356038&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 Dec 11 13:48:12 2005
@@ -30,9 +30,9 @@
/**
* todo: EVIL!!! Should be replaced with something, somehow!
*/
- private final static String TRANQL_RAR_NAME = "tranql/tranql-connector/1.1-SNAPSHOT/rar";
- private final static String DERBY_EMBEDDED_RAR_NAME = "tranql/tranql-connector-derby-embed-xa/1.1-SNAPSHOT/rar";
- private final static String DERBY_NETWORK_RAR_NAME = "tranql/tranql-connector-derby-client-xa/1.1-SNAPSHOT/rar";
+ private final static String TRANQL_RAR_NAME = "tranql/tranql-connector/1.1/rar";
+ private final static String DERBY_EMBEDDED_RAR_NAME = "tranql/tranql-connector-derby-embed-xa/1.1/rar";
+ private final static String DERBY_NETWORK_RAR_NAME = "tranql/tranql-connector-derby-client-xa/1.1/rar";
//todo: Load this from a config file or something
public static final DatabaseInfo[] ALL_DATABASES = new DatabaseInfo[]{
Modified: geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties?rev=356038&r1=356037&r2=356038&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties Sun Dec 11 13:48:12 2005
@@ -57,11 +57,13 @@
log4j.category.org.apache.jasper.compiler.SmapUtil=WARN
# ActiveMQ
+log4j.category.org.activemq.ActiveMQConnection=WARN
log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=WARN
log4j.category.org.activemq.store.jdbc.JDBCPersistenceAdapter=WARN
log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
log4j.category.org.activemq.broker.impl.BrokerContainerImpl=WARN
log4j.category.org.activemq.broker.impl.BrokerConnectorImpl=WARN
+log4j.category.org.activemq.transport.tcp.TcpTransportChannel=ERROR
log4j.category.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
log4j.category.org.activemq.transport.vm.VmTransportServerChannel=WARN
@@ -73,10 +75,12 @@
# Various Jetty startup/shutdown output
log4j.category.org.mortbay.http.HttpServer=WARN
log4j.category.org.mortbay.http.SocketListener=WARN
+log4j.category.org.mortbay.http.ajp.AJP13Listener=WARN
log4j.category.org.mortbay.util.Container=WARN
log4j.category.org.mortbay.util.Credential=WARN
log4j.category.org.mortbay.util.ThreadedServer=WARN
log4j.category.org.mortbay.jetty.servlet.WebApplicationContext=WARN
+log4j.category.org.mortbay.jetty.context=WARN
# Various Tomcat startup output
log4j.category.org.apache.catalina.realm.JAASRealm=WARN
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties?rev=356038&r1=356037&r2=356038&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties Sun Dec 11 13:48:12 2005
@@ -63,6 +63,7 @@
log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
log4j.category.org.activemq.broker.impl.BrokerContainerImpl=WARN
log4j.category.org.activemq.broker.impl.BrokerConnectorImpl=WARN
+log4j.category.org.activemq.transport.tcp.TcpTransportChannel=ERROR
log4j.category.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
log4j.category.org.activemq.transport.vm.VmTransportServerChannel=WARN
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties?rev=356038&r1=356037&r2=356038&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties Sun Dec 11 13:48:12 2005
@@ -63,6 +63,7 @@
log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
log4j.category.org.activemq.broker.impl.BrokerContainerImpl=WARN
log4j.category.org.activemq.broker.impl.BrokerConnectorImpl=WARN
+log4j.category.org.activemq.transport.tcp.TcpTransportChannel=ERROR
log4j.category.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
log4j.category.org.activemq.transport.vm.VmTransportServerChannel=WARN
Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java?rev=356038&r1=356037&r2=356038&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java Sun Dec 11 13:48:12 2005
@@ -171,7 +171,10 @@
try {
PreparedStatement statement = conn.prepareStatement(userSelect);
try {
- statement.setObject(1, cbUsername);
+ int count = countParameters(userSelect);
+ for(int i=0; i<count; i++) {
+ statement.setObject(i+1, cbUsername);
+ }
ResultSet result = statement.executeQuery();
try {
@@ -198,7 +201,10 @@
statement = conn.prepareStatement(groupSelect);
try {
- statement.setObject(1, cbUsername);
+ int count = countParameters(groupSelect);
+ for(int i=0; i<count; i++) {
+ statement.setObject(i+1, cbUsername);
+ }
ResultSet result = statement.executeQuery();
try {
@@ -249,5 +255,14 @@
cbPassword = null;
//todo: should remove principals put in by commit
return true;
+ }
+
+ private static int countParameters(String sql) {
+ int count = 0;
+ int pos = -1;
+ while((pos = sql.indexOf('?', pos+1)) != -1) {
+ ++count;
+ }
+ return count;
}
}