You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2007/07/09 01:10:49 UTC
svn commit: r554470 - in /portals/pluto/branches/pluto-1.1.x:
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/
pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/
pluto-util/src/main/java/org/apache/pluto/util/ins...
Author: cdoremus
Date: Sun Jul 8 16:10:48 2007
New Revision: 554470
URL: http://svn.apache.org/viewvc?view=rev&rev=554470
Log:
Replace calls to String.contains(CharSequence) with String.indexOf(String) != -1 to maintain JDK 1.4 compatibility.
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java
portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?view=diff&rev=554470&r1=554469&r2=554470
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java Sun Jul 8 16:10:48 2007
@@ -109,7 +109,7 @@
// Support added for filter. Should we seperate into a different impl?
String pathInfo = request.getPathInfo();
if (pathInfo == null) {
- if(servletName.contains(".jsp") && !servletName.endsWith(".jsp")) {
+ if((servletName.indexOf(".jsp") != -1) && !servletName.endsWith(".jsp")) {
int idx = servletName.indexOf(".jsp")+".jsp".length();
pathInfo = servletName.substring(idx);
servletName = servletName.substring(0, idx);
Modified: portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java?view=diff&rev=554470&r1=554469&r2=554470
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java Sun Jul 8 16:10:48 2007
@@ -40,7 +40,7 @@
if ( new File(config.getInstallationDirectory(), "ext/commons-logging.jar").exists()) {
for (Iterator iter = config.getSharedDependencies().iterator(); iter.hasNext();) {
File dep = (File) iter.next();
- if (dep.getPath().contains("commons-logging-api")) {
+ if (dep.getPath().indexOf("commons-logging-api") != -1) {
iter.remove();
}
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java?view=diff&rev=554470&r1=554469&r2=554470
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java Sun Jul 8 16:10:48 2007
@@ -96,7 +96,7 @@
if ( new File(config.getInstallationDirectory(), "bin/commons-logging-api.jar").exists()) {
for (Iterator iter = config.getSharedDependencies().iterator(); iter.hasNext();) {
File dep = (File) iter.next();
- if (dep.getPath().contains("commons-logging-api")) {
+ if (dep.getPath().indexOf("commons-logging-api") != -1) {
iter.remove();
}
}