You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ni...@apache.org on 2006/11/24 22:10:57 UTC

svn commit: r478998 - in /jakarta/commons/proper/dbutils/trunk: ./ xdocs/ xdocs/style/

Author: niallp
Date: Fri Nov 24 13:10:56 2006
New Revision: 478998

URL: http://svn.apache.org/viewvc?view=rev&rev=478998
Log:
Fix issues with the RC1 site and build:

1) Update XML files license headers to comply with the new "ASF Source Header and Copyright Notice Policy"
2) Add DbUtils copyright notice to the NOTICE.txt file (as per "ASF Source Header and Copyright Notice Policy")
3) Remove the dependency on commons-build for generating the DBUtils Site/Docs (in line with other components)
4) NOTICE.txt, RELEASE-NOTES.txt missing from the binary distro
5) NOTICE.txt and RELEASE-NOTES.txt, checkstyle.xml and pom.xml missing from the source distro
6) Directory and contents of "xdocs" and "lib" missing from source distro
7) Add creation of a versioned pom to the maven build
8) Add md5 checksum generation to maven build for source/binary distros, jar file and pom file
9) Fix broken links on changes report (needed "maven.changes.issue.template" specified in project.properties)
10) Make the source distro unpack to a different directory name than the binary distro
11) Add "maven.compile.source" and "maven.compile.target" properties set to "1.3"
12) Change the "groupId" in the project.xml from "org.apache.commons" back to "commons-dbutils" ("org.apache.commons" not setup to work yet?)
13) Correct mail archive links (eyebrowse is now dead)
14) Remove empty "organization" elements from the project.xml
15) Add comments on dependencies (useful on maven generated dependencies report)
16) NOTICE.txt file is missing from the jar
17) Re-organize the DbUtils navigation menu
18) Add a custom "Source Repository" page to the Site/Docs (better than the default maven generated one)
19) Add a custom "Issue Tracking" page to the Site/Docs (better than the default maven generated one)
20) Add a page about "building" DBUtils to the Site/Docs

Added:
    jakarta/commons/proper/dbutils/trunk/xdocs/building.xml   (with props)
    jakarta/commons/proper/dbutils/trunk/xdocs/cvs-usage.xml   (with props)
    jakarta/commons/proper/dbutils/trunk/xdocs/issue-tracking.xml   (with props)
    jakarta/commons/proper/dbutils/trunk/xdocs/style/
    jakarta/commons/proper/dbutils/trunk/xdocs/style/project.css   (with props)
Modified:
    jakarta/commons/proper/dbutils/trunk/NOTICE.txt
    jakarta/commons/proper/dbutils/trunk/PROPOSAL.html
    jakarta/commons/proper/dbutils/trunk/STATUS.html
    jakarta/commons/proper/dbutils/trunk/build.xml
    jakarta/commons/proper/dbutils/trunk/maven.xml
    jakarta/commons/proper/dbutils/trunk/project.properties
    jakarta/commons/proper/dbutils/trunk/project.xml
    jakarta/commons/proper/dbutils/trunk/xdocs/changes.xml
    jakarta/commons/proper/dbutils/trunk/xdocs/examples.xml
    jakarta/commons/proper/dbutils/trunk/xdocs/index.xml
    jakarta/commons/proper/dbutils/trunk/xdocs/navigation.xml
    jakarta/commons/proper/dbutils/trunk/xdocs/proposal.xml

Modified: jakarta/commons/proper/dbutils/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/NOTICE.txt?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/NOTICE.txt (original)
+++ jakarta/commons/proper/dbutils/trunk/NOTICE.txt Fri Nov 24 13:10:56 2006
@@ -1,2 +1,5 @@
+Apache Jakarta Commons DbUtils
+Copyright 2002-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: jakarta/commons/proper/dbutils/trunk/PROPOSAL.html
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/PROPOSAL.html?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/PROPOSAL.html (original)
+++ jakarta/commons/proper/dbutils/trunk/PROPOSAL.html Fri Nov 24 13:10:56 2006
@@ -1,17 +1,18 @@
 <!--
