Author: niallp
Date: Mon Jul 10 20:44:31 2006
New Revision: 420694
URL: http://svn.apache.org/viewvc?rev=420694&view=rev
Log:
Various site/build changes:
- Remove the dependency on commons build & improve site navigation
- Bring changes report up to date with all changes since 1.2.1 release
- Change maven build to include files missing from source distro
- Configure the source distro to unpack to a different directory
- Add page for building Commons DBCP (i.e. building.xml)
- Add custom "Source Repository" page (i.e. csv-usage.xml)
- Change downloads.xml page to point to DBCP's download page
- Change issue-tracking.xml to filter searches for DBCP project
Added:
jakarta/commons/proper/dbcp/trunk/xdocs/building.xml (with props)
jakarta/commons/proper/dbcp/trunk/xdocs/cvs-usage.xml (with props)
jakarta/commons/proper/dbcp/trunk/xdocs/style/
jakarta/commons/proper/dbcp/trunk/xdocs/style/project.css (with props)
Removed:
jakarta/commons/proper/dbcp/trunk/xdocs/release-notes-1.2.2.xml
Modified:
jakarta/commons/proper/dbcp/trunk/maven.xml
jakarta/commons/proper/dbcp/trunk/project.properties
jakarta/commons/proper/dbcp/trunk/xdocs/changes.xml
jakarta/commons/proper/dbcp/trunk/xdocs/downloads.xml
jakarta/commons/proper/dbcp/trunk/xdocs/issue-tracking.xml
jakarta/commons/proper/dbcp/trunk/xdocs/navigation.xml
Modified: jakarta/commons/proper/dbcp/trunk/maven.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/maven.xml?rev=420694&r1=420693&r2=420694&view=diff
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/maven.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/maven.xml Mon Jul 10 20:44:31 2006
@@ -17,23 +17,6 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
- <!-- ================================================================== -->
- <!-- START : C O M M O N S - B U I L D -->
- <!-- ================================================================== -->
- <!-- Required: Look and Feel for documentation within distributions -->
- <!-- ================================================================== -->
- <postGoal name="xdoc:copy-resources">
- <copy todir="${basedir}/target/docs/style/" failonerror="false">
- <fileset dir="${basedir}/../commons-build/xdocs/style">
- <include name='**/*'/>
- <exclude name='**/CVS/**'/>
- </fileset>
- </copy>
- </postGoal>
- <!-- ================================================================== -->
- <!-- END: C O M M O N S - B U I L D -->
- <!-- ================================================================== -->
-
<!-- ============== DIST ================== -->
<!-- Copied from Commons-Collections -->
<postGoal name="dist:prepare-bin-filesystem">
@@ -62,6 +45,8 @@
<ant:copy todir="${maven.dist.src.assembly.dir}">
<ant:fileset dir=".">
<ant:include name="NOTICE.txt"/>
+ <ant:include name="build.properties.sample"/>
+ <ant:include name="checkstyle.xml"/>
</ant:fileset>
</ant:copy>
@@ -77,6 +62,11 @@
<ant:fileset dir="xdocs" />
</ant:copy>
+ <!-- Copy XDocs -->
+ <ant:copy todir="${maven.dist.src.assembly.dir}/doc">
+ <ant:fileset dir="doc" />
+ </ant:copy>
+
</postGoal>
<postGoal name="dist:build-bin">
Modified: jakarta/commons/proper/dbcp/trunk/project.properties
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/project.properties?rev=420694&r1=420693&r2=420694&view=diff
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/project.properties (original)
+++ jakarta/commons/proper/dbcp/trunk/project.properties Mon Jul 10 20:44:31
2006
@@ -8,7 +8,6 @@
maven.javadoc.author=false
maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api,http://jakarta.apache.org/commons/pool/apidocs
-maven.xdoc.jsl=../commons-build/commons-site.jsl
maven.xdoc.date=bottom
maven.xdoc.poweredby.image=maven-feather.png
maven.xdoc.version=${pom.currentVersion}
@@ -23,6 +22,9 @@
maven.compile.debug=on
maven.compile.deprecation=off
maven.compile.optimize=off
+
+# Make the source distro unzip to a different directory
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src
maven.jarResources.basedir=src/java
maven.jar.excludes=**/package.html
Added: jakarta/commons/proper/dbcp/trunk/xdocs/building.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/xdocs/building.xml?rev=420694&view=auto
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/xdocs/building.xml (added)
+++ jakarta/commons/proper/dbcp/trunk/xdocs/building.xml Mon Jul 10 20:44:31
2006
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+Copyright 2006 The Apache Software Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<document>
+ <properties>
+ <title>Building</title>
+ <author email="[email protected]">Commons Documentation
Team</author>
+ </properties>
+<body>
+<!-- ================================================== -->
+<section name="Overview">
+<p>
+ Commons DBCP uses <a href="http://maven.apache.org";>Maven</a> or
+ <a href="http://ant.apache.org";>Ant</a> as a build system.
+</p>
+</section>
+<!-- ================================================== -->
+<section name="Maven Goals">
+ <p>
+ To build a jar file, change into DBCP's root directory and run
+ <strong><code>maven jar</code></strong>.
+ The result will be in the "target" subdirectory.
+ </p>
+ <p>
+ To build the Javadocs, run <strong><code>maven javadoc</code></strong>.
+ The result will be in "target/docs/apidocs".
+ </p>
+ <p>
+ To build the full website, run <strong><code>maven site</code></strong>.
+
+ The result will be in "target/docs".
+ </p>
+ <p>
+ Further details can be found in the
+ <a href="http://jakarta.apache.org/commons/building.html";>commons build
instructions</a>.
+ </p>
+</section>
+<!-- ================================================== -->
+<section name="Ant Goals">
+ <p>
+ To build a jar file and the javadocs, change into DBCP's root directory
+ and run <strong><code>ant dist</code></strong>.
+ The result will be in the "dist" subdirectory.
+ </p>
+</section>
+<!-- ================================================== -->
+</body>
+</document>
Propchange: jakarta/commons/proper/dbcp/trunk/xdocs/building.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/dbcp/trunk/xdocs/building.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/dbcp/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/xdocs/changes.xml?rev=420694&r1=420693&r2=420694&view=diff
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/xdocs/changes.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/xdocs/changes.xml Mon Jul 10 20:44:31 2006
@@ -38,6 +38,53 @@
</properties>
<body>
<release version="1.2.2-SNAPSHOT" date="TBD">
+ <action dev="dirkv " type="add">
+ Add a <i>JNDO How To</i> to the User Guide.
+ </action>
+ <action dev="dirkv " type="fix" issue="DBCP-108" due-to="Maxwell
Grender-Jones">
+ DriverManagerConnectionFactory: blank username/password handling.
+ </action>
+ <action dev="dirkv " type="fix" issue="DBCP-113" due-to="Rohan Lenard">
+ Broken behaviour for BasicDataSource.setMaxActive(0).
+ </action>
+ <action dev="dirkv " type="fix" issue="DBCP-36" due-to="Jonathan
Whitall">
+ BasicDataSource does not work with getConnection(String, String).
+ </action>
+ <action dev="dirkv " type="update" issue="DBCP-164" due-to="Todd
Carmichael">
+ Enhancements to prepared statement in DriverAdapterCPDS.
+ </action>
+ <action dev="yoavs" type="update" issue="DBCP-186" due-to="Ralf Hauser">
+ Better messages and docs for LoginTimeout
UnsupportedOperationException.
+ </action>
+ <action dev="yoavs" type="fix" issue="DBCP-50" due-to="Nicky Nicolson">
+ Error in JOCL snippet in org.apache.commons.dbcp package javadoc.
+ </action>
+ <action dev="yoavs" type="update" issue="DBCP-165" due-to="QM">
+ Added toString() methods to DelegatingPreparedStatement and
DelegatingStatement
+ </action>
+ <action dev="yoavs" type="fix">
+ Changes to make DBCP compile on JDK 1.5 by adding source="1.4" to
compiler
+ arguments (there are compiler errors in JDK 5.0 without this source
switch
+ that cannot be fixed without JDK 5.0-specific syntax).
+ </action>
+ <action dev="dirkv " type="fix" issue="DBCP-20" due-to="Chris Nappin">
+ Per-user pooling with Oracle driver and default isolation settings.
+ </action>
+ <action dev="dirkv " type="fix" issue="DBCP-9" due-to="Adrian Baker">
+ Error in JOCL document in javadoc.
+ </action>
+ <action dev="sullis" type="update">
+ Added toString() method to DelegatingConnection.
+ </action>
+ <action dev="dirkv " type="update" issue="DBCP-181" due-to="Meikel
Bisping">
+ Add DriverManager.invalidateConnection().
+ </action>
+ <action dev="dirkv " type="fix" issue="DBCP-184" due-to="Meikel Bisping">
+ Improved Exception nesting in ConnectionPool.
+ </action>
+ <action dev="dennisl" type="fix" issue="DBCP-144" due-to="Sebb">
+ Fix broken website links for examples.
+ </action>
<action dev="psteitz" type="fix" issue="DBCP-28"
due-to="Huw Lewis, James Ring">
Modified PoolableConnection close method to invalidate instance
@@ -56,14 +103,52 @@
Inserted null check in close method of SharedPoolDataSource to avoid
NPE when invoked on non-initialized pool.
</action>
+ <action dev="psteitz" type="fix" issue="DBCP-71" due-to="Douglas
Squirrel">
+ Document fact that true values for testOnBorrow, testOnReturn,
testWhileIdle
+ only have effect when validationQuery is set to a non-null string
+ </action>
<action dev="psteitz" type="fix" issue="DBCP-102">
Modified activateObject in PoolableConnection to test connection
properties before resetting to defaults.
</action>
+ <action dev="bayard" type="update" issue="DBCP-68" due-to="Christoph
Cenowa">
+ Upgrade dependency to Collections 3.1.
+ </action>
+ <action dev="sandymac" type="fix" issue="DBCP-188">
+ maxActive in configuration.html is documented incorrectly.
+ </action>
+ <action dev="psteitz" type="update">
+ Upgrade dependency to Pool 1.3.
+ </action>
<action dev="psteitz" type="update" issue="DBCP-187" due-to="Ralf
Hauser">
Added connection info to SQLException messages when closed connections
(resp stmts) are accessed in DelegatingConnection, DelegatingStatement.
</action>
</release>
+
+ <release version="1.2.1" date="2004-06-12" description="Maintenance
Release to restore JDK 1.3 compatibility">
+ <action type="fix">
+ See <a href="release-notes-1.2.1.html">DBCP 1.2.1 Release Notes</a>
for details.
+ </action>
+ </release>
+
+ <release version="1.2" date="2004-06-07">
+ <action type="update">
+ See <a href="release-notes-1.2.html">DBCP 1.2 Release Notes</a> for
details.
+ </action>
+ </release>
+
+ <release version="1.1" date="2003-10-20">
+ <action type="update">
+ See <a href="release-notes-1.1.html">DBCP 1.1 Release Notes</a> for
details.
+ </action>
+ </release>
+
+ <release version="1.0" date="2002-08-12" description="Initial Release">
+ <action type="add">
+ Initial Release
+ </action>
+ </release>
+
</body>
</document>
Added: jakarta/commons/proper/dbcp/trunk/xdocs/cvs-usage.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/xdocs/cvs-usage.xml?rev=420694&view=auto
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/xdocs/cvs-usage.xml (added)
+++ jakarta/commons/proper/dbcp/trunk/xdocs/cvs-usage.xml Mon Jul 10 20:44:31
2006
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<document>
+ <properties>
+ <title>Source repository</title>
+ <author email="[email protected]">Commons Documentation
Team</author>
+ </properties>
+ <body>
+<!-- ================================================== -->
+<section name="Source repository">
+<p>
+ Jakarta Commons DBCP is hosted on the Apache
+ <a href="http://subversion.tigris.org/";>subversion</a> repository.
+</p>
+<p>
+ The project URL is:<br />
+
<code>http://svn.apache.org/repos/asf/jakarta/commons/proper/dbcp/trunk</code>
+</p>
+<p>
+ The best way to view the repository is via the
+ <a
href="http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/";>subversion
viewer</a>.
+</p>
+<p>
+ The alternative is to use the
+ <a
href="http://svn.apache.org/repos/asf/jakarta/commons/proper/dbcp/trunk/";>native
subversion</a> display.
+</p>
+<p>
+ For more information on subversion and creating patches see the
+ <a href="http://www.apache.org/dev/contributors.html";>Apache Contributors
Guide</a>.
+</p>
+</section>
+<!-- ================================================== -->
+</body>
+</document>
\ No newline at end of file
Propchange: jakarta/commons/proper/dbcp/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/dbcp/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/dbcp/trunk/xdocs/downloads.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/xdocs/downloads.xml?rev=420694&r1=420693&r2=420694&view=diff
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/xdocs/downloads.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/xdocs/downloads.xml Mon Jul 10 20:44:31
2006
@@ -32,12 +32,9 @@
</ul>
<br/>
<p>
- The latest binary release is always available on the
- <a href="http://jakarta.apache.org/site/binindex.cgi#commons-dbcp";>
- Jakarta Binary Downloads page</a>,
- its source is available from
- <a
href="http://jakarta.apache.org/site/sourceindex.cgi#commons-dbcp";>
- Jakarta Source Downloads page</a>.
+ The latest source and binary release is always available on the
+ <a
href="http://jakarta.apache.org/site/downloads/downloads_commons-dbcp.cgi";>
+ DBCP Downloads page</a>.
</p>
<p>
Commons-DBCP depends at runtime on
Modified: jakarta/commons/proper/dbcp/trunk/xdocs/issue-tracking.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/xdocs/issue-tracking.xml?rev=420694&r1=420693&r2=420694&view=diff
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/xdocs/issue-tracking.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/xdocs/issue-tracking.xml Mon Jul 10
20:44:31 2006
@@ -29,22 +29,26 @@
To open issues or add comments to existing issues in Jira, you will need to
<a href="http://issues.apache.org/jira/secure/Signup!default.jspa";>create an
account</a> if you don't already have one.
+ (if you have previously created/updated Commons issues using Bugzilla an
account
+ will have been automatically created and you can use the
+ <a
href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa";>Forgot
Password</a>
+ page to get a new password).
</p>
<p>
If you would like to report a bug, or raise an enhancement request with
Commons DBCP please do the following:
<ol>
<li>
- <a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa";>
+ <a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC&status=1&status=4";>
Search existing open bugs</a>.
If you find your issue listed then please add a comment with your
details.</li>
<li>
<a href="http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/";>
Search the mailing list archive</a>.
You may find your issue or idea has already been discussed.</li>
- <li><a href="http://issues.apache.org/jira/secure/CreateIssue!default.jspa";>
- Submit a bug report or enhancement request</a>.
- Please prefix all new issues with [dbcp] in the summary line.
+ <li>Decide if your issue is a bug or an enhancement.</li>
+ <li>Submit either a <a
href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310469&issuetype=1&priority=4&assignee=-1";>bug
report</a>
+ or <a
href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310469&issuetype=4&priority=4&assignee=-1";>enhancement
request</a>.
</li>
</ol>
</p>
@@ -56,22 +60,20 @@
<li>the developers of Commons DBCP are all unpaid volunteers</li>
</ul>
</p>
-<!-- Need to find a way to get filters into links
<p>
You may also find these links useful:
<ul>
<li>
- <a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa";>
+ <a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC&status=1&status=4";>
All Open DBCP bugs</a></li>
<li>
- <a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa";>
- All Closed DBCP bugs</a></li>
+ <a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC&status=5&status=6";>
+ All Resolved DBCP bugs</a></li>
<li>
- <a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa";>
+ <a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310469&sorter/field=issuekey&sorter/order=DESC";>
All DBCP bugs</a></li>
</ul>
</p>
--->
</section>
<!-- ================================================== -->
</body>
Modified: jakarta/commons/proper/dbcp/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/xdocs/navigation.xml?rev=420694&r1=420693&r2=420694&view=diff
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/xdocs/navigation.xml Mon Jul 10 20:44:31
2006
@@ -14,10 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE org.apache.commons.menus SYSTEM
'../../commons-build/menus/menus.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM
'http://jakarta.apache.org/commons/build/maven-build.dtd'>
<project name="Commons DBCP">
<title>Commons DBCP</title>
<body>
+
+ <links>
+ <item name="Apache" href="http://www.apache.org"/>
+ <item name="Jakarta" href="http://jakarta.apache.org"/>
+ <item name="Commons" href="http://jakarta.apache.org/commons/"/>
+ </links>
+
<menu name="Commons DBCP">
<item name="Overview" href="/index.html" />
<item name="Configuration"
href="/configuration.html" />
@@ -31,6 +38,18 @@
<item name="Downloads" href="/downloads.html"/>
<item name="Wiki"
href="http://wiki.apache.org/jakarta-commons/DBCP"/>
</menu>
- &common-menus;
+
+ <menu name="Development">
+ <item name="History" href="/changes-report.html"/>
+ <item name="Building" href="/building.html"/>
+ <item name="Mailing lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ <item name="Team" href="/team-list.html"/>
+ <item name="Source repository" href="cvs-usage.html"/>
+ <item name="Javadoc (SVN latest)"
href="http://jakarta.apache.org/commons/validator/apidocs/"/>
+ </menu>
+
+ &commons;
+
</body>
</project>
Added: jakarta/commons/proper/dbcp/trunk/xdocs/style/project.css
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/xdocs/style/project.css?rev=420694&view=auto
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/xdocs/style/project.css (added)
+++ jakarta/commons/proper/dbcp/trunk/xdocs/style/project.css Mon Jul 10
20:44:31 2006
@@ -0,0 +1 @@
[EMAIL PROTECTED] url("http://jakarta.apache.org/style/jakarta-maven.css";);
Propchange: jakarta/commons/proper/dbcp/trunk/xdocs/style/project.css
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
