db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r583324 - in /db/derby/code/trunk: java/demo/simple/example.html tools/release/build.xml
Date Tue, 09 Oct 2007 23:51:31 GMT
Author: myrnavl
Date: Tue Oct  9 16:51:31 2007
New Revision: 583324

URL: http://svn.apache.org/viewvc?rev=583324&view=rev
Log:
DERBY-3026: remove deprecated frameworks directory, scripts, and text file 
  patch contributed by John H. Embretsen

Modified:
    db/derby/code/trunk/java/demo/simple/example.html
    db/derby/code/trunk/tools/release/build.xml

Modified: db/derby/code/trunk/java/demo/simple/example.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/simple/example.html?rev=583324&r1=583323&r2=583324&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/simple/example.html (original)
+++ db/derby/code/trunk/java/demo/simple/example.html Tue Oct  9 16:51:31 2007
@@ -201,7 +201,7 @@
     <td class="BoxTable"><h3 class="BoxHead">
   <a name="819210"> </a>A note on setting the classpath for an embedded environment
 </h3>
-<a name="819214"> </a><p class="CellBody">Derby provides a script to help
you get started with setting the classpath in <br> <em class="fileName">%DERBY_INSTALL%\frameworks\embedded\bin</em>.
This script is called<em class="fileName"> setEmbeddedCP </em>and comes in two
flavors: one for Windows environment (this file ends with <em class="fileName">.bat</em>)
and one for UNIX environments (this file ends with <em class="fileName">.ksh</em>).
For users working in those environments, copying the commands in this file will help you get
started setting the classpath. </p>
+<a name="819214"> </a><p class="CellBody">Derby provides a script to help
you get started with setting the classpath in <br> <em class="fileName">%DERBY_INSTALL%\bin</em>.
This script is called<em class="fileName"> setEmbeddedCP </em>and comes in two
flavors: one for Windows environment (this file ends with <em class="fileName">.bat</em>)
and one for UNIX environments (this file ends with <em class="fileName">.ksh</em>).
For users working in those environments, copying the commands in this file will help you get
started setting the classpath. </p>
 </td>
   </tr>
 </table>
@@ -339,7 +339,7 @@
         <P class=CellBody>Derby provides a script to help you get started with 
         setting the classpath in <BR>
         <EM 
-        class=fileName>%DERBY_INSTALL%\frameworks\NetworkServer\bin</EM>. This 
+        class=fileName>%DERBY_INSTALL%\bin</EM>. This 
         script is called <EM class=fileName>setNetworkServerCP</EM> and comes
