sylvain 2003/01/02 03:02:13
Modified: . Tag: cocoon_2_0_3_branch .cvsignore build.xml
src/java/org/apache/cocoon/acting Tag: cocoon_2_0_3_branch
SendmailAction.java
src/java/org/apache/cocoon/components/language/markup/xsp
Tag: cocoon_2_0_3_branch EsqlConnection.java
src/java/org/apache/cocoon/util Tag: cocoon_2_0_3_branch
BlobHelper.java ClobHelper.java
Added: src/mocks/com/informix/jdbc Tag: cocoon_2_0_3_branch
IfxStatement.java
src/mocks/javax/mail Tag: cocoon_2_0_3_branch Address.java
Message.java MessagingException.java Part.java
Session.java Transport.java
src/mocks/javax/mail/internet Tag: cocoon_2_0_3_branch
AddressException.java InternetAddress.java
MimeMessage.java
src/mocks/net/php Tag: cocoon_2_0_3_branch servlet.java
src/mocks/oracle/jdbc Tag: cocoon_2_0_3_branch
OracleResultSet.java
src/mocks/oracle/sql Tag: cocoon_2_0_3_branch BLOB.java
CLOB.java
src/mocks/org/jaxen/dom Tag: cocoon_2_0_3_branch
DOMXPath.java
src/mocks/sun/tools/javac Tag: cocoon_2_0_3_branch Main.java
src/mocks/weblogic/servlet/internal Tag: cocoon_2_0_3_branch
ServletContextImpl.java
ServletOutputStreamImpl.java
ServletResponseImpl.java
src/resources/dev/eclipse Tag: cocoon_2_0_3_branch
classpath-tmpl.xml make-classpath.xsl project
Log:
Changes to the build system :
- remove conditional compilation using new mock classes
- set JDBC code to JDBC3 (translated to JDBC2 at build time)
- "eclipse-project" target to build an Eclipse project
Revision Changes Path
No revision
No revision
1.5.2.2 +2 -1 xml-cocoon2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/xml-cocoon2/.cvsignore,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- .cvsignore 6 Jun 2002 08:47:40 -0000 1.5.2.1
+++ .cvsignore 2 Jan 2003 11:02:11 -0000 1.5.2.2
@@ -3,4 +3,5 @@
tools/anttasks
.ant.properties
prj.el
-
+.classpath
+.project
1.196.2.24 +127 -13 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.196.2.23
retrieving revision 1.196.2.24
diff -u -r1.196.2.23 -r1.196.2.24
--- build.xml 6 Dec 2002 11:39:19 -0000 1.196.2.23
+++ build.xml 2 Jan 2003 11:02:11 -0000 1.196.2.24
@@ -227,6 +227,7 @@
<property name="src.dir" value="./src"/>
<property name="java.dir" value="${src.dir}/java"/>
+ <property name="mocks.dir" value="${src.dir}/mocks"/>
<property name="test.dir" value="${src.dir}/test"/>
<property name="lib.dir" value="./lib"/>
<property name="tools.dir" value="./tools"/>
@@ -248,6 +249,7 @@
<property name="build.src" value="${build.dir}/src"/>
<property name="build.test" value="${build.dir}/test"/>
<property name="build.dest" value="${build.dir}/classes"/>
+ <property name="build.mocks" value="${build.dir}/mock-classes"/>
<property name="build.docs" value="${build.dir}/docs"/>
<property name="build.xdocs" value="${build.dir}/xdocs"/>
<property name="build.docs.printer" value="${build.dir}/printer-docs"/>
@@ -259,6 +261,7 @@
<property name="build.scratchpad" value="${build.dir}/scratchpad"/>
<property name="build.scratchpad.src" value="${build.scratchpad}/src"/>
<property name="build.scratchpad.dest" value="${build.scratchpad}/classes"/>
+ <property name="build.work" value="${build.dir}/work"/>
<property name="dist.root" value="./dist"/>
<property name="dist.name" value="${name}-${version}"/>
<property name="dist.dir" value="${dist.root}/${dist.name}"/>
@@ -511,13 +514,13 @@
<target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
<target name="filter-jdbc" unless="jdbc3.present">
- <filter token="JDBC3_START" value=""/>
- <filter token="JDBC3_END" value=""/>
+ <filter token="JDBC3_START" value="${line.separator} /* Start JDBC3 specific
code "/>
+ <filter token="JDBC3_END" value=" End JDBC3 specific code */"/>
</target>
<target name="nofilter-jdbc" if="jdbc3.present">
- <filter token="JDBC3_START" value="*/"/>
- <filter token="JDBC3_END" value="/*"/>
+ <filter token="JDBC3_START" value="Start JDBC3 specific code"/>
+ <filter token="JDBC3_END" value="End JDBC3 specific code"/>
</target>
<!-- =================================================================== -->
@@ -796,7 +799,8 @@
<mkdir dir="${build.dest}"/>
<copy todir="${build.src}" filtering="on">
<fileset dir="${java.dir}">
-
+<!--
+ Don't use conditional compilation
<exclude name="**/poi/**" unless="poi.present"/>
<exclude name="**/HSSFSerializer.java" unless="poi.present"/>
<exclude name="**/poi.x*" unless="poi.present"/>
@@ -804,8 +808,9 @@
<exclude name="**/java/Pizza.java" unless="pizza.present"/>
<exclude name="**/java/pizza.x*" unless="pizza.present"/>
+-->
<exclude name="**/java/javac.x*" if="pizza.present"/>
-
+<!--
<exclude name="**/JSP*.java" unless="servlet.present"/>
<exclude name="**/Jsp*.java" unless="servlet.present"/>
<exclude name="**/servlet.x*" unless="servlet.present"/>
@@ -854,9 +859,6 @@
<exclude name="**/Php*" unless="php.present"/>
<exclude name="**/php.x*" unless="php.present"/>
- <exclude name="**/Ora*.java" unless="ora.driver.present"/>
-
- <exclude name="**/Ifx*.java" unless="ifx.driver.present"/>
<exclude name="**/Sendmail*.java" unless="mail.present"/>
@@ -868,7 +870,7 @@
<exclude name="**/XMLDB*.java" unless="xmldb.present"/>
<exclude name="**/DbXML*.java" unless="xmldb.present"/>
- <!-- XML:DB protocol config references only one driver, xindice -->
+ <!- - XML:DB protocol config references only one driver, xindice - ->
<exclude name="**/source/xmldb.x*" unless="xindice.present"/>
<exclude name="**/generation/xmldb.x*" unless="xindice.present"/>
@@ -890,6 +892,8 @@
<exclude name="**/MaybeUpload*.java"
unless="maybeupload.present"/>
<exclude name="**/http/RequestWrapper*.java"/>
+-->
+<!-- FIXME (SW) : why is this excluded ? -->
<exclude name="**/browser/*.x*"/>
</fileset>
</copy>
@@ -898,6 +902,7 @@
<mkdir dir="${build.scratchpad.dest}"/>
<copy todir="${build.scratchpad.src}" filtering="on">
<fileset dir="${scratchpad.src}">
+<!--
<exclude name="**/Ifx*.java" unless="ifx.driver.present"/>
<exclude name="**/precept/**" unless="servlet.present"/>
@@ -905,6 +910,7 @@
<exclude name="**/XMLDB*.java" unless="xmldb.present"/>
<exclude name="**/DbXML*.java" unless="xmldb.present"/>
+-->
</fileset>
</copy>
</target>
@@ -932,11 +938,27 @@
style="${java.dir}/org/apache/cocoon/components/browser/BrowserImpl.xsl"/>
</target>
+ <!-- =================================================================== -->
+ <!-- Compiles the mock classes -->
+ <!-- =================================================================== -->
+ <target name="compile-mocks">
+ <mkdir dir="${build.mocks}"/>
+
+ <javac srcdir="${mocks.dir}"
+ destdir="${build.mocks}"
+ debug="${debug}"
+ optimize="${optimize}"
+ deprecation="${deprecation}"
+ target="${target.vm}"
+ nowarn="${nowarn}">
+ <classpath refid="classpath"/>
+ </javac>
+ </target>
<!-- =================================================================== -->
<!-- Compiles the source directory -->
<!-- =================================================================== -->
- <target name="compile" depends="prepare-src-main"
+ <target name="compile" depends="prepare-src-main, compile-mocks"
description="Compiles the source code">
<copy todir="${build.dest}">
<fileset dir="${build.src}">
@@ -959,7 +981,11 @@
deprecation="${deprecation}"
target="${target.vm}"
nowarn="${nowarn}">
- <classpath refid="classpath"/>
+ <!--classpath refid="classpath"/-->
+ <classpath>
+ <path refid="classpath"/>
+ <path location="${build.mocks}"/>
+ </classpath>
</javac>
<copy todir="${build.scratchpad.dest}">
@@ -977,7 +1003,11 @@
optimize="${optimize}"
deprecation="${deprecation}"
target="${target.vm}">
- <classpath refid="scratchpad.classpath"/>
+ <!--classpath refid="scratchpad.classpath"/-->
+ <classpath>
+ <path refid="scratchpad.classpath"/>
+ <path location="${build.mocks}"/>
+ </classpath>
</javac>
</target>
@@ -1538,6 +1568,7 @@
<mkdir dir="${dist.src.dir}/src"/>
<mkdir dir="${dist.src.dir}/src/java"/>
<mkdir dir="${dist.src.dir}/src/documentation"/>
+ <mkdir dir="${dist.src.dir}/src/mocks"/>
<mkdir dir="${dist.src.dir}/src/resources"/>
<mkdir dir="${dist.src.dir}/src/scratchpad"/>
<mkdir dir="${dist.src.dir}/src/webapp"/>
@@ -1583,6 +1614,10 @@
<fileset dir="${java.dir}"/>
</copy>
+ <copy todir="${dist.src.dir}/src/mocks" filtering="off">
+ <fileset dir="${mocks.dir}"/>
+ </copy>
+
<copy todir="${dist.src.dir}/src/scratchpad" filtering="off">
<fileset dir="${scratchpad.dir}"/>
</copy>
@@ -1944,7 +1979,86 @@
</jing>
</target>
+ <!-- =================================================================== -->
+ <!-- Build the Eclipse projects files -->
+ <!--=================================================================== -->
+ <target name="eclipse-project" depends="init">
+
+ <!-- prepare the various paths that will form the project -->
+ <path id="src.dirs">
+ <!-- main source dir -->
+ <pathelement path="${src.dir}/java"/>
+ <!-- scratchpad source dir -->
+ <pathelement path="${src.dir}/scratchpad/src"/>
+ </path>
+
+ <path id="mocks.dirs">
+ <!-- main mocks dir -->
+ <pathelement path="${mocks.dir}"/>
+ </path>
+
+ <path id="libs">
+ <!-- main libs -->
+ <fileset dir="${lib.dir}">
+ <include name="core/*.jar"/>
+ <include name="core/jvm${target.vm}/*.jar"/>
+ <include name="optional/*.jar"/>
+ <include name="local/*.jar"/>
+ <include name="endorsed/*.jar"/>
+ </fileset>
+ <!-- scratchpad libs -->
+ <fileset dir="${scratchpad.dir}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- convert paths to properties -->
+ <property name="src.dirs" refid="src.dirs"/>
+ <property name="mocks.dirs" refid="mocks.dirs"/>
+ <property name="libs" refid="libs"/>
+
+ <!-- expand properties in the template file -->
+ <copy file="${src.dir}/resources/dev/eclipse/classpath-tmpl.xml"
+ tofile="${build.work}/classpath-temp.xml"
+ filtering="yes"
+ overwrite="yes">
+ <filterset>
+ <filter token="SRC_DIRS" value="${src.dirs}"/>
+ <filter token="LIBS" value="${libs}"/>
+ <filter token="MOCKS_DIRS" value="${mocks.dirs}"/>
+ </filterset>
+ </copy>
+
+ <!-- split the path in 'item' XML elements -->
+ <replace file="${build.work}/classpath-temp.xml"
+ token="${path.separator}" value="</item>
 <item>"/>
