16024185 tomcat doesn't build with jdk 1.7 s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 07 May 2013 12:53:03 -0700
branchs11-update
changeset 2602 5caab247ea3d
parent 2601 af823e6595c2
child 2620 70885a8bb9bc
16024185 tomcat doesn't build with jdk 1.7
components/tomcat/Makefile
components/tomcat/Solaris/http-tomcat6
components/tomcat/jdbc41.patch
components/tomcat/patches/build.xml.patch
components/tomcat/patches/env.patch
components/tomcat/resolve.deps
components/tomcat/tomcat.p5m
--- a/components/tomcat/Makefile	Tue May 07 12:53:03 2013 -0700
+++ b/components/tomcat/Makefile	Tue May 07 12:53:03 2013 -0700
@@ -54,8 +54,6 @@
 include ../../make-rules/ant.mk
 include ../../make-rules/ips.mk
 
-JAVA_HOME=$(JAVA6_HOME)
-COMPONENT_BUILD_ENV += JAVA_HOME="$(JAVA_HOME)"
 COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR)
 COMPONENT_BUILD_TARGETS=download deploy
 
--- a/components/tomcat/Solaris/http-tomcat6	Tue May 07 12:53:03 2013 -0700
+++ b/components/tomcat/Solaris/http-tomcat6	Tue May 07 12:53:03 2013 -0700
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 . /lib/svc/share/smf_include.sh
@@ -29,7 +29,7 @@
 CATALINA_HOME=/usr/tomcat6
 CATALINA_BASE=/var/tomcat6
 CATALINA_PID=$CATALINA_BASE/logs/pid
-JAVA_HOME=/usr/java
+JAVA_HOME=/usr/jdk/instances/jdk1.7.0
 export CATALINA_HOME CATALINA_BASE CATALINA_PID JAVA_HOME
 
 case "$1" in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/jdbc41.patch	Tue May 07 12:53:03 2013 -0700