in 
         two flavors: one for Windows environment (this file ends with <EM 
         class=fileName>.bat</EM>) and one for UNIX environments (this file ends

@@ -532,7 +532,7 @@
         <P class=CellBody>Derby provides a script to help you get started with setting
the IBM DB2
       JDBC Universal Driver client classpath: <BR>
         <EM 
-        class=fileName>%DERBY_INSTALL%\frameworks\NetworkServer\bin</EM>. This 
+        class=fileName>%DERBY_INSTALL%\bin</EM>. This 
         script is called <EM class=fileName>setNetworkClientCP</EM> and comes
in 
         two flavors: one for Windows environment (this file ends with <EM 
         class=fileName>.bat</EM>) and one for UNIX environments (this file ends


Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?rev=583324&r1=583323&r2=583324&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Tue Oct  9 16:51:31 2007
@@ -38,9 +38,9 @@
 
 
   <!-- Files to be included with and excluded from the source distribution -->
-  <property name="src.top.includes" value="BUILDING.txt,README,CHANGES.html,COPYRIGHT,KEYS,LICENSE,NOTICE,RELEASE-NOTES.html,STATUS,build.xml,frameworks.DEPRECATED.txt,index.html,published_api_overview.html"/>
+  <property name="src.top.includes" value="BUILDING.txt,README,CHANGES.html,COPYRIGHT,KEYS,LICENSE,NOTICE,RELEASE-NOTES.html,STATUS,build.xml,index.html,published_api_overview.html"/>
   <property name="src.tools.includes" value="tools/ant/**,tools/j2ee/**,tools/jar/**,tools/java/**,tools/javadoc/**,tools/jdbc4/**,tools/testing/**,tools/release/build.xml"/>
-  <property name="src.dirs.includes" value="frameworks/**,java/**,plugins/**,bin/**,maven/**"/>
+  <property name="src.dirs.includes" value="java/**,plugins/**,bin/**,maven/**"/>
   <property name="src.includes" value="${src.top.includes},${src.tools.includes},${src.dirs.includes}"/>
 
   <property name="src.excludes" value="tools/**/db2jcc*,tools/**/osgi.jar,tools/**/junit.jar,tools/**/jdbc2_0*,tools/java/jce*,tools/**/packaging.properties,java/demo/toursdb/toursdb/**,java/demo/toursdb/toursdb.out,java/demo/toursdb/toursdb.jar,tools/testing/derby/**,**/derby.log"/>
@@ -98,9 +98,9 @@
     <mkdir dir="${crlf.dir}"/>
     <mkdir dir="${lf.dir}"/>
     <fixcrlf srcdir="${basedir}" destdir="${crlf.dir}" eol="crlf"
-             includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html,frameworks.DEPRECATED.txt"/>
+             includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
     <fixcrlf srcdir="${basedir}" destdir="${lf.dir}" eol="lf"
-             includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html,frameworks.DEPRECATED.txt"/>
+             includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
 
   </target>
 
@@ -150,7 +150,7 @@
     <zip destfile="${release.dir}/${derby.bin}.zip"
          compress="true">
       <!-- top-level -->
-      <zipfileset dir="${crlf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html,frameworks.DEPRECATED.txt"
+      <zipfileset dir="${crlf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
                   prefix="${derby.bin}/"/>
       <zipfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
       <!-- bin -->
@@ -181,9 +181,6 @@
                   prefix="${derby.bin}/docs/html"/>
       <zipfileset dir="${docs.out}" includes="**/*.pdf"
                   prefix="${derby.bin}/docs/pdf"/>
-      <!-- frameworks -->
-      <zipfileset dir="${basedir}/frameworks" prefix="${derby.bin}/frameworks" includes="**/*.html"/>

-      <zipfileset dir="${basedir}/frameworks" prefix="${derby.bin}/frameworks" includes="**/bin/*"
filemode="755"/> 
       <!-- javadoc -->
       <zipfileset dir="${basedir}/javadoc/publishedapi" prefix="${derby.bin}/javadoc"
includes="**"/>   
       <!-- lib -->
@@ -202,7 +199,7 @@
     <tar destfile="${release.dir}/${derby.bin}.tar.gz"
          compression="gzip" longfile="gnu">
       <!-- top-level -->
-      <tarfileset dir="${lf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html,frameworks.DEPRECATED.txt"
+      <tarfileset dir="${lf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
                   prefix="${derby.bin}/"/>
       <tarfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
       <!-- bin -->
@@ -232,9 +229,6 @@
 		          prefix="${derby.bin}/docs/html"/>
       <tarfileset dir="${docs.out}" includes="**/*.pdf"
 	              prefix="${derby.bin}/docs/pdf"/>
-      <!-- frameworks -->
-      <tarfileset dir="${basedir}/frameworks" prefix="${derby.bin}/frameworks" includes="**/*.html"/>

-      <tarfileset dir="${basedir}/frameworks" prefix="${derby.bin}/frameworks" includes="**/bin/*"
mode="755"/> 
       <!-- javadoc -->
       <tarfileset dir="${basedir}/javadoc/publishedapi" prefix="${derby.bin}/javadoc"
includes="**"/>   
       <!-- lib -->



Mime
View raw message