db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r433814 - in /db/derby/docs/trunk: ./ lib/ src/adminguide/ src/devguide/ src/getstart/ src/images/ src/ref/ src/tools/ src/tuning/ src/workingwithderby/
Date Wed, 23 Aug 2006 00:28:30 GMT
Author: fuzzylogic
Date: Tue Aug 22 17:28:27 2006
New Revision: 433814

URL: http://svn.apache.org/viewvc?rev=433814&view=rev
Log:
DERBY-935 DERBY-1565: Add logo to docs, fix copyright statements and license 
text.

Added:
    db/derby/docs/trunk/src/images/
    db/derby/docs/trunk/src/images/logowithtext.jpg   (with props)
Removed:
    db/derby/docs/trunk/src/adminguide/RVa03912
Modified:
    db/derby/docs/trunk/build.xml
    db/derby/docs/trunk/docs.properties
    db/derby/docs/trunk/lib/dita2fo-shell.xsl
    db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    db/derby/docs/trunk/src/adminguide/radmincopyright.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/rdevcopyright.dita
    db/derby/docs/trunk/src/getstart/getstartderby.ditamap
    db/derby/docs/trunk/src/getstart/rgscopyright.dita
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefcopyright.dita
    db/derby/docs/trunk/src/tools/derbytools.ditamap
    db/derby/docs/trunk/src/tools/rtoolscopyright.dita
    db/derby/docs/trunk/src/tuning/rtuncopyright.dita
    db/derby/docs/trunk/src/tuning/tuningderby.ditamap
    db/derby/docs/trunk/src/workingwithderby/rwwdcopyright.dita

Modified: db/derby/docs/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/build.xml?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/build.xml (original)
+++ db/derby/docs/trunk/build.xml Tue Aug 22 17:28:27 2006
@@ -37,6 +37,9 @@
       <fileset dir="${dita.dtd.dir}"/>
     </copy>
     <mkdir dir="${dita.temp.dir}"/>
+    <copy todir="${dita.output.dir}/images">
+      <fileset dir="${dita.src.dir}/images"/>
+    </copy> 
   </target>
 
   <target name="check.dita">

Modified: db/derby/docs/trunk/docs.properties
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/docs.properties?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/docs.properties (original)
+++ db/derby/docs/trunk/docs.properties Tue Aug 22 17:28:27 2006
@@ -5,6 +5,7 @@
 dita.css.dir=${dita.dir}/css
 dita.resource.dir=${dita.dir}/resource
 dita.output.dir=${basedir}/out
+dita.src.dir=${basedir}/src
 dita.temp.dir=${basedir}/temp
 dita.lib.dir=${basedir}/lib
 dita.extname=.dita

Modified: db/derby/docs/trunk/lib/dita2fo-shell.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/dita2fo-shell.xsl?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/lib/dita2fo-shell.xsl (original)
+++ db/derby/docs/trunk/lib/dita2fo-shell.xsl Tue Aug 22 17:28:27 2006
@@ -165,9 +165,6 @@
       <!-- End of custom art section -->
       <fo:block text-align="left" font-family="Helvetica">
         <!-- set the brand and title -->
-        <fo:block font-size="14pt" line-height="540%" margin-bottom="1in" text-align="right">
    
-   <xsl:value-of select="//*[contains(@class,' topic/prodinfo ')]/*[contains(@class,'
topic/brand ')]"/>
-</fo:block>
         <fo:block font-size="22pt" font-weight="bold" line-height="140%">
          <xsl:value-of select="//*[contains(@class,' topic/prodinfo ')]/*[contains(@class,'
topic/prodname ')]"/>
         </fo:block>
@@ -242,8 +239,7 @@
 <!-- product specific art, etc. -->
 <fo:block margin-top="2pc" font-family="Helvetica" border-color="black" border-width="thin"
padding="6pt">
   <fo:block font-size="12pt" line-height="100%" margin-top="12pc" margin-bottom="12pc"
text-align="right">
-   Derby Logo
-    <!-- one might imbed SVG directly here for use with FOP, for instance -->
+    <fo:external-graphic src="url(../images/logowithtext.jpg)"/>
   </fo:block>
 </fo:block>
 </xsl:template>