-   Copyright 2003-2005 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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
 
-       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.
+ 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.
 -->
 <html>
 <head>

Modified: jakarta/commons/proper/dbutils/trunk/STATUS.html
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/STATUS.html?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/STATUS.html (original)
+++ jakarta/commons/proper/dbutils/trunk/STATUS.html Fri Nov 24 13:10:56 2006
@@ -1,17 +1,18 @@
 <!--
-   Copyright 2003-2005 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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
 
-       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.
+ 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.
 -->
 <html>
 <head>

Modified: jakarta/commons/proper/dbutils/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/build.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/build.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/build.xml Fri Nov 24 13:10:56 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright 2003-2005 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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
 
-       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.
+ 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.
 -->
 
 <!--

Modified: jakarta/commons/proper/dbutils/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/maven.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/maven.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/maven.xml Fri Nov 24 13:10:56 2006
@@ -1,36 +1,99 @@
 <!--
-   Copyright 2001-2005 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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.
+      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.
 -->
 <project default="java:jar"
+  xmlns:ant="jelly:ant"
   xmlns:j="jelly:core">
 
   <!-- ================================================================== -->
-  <!-- START : C O M M O N S - B U I L D                                  -->
+  <!-- Copy into the binary distribution                                  -->
+  <!-- ================================================================== -->
+  <postGoal name="dist:prepare-bin-filesystem">
+
+    <!-- Copy the NOTICE -->
+    <copy todir="${maven.dist.bin.assembly.dir}">
+      <fileset file='${basedir}/NOTICE.txt'/>
+      <fileset file="${basedir}/RELEASE-NOTES.txt"/>
+    </copy>
+
+  </postGoal>
+  
   <!-- ================================================================== -->
-  <!-- Required: Look and Feel for documentation within distributions     -->
+  <!-- Copy into the source distribution                                  -->
   <!-- ================================================================== -->
-  <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>
+  <postGoal name="dist:prepare-src-filesystem">
+
+    <!-- Copy the NOTICE -->
+    <copy todir="${maven.dist.src.assembly.dir}">
+      <fileset file='${basedir}/NOTICE.txt'/>
+      <fileset file="${basedir}/RELEASE-NOTES.txt"/>
+      <fileset file="${basedir}/checkstyle.xml"/>
+      <fileset file="${basedir}/pom.xml"/>
+    </copy>
+
+    <!-- Copy xdoc files -->
+    <copy todir="${maven.dist.src.assembly.dir}/xdocs">
+      <fileset dir="./xdocs"/>
+    </copy>
+
+    <!-- Copy lib files -->
+    <copy todir="${maven.dist.src.assembly.dir}/lib">
+      <fileset dir="./lib"/>
     </copy>
+
   </postGoal>
+
   <!-- ================================================================== -->
-  <!-- END: C O M M O N S - B U I L D                                     -->
+  <!-- Create MD5 Check Sums                                              -->
   <!-- ================================================================== -->
