Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 63227 invoked from network); 25 Jan 2006 20:53:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Jan 2006 20:53:13 -0000 Received: (qmail 45495 invoked by uid 500); 25 Jan 2006 20:53:13 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 45481 invoked by uid 500); 25 Jan 2006 20:53:13 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 45469 invoked by uid 99); 25 Jan 2006 20:53:12 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2006 12:53:12 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 25 Jan 2006 12:53:12 -0800 Received: (qmail 63029 invoked by uid 65534); 25 Jan 2006 20:52:51 -0000 Message-ID: <20060125205251.63026.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r372312 - in /geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console: databasemanager/wizard/ jmsmanager/wizard/ repository/ securitymanager/realm/ Date: Wed, 25 Jan 2006 20:52:50 -0000 To: scm@geronimo.apache.org From: ammulder@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ammulder Date: Wed Jan 25 12:52:46 2006 New Revision: 372312 URL: http://svn.apache.org/viewcvs?rev=372312&view=rev Log: Merge GERONIMO-1467 change from branch Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java 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=372312&r1=372311&r2=372312&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 Wed Jan 25 12:52:46 2006 @@ -748,6 +748,9 @@ final URI[] uris = repo.listURIs(); outer: for (int j = 0; j < uris.length; j++) { + if(uris[j] == null) { + continue; // probably a JAR lacks a version number in the name, etc. + } String test = uris[j].toString(); for (int k = 0; k < SKIP_ENTRIES_WITH.length; k++) { String skip = SKIP_ENTRIES_WITH[k]; Modified: 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=372312&r1=372311&r2=372312&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java Wed Jan 25 12:52:46 2006 @@ -131,7 +131,7 @@ return count; } - public final static class PoolProgress { + public final static class PoolProgress implements Serializable { public final static String TYPE_NOTX = "NoTX"; public final static String TYPE_LOCAL = "JDBC"; public final static String TYPE_XA = "XA"; Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java?rev=372312&r1=372311&r2=372312&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java Wed Jan 25 12:52:46 2006 @@ -70,8 +70,11 @@ final URI[] uris = repo.listURIs(); outer: for (int j = 0; j < uris.length; j++) { + if(uris[j] == null) { + continue; // probably a JAR lacks a version number in the name, etc. + } String test = uris[j].toString(); - if(!test.endsWith("/rar")) { + if(!test.endsWith("/rar")) { //todo: may need to change this logic if configId format changes continue; } for (int k = 0; k < SKIP_RARS_CONTAINING.length; k++) { Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java?rev=372312&r1=372311&r2=372312&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java Wed Jan 25 12:52:46 2006 @@ -191,6 +191,9 @@ try { final URI[] uris = repo.listURIs(); for (int j = 0; j < uris.length; j++) { + if(uris[j] == null) { + continue; // probably a JAR lacks a version number in the name, etc. + } String fileName = uris[j].toString(); list.add(fileName); } Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=372312&r1=372311&r2=372312&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Wed Jan 25 12:52:46 2006 @@ -607,6 +607,9 @@ final URI[] uris = repo.listURIs(); outer: for (int j = 0; j < uris.length; j++) { + if(uris[j] == null) { + continue; // probably a JAR lacks a version number in the name, etc. + } String test = uris[j].toString(); for (int k = 0; k < SKIP_ENTRIES_WITH.length; k++) { String skip = SKIP_ENTRIES_WITH[k];