@@ -0,0 +1,442 @@
+http://pkgs.fedoraproject.org/cgit/apache-commons-dbcp.git/tree/jdbc41.patch 
+
+diff -u -r dbcp/BasicDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java
+--- src/java/org/apache/commons/dbcp/BasicDataSource.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/BasicDataSource.java	2012-02-23 09:11:04.481618663 +0100
[email protected]@ -24,10 +24,12 @@
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.Collections;
++import java.util.logging.Logger;
+ import java.sql.Connection;
+ import java.sql.Driver;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.DataSource;
+ 
+ import org.apache.commons.pool.KeyedObjectPoolFactory;
[email protected]@ -1579,4 +1581,10 @@
+             logWriter.println(message);
+         }
+     }
++
++    /* This functionality is not implemented yet */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+diff -u -r dbcp/cpdsadapter/DriverAdapterCPDS.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
+--- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java	2010-02-07 17:59:19.000000000 +0100
++++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java	2012-02-23 09:13:29.490605580 +0100
[email protected]@ -19,10 +19,12 @@
+ 
+ import java.util.Hashtable;
+ import java.util.Properties;
++import java.util.logging.Logger;
+ import java.io.PrintWriter;
+ import java.io.Serializable;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.PooledConnection;
+ import javax.sql.ConnectionPoolDataSource;
+ import javax.naming.Name;
[email protected]@ -719,4 +721,10 @@
+     {
+         _maxPreparedStatements = maxPreparedStatements;
+     }
++
++    /* This functionality is not implemented yet */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+diff -u -r dbcp/datasources/PerUserPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
+--- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java	2012-02-23 09:12:13.582612432 +0100
[email protected]@ -21,10 +21,12 @@
+ import java.io.ObjectInputStream;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.NoSuchElementException;
++import java.util.logging.Logger;
+ 
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
[email protected]@ -561,4 +563,10 @@
+         CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);
+         return mgr == null ? null : (GenericObjectPool) mgr.getPool();
+     }
++
++    /* This functionality is not implemented yet */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+diff -u -r dbcp/datasources/SharedPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
+--- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java	2012-02-23 09:14:10.326601896 +0100
[email protected]@ -21,6 +21,8 @@
+ import java.io.ObjectInputStream;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ 
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
[email protected]@ -269,5 +271,11 @@
+             throw new IOException("NamingException: " + e);
+         }
+     }
++
++    /* This functionality is not implemented yet */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+ 
+diff -u -r dbcp/DelegatingCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
+--- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2012-02-23 09:17:35.805583354 +0100
[email protected]@ -37,6 +37,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+ 
+ /**
+  * A base delegating implementation of {@link CallableStatement}.
[email protected]@ -661,4 +662,14 @@
+         }
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* This functionality is not implemented yet */
++    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+diff -u -r dbcp/DelegatingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java
+--- src/java/org/apache/commons/dbcp/DelegatingConnection.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingConnection.java	2012-02-23 09:04:56.488651873 +0100
[email protected]@ -27,6 +27,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
++import java.util.concurrent.Executor;
+ import java.sql.ResultSet;
+ /* JDBC_4_ANT_KEY_BEGIN */
+ import java.sql.Array;
[email protected]@ -40,6 +41,7 @@
+ import java.util.Collections;
+ import java.util.Properties;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+ 
+ /**
+  * A base delegating implementation of {@link Connection}.
[email protected]@ -678,5 +680,31 @@
+             return null;
+         }
+     }
+-/* JDBC_4_ANT_KEY_END */
++    /* JDBC_4_ANT_KEY_END */
++
++    /* This functionality is not implemented yet */
++    public int getNetworkTimeout() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void abort(Executor executor) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public String getSchema() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void setSchema(String schema) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
++
+diff -u -r dbcp/DelegatingDatabaseMetaData.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
+--- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java	2012-02-23 09:20:38.181566898 +0100
[email protected]@ -24,6 +24,7 @@
+ import java.sql.RowIdLifetime;
+ /* JDBC_4_ANT_KEY_END */
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ 
+ /**
+  * A base delegating implementation of {@link DatabaseMetaData}.
[email protected]@ -1208,4 +1209,13 @@
+ 
+     /* JDBC_4_ANT_KEY_END */
+ 
++    /* This functionality is not implemented yet */
++    public boolean generatedKeyAlwaysReturned() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+diff -u -r dbcp/DelegatingPreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
+--- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2012-02-23 09:04:37.793653560 +0100
[email protected]@ -34,6 +34,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+ 
+ /**
+  * A base delegating implementation of {@link PreparedStatement}.
[email protected]@ -402,4 +403,15 @@
+         }
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* This functionality is not implemented yet */
++    public boolean isCloseOnCompletion() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void closeOnCompletion() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+diff -u -r dbcp/DelegatingResultSet.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
+--- src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2012-02-23 09:17:19.905584789 +0100
[email protected]@ -40,6 +40,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+ 
+ /**
+  * A base delegating implementation of {@link ResultSet}.
[email protected]@ -1079,4 +1080,14 @@
+         }
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* This functionality is not implemented yet */
++    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+diff -u -r dbcp/DelegatingStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java
+--- src/java/org/apache/commons/dbcp/DelegatingStatement.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/DelegatingStatement.java	2012-02-23 09:04:41.171653252 +0100
[email protected]@ -22,6 +22,7 @@
+ import java.sql.SQLException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+ 
+ /**
[email protected]@ -386,4 +387,15 @@
+         }
+     }
+ /* JDBC_4_ANT_KEY_END */
++
++    /* This functionality is not implemented yet */
++    public boolean isCloseOnCompletion() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void closeOnCompletion() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+diff -u -r dbcp/PoolableCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
+--- src/java/org/apache/commons/dbcp/PoolableCallableStatement.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolableCallableStatement.java	2012-02-23 09:17:44.514582568 +0100
[email protected]@ -21,6 +21,7 @@
+ import java.sql.Connection;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+ 
+ import org.apache.commons.pool.KeyedObjectPool;
[email protected]@ -123,4 +124,13 @@
+         super.passivate();
+     }
+ 
++    /* This functionality is not implemented yet */
++    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+diff -u -r dbcp/PoolablePreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
+--- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java	2012-02-23 09:16:01.670591848 +0100
[email protected]@ -21,6 +21,7 @@
+ import java.sql.PreparedStatement;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+ 
+ import org.apache.commons.pool.KeyedObjectPool;
[email protected]@ -137,4 +138,14 @@
+         super.passivate();
+     }
+ 
++    /* This functionality is not implemented yet */
++    public boolean isCloseOnCompletion() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void closeOnCompletion() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
+diff -u -r dbcp/PoolingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java
+--- src/java/org/apache/commons/dbcp/PoolingConnection.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolingConnection.java	2012-02-23 09:08:08.716634524 +0100
[email protected]@ -21,8 +21,10 @@
+ import java.sql.Connection;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ 
+ import java.util.NoSuchElementException;
++import java.util.concurrent.Executor;
+ 
+ import org.apache.commons.pool.KeyedObjectPool;
+ import org.apache.commons.pool.KeyedPoolableObjectFactory;
[email protected]@ -455,4 +457,30 @@
+             return buf.toString();
+         }
+     }
++
++    /* This functionality is not implemented yet */
++    public int getNetworkTimeout() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void abort(Executor executor) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public String getSchema() throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    /* This functionality is not implemented yet */
++    public void setSchema(String schema) throws SQLException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
++
+diff -u -r dbcp/PoolingDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java
+--- src/java/org/apache/commons/dbcp/PoolingDataSource.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolingDataSource.java	2012-02-23 09:11:31.873616194 +0100
[email protected]@ -23,10 +23,12 @@
+ import java.sql.DatabaseMetaData;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.Map;
+ import java.util.NoSuchElementException;
++import java.util.logging.Logger;
+ 
+ import javax.sql.DataSource;
+ 
[email protected]@ -437,4 +439,9 @@
+             }
+         }
+     }
++
++    /* This functionality is not implemented yet */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+diff -u -r dbcp/PoolingDriver.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java
+--- src/java/org/apache/commons/dbcp/PoolingDriver.java	2010-02-07 17:59:20.000000000 +0100
++++ src/java/org/apache/commons/dbcp/PoolingDriver.java	2012-02-23 09:14:12.193601726 +0100
[email protected]@ -27,6 +27,7 @@
+ import java.sql.DriverPropertyInfo;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.HashMap;
[email protected]@ -34,6 +35,7 @@
+ import java.util.NoSuchElementException;
+ import java.util.Properties;
+ import java.util.Set;
++import java.util.logging.Logger;
+ 
+ import org.apache.commons.jocl.JOCLContentHandler;
+ import org.apache.commons.pool.ObjectPool;
[email protected]@ -496,4 +498,10 @@
+             }
+         }
+     }
++
++    /* This functionality is not implemented yet */
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
++
+ }
--- a/components/tomcat/patches/build.xml.patch	Tue May 07 12:53:03 2013 -0700
+++ b/components/tomcat/patches/build.xml.patch	Tue May 07 12:53:03 2013 -0700
@@ -1,5 +1,5 @@
---- apache-tomcat-6.0.36-src/build.xml	Tue Oct 16 01:05:51 2012
-+++ apache-tomcat-6.0.36-src/build.xml	Thu Dec  6 04:01:54 2012
+--- apache-tomcat-6.0.36-src/build.xml
++++ apache-tomcat-6.0.36-src/build.xml
 @@ -487,13 +487,6 @@
  
    <target name="deploy" depends="build-only,build-docs,warn.dbcp">
