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 2006/08/08 05:20:13 UTC

svn commit: r429551 - in /db/derby/code/trunk: build.xml frameworks/readme.html

Author: fuzzylogic
Date: Mon Aug  7 20:20:12 2006
New Revision: 429551

URL: http://svn.apache.org/viewvc?rev=429551&view=rev
Log:
DERBY-1431: Remove demos from snapshots and remove link to demos from
frameworks/readme.html, which is in the snapshot.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/frameworks/readme.html

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=429551&r1=429550&r2=429551&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Mon Aug  7 20:20:12 2006
@@ -1540,26 +1540,22 @@
     <zip destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
       <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
       <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
-      <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
     </zip>
     <tar destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
          compression="gzip">
       <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
       <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
-      <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
     </tar>
 
     <!-- debug archives - DERBY-178 --> 
     <zip destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
       <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
       <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,CHANGES,README,frameworks/**,javadoc/publishedapi/**"/>
-      <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
     </zip>
     <tar destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
          compression="gzip">
       <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
       <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
-      <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
     </tar>
 
     <copy file="${basedir}/jars/insane/derby_core_plugin_${major}.${minor}.${interim}.zip"

Modified: db/derby/code/trunk/frameworks/readme.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/frameworks/readme.html?rev=429551&r1=429550&r2=429551&view=diff
==============================================================================
--- db/derby/code/trunk/frameworks/readme.html (original)
+++ db/derby/code/trunk/frameworks/readme.html Mon Aug  7 20:20:12 2006
@@ -1,3 +1,4 @@
+<!doctype html public "-//W3C//DTD HTML 3.2//EN">
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -14,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!doctype html public "-//W3C//DTD HTML 3.2//EN">
 <html>
 <head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>About Derby's Frameworks
@@ -30,7 +30,7 @@
 	All subdirectories in this directory contain a <em>bin</em> subdirectory that has scripts that serve as examples of how to run some of the basic Derby tools and utilities tailored for the particular framework. For server frameworks, start and stop scripts are also provided.
 <br>To use the scripts for a particular framework, modify the scripts as necessary and put that framework's <em>bin</em> subdirectory first in your path.</p></li>
 </ul>
-<p>For an easy-to-follow example of how to run an application in the two frameworks, see the <a href="../demo/programs/simple/example.html">simple example</a>.</p>
+<p>For an easy-to-follow example of how to run an application in the two frameworks, see the simple example in the demos directory if your distribution includes it.</p>
 <p>For more information about frameworks, see <a href="../doc/pdf/getstart.pdf"><em>Getting Started with Derby</em></a>.</p>
 <h2><a name="embed">Embedded Framework</a></h2>
 <p>An <em>embedded</em> <a href="#framework">framework</a> is the most basic framework. Derby runs embedded in a Java application. When the application loads the local JDBC driver, it starts up the Derby engine. When the application shuts down, it shuts down the Derby engine. Only a single application can access a database at one time.