+ <!-- relativize file names by removing the current directory -->
+ <replace file="${build.work}/classpath-temp.xml"
+ token="${user.dir}${file.separator}" value=""/>
+ <!-- and in case that fails, remove the base directory -->
+ <replace file="${build.work}/classpath-temp.xml"
+ token="${basedir}${file.separator}" value=""/>
+
+ <!-- replace platform-dependent path separator by '/' -->
+ <replace file="${build.work}/classpath-temp.xml"
+ token="${file.separator}" value="/"/>
+ <!-- now build the .classpath file -->
+ <style in="${build.work}/classpath-temp.xml" out="${basedir}/.classpath"
+ processor="trax"
+ style="${src.dir}/resources/dev/eclipse/make-classpath.xsl"/>
+
+ <!-- copy the project file (expand version) -->
+ <copy file="${src.dir}/resources/dev/eclipse/project"
+ tofile="${basedir}/.project"
+ overwrite="yes">
+ <filterset>
+ <filter token="VERSION" value="${version}"/>
+ </filterset>
+ </copy>
+
+ </target>
+
</project>
<!-- End of file -->
No revision
No revision
1.6.2.1 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SendmailAction.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- SendmailAction.java 22 Feb 2002 06:59:26 -0000 1.6
+++ SendmailAction.java 2 Jan 2003 11:02:11 -0000 1.6.2.1
@@ -113,7 +113,7 @@
properties.put("mail.smtp.host",parameters.getParameter("smtphost",null));
getLogger().debug("SendmailAction: overriding default smtp server, using
"+properties.get("mail.smtp.host"));
}
- Session session = Session.getDefaultInstance(properties,null);
+ Session session = Session.getDefaultInstance(properties);
Message message = new MimeMessage(session);
String from = null;
String to = null;
No revision
No revision
1.6.2.7 +246 -237
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlConnection.java
Index: EsqlConnection.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlConnection.java,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -r1.6.2.6 -r1.6.2.7
--- EsqlConnection.java 19 Dec 2002 11:24:29 -0000 1.6.2.6
+++ EsqlConnection.java 2 Jan 2003 11:02:12 -0000 1.6.2.7
@@ -66,19 +66,18 @@
*/
public class EsqlConnection implements Connection {
- public static final int LIMIT_METHOD_NOLIMIT = 0;
- public static final int LIMIT_METHOD_POSTGRESQL = 1;
- public static final int LIMIT_METHOD_POSTGRESQL_OLD = 4;
- public static final int LIMIT_METHOD_MYSQL = 2;
- public static final int LIMIT_METHOD_JDBC = 3;
-
- public Connection connection = null;
-
- private String url = null;
- private Properties info = new Properties();
- private int limitMethod = LIMIT_METHOD_NOLIMIT;
- private boolean multipleResults = false;
-
+ public static final int LIMIT_METHOD_NOLIMIT = 0;
+ public static final int LIMIT_METHOD_POSTGRESQL = 1;
+ public static final int LIMIT_METHOD_POSTGRESQL_OLD = 4;
+ public static final int LIMIT_METHOD_MYSQL = 2;
+ public static final int LIMIT_METHOD_JDBC = 3;
+
+ public Connection connection = null;
+
+ private String url = null;
+ private Properties info = new Properties();
+ private int limitMethod = LIMIT_METHOD_NOLIMIT;
+ private boolean multipleResults = false;
public boolean multipleResults() {
return this.multipleResults;
@@ -93,260 +92,270 @@
**/
public void setMultipleResults(String value) {
if (value != null)
- this.multipleResults = ("true".equalsIgnoreCase(value) ||
"yes".equalsIgnoreCase(value));
+ this.multipleResults =
+ ("true".equalsIgnoreCase(value)
+ || "yes".equalsIgnoreCase(value));
+ }
+
+ public Properties getInfo() {
+ return (info);
+ }
+
+ public String getUrl() {
+ if (this.url == null)
+ {
+ try {
+ this.url = this.connection.getMetaData().getURL();
+ } catch (SQLException e) {
+ }
+ }
+ return this.url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public void setProperty(String name, Object value) {
+ info.put(name, value);
+ }
+
+ public void setUser(String user) {
+ setProperty("user", user);
+ }
+
+ public void setPassword(String password) {
+ setProperty("password", password);
+ }
+
+ public int getLimitMethod() {
+ return (limitMethod);
+ }
+
+ public void setLimitMethod(String method) {
+ if ("".equals(method) || "auto".equals(method)) {
+ String jdbcSource;
+ try {
+ jdbcSource = connection.getMetaData().getURL();
+ } catch (Exception e) {
+ throw new CascadingRuntimeException(
+ "Error accessing connection metadata",
+ e);
+ }
+ if (jdbcSource.startsWith("jdbc:postgresql:")) {
+ limitMethod = LIMIT_METHOD_POSTGRESQL;
+ } else if (jdbcSource.startsWith("jdbc:mysql:")) {
+ limitMethod = LIMIT_METHOD_MYSQL;
+ } else if (jdbcSource.startsWith("jdbc:sybase:")) {
+ limitMethod = LIMIT_METHOD_JDBC;
+ } else {
+ throw new RuntimeException(
+ "Cannot guess limit method from jdbc url: " + method);
+ }
+ } else if ("postgresql".equals(method)) {
+ limitMethod = LIMIT_METHOD_POSTGRESQL;
+ } else if ("postgresql-old".equals(method)) {
+ limitMethod = LIMIT_METHOD_POSTGRESQL;
+ } else if ("mysql".equals(method)) {
+ limitMethod = LIMIT_METHOD_MYSQL;
+ } else if ("jdbc".equals(method)) {
+ limitMethod = LIMIT_METHOD_JDBC;
+ } else {
+ throw new RuntimeException("Unknown limit method: " + method);
+ }
+ }
+
+ /* */
+
+ public java.sql.Statement createStatement() throws SQLException {
+ return (connection.createStatement());
+ }
+
+ public java.sql.Statement createStatement(int i1, int i2)
+ throws SQLException {
+ return (connection.createStatement(i1, i2));
+ }
+
+ public java.sql.PreparedStatement prepareStatement(String s)
+ throws SQLException {
+ return (connection.prepareStatement(s));
+ }
+
+ public java.sql.PreparedStatement prepareStatement(
+ String s,
+ int i1,
+ int i2)
+ throws SQLException {
+ return (connection.prepareStatement(s, i1, i2));
+ }
+
+ public void close() throws SQLException {
+ connection.close();
+ }
+
+ public void commit() throws SQLException {
+ connection.commit();
+ }
+
+ public void rollback() throws SQLException {
+ connection.rollback();
+ }
+
+ public boolean getAutoCommit() throws SQLException {
+ return (connection.getAutoCommit());
}
+ public void setAutoCommit(boolean autocommit) throws SQLException {
+ connection.setAutoCommit(autocommit);
+ }
+ public void setTransactionIsolation(int i) throws SQLException {
+ connection.setTransactionIsolation(i);
+ }
+
+ public int getTransactionIsolation() throws SQLException {
+ return (connection.getTransactionIsolation());
+ }
+
+ public String getCatalog() throws SQLException {
+ return (connection.getCatalog());
+ }
+
+ public java.sql.SQLWarning getWarnings() throws SQLException {
+ return (connection.getWarnings());
+ }
+
+ public java.util.Map getTypeMap() throws SQLException {
+ return (connection.getTypeMap());
+ }
+
+ public boolean isClosed() throws SQLException {
+ return (connection.isClosed());
+ }
+
+ public java.sql.DatabaseMetaData getMetaData() throws SQLException {
+ return (connection.getMetaData());
+ }
+
+ public void setCatalog(String s) throws SQLException {
+ connection.setCatalog(s);
+ }
- public Properties getInfo() {
- return(info);
- }
-
- public String getUrl() {
- if (this.url == null)
- try {
- this.url=this.connection.getMetaData().getURL();
- } catch (SQLException e) {
- };
- return this.url;
- }
-
- public void setUrl( String url ) {
- this.url = url;
- }
-
- public void setProperty( String name, Object value ) {
- info.put(name,value);
- }
-
- public void setUser(String user) {
- setProperty("user",user);
- }
-
- public void setPassword(String password) {
- setProperty("password",password);
- }
-
- public int getLimitMethod() {
- return(limitMethod);
- }
-
- public void setLimitMethod( String method ) {
- if ("".equals(method) || "auto".equals(method) ) {
- String jdbcSource;
- try {
- jdbcSource = connection.getMetaData().getURL();
- } catch (Exception e) {
- throw new CascadingRuntimeException("Error accessing connection metadata",
e);
- }
- if (jdbcSource.startsWith("jdbc:postgresql:")) {
- limitMethod = LIMIT_METHOD_POSTGRESQL;
- } else if (jdbcSource.startsWith("jdbc:mysql:")) {
- limitMethod = LIMIT_METHOD_MYSQL;
- } else if (jdbcSource.startsWith("jdbc:sybase:")) {
- limitMethod = LIMIT_METHOD_JDBC;
- }
- else {
- throw new RuntimeException("Cannot guess limit method from jdbc url: " +
method);
- }
- }
- else if ("postgresql".equals(method)) {
- limitMethod = LIMIT_METHOD_POSTGRESQL;
- } else if ("postgresql-old".equals(method)) {
- limitMethod = LIMIT_METHOD_POSTGRESQL;
- } else if ("mysql".equals(method)) {
- limitMethod = LIMIT_METHOD_MYSQL;
- } else if ("jdbc".equals(method)) {
- limitMethod = LIMIT_METHOD_JDBC;
- } else {
- throw new RuntimeException("Unknown limit method: " + method);
- }
- }
-
-
- /* */
-
- public java.sql.Statement createStatement() throws SQLException {
- return(connection.createStatement());
- }
-
- public java.sql.Statement createStatement(int i1, int i2) throws SQLException {
- return(connection.createStatement(i1, i2));
- }
-
- public java.sql.PreparedStatement prepareStatement(String s) throws SQLException {
- return(connection.prepareStatement(s));
- }
-
- public java.sql.PreparedStatement prepareStatement(String s, int i1, int i2)
throws SQLException {
- return(connection.prepareStatement(s, i1, i2));
- }
-
-
- public void close() throws SQLException {
- connection.close();
- }
-
- public void commit() throws SQLException {
- connection.commit();
- }
-
- public void rollback() throws SQLException {
- connection.rollback();
- }
-
- public boolean getAutoCommit() throws SQLException {
- return(connection.getAutoCommit());
- }
-
- public void setAutoCommit(boolean autocommit) throws SQLException {
- connection.setAutoCommit(autocommit);
- }
-
- public void setTransactionIsolation(int i) throws SQLException {
- connection.setTransactionIsolation(i);
- }
-
- public int getTransactionIsolation() throws SQLException {
- return(connection.getTransactionIsolation());
- }
-
- public String getCatalog() throws SQLException {
- return(connection.getCatalog());
- }
-
- public java.sql.SQLWarning getWarnings() throws SQLException {
- return(connection.getWarnings());
- }
-
- public java.util.Map getTypeMap() throws SQLException {
- return(connection.getTypeMap());
- }
-
- public boolean isClosed() throws SQLException {
- return(connection.isClosed());
- }
-
- public java.sql.DatabaseMetaData getMetaData() throws SQLException {
- return(connection.getMetaData());
- }
-
- public void setCatalog(String s) throws SQLException {
- connection.setCatalog(s);
- }
-
- public void setTypeMap(java.util.Map m) throws SQLException {
- connection.setTypeMap(m);
- }
-
- public void setReadOnly(boolean b) throws SQLException {
- connection.setReadOnly(b);
- }
-
- public void clearWarnings() throws SQLException {
- connection.clearWarnings();
- }
-
- public boolean isReadOnly() throws SQLException {
- return(connection.isReadOnly());
- }
-
- public String nativeSQL(String s) throws SQLException {
- return(connection.nativeSQL(s));
- }
-
- public java.sql.CallableStatement prepareCall(String s) throws SQLException {
- return(connection.prepareCall(s));
- }
-
- public java.sql.CallableStatement prepareCall(String s, int i1, int i2) throws
SQLException {
- return(connection.prepareCall(s,i1,i2));
- }
-
- /* @JDBC3_START@
- public void setHoldability(int holdability)
- throws SQLException
- {
+ public void setTypeMap(java.util.Map m) throws SQLException {
+ connection.setTypeMap(m);
+ }
+
+ public void setReadOnly(boolean b) throws SQLException {
+ connection.setReadOnly(b);
+ }
+
+ public void clearWarnings() throws SQLException {
+ connection.clearWarnings();
+ }
+
+ public boolean isReadOnly() throws SQLException {
+ return (connection.isReadOnly());
+ }
+
+ public String nativeSQL(String s) throws SQLException {
+ return (connection.nativeSQL(s));
+ }
+
+ public java.sql.CallableStatement prepareCall(String s)
+ throws SQLException {
+ return (connection.prepareCall(s));
+ }
+
+ public java.sql.CallableStatement prepareCall(String s, int i1, int i2)
+ throws SQLException {
+ return (connection.prepareCall(s, i1, i2));
+ }
+
+ // @JDBC3_START@
+
+ public void setHoldability(int holdability) throws SQLException {
connection.setHoldability(holdability);
}
- public int getHoldability()
- throws SQLException
- {
+ public int getHoldability() throws SQLException {
return connection.getHoldability();
}
- public java.sql.Savepoint setSavepoint()
- throws SQLException
- {
+ public java.sql.Savepoint setSavepoint() throws SQLException {
return connection.setSavepoint();
}
public java.sql.Savepoint setSavepoint(String savepoint)
- throws SQLException
- {
+ throws SQLException {
return connection.setSavepoint(savepoint);
}
- public void rollback(java.sql.Savepoint savepoint)
- throws SQLException
- {
+ public void rollback(java.sql.Savepoint savepoint) throws SQLException {
connection.rollback(savepoint);
}
public void releaseSavepoint(java.sql.Savepoint savepoint)
- throws SQLException
- {
+ throws SQLException {
connection.releaseSavepoint(savepoint);
}
- public java.sql.Statement createStatement(int resulSetType,
- int resultSetConcurrency,
- int resultSetHoldability)
- throws SQLException
- {
- return connection.createStatement(resulSetType, resultSetConcurrency,
resultSetHoldability);
- }
-
- public java.sql.PreparedStatement prepareStatement(String sql,
- int resulSetType,
- int resultSetConcurrency,
- int resultSetHoldability)
- throws SQLException
- {
- return connection.prepareStatement(sql, resulSetType, resultSetConcurrency,
resultSetHoldability);
- }
-
- public java.sql.CallableStatement prepareCall(String sql,
- int resulSetType,
- int resultSetConcurrency,
- int resultSetHoldability)
- throws SQLException
- {
- return connection.prepareCall(sql, resulSetType, resultSetConcurrency,
resultSetHoldability);
- }
-
- public java.sql.PreparedStatement prepareStatement(String sql,
- int autoGeneratedKeys)
- throws SQLException
- {
+ public java.sql.Statement createStatement(
+ int resulSetType,
+ int resultSetConcurrency,
+ int resultSetHoldability)
+ throws SQLException {
+ return connection.createStatement(
+ resulSetType,
+ resultSetConcurrency,
+ resultSetHoldability);
+ }
+
+ public java.sql.PreparedStatement prepareStatement(
+ String sql,
+ int resulSetType,
+ int resultSetConcurrency,
+ int resultSetHoldability)
+ throws SQLException {
+ return connection.prepareStatement(
+ sql,
+ resulSetType,
+ resultSetConcurrency,
+ resultSetHoldability);
+ }
+
+ public java.sql.CallableStatement prepareCall(
+ String sql,
+ int resulSetType,
+ int resultSetConcurrency,
+ int resultSetHoldability)
+ throws SQLException {
+ return connection.prepareCall(
+ sql,
+ resulSetType,
+ resultSetConcurrency,
+ resultSetHoldability);
+ }
+
+ public java.sql.PreparedStatement prepareStatement(
+ String sql,
+ int autoGeneratedKeys)
+ throws SQLException {
return connection.prepareStatement(sql, autoGeneratedKeys);
}
- public java.sql.PreparedStatement prepareStatement(String sql,
- int[] columnIndexes)
- throws SQLException
- {
+ public java.sql.PreparedStatement prepareStatement(
+ String sql,
+ int[] columnIndexes)
+ throws SQLException {
return connection.prepareStatement(sql, columnIndexes);
}
- public java.sql.PreparedStatement prepareStatement(String sql,
- String[] columnNames)
- throws SQLException
- {
+ public java.sql.PreparedStatement prepareStatement(
+ String sql,
+ String[] columnNames)
+ throws SQLException {
return connection.prepareStatement(sql, columnNames);
}
-@JDBC3_END@ */
+ // @JDBC3_END@
}
-
No revision
No revision
1.1.2.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/util/Attic/BlobHelper.java
Index: BlobHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/Attic/BlobHelper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BlobHelper.java 17 Nov 2002 19:13:52 -0000 1.1.2.1
+++ BlobHelper.java 2 Jan 2003 11:02:12 -0000 1.1.2.2
@@ -104,8 +104,8 @@
// if ever implemented.... the following are the JDBC3 methods
// since not implemented anyway, included in JDBC2 builds as well.
- /* @JDBC3_START@
- @JDBC3_END@ */
+ // @JDBC3_START@
+ // @JDBC3_END@
/**
1.1.2.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/util/Attic/ClobHelper.java
Index: ClobHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/Attic/ClobHelper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ClobHelper.java 17 Nov 2002 19:13:52 -0000 1.1.2.1
+++ ClobHelper.java 2 Jan 2003 11:02:12 -0000 1.1.2.2
@@ -112,8 +112,8 @@
// if ever implemented.... the following are the JDBC3 methods
// since not implemented anyway, included in JDBC2 builds as well.
- /* @JDBC3_START@
- @JDBC3_END@ */
+ // @JDBC3_START@
+ // @JDBC3_END@
/**
No revision
No revision
1.1.2.1 +65 -0 xml-cocoon2/src/mocks/com/informix/jdbc/Attic/IfxStatement.java
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/Address.java
Index: Address.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/Address.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/Message.java
Index: Message.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/Message.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/MessagingException.java
Index: MessagingException.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/MessagingException.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/Part.java
Index: Part.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/Part.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/Session.java
Index: Session.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/Session.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/Transport.java
Index: Transport.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/Transport.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/internet/AddressException.java
Index: AddressException.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/internet/AddressException.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/internet/InternetAddress.java
Index: InternetAddress.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/internet/InternetAddress.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/javax/mail/internet/MimeMessage.java
Index: MimeMessage.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/javax/mail/internet/MimeMessage.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +70 -0 xml-cocoon2/src/mocks/net/php/Attic/servlet.java
No revision
No revision
1.1.2.1 +70 -0 xml-cocoon2/src/mocks/oracle/jdbc/Attic/OracleResultSet.java
No revision
No revision
1.1.2.1 +66 -0 xml-cocoon2/src/mocks/oracle/sql/Attic/BLOB.java
1.1.2.1 +66 -0 xml-cocoon2/src/mocks/oracle/sql/Attic/CLOB.java
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/org/jaxen/dom/DOMXPath.java
Index: DOMXPath.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/org/jaxen/dom/DOMXPath.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/src/mocks/sun/tools/javac/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/mocks/sun/tools/javac/Main.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +193 -0
xml-cocoon2/src/mocks/weblogic/servlet/internal/Attic/ServletContextImpl.java
1.1.2.1 +113 -0
xml-cocoon2/src/mocks/weblogic/servlet/internal/Attic/ServletOutputStreamImpl.java
1.1.2.1 +215 -0
xml-cocoon2/src/mocks/weblogic/servlet/internal/Attic/ServletResponseImpl.java
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/src/resources/dev/eclipse/classpath-tmpl.xml
Index: classpath-tmpl.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/resources/dev/eclipse/classpath-tmpl.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/resources/dev/eclipse/make-classpath.xsl
Index: make-classpath.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/resources/dev/eclipse/make-classpath.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/resources/dev/eclipse/project
Index: project
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/resources/dev/eclipse/project,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
