geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r800700 - /geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Date Tue, 04 Aug 2009 08:41:23 GMT
Author: xuhaihong
Date: Tue Aug  4 08:41:23 2009
New Revision: 800700

URL: http://svn.apache.org/viewvc?rev=800700&view=rev
Log:
GERONIMO-4767 Use keywords strategy when filter the jdbc driver in database pools (Patch from
Rex Wang)

Modified:
    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-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=800700&r1=800699&r2=800700&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
Tue Aug  4 08:41:23 2009
@@ -860,9 +860,12 @@
             for (Artifact artifact : artifacts) {
                 if (dependencyFilters != null) {
                     for (Artifact filter: dependencyFilters) {
-                        if (filter.matches(artifact)) {
-                            list.add(artifact.toString());
-                        }
+                        // It is too strict if using artifact.matches(filter)
+                        if (filter.getGroupId() != null && artifact.getGroupId().indexOf(filter.getGroupId())
== -1) continue;
+                        if (filter.getArtifactId() != null && artifact.getArtifactId().indexOf(filter.getArtifactId())
== -1) continue;
+                        if (filter.getVersion() != null && !artifact.getVersion().equals(filter.getVersion()))
continue;
+                        if (filter.getType() != null && !artifact.getType().equals(filter.getType()))
continue;
+                        list.add(artifact.toString());
                     }
 
                 } else if (INCLUDE_ARTIFACTIDS.contains(artifact.getArtifactId())



Mime
View raw message