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 ch...@apache.org on 2014/02/04 22:42:32 UTC
svn commit: r1564519 - in /db/derby/code/branches/10.10: ./
java/demo/demo.html java/demo/localcal/ java/demo/navbar.html
tools/release/build.xml
Author: chaase3
Date: Tue Feb 4 21:42:32 2014
New Revision: 1564519
URL: http://svn.apache.org/r1564519
Log:
DERBY-6463 localcal demo seems to be obsolete and should be removed
Merged DERBY-6463-2.diff to 10.10 code branch from trunk revisions 1564508 and 1564513.
Removed:
db/derby/code/branches/10.10/java/demo/localcal/
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/demo/demo.html
db/derby/code/branches/10.10/java/demo/navbar.html
db/derby/code/branches/10.10/tools/release/build.xml
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1564508-1564513
Modified: db/derby/code/branches/10.10/java/demo/demo.html
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/demo/demo.html?rev=1564519&r1=1564518&r2=1564519&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/demo/demo.html (original)
+++ db/derby/code/branches/10.10/java/demo/demo.html Tue Feb 4 21:42:32 2014
@@ -58,12 +58,6 @@ The document describes the tables, the n
<p class="BodyRelative">Programs described and modified as part of the activities documented in
the <A href="../../docs/html/getstart/index.html">Getting Started With Derby</A> manual.</p>
</LI>
-<LI><A href="localcal/README" type="text/plain">LocalCalendar</A>
-<p class="BodyRelative">The LocalCalendar application demonstrates the
-embedded/offline capabilities of Derby through a sample application that
-lets you manage GoogleCalendar events offline and synchronize when
-you come back online.</p>
-</LI>
<LI><A href="scores/README" type="text/plain">Scores</A>
<p class="BodyRelative">
From Apachecon 2006 (Austin), this demo shows how to use user-coded Java
Modified: db/derby/code/branches/10.10/java/demo/navbar.html
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/demo/navbar.html?rev=1564519&r1=1564518&r2=1564519&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/demo/navbar.html (original)
+++ db/derby/code/branches/10.10/java/demo/navbar.html Tue Feb 4 21:42:32 2014
@@ -31,7 +31,6 @@
<p class="NavBar1"><a href="nserverdemo/readme.html" target="mainPage">Network Server Sample Programs</a></p>
<p class="NavBar1"><a href="toursdb/toursdb_readme.html" target="mainPage">ToursDB sample database schema</a></p>
<p class="NavBar1"><a href="workingwithderby/readme.html" target="mainPage">Getting Started With Derby Activities Programs</a></p>
- <p class="NavBar1"><a href="localcal/README" type="text/plain" target="mainPage">LocalCalendar example</a></p>
<p class="NavBar1"><a href="scores/README" type="text/plain" target="mainPage">Scores example</a></p>
<p class="NavBar1"><a href="vtis/README" type="text/plain" target="mainPage">VTI samples</a></p>
</div>
Modified: db/derby/code/branches/10.10/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/tools/release/build.xml?rev=1564519&r1=1564518&r2=1564519&view=diff
==============================================================================
--- db/derby/code/branches/10.10/tools/release/build.xml (original)
+++ db/derby/code/branches/10.10/tools/release/build.xml Tue Feb 4 21:42:32 2014
@@ -229,16 +229,12 @@
fullpath="${derby.bin}/demo/programs/toursdb/build.xml"/>
<zipfileset file="${derby.demo.src.dir}/toursdb/toursdb_readme.html"
fullpath="${derby.bin}/demo/programs/toursdb/toursdb_readme.html"/>
- <zipfileset file="${derby.demo.src.dir}/localcal/build.xml"
- fullpath="${derby.bin}/demo/programs/localcal/build.xml"/>
<zipfileset file="${derby.demo.src.dir}/scores/build.xml"
fullpath="${derby.bin}/demo/programs/scores/build.xml"/>
<zipfileset file="${derby.drda.dir}/drda/template.policy"
fullpath="${derby.bin}/demo/templates/server.policy"/>
<zipfileset dir="${basedir}/classes" includes="SimpleApp.class"
prefix="${derby.bin}/demo/programs/simple"/>
- <zipfileset dir="${basedir}/classes" includes="SimpleMobileApp.class"
- prefix="${derby.bin}/demo/programs/simplemobile"/>
<zipfileset dir="${basedir}/classes" includes="SimpleNetwork*.class"
prefix="${derby.bin}/demo/programs/nserverdemo"/>
<zipfileset dir="${basedir}/classes/nserverdemo" includes="*.class"
@@ -288,8 +284,6 @@
fullpath="${derby.bin}/demo/programs/toursdb/build.xml"/>
<tarfileset file="${derby.demo.src.dir}/toursdb/toursdb_readme.html"
fullpath="${derby.bin}/demo/programs/toursdb/toursdb_readme.html"/>
- <tarfileset file="${derby.demo.src.dir}/localcal/build.xml"
- fullpath="${derby.bin}/demo/programs/localcal/build.xml"/>
<tarfileset file="${derby.demo.src.dir}/scores/build.xml"
fullpath="${derby.bin}/demo/programs/scores/build.xml"/>
<tarfileset file="${derby.drda.dir}/drda/template.policy"