You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/04/27 20:58:12 UTC
svn commit: r165027 - in /incubator/derby/code/branches/10.0: CHANGES STATUS
build.xml
java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
tools/ant/properties/jikes.properties tools/ant/properties/modern.properties
Author: fuzzylogic
Date: Wed Apr 27 11:58:11 2005
New Revision: 165027
URL: http://svn.apache.org/viewcvs?rev=165027&view=rev
Log:
Add snapshot target.
Also, fix two javadoc errors in publishedapi, remove unnecessary properties
from compiler properties files, and update STATUS and CHANGES for the branch.
Modified:
incubator/derby/code/branches/10.0/CHANGES
incubator/derby/code/branches/10.0/STATUS
incubator/derby/code/branches/10.0/build.xml
incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
incubator/derby/code/branches/10.0/tools/ant/properties/jikes.properties
incubator/derby/code/branches/10.0/tools/ant/properties/modern.properties
Modified: incubator/derby/code/branches/10.0/CHANGES
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/CHANGES?rev=165027&r1=165026&r2=165027&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/CHANGES (original)
+++ incubator/derby/code/branches/10.0/CHANGES Wed Apr 27 11:58:11 2005
@@ -1,88 +1,105 @@
+Changes in Derby 10.0.2.2 - Still in development / Not yet released
+
+ *) Make LOCAL an unreserved word. (Derby-139)
+ [Dan Debrunner <dj...@debrunners.com>]
+
+ *) Fix Eclipse plugin version specification. (Derby-153)
+ [Rajesh Kartha <ka...@source-zone.org>]
+
+ *) Build number added to Bundle-Version in derby.jar manifest. (Derby-228)
+ [Andrew McIntyre <mc...@gmail.com>]
+
Changes in Derby 10.0.2.1
- *) For Network Server, clear back to appropriate point if
- query fails instead of clearing buffer. (Derby-5)
- [Army Brown <ar...@golux.com>]
-
+ *) For Network Server, clear back to appropriate point if
+ query fails instead of clearing buffer. (Derby-5)
+ [Army Brown <ar...@golux.com>]
+
*) Enable use of functions in triggers (Derby-6)
[Jack Klebanoff <kl...@mutagen.net>]
-
- *) Triggers do not evaluate functions in VALUES trigger actions. (Derby-14)
+
+ *) Triggers do not evaluate functions in VALUES trigger actions. (Derby-14)
- *) Method calls on a closed Connection from a PooledConnection no longer
- cause connection closed events to be sent to any listeners.
- Minor clean up of BrokeredConnection as well, remove an unused
- constructor, make the control field final and remove incorrect comment
- and unused imports. (Derby-24)
+ *) Method calls on a closed Connection from a PooledConnection no
+ longer cause connection closed events to be sent to any listeners.
+ Minor clean up of BrokeredConnection as well, remove an unused
+ constructor, make the control field final and remove incorrect
+ comment and unused imports. (Derby-24)
[Dan Debrunner <dj...@debrunners.com>]
- *) Connection.close() on a closed connection is defined by JDBC javadoc to
- be a no-op. (Derby-30)
+ *) Connection.close() on a closed connection is defined by JDBC
+ javadoc to be a no-op. (Derby-30)
[Dan Debrunner]
- *) Multiple jvms prevented from booting the same database in parallel to
- avoid accidental corruptions in Unix environments. (Derby-32)
+ *) Multiple jvms prevented from booting the same database in parallel
+ to avoid accidental corruptions in Unix environments. (Derby-32)
[Suresh Thalamati <ts...@source-zone.org>]
- *) Allow default to be specified for CHAR FOR BIT DATA columns (Derby-34)
- [Satheesh Bandaram <sa...@sourcery.org>]
-
- *) Fix dss chaining problems for network server. (Derby-35)
- [Army Brown]
+ *) Allow default to be specified for CHAR FOR BIT DATA columns
+ (Derby-34)
+ [Satheesh Bandaram <sa...@sourcery.org>]
+
+ *) Fix dss chaining problems for network server. (Derby-35)
+ [Army Brown]
*) LOCKS is no longer a reserved keyword (Derby-38)
- [Mamta Satoor <ma...@remulak.net>]
-
- *) Allow BIGINT default values in create table. (Derby-40)
- [Satheesh Bandaram]
-
- *) Encryption key length no longer stored in service.properties. (Derby-42)
- [Sunitha Kambhampati <sk...@Yngvi.Org>]
-
- *) Enable LIKE ? ESCAPE ? syntax that was disabled before (Derby-44)
- [Satheesh Bandaram]
-
- *) Allow expressions that result in string types as arguments to a LIKE
- expression (Derby-45)
- [Satheesh Bandaram]
-
- *) Make RETAIN a non-reserved keyword (Derby-54)
- [Satheesh Bandaram]
-
- *) Faster create database by moving DatabaseMetaData SPS creation into the
- DataDictionary. Means creation of these statements is not logged and
- compilation is delayed until the matching DatabaseMetaData method is
- first called.
+ [Mamta Satoor <ma...@remulak.net>]
+
+ *) Allow BIGINT default values in create table. (Derby-40)
+ [Satheesh Bandaram]
+
+ *) Encryption key length no longer stored in
+ service.properties. (Derby-42)
+ [Sunitha Kambhampati <sk...@Yngvi.Org>]
+
+ *) Enable LIKE ? ESCAPE ? syntax that was disabled before (Derby-44)
+ [Satheesh Bandaram]
+
+ *) Allow expressions that result in string types as arguments to a
+ LIKE expression (Derby-45)
+ [Satheesh Bandaram]
+
+ *) Make RETAIN a non-reserved keyword (Derby-54)
+ [Satheesh Bandaram]
+
+ *) Faster create database by moving DatabaseMetaData SPS creation
+ into the DataDictionary. Means creation of these statements is not
+ logged and compilation is delayed until the matching
+ DatabaseMetaData method is first called.
[Dan Debrunner]
- *) dblook argument handling has been improved. Bad arguments now generate
- an error, and connection URLs in quotes are handled properly.
+ *) dblook argument handling has been improved. Bad arguments now
+ generate an error, and connection URLs in quotes are handled
+ properly.
[Jalud Abdulmenan <te...@rogers.com>]
*) Localization of dblook messages enabled.
[Satheesh Bandaram]
*) Extension Packaging:
- 1. The monitor is changed to read multiple module.properties files,
- using method ClassLoader.getSystemResources.
+ 1. The monitor is changed to read multiple module.properties
+ files, using method ClassLoader.getSystemResources.
2. The monitor reads sub-sub-protocol properties from the
- modules.properties files, instead of just the system properties.
- 3. Sub-sub-protocol property values can name either a StorageFactory
- or a PersistentService implementation. Previously it could only
- name a StorageFactory implementation.
+ modules.properties files, instead of just the system
+ properties.
+ 3. Sub-sub-protocol property values can name either a
+ StorageFactory or a PersistentService
+ implementation. Previously it could only name a
+ StorageFactory implementation.
[Jack Klebanoff]
- *) Latent bug fixed in org.apache.derby.impl.store.access.sort.ExternalSortFactory.
- Its canSupport method throws an exception if it is called with a null
+ *) Latent bug fixed in
+ org.apache.derby.impl.store.access.sort.ExternalSortFactory. Its
+ canSupport method throws an exception if it is called with a null
startParams argument.
[Jack Klebanoff]
- *) Prevent empty log switches by rechecking the conditions that trigger the
- log switched in synchronized blocks, and make backward scans skip the
- empty log files. In multi-threaded application when many threads are
- executing commits in parallel, empty log files might be created.
- Recovery log scan does not expect empty log files while scanning log
- records to undo incomplete transactions.
+ *) Prevent empty log switches by rechecking the conditions that
+ trigger the log switched in synchronized blocks, and make backward
+ scans skip the empty log files. In multi-threaded application when
+ many threads are executing commits in parallel, empty log files
+ might be created. Recovery log scan does not expect empty log
+ files while scanning log records to undo incomplete transactions.
[Suresh Thalamati]
*) Add derby.war file
@@ -90,17 +107,16 @@
*) Fix display of NetServlet messages.
[Lynh Nguyen <ly...@remulak.net>]
-
- *) Database Metadata now returns correct size for maximum column name
- length, maximum schema name length, etc.
- [Satheesh Bandaram]
-
- *) Add static property derby.drda.keepAlive to Network Server, to set the
- use of TCP keepalive for Network Server connections on the server side,
- with the use of keepalive on by default.
- [Kathey Marsden]
-
- *) Ensure BrokeredStatement and PreparedStatement always throw a Statement
- is closed exception if the statement is closed.
- [Dan Debrunner]
-
+
+ *) Database Metadata now returns correct size for maximum column name
+ length, maximum schema name length, etc.
+ [Satheesh Bandaram]
+
+ *) Add static property derby.drda.keepAlive to Network Server, to set
+ the use of TCP keepalive for Network Server connections on the
+ server side, with the use of keepalive on by default.
+ [Kathey Marsden]
+
+ *) Ensure BrokeredStatement and PreparedStatement always throw a
+ Statement is closed exception if the statement is closed.
+ [Dan Debrunner]
Modified: incubator/derby/code/branches/10.0/STATUS
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/STATUS?rev=165027&r1=165026&r2=165027&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/STATUS (original)
+++ incubator/derby/code/branches/10.0/STATUS Wed Apr 27 11:58:11 2005
@@ -1,367 +1,33 @@
APACHE DERBY STATUS:
-Last modified at [$Date$] by $Author$.
+Last modified at [$Date: 2005-02-10 12:37:41 -0800 (Thu, 10 Feb 2005) $] by $Author: fuzzylogic $.
Web site: http://incubator.apache.org/derby/
-Incubator Status
-
- Description
-
- "Derby" is a snapshot of the IBM's Cloudscape Java relational database. IBM is
- opening the code by contributing it to The Apache Software Foundation and
- basing future versions of IBM Cloudscape on the Apache-managed code.
-
- To participate in the Derby podling, you should join the mailing list. Just
- send an empty message to derby-dev-subscribe@db.apache.org .
-
- The initial goal of the project while in incubation is to build a viable
- developer community around the codebase.
-
- The second goal of Derby-in-incubation is to successfully produce a release.
- Since Derby is in incubation, such a release would not have formal standing;
- it will serve as a proof-of-concept to demonstrate to the developers' and
- incubator's satisfaction that this aspect of the project is health and
- understood.
-
-Project info
-
- * The Apache DB project will own the Derby subproject, and the subproject will
- follow the Apache DB PMC's direction. Significant contributors to this sub-
- project (for example, after a significant interval of sustained contribution)
- will be proposed for commit access to the codebase.
-
- * The Derby sub-project's modules will be available as distinct and discrete downloads.
-
-Detailed References:
-
-item type reference
-Status file www http://incubator.apache.org/projects/derby.html
-Website www http://incubator.apache.org/derby/
-Mailing list dev derby-dev@db.apache.org
-Mailing list users derby-user@db.apache.org
-Source code SVN /repos/asf/incubator/derby/code/trunk/
-Mentor coar Ken Coar (CLA on file)
-Committers jta Jean Anderson (CLA on file)
-Committers satheesh Satheesh Bandaram (CLA on file)
-Committers djd Daniel Debrunner (CLA on file)
-Committers kmarsden Katherine Marsden (CLA on file)
-Committers mikem Mike Matrigali (CLA on file)
-Committers mcintyre Samuel McIntyre (CLA on file)
-Committers coar Ken Coar (CLA on file)
-
-Completed tasks are shown by the completion date (YYYY-MM-dd).
-Incubation status reports
-
- * none yet
-
-Incubation work items
-
-Project Setup
-
-Identify the codebase
-
-date item
-....-..-.. If applicable, make sure that any associated name does not already
- exist and check www.nameprotect.com to be sure that the name is not
- already trademarked for an existing software product.
-
-Copyright
-
-date item
-2004-08-26 Check and make sure that the papers that transfer rights to the ASF
- been received. It is only necessary to transfer rights for the
- package, the core code, and any new code produced by the project.
-2004-11-04 Check and make sure that the files that have been donated have been
- updated to reflect the new ASF copyright.
-
-Verify distribution rights
-date item
-2004-10-12 Check that all active committers have a signed CLA on record.
-2004-10-12 Remind active committers that they are responsible for ensuring that
- a Corporate CLA is recorded if such is is required to authorize
- their contributions under their individual CLA.
-2004-10-12 Check and make sure that for all items included with the distribution
- that is not under the Apache license, we have the right to combine
- with Apache-licensed code and redistribute.
-2004-10-12 Check and make sure that all items depended upon by the project is
- covered by one or more of the following approved licenses: Apache,
- BSD, Artistic, MIT/X, MIT/W3C, MPL 1.1, or something with essentially
- the same terms.
-
-Generally, the result of checking off these items will be a Software Grant, CLA, and Corporate CLA for ASF licensed code, which must have no dependencies upon items whose licenses that are incompatible with the Apache License.
-Organizational acceptance of responsibility for the project
-
- * Has the receiving PMC voted to accept it? **YES**
+This is the status file for the Derby 10.0 branch. The real STATUS file can
+be found in the trunk, viewable on the web at:
+http://svn.apache.org/viewcvs.cgi/incubator/derby/code/trunk/STATUS?view=markup
Releases:
-None so far. A first release is in progress. This first release will be
-versioned 10.0.2.1.
+ * 10.0.2.1 - First official Apache Derby release.
+
+Note that the 10.0 branch is versioned 10.0.2.2 when checked out from
+Subversion to indicate that additional changes have been made to the branch
+which were not in the 10.0.2.1 release.
PENDING ISSUES
==============
-Derby documentation in PDF format:
-
- A request was made for PDF documentation, however, the source files for the
- current HTML documentation for Derby are not in a form useful for creating PDF
- documentation with Forrest. A proposal was made by Jeff Levitt
- <jl...@mutagen.net> to convert the documentation into XML DITA format.
-
+None.
-RESOLVED ISSUES SINCE LAST STATUS
-=================================
-
-[VOTE] on repository layout:
-
- [ Ten votes ] Option 1: Keep the code and site pages in separately-versionable
- trees ( derby/site/{trunk,tags,branches}/<pages> and
- derby/code/{t,t,b}<code> )
-
- [ One vote ] Option 2: Put all things Derby into a single tree
- ( derby/{trunk,tags,branches}/{<code>,<pages>} )
-
-
-[VOTE] Establish development model based on Apache DB guidelines
-
- Derby is being sponsored by the Apache DB project and the Derby status
- page states 'The Apache DB project will own the Derby subproject, and
- the subproject will follow the Apache DB PMC's direction'.
- (http://incubator.apache.org/projects/derby.html)
-
- A vote was proposed that the Derby development model
- follows the guidelines defined by the Apache DB project. This will set
- the initial rules for development, changes to the model could
- subsequently be called for and voted on using the Derby developer
- mailing list.
-
- The guidelines are defined at http://db.apache.org/guidelines.html
-
- There is one difference that the Derby code is in SVN and not CVS.
-
- Note the decision making page at http://db.apache.org/decisions.html
- and the Changes section on this page http://db.apache.org/source.html.
-
- The Changes section indicates the commit model is:
-
- (quote)
-
- Simple patches to fix bugs can be committed then reviewed. With a
- commit-then-review process, the Committer is trusted to have a high
- degree of confidence in the change.
-
- Doubtful changes, new features, and large scale overhauls need to be
- discussed before committing them into the repository. Any change that
- affects the semantics of an existing API function, the size of the
- program, configuration data formats, or other major areas must receive
- consensus approval before being committed.
-
- (end-quote)
-
- Result: Six +1 votes.
-
-
-[VOTE] Derby upgrade policy
-
- A vote was proposed to accept that for any release of Derby the upgrade policy described in:
-
- http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&msgNo=77
-
- is followed.
-
- The summary is that any release of Derby can run against a database
- created by a previous release with either no upgrade, soft upgrade or
- hard upgrade mode, depending on the circumstance.
-
- This would mean that if some new feature was added to Derby, before a
- release occurred the correct upgrade code would have to be written, if
- the feature contributor did not provide it.
-
- Result: Three +1 votes.
-
-
-[VOTE] Derby versioning:
-
- A vote was proposed related to the Derby upgrade policy vote.
-
- That the version scheme currently in place, and described in:
-
- http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-
- dev@db.apache.org&msgNo=73
-
- be accepted in order to facilitate the upgrade policy voted on and
- accepted in the Derby upgrade policy thread. As such, Derby versions
- should take the following form: MAJOR.Minor.interim.point {beta} (build
- identifier). As an example, the currently posted snapshot version of
- Derby is 10.0.2.0 (46005).
-
- Whereby:
-
- Differences in the major version are used to identify large changes in
- architecture and functionality, and for which upgrade is required.
- Differences in the minor version are used to identify changes in
- functionality large enough to require an upgrade procedure for
- databases from the previous version, and for which upgrade is required.
- Differences in the interim version are used to identify significant
- differences in behavior of the database engine from the previous
- interim version, but for which upgrade to databases is not required.
- Differences in the point version are used to identify that any amount
- of change to the database engine has occurred from the previously
- released point version.
- That the build identifier be used to distinguish the exact state of the
- code from which any specific set of binaries have been compiled,
- That the beta flag in the version denote that the upgrade policy is in
- an indeterminate state with respect to the previous version and, as
- such, that an upgrade to a beta version of Derby is allowed, but an
- upgrade from a beta version of Derby to any other version of Derby is
- not allowed.
-
- I would like to further propose that, following that version scheme,
- that releases from any branch have a specific version number and be
- tagged in the repository. Thus, following this version scheme, the
- forthcoming baseline release of Derby should be versioned 10.0.2.1, as
- it includes changes which are not included in the first public version
- of the source. Once the release is ready, the version on the trunk will
- be changed to 10.0.2.1 and then tagged in subversion.
-
- I would like to also further propose that before changes which would
- require upgrade are allowed into the trunk, that the trunk be branched,
- so that the branch can serve as the reference for the upgrade policy.
- After branching, the minor (and/or major) version of the trunk will be
- incremented, and the beta tag applied to indicate that significant
- changes exist in the trunk which would require database upgrade and
- that the code for performing the upgrade has not been rigorously
- tested. As an example, before a change could be applied which would
- require upgrade, a new 10.0 branch would be created and the trunk would
- be reversioned 10.1.0.0 beta, in order to distinguish the trunk from
- the new branch and to allow changes that require a database upgrade
- into the trunk.
-
- Result: Three +1 votes. Passed.
-
-
-[VOTE] Re: Help detecting client disconnects for network server
-
- Kathey Marsden proposed the following vote concerning the use of TCP keepalive
- for Network Server:
-
- 1) Have keepAlive on by default. It seems important not only for locks
- but for potential network server bloat due to connections not getting
- cleaned up. Result: Three +1 votes. Passed.
-
- 2) Add a property derby.drda.keepAlive={true|false} (defaults to true as
- described above). There seems to be a need to be able to turn keepAlive
- off in some cases. Result: Two +1 votes, no objections. Passed.
-
- 3) Add property derby.drda.connSoTimeout=<milliseconds> (defaults to 0,
- infinite) to provide the ability to have connections timeout after a
- period of inactivity. The connections will still timeout, even if the
- connection is working fine but will timeout after blocking on a read for
- this length of time. I am about +.5 on this one. It would be nice to
- provide the capability, but hesitate to add yet another property.
- Result: One +1 vote, objections noted. Not passed.
-
-
-Copyright issues with the Derby codebase
-
- There were concerns over how the IBM copyright notices attached to the
- Derby source files were to be retained, if at all. For the discussion
- of the concerns surrounding this issue, please see:
-
- http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&msgId=1885981
-
- and the thread concerning the resolution of this issue:
-
- http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&msgId=1968757
-
-
-OTHER NEWS
-==========
-
-Bug tracking has been set up at http://issues.apache.org/jira/browse/DERBY
-
RELEASE STATUS
==============
-A baseline release is in progress. This first release will be versioned 10.0.2.1.
-Any release must be approved by the Incubator PMC and must clearly be marked as
-an incubator release, according to the Apache Incubator guidelines:
-
-http://incubator.apache.org/incubation/Incubation_Policy.html#Releases%0A
-
-Open showstoppers:
-
- None.
-
-Resolved showstoppers:
-
- DERBY-24 Client should not be able to raise an event on a PooledConnection
- it no longer owns.
-
- DERBY-32 Logic to prevent mutiple jvms booting the same database in parallel
- to avoid accidental corruptions on Unix environment is not working.
-
-Resolved non-showstoppers:
-
- DERBY-6 Trigger of the form: create trigger ... values myFunction(); has
- no effect.
-
- DERBY-14 Triggers do not evaluate functions in VALUES trigger actions.
-
- DERBY-21 ResultsetMetaData.getColumnClassName() for CLOB and BLOB datatypes is
- incorrect.
-
- DERBY-30 Connection.close() method inconsistently throws exception on
- closed connection
-
- DERBY-35 DRDA Chaining in Network Server is incorrect
-
- DERBY-38 Make LOCKS as non-reserved keyword in Derby since it is not a
- reserved keyword in the SQL standards
-
- DERBY-40 Cannot set default value for BIGINT
-
- DERBY-42 When using encryption, do not store the length information about the
- external key in service.properties
-
- DERBY-44 Support for like ? Escape ?
-
- DERBY-50 getMaxColumnNameLength() database metadata function returns incorrect
- value.
-
- DERBY-54 'retain' was not a keyword, now it is, possible schema impact
-
- DERBY-59 dblook currently has driver classes hard coded
-
- DERBY-67 Network Server on a 64 bit JVM fails with: Execution failed because
- of a Distributed Protocol Error: DRDA_Proto_SYNTAXRM; CODPNT arg = 2116; Error
- Code Value = 14
-
- DERBY-72 IBM (c) message in properties files
-
-
-Items deferred to next release:
+Since the release of Derby 10.0.2.1, there have been no requests or discussion
+for a 10.0.2.2 bugfix release, and minimal changes have been committed to the
+branch, with the bulk of development happening on the trunk, as expected.
- [PATCH] retrieveMessages... true by default in ij
- The original submitter of this patch (myrnap) requested that it not be applied to
- the current release due to an issue when setting the property on the command-line
- and passing the same property with the connection URL.
-
-Other applied patches:
-
- [PATCH] Optimization of org.apache.derby.impl.services.uuid.BasicUUID.toByteArray()
- [PATCH] Set Derby's build number to be the subversion revision number
- [PATCH] derby.war file build
- [PATCH] derby.log file error message
- [PATCH] Network servlet display only message key
- [PATCH] added 3 more parser generated files to the clobber target in main build.xml
- [PATCH] Various fixes to javadoc generation
- [PATCH] Trigger Bug Fix
- [PATCH] Fix to prevent empty log file switches that could cause recovery failures
- [PATCH] ExternalSortFactory Bug Fix
- [PATCH] Modify dblook messages to enable localization ...
- [PATCH] minor bugs in dblook
- [PATCH] Extension Packaging
- [PATCH] DB Shutdown fix for Network Server
+Check the CHANGES file for a list of changes which have been made since the
+release of 10.0.2.1.
Modified: incubator/derby/code/branches/10.0/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/build.xml?rev=165027&r1=165026&r2=165027&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/build.xml (original)
+++ incubator/derby/code/branches/10.0/build.xml Wed Apr 27 11:58:11 2005
@@ -593,7 +593,7 @@
<!-- =================================================================== -->
<!-- Eclipse Plugin -->
<!-- =================================================================== -->
- <target name="plugin" depends= "buildjars">
+ <target name="plugin" depends="buildjars">
<echo message="Begining Derby Eclipse plugin build"/>
<property name="plugin.tmp.dir" value ="plugintmp"/>
<mkdir dir="${derby.jar.dir}/${plugin.tmp.dir}"/>
@@ -1027,23 +1027,56 @@
<target name="buildworld">
- <property name="proceed" value="true"/>
-
<!-- Build insane product jars -->
<antcall target="clobber"/>
<antcall target="insane"/>
<antcall target="all"/>
- <antcall target="jars"/>
+ <antcall target="buildjars"/>
<!-- Build sane product jars -->
<antcall target="clobber"/>
<antcall target="sane"/>
<antcall target="all"/>
- <antcall target="jars"/>
+ <antcall target="buildjars"/>
<!-- Build everything else -->
<antcall target="javadoc"/>
</target>
+ <target name="snapshot" depends="init,snapshotError">
+
+ <antcall target="clobber"/>
+ <antcall target="insane"/>
+ <antcall target="all"/>
+ <antcall target="buildjars"/>
+ <antcall target="plugin"/>
+ <antcall target="publishedapi"/>
+
+ <mkdir dir="${basedir}/snapshot"/>
+ <zip destfile="${basedir}/snapshot/incubating-derby-snapshot-10.0-${changenumber}.zip">
+ <fileset dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
+ <fileset dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
+ <fileset dir="${basedir}/java" includes="demo/**"/>
+ </zip>
+ <tar destfile="${basedir}/snapshot/incubating-derby-snapshot-10.0-${changenumber}.tar.gz"
+ compression="gzip">
+ <tarfileset dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
+ <tarfileset dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
+ <tarfileset dir="${basedir}/java" includes="demo/**"/>
+ </tar>
+
+ <copy file="${basedir}/jars/insane/derby_core_plugin_10.0.2.zip"
+ tofile="${basedir}/snapshot/derby_core_plugin_10.0.2.${changenumber}.zip"/>
+
+ </target>
+
+ <target name="snapshotError" if="sane" depends="init">
+ <echo message="Please generate the snapshot using an insane build."/>
+ <echo message="Either run "ant -Dsane=false snapshot", or run"/>
+ <echo message="the insane target before running the snapshot target."/>
+ <echo message=""/>
+ <fail message="Exiting snapshot build..."/>
+ </target>
+
</project>
Modified: incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java?rev=165027&r1=165026&r2=165027&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java (original)
+++ incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java Wed Apr 27 11:58:11 2005
@@ -77,7 +77,7 @@
/**
Attempt to establish a database connection.
- @param user the database user on whose behalf the Connection is being made
+ @param username the database user on whose behalf the Connection is being made
@param password the user's password
@return a Connection to the database
Modified: incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java?rev=165027&r1=165026&r2=165027&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java (original)
+++ incubator/derby/code/branches/10.0/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java Wed Apr 27 11:58:11 2005
@@ -413,7 +413,7 @@
connection attributes with the same format as the connectionAttributes property.
*
- * @param user the database user on whose behalf the Connection is
+ * @param username the database user on whose behalf the Connection is
* being made
* @param password the user's password
* @return a Connection to the database
Modified: incubator/derby/code/branches/10.0/tools/ant/properties/jikes.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/ant/properties/jikes.properties?rev=165027&r1=165026&r2=165027&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/tools/ant/properties/jikes.properties (original)
+++ incubator/derby/code/branches/10.0/tools/ant/properties/jikes.properties Wed Apr 27 11:58:11 2005
@@ -2,9 +2,7 @@
build.compiler.fulldepend=off
build.compiler.pedantic=off
build.sysclasspath=ignore
-debug=on
depend=off
deprecation=on
-optimize=off
proceed=no
verbose=no
Modified: incubator/derby/code/branches/10.0/tools/ant/properties/modern.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/ant/properties/modern.properties?rev=165027&r1=165026&r2=165027&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/tools/ant/properties/modern.properties (original)
+++ incubator/derby/code/branches/10.0/tools/ant/properties/modern.properties Wed Apr 27 11:58:11 2005
@@ -3,9 +3,7 @@
build.compiler.pedantic=off
build.compiler.warnings=off
build.sysclasspath=ignore
-debug=on
depend=off
deprecation=on
-optimize=off
proceed=no
verbose=no