Modified: db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Tue Aug 22 17:28:27 2006
@@ -24,7 +24,7 @@
 <map title="Server and Administration Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/trunk/src/adminguide/radmincopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmincopyright.dita?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radmincopyright.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radmincopyright.dita Tue Aug 22 17:28:27 2006
@@ -20,10 +20,19 @@
 <reference id="radmincopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.png"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Tue Aug 22 17:28:27 2006
@@ -21,7 +21,7 @@
 <map title="Developer's Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2006"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/trunk/src/devguide/rdevcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcopyright.dita?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcopyright.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcopyright.dita Tue Aug 22 17:28:27 2006
@@ -20,10 +20,19 @@
 <reference id="rdevcopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.png"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Modified: db/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/getstart/getstartderby.ditamap Tue Aug 22 17:28:27 2006
@@ -20,7 +20,7 @@
 <map title="Getting Started with Derby">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2006"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/trunk/src/getstart/rgscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgscopyright.dita?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgscopyright.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgscopyright.dita Tue Aug 22 17:28:27 2006
@@ -22,10 +22,19 @@
 <reference id="rgscopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.png"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Added: db/derby/docs/trunk/src/images/logowithtext.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/images/logowithtext.jpg?rev=433814&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/docs/trunk/src/images/logowithtext.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Tue Aug 22 17:28:27 2006
@@ -21,7 +21,7 @@
 <map title="Reference Manual">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/trunk/src/ref/rrefcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcopyright.dita?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcopyright.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcopyright.dita Tue Aug 22 17:28:27 2006
@@ -21,10 +21,19 @@
 <reference id="rrefcopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.png"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Modified: db/derby/docs/trunk/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/derbytools.ditamap?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/trunk/src/tools/derbytools.ditamap Tue Aug 22 17:28:27 2006
@@ -20,7 +20,7 @@
 <map title="Tools and Utilities Guide">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/trunk/src/tools/rtoolscopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolscopyright.dita?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolscopyright.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolscopyright.dita Tue Aug 22 17:28:27 2006
@@ -21,10 +21,19 @@
 <reference id="rtoolscopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.png"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Modified: db/derby/docs/trunk/src/tuning/rtuncopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/rtuncopyright.dita?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/rtuncopyright.dita (original)
+++ db/derby/docs/trunk/src/tuning/rtuncopyright.dita Tue Aug 22 17:28:27 2006
@@ -21,10 +21,19 @@
 <reference id="rtuncopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 1997, 2006 The Apache Software Foundation
-or its licensors, as applicable.</p><p>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<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.png"/></p>
+<p>Copyright 2004, 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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

Modified: db/derby/docs/trunk/src/tuning/tuningderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/tuningderby.ditamap?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/tuningderby.ditamap (original)
+++ db/derby/docs/trunk/src/tuning/tuningderby.ditamap Tue Aug 22 17:28:27 2006
@@ -21,7 +21,7 @@
 <map title="Tuning Derby">
 <topicmeta>
 <copyright>
-<copyryear year="1997, 2005"/>
+<copyryear year="2004, 2006"/>
 <copyrholder>Apache Software Foundation</copyrholder>
 </copyright>
 <prodinfo>

Modified: db/derby/docs/trunk/src/workingwithderby/rwwdcopyright.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/rwwdcopyright.dita?rev=433814&r1=433813&r2=433814&view=diff
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/rwwdcopyright.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/rwwdcopyright.dita Tue Aug 22 17:28:27 2006
@@ -21,10 +21,19 @@
 <reference id="rwwdcopyright" xml:lang="en-us">
 <title>Copyright</title>
 <refbody>
-<section><p>Copyright 2006 The Apache Software Foundation or its licensors,
-as applicable.</p><p>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   <codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>Unless
+<section>
+<p><image href="../images/logowithtext.png"/></p>
+<p>Copyright 2006 The Apache Software Foundation or its licensors,
+as applicable.</p>
+<p>
+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
+<codeblock>http://www.apache.org/licenses/LICENSE-2.0</codeblock></p><p>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



Mime
View raw message