@@ -56,7 +56,19 @@
      <!-- Build Tomcat DBCP bundle -->
      <antcall target="downloadgz-2">
        <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
[email protected]@ -836,15 +794,9 @@
[email protected]@ -823,6 +781,11 @@
+       <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
+       <param name="destfile" value="${commons-dbcp.home}/build.xml" />
+     </antcall>
++    <!-- We need to patch DBCP so it can be built with JDK 1.7. -->
++    <exec executable="sh">
++      <arg value="-c" />
++      <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" />
++    </exec>
+     <mkdir dir="${tomcat-dbcp.home}"/>
+     <antcall target="build-tomcat-dbcp">
+       <param name="basedir" value="${tomcat-dbcp.home}" />
[email protected]@ -836,15 +799,9 @@
        <param name="destdir" value="${jdt.home}"/>
      </antcall>
  
--- a/components/tomcat/patches/env.patch	Tue May 07 12:53:03 2013 -0700
+++ b/components/tomcat/patches/env.patch	Tue May 07 12:53:03 2013 -0700
@@ -36,7 +36,7 @@
  
 +# For Solaris
 +if $solaris; then
-+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0
++  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0
 +fi
 +
  # Get standard Java environment variables
@@ -87,7 +87,7 @@
  
 +# For Solaris
 +if $solaris; then
-+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0
++  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0
 +fi
 +
  # Get standard Java environment variables
--- a/components/tomcat/resolve.deps	Tue May 07 12:53:03 2013 -0700
+++ b/components/tomcat/resolve.deps	Tue May 07 12:53:03 2013 -0700
@@ -1,4 +1,3 @@
-runtime/java/jre-6
 runtime/java/jre-7
 shell/ksh93
 system/core-os
--- a/components/tomcat/tomcat.p5m	Tue May 07 12:53:03 2013 -0700
+++ b/components/tomcat/tomcat.p5m	Tue May 07 12:53:03 2013 -0700
@@ -295,7 +295,7 @@
 file path=var/tomcat6/webapps/manager/status.xsd
 file path=var/tomcat6/webapps/manager/xform.xsl
 
-depend fmri=__TBD pkg.debug.depend.file=usr/jdk/instances/jdk1.6.0/bin/java \
+depend fmri=__TBD pkg.debug.depend.file=usr/jdk/instances/jdk1.7.0/bin/java \
     type=require
 
 license tomcat.license license="Apache v2.0"