-  
+  <postGoal name="dist">
+
+       <!-- Create a versioned pom -->
+       <copy file="${basedir}/project.xml" tofile="${maven.dist.dir}/${maven.final.name}.pom"/>
+
+       <!-- create checksum for pom -->
+       <ant:checksum file="${maven.dist.dir}/${maven.final.name}.pom" property="pom.md5"/>
+       <ant:echo message="${pom.md5} *${maven.final.name}.pom" 
+                 file="${maven.dist.dir}/${maven.final.name}.pom.md5" />
+
+       <!-- create checksum for jar -->
+       <ant:checksum file="${maven.build.dir}/${maven.final.name}.jar" property="jar.md5"/>
+       <ant:echo message="${jar.md5} *${maven.final.name}.jar" 
+                 file="${maven.build.dir}/${maven.final.name}.jar.md5" />
+
+       <!-- create checksum for binary zip -->
+       <ant:checksum file="${maven.dist.dir}/${maven.final.name}.zip" property="zip.md5"/>
+       <ant:echo message="${zip.md5} *${maven.final.name}.zip" 
+                 file="${maven.dist.dir}/${maven.final.name}.zip.md5" />
+
+       <!-- create checksum for binary tar.gz -->
+       <ant:checksum file="${maven.dist.dir}/${maven.final.name}.tar.gz" property="tar.gz.md5"/>
+       <ant:echo message="${tar.gz.md5} *${maven.final.name}.tar.gz" 
+                 file="${maven.dist.dir}/${maven.final.name}.tar.gz.md5" />
+
+       <!-- create checksum for source zip -->
+       <ant:checksum file="${maven.dist.dir}/${maven.final.name}-src.zip" property="src.zip.md5"/>
+       <ant:echo message="${src.zip.md5} *${maven.final.name}-src.zip" 
+                 file="${maven.dist.dir}/${maven.final.name}-src.zip.md5" />
+
+       <!-- create checksum for source tar.gz -->
+       <ant:checksum file="${maven.dist.dir}/${maven.final.name}-src.tar.gz" property="src.tar.gz.md5"/>
+       <ant:echo message="${src.tar.gz.md5} *${maven.final.name}-src.tar.gz" 
+                 file="${maven.dist.dir}/${maven.final.name}-src.tar.gz.md5" />
+
+    </postGoal>
+
 </project>

Modified: jakarta/commons/proper/dbutils/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/project.properties?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/project.properties (original)
+++ jakarta/commons/proper/dbutils/trunk/project.properties Fri Nov 24 13:10:56 2006
@@ -1,8 +1,9 @@
-#   Copyright 2003-2005 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
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You 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
 #
@@ -15,20 +16,29 @@
 # $Id$
 #
 
+# change log report
+maven.changelog.range = 120
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+maven.changes.issue.template=%URL%/browse/%ISSUE% 
+
+# checkstyle
 maven.checkstyle.properties=checkstyle.xml
 
+# JDK Version Compatibility
+maven.compile.source=1.3
+maven.compile.target=1.3
+
 # Jar Manifest Additional Attributes
 maven.jar.manifest.attributes.list=Implementation-Vendor-Id,X-Compile-Source-JDK,X-Compile-Target-JDK
 maven.jar.manifest.attribute.Implementation-Vendor-Id=org.apache
 maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
 maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
 
+# Make the source distro unzip to a different directory
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src
+
 # commons site L&F
-maven.xdoc.jsl=../commons-build/commons-site.jsl
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
 maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
 maven.xdoc.poweredby.image=
-
-maven.changelog.range = 120

Modified: jakarta/commons/proper/dbutils/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/project.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/project.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/project.xml Fri Nov 24 13:10:56 2006
@@ -1,23 +1,24 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2003-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.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
 -->
 <project>
   <pomVersion>3</pomVersion>
   
-  <groupId>org.apache.commons</groupId>
+  <groupId>commons-dbutils</groupId>
   <artifactId>commons-dbutils</artifactId>
   <inceptionYear>2002</inceptionYear>
   <currentVersion>1.1-RC1</currentVersion>
@@ -59,13 +60,13 @@
       <name>Commons Dev List</name>
       <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
       <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
     </mailingList>
     <mailingList>
       <name>Commons User List</name>
       <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
       <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
     </mailingList>
   </mailingLists>
 
@@ -74,7 +75,6 @@
       <name>Juozas Baliuka</name>
       <id>baliuka</id>
       <email>baliuka@apache.org</email>
-      <organization></organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -83,7 +83,6 @@
       <name>Steven Caswell</name>
       <id>scaswell</id>
       <email>steven@caswell.name</email>
-      <organization></organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -92,7 +91,6 @@
       <name>David Graham</name>
       <id>dgraham</id>
       <email>dgraham@apache.org</email>
-      <organization></organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -101,7 +99,6 @@
       <name>Yoav Shapira</name>
       <id>yoavs</id>
       <email>yoavs@apache.org</email>
-      <organization></organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -110,7 +107,6 @@
       <name>Henri Yandell</name>
       <id>bayard</id>
       <email>bayard@generationjava.com</email>
-      <organization></organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -192,6 +188,13 @@
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <url>http://www.junit.org/</url>
+      <properties>
+          <scope>test</scope>
+          <comment>
+              &lt;strong&gt;Test Only&lt;/strong&gt; - required
+              only for running the unit tests.
+          </comment>
+      </properties>
     </dependency>
     
     <dependency>
@@ -200,6 +203,12 @@
       <version>1.9.2</version>
       <url>http://maven.apache.org/reference/plugins/xdoc</url>
       <type>plugin</type>
+      <properties>
+          <comment>
+              &lt;strong&gt;Site Only&lt;/strong&gt; - v1.9.2 (minimum)
+              required for building the Site documentation.
+          </comment>
+      </properties>
     </dependency> 
   </dependencies>
 	
@@ -215,6 +224,15 @@
       </includes>
     </unitTest>
     
+    <resources>
+        <resource>
+            <directory>${basedir}</directory>
+            <targetPath>META-INF</targetPath>
+            <includes>
+                <include>NOTICE.txt</include>
+            </includes>
+        </resource>
+    </resources>
   </build>
   
   <reports>

Added: jakarta/commons/proper/dbutils/trunk/xdocs/building.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/building.xml?view=auto&rev=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/building.xml (added)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/building.xml Fri Nov 24 13:10:56 2006
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+<!-- ================================================== -->
+<section name="Overview">
+<p>
+  Commons DBUtils 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 DBUtils'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 DBUtils's root directory
+    and run <strong><code>ant dist</code></strong>.
+    The result will be in the "dist" subdirectory.
+  </p>
+</section>
+
+<!-- ================================================== -->
+<section name="Nightly Builds">
+  <p>
+      <a href="http://people.apache.org/builds/jakarta-commons/nightly/commons-dbutils/">Nightly Builds</a>
+      are built once a day from the current SVN HEAD. These are provided purely for test purposes and are <b>NOT
+      official releases</b> of the Apache Software Foundation - Released versions of Commons DBUtils are
+      available <a href="http://jakarta.apache.org/site/downloads/downloads_commons-dbutils.cgi">here</a>.
+  </p>
+</section>
+
+<!-- ================================================== -->
+</body>
+</document>

Propchange: jakarta/commons/proper/dbutils/trunk/xdocs/building.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/dbutils/trunk/xdocs/building.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/commons/proper/dbutils/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/changes.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/changes.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/changes.xml Fri Nov 24 13:10:56 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2004 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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
 
-       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.
+ 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.
 -->
 
 <!--

Added: jakarta/commons/proper/dbutils/trunk/xdocs/cvs-usage.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/cvs-usage.xml?view=auto&rev=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/cvs-usage.xml (added)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/cvs-usage.xml Fri Nov 24 13:10:56 2006
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ </properties>
+ <body>
+<!-- ================================================== -->
+<section name="Source repository">
+<p>
+  Jakarta Commons DBUtils 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/dbutils/trunk</code>
+</p>
+<p>
+  The best way to view the repository is via the
+  <a href="http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/">subversion viewer</a>.
+</p>
+<p>
+  The alternative is to use the
+  <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/dbutils/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/dbutils/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/dbutils/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/commons/proper/dbutils/trunk/xdocs/examples.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/examples.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/examples.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/examples.xml Fri Nov 24 13:10:56 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2003-2005 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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
 
-       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.
+ 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>

Modified: jakarta/commons/proper/dbutils/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/index.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/index.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/index.xml Fri Nov 24 13:10:56 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 <!--
-   Copyright 2003-2005 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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
 
-       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.
+ 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>

Added: jakarta/commons/proper/dbutils/trunk/xdocs/issue-tracking.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/issue-tracking.xml?view=auto&rev=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/issue-tracking.xml (added)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/issue-tracking.xml Fri Nov 24 13:10:56 2006
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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>Issue tracking</title>
+  <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+<!-- ================================================== -->
+<section name="Issue tracking">
+<p>
+  Commons DBUtils uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for for tracking issues.
+  See the <a href="http://issues.apache.org/jira/browse/DBUTILS">DBUtils JIRA project page</a>.
+</p>
+<p>
+  To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+  (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 DBUtils please do the following:
+  <ol>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310470&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;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>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=12310470&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
+  or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310470&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
+  </ol>
+</p>
+<p>
+  Please also remember these points:
+  <ul>
+  <li>the more information you provide, the better we can help you</li>
+  <li>test cases are vital, particularly for any proposed enhancements</li>
+  <li>the developers of Commons DBUtils are all unpaid volunteers</li>
+  </ul>
+</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>
+<p>
+  You may also find these links useful:
+  <ul>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310470&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">All Open DBUtils bugs</a></li>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310470&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved DBUtils bugs</a></li>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310470&amp;sorter/field=issuekey&amp;sorter/order=DESC">All DBUtils bugs</a></li>
+  </ul>
+</p>
+</section>
+<!-- ================================================== -->
+</body>
+</document>

Propchange: jakarta/commons/proper/dbutils/trunk/xdocs/issue-tracking.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/dbutils/trunk/xdocs/issue-tracking.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/commons/proper/dbutils/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/navigation.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/navigation.xml Fri Nov 24 13:10:56 2006
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-   Copyright 2003-2005 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.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
 -->
 
-<!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="DbUtils">
 
@@ -26,22 +27,34 @@
 
   <body>
     <links>
-      <item name="Jakarta Commons"                   
-            href="http://jakarta.apache.org/commons/"/>
+      <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 DbUtils">
       <item name="Overview" href="/index.html"/>
-      <item name="Examples" href="/examples.html"/>
-      <item name="Latest Javadoc" href="apidocs/index.html"/>
-      <item name="Mailing lists" href="/mail-lists.html"/>
-      <item name="Team" href="/team-list.html"/>
-      <item name="Latest Source" href="/cvs-usage.html"/>
-      <item name="Release History" href="/changes-report.html"/>
-      <item name="Downloads" href="http://jakarta.apache.org/site/downloads/downloads_commons-dbutils.cgi"/>
+      <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_commons-dbutils.cgi"/>
+
+      <item name="Documentation">
+        <item name="Examples"              href="/examples.html"/>
+        <item name="Release Notes"         href="/changes-report.html"/>
+        <item name="Dependencies"          href="/dependencies.html"/>
+        <item name="License"               href="/license.html"/>
+        <item name="Latest Javadoc"        href="apidocs/index.html"/>
+        <item name="Wiki"                  href="http://wiki.apache.org/jakarta-commons/DbUtils"/>
+      </item>
+
+    </menu>
+    
+    <menu name="Development">
+      <item name="Mailing Lists"           href="/mail-lists.html"/>
+      <item name="Issue Tracking"          href="/issue-tracking.html"/>
+      <item name="Source Repository"       href="/cvs-usage.html"/>
+      <item name="Building"                href="/building.html"/>
     </menu>
     
-    &common-menus;
+    &commons;
 
   </body>
 </project>

Modified: jakarta/commons/proper/dbutils/trunk/xdocs/proposal.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/proposal.xml?view=diff&rev=478998&r1=478997&r2=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/proposal.xml (original)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/proposal.xml Fri Nov 24 13:10:56 2006
@@ -1,17 +1,18 @@
 <!--
-   Copyright 2003-2005 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
 
-   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
 
-       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.
+ 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>

Added: jakarta/commons/proper/dbutils/trunk/xdocs/style/project.css
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/xdocs/style/project.css?view=auto&rev=478998
==============================================================================
--- jakarta/commons/proper/dbutils/trunk/xdocs/style/project.css (added)
+++ jakarta/commons/proper/dbutils/trunk/xdocs/style/project.css Fri Nov 24 13:10:56 2006
@@ -0,0 +1 @@
+@import url("http://jakarta.apache.org/style/jakarta-maven.css");

Propchange: jakarta/commons/proper/dbutils/trunk/xdocs/style/project.css
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org