commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1169442 - in /commons/proper/bsf/trunk: ./ src/site/ src/site/resources/ src/site/resources/images/ src/site/xdoc/ src/site/xdoc/images/ src/site/xdoc/stylesheets/ xdocs/
Date Sun, 11 Sep 2011 12:59:05 GMT
Author: sebb
Date: Sun Sep 11 12:59:01 2011
New Revision: 1169442

URL: http://svn.apache.org/viewvc?rev=1169442&view=rev
Log:
Move site to standard Maven locations.
Fix build.xml so it still works from the new location
TODO - had to change faq.xml to work with Maven; format needs adjusting

Added:
    commons/proper/bsf/trunk/src/site/
    commons/proper/bsf/trunk/src/site/resources/
    commons/proper/bsf/trunk/src/site/resources/images/
      - copied from r1158660, commons/proper/bsf/trunk/xdocs/images/
    commons/proper/bsf/trunk/src/site/site.xml   (with props)
    commons/proper/bsf/trunk/src/site/xdoc/
      - copied from r1158660, commons/proper/bsf/trunk/xdocs/
Modified:
    commons/proper/bsf/trunk/build-properties.xml
    commons/proper/bsf/trunk/build.xml
    commons/proper/bsf/trunk/src/site/xdoc/bsfnews.xml
    commons/proper/bsf/trunk/src/site/xdoc/faq.xml
    commons/proper/bsf/trunk/src/site/xdoc/images/
    commons/proper/bsf/trunk/src/site/xdoc/index.xml
    commons/proper/bsf/trunk/src/site/xdoc/manual.xml
    commons/proper/bsf/trunk/src/site/xdoc/resources.xml
    commons/proper/bsf/trunk/src/site/xdoc/stylesheets/project.xml
    commons/proper/bsf/trunk/src/site/xdoc/velocity.properties
    commons/proper/bsf/trunk/xdocs/

Modified: commons/proper/bsf/trunk/build-properties.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/build-properties.xml?rev=1169442&r1=1169441&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/build-properties.xml (original)
+++ commons/proper/bsf/trunk/build-properties.xml Sun Sep 11 12:59:01 2011
@@ -46,7 +46,8 @@
 
     <property name="samples.dir" value="samples"/>
 
-    <property name="site.src" location="xdocs"/>
+    <property name="site.src" location="src/site/xdoc"/>
+    <property name="site.images" location="src/site/resources/images"/>
     <property name="site.dest" location="docs"/>
     <property name="site.projectFile" value="stylesheets/project.xml"/>
 
@@ -54,7 +55,7 @@
 
     <property name="src.dir" value="src"/>
 
-    <property name="templ.path" location="xdocs/stylesheets"/>
+    <property name="templ.path" location="src/site/xdoc/stylesheets"/>
 
     <property name="tests.dir" value="test"/>
 

Modified: commons/proper/bsf/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/build.xml?rev=1169442&r1=1169441&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/build.xml (original)
+++ commons/proper/bsf/trunk/build.xml Sun Sep 11 12:59:01 2011
@@ -294,15 +294,15 @@ Copyright:
 			<classpath refid="anakia.classpath" />
 		</taskdef>
 
-		<anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./site.vsl"
projectFile="${site.projectFile}" excludes="**/stylesheets/** faq.xml" includes="**/*.xml"
lastModifiedCheck="false" templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}"/>
+		<anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./site.vsl"
projectFile="${site.projectFile}" excludes="**/stylesheets/**" includes="**/*.xml" lastModifiedCheck="false"
templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}"/>
 
 
-		<anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./faq.vsl"
projectFile="${site.projectFile}" includes="faq.xml" lastModifiedCheck="false" templatePath="${templ.path}"
velocityPropertiesFile="${velocity.props}"/>
+		<!--anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./faq.vsl"
projectFile="${site.projectFile}" includes="faq.xml" lastModifiedCheck="false" templatePath="${templ.path}"
velocityPropertiesFile="${velocity.props}"/-->
 
 		<fixcrlf srcdir="${site.dest}/" includes="**/*.html" fixlast="false"/>
 
 		<copy todir="${site.dest}/images" filtering="no">
-			<fileset dir="${site.src}/images">
+			<fileset dir="${site.images}">
 				<include name="**/*.gif" />
 				<include name="**/*.jpeg" />
 				<include name="**/*.jpg" />

Added: commons/proper/bsf/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/site.xml?rev=1169442&view=auto
==============================================================================
--- commons/proper/bsf/trunk/src/site/site.xml (added)
+++ commons/proper/bsf/trunk/src/site/site.xml Sun Sep 11 12:59:01 2011
@@ -0,0 +1,44 @@
+<?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.    
+-->
+<project name="Apache Commons BSF&amp;trade;">
+
+    <bannerRight>
+        <name>Commons BSF</name>
+        <src>/images/bsf_logo.jpg</src>
+        <href>/index.html</href>
+    </bannerRight>
+
+  <publishDate format="dd MMM yyyy" />
+
+  <body>
+
+    <menu name="BSF">
+      <item name="About" href="index.html"/>
+      <item name="News" href="bsfnews.html"/>
+      <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_bsf.cgi"/>
+      <item name="Documentation" href="manual.html"/>
+      <item name="FAQ" href="faq.html"/>
+      <item name="Related projects" href="projects.html"/>
+      <item name="Resources" href="resources.html"/>
+      <item name="Having a problem?" href="problems.html"/>
+    </menu>
+
+  </body>
+</project>

Propchange: commons/proper/bsf/trunk/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/bsf/trunk/src/site/xdoc/bsfnews.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/xdoc/bsfnews.xml?rev=1169442&r1=1158660&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/src/site/xdoc/bsfnews.xml (original)
+++ commons/proper/bsf/trunk/src/site/xdoc/bsfnews.xml Sun Sep 11 12:59:01 2011
@@ -91,7 +91,7 @@
   <section name="Interested?">
     <p>
      If you want to participate in developing BSF, join the
-     <a href="http://jakarta.apache.org/site/mail.html">
+     <a href="http://commons.apache.org/bsf/mail-lists.html">
      bsf-dev mailing list</a> and contribute your ideas.
     </p>
   </section>

Modified: commons/proper/bsf/trunk/src/site/xdoc/faq.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/xdoc/faq.xml?rev=1169442&r1=1158660&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/src/site/xdoc/faq.xml (original)
+++ commons/proper/bsf/trunk/src/site/xdoc/faq.xml Sun Sep 11 12:59:01 2011
@@ -27,17 +27,19 @@
     <title>Frequently Asked Questions</title>
   </properties>
 
-  <faqsection title="About this FAQ">
-    <faq id="latest-version">
+ <body>
+
+  <section name="About this FAQ">
+    <subsection name="latest-version">
       <question>Where do I find the latest version of this
         document?</question>
       <answer>
         <p>The latest version can always be found at BSF&apos;s homepage 
-          <a href="http://jakarta.apache.org/bsf/faq.html">http://jakarta.apache.org/bsf/faq.html</a>.</p>
+          <a href="http://commons.apache.org/bsf/faq.html">http://commons.apache.org/bsf/faq.html</a>.</p>
       </answer>
-    </faq>
+    </subsection>
 
-    <faq id="adding-faqs">
+    <subsection name="adding-faqs">
       <question>How can I contribute to this FAQ?</question>
       <answer>
         <p>The page you are looking it is generated from 
@@ -50,9 +52,9 @@
           section of <a href="http://jakarta.apache.org/site/source.html">this
           page</a>.</p>
       </answer>
-    </faq>
+    </subsection>
 
-    <faq id="creating-faq">
+    <subsection name="creating-faq">
       <question>How do you create the HTML version of this
         FAQ?</question>
 
@@ -70,12 +72,12 @@
         homepage, you should get it to work without that.  Just make
         sure all required jars are in the task&apos;s classpath.</p>
       </answer>
-    </faq>
+    </subsection>
 
-  </faqsection>
+  </section>
 
-  <faqsection title="General">
-    <faq id="what-is-bsf">
+  <section name="General">
+    <subsection name="what-is-bsf">
       <question>What is Bean Scripting Framework?</question>
       <answer>
         <p>
@@ -91,9 +93,9 @@
         objects to these scripting language engines.
         </p>
       </answer>
-    </faq>
+    </subsection>
 
-    <faq id="bsf-name">
+    <subsection name="bsf-name">
       <question>Why do you call it BSF?</question>
       <answer>
 
@@ -103,9 +105,9 @@
         </p>
         
       </answer>
-    </faq>
+    </subsection>
 
-    <faq id="history">
+    <subsection name="history">
       <question>Tell us a little bit about BSF&apos;s history.</question>
       <answer>
 
@@ -140,12 +142,12 @@
         </p>
 
       </answer>
-    </faq>
+    </subsection>
 
-  </faqsection>
+  </section>
 
-  <faqsection title="Installation">
-    <faq id="no-gnu-tar">
+  <section name="Installation">
+    <subsection name="no-gnu-tar">
       <question>I get checksum errors when I try to extract the
       <code>tar.gz</code> distribution file. Why?</question>
       <answer>
@@ -166,11 +168,11 @@
         or use the zip archive instead (you can extract it using
         <code>jar xf</code>).</p>
       </answer>
-    </faq>
-  </faqsection>
+    </subsection>
+  </section>
 
-  <faqsection title="How do I ...">
-    <faq id="doh">
+  <section name="How do I ...">
+    <subsection name="doh">
       <question>How do I install BSF?</question>
       <answer>
 
@@ -179,14 +181,14 @@
         application server. In order to be used as a class library or as
         a standalone system, one simply downloads a copy of the bsf.jar
         file from the
-        <a href="http://jakarta.apache.org/bsf/index.html">BSF web site</a>
+        <a href="http://commons.apache.org/bsf/index.html">BSF web site</a>
         and includes it in their classpath, along with any required classes
         or jar files for the desired languages.    
         </p>
         
         <p>
         In order to use BSF as part of the
-        <a href="http://jakarta.apache.org/tomcat/">Tomcat</a>
+        <a href="http://tomcat.apache.org/tomcat/">Tomcat</a>
         servlet engine, one must currently download patches from the BSF
         web site that permit Jasper to call BSF. Instructions for this will be
         posted on the website, and will be accompanied by prebuilt binaries.
@@ -195,13 +197,13 @@
         </p>
 
       </answer>
-    </faq>
+    </subsection>
 
-  </faqsection>
+  </section>
 
-  <faqsection title="It doesn&apos;t work (as expected)">
+  <section name="It doesn&apos;t work (as expected)">
 
-    <faq id="winzip-lies">
+    <subsection name="winzip-lies">
       <question>BSF creates JAR files with a lower-case
         <code>meta-inf</code> directory.</question>
         
@@ -217,11 +219,11 @@
         <p>If you extract (or just check) the archive with jar, you
         will see that the names have the correct case.</p>
       </answer>
-    </faq>
-  </faqsection>
+    </subsection>
+  </section>
 
-  <faqsection title="Advanced Issues">
-    <faq id="TBD2">
+  <section name="Advanced Issues">
+    <subsection name="TBD2">
       <question>
       To be added
       </question>
@@ -233,11 +235,11 @@
         </p>
 
       </answer>
-    </faq>
-  </faqsection>
+    </subsection>
+  </section>
 
-  <faqsection title="Known Problems">
-    <faq id="javadoc-cannot-execute">
+  <section name="Known Problems">
+    <subsection name="javadoc-cannot-execute">
       <question>JavaDoc failed: java.io.IOException: javadoc: cannot execute</question>
       <answer>
         <p>There is a bug in the Solaris reference implementation of
@@ -245,8 +247,8 @@
         This also appears to be true under Linux. Moving the JDK to
         the front of the PATH fixes the problem.</p>
       </answer>
-    </faq>
-
-  </faqsection>
+    </subsection>
 
+  </section>
+ </body>
 </document>

Modified: commons/proper/bsf/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/xdoc/index.xml?rev=1169442&r1=1158660&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/bsf/trunk/src/site/xdoc/index.xml Sun Sep 11 12:59:01 2011
@@ -218,20 +218,6 @@ This provides a combined archive from wh
         </li>
     </ul>
   </section>
-  <section name="Get Involved">
-<ul>
-<li><a href="http://jakarta.apache.org/getinvolved/getinvolvedindex.html">Get
Involved</a></li>
-<li><a href="http://jakarta.apache.org/getinvolved/mail.html">Join Mailing Lists</a></li>
-<li><a href="http://marc.theaimsgroup.com/?l=bsf-dev&amp;r=1&amp;w=2">Search
the Dev Mailing List</a>
-</li>
-<li><a href="http://marc.theaimsgroup.com/?l=bsf-user&amp;r=1&amp;w=2">Search
the User Mailing List</a>
-</li>
-</ul>
-
-
-
-  </section>
-
 </body>
 </document>
 

Modified: commons/proper/bsf/trunk/src/site/xdoc/manual.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/xdoc/manual.xml?rev=1169442&r1=1158660&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/src/site/xdoc/manual.xml (original)
+++ commons/proper/bsf/trunk/src/site/xdoc/manual.xml Sun Sep 11 12:59:01 2011
@@ -80,14 +80,14 @@
     application server. In order to be used as a class library or as
     a standalone system, you simply download a copy of the bsf.jar
     file from the
-    <a href="http://jakarta.apache.org/bsf/index.html">BSF web site</a>
+    <a href="http://commons.apache.org/bsf/index.html">BSF web site</a>
     and include it in your classpath, along with any required classes
     or jar files for desired languages.
     </p>
 
     <p>
     In order to use BSF as part of the
-    <a href="http://jakarta.apache.org/tomcat/">Tomcat</a>
+    <a href="http://tomcat.apache.org/tomcat/">Tomcat</a>
     servlet engine, you must currently download patches from the BSF
     web site that permit Jasper to call BSF. Instructions for this will be
     posted on the website, and will soon be accompanied by prebuilt binaries.
@@ -135,7 +135,7 @@
     <p>
     Multiple languages can be supported within a given JSP; this is
     accomplished by using the BSF taglibs, which are available from the
-    <a href="http://jakarta.apache.org/taglibs/index.html">Jakarta Taglibs</a>
+    <a href="http://tomcat.apache.org/taglibs/index.html">Jakarta Taglibs</a>
     project. BSF taglib provides two tags: <code>scriptlet</code> and
     <code>expression</code>. Both of these have a required language attribute,
     which is used to specify the language used on a per <code>scriptlet</code>

Modified: commons/proper/bsf/trunk/src/site/xdoc/resources.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/xdoc/resources.xml?rev=1169442&r1=1158660&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/src/site/xdoc/resources.xml (original)
+++ commons/proper/bsf/trunk/src/site/xdoc/resources.xml Sun Sep 11 12:59:01 2011
@@ -38,7 +38,7 @@
         <table>
           <tr>
             <th>FAQ:</th>
-            <td><a href="faq.html">http://jakarta.apache.org/bsf/faq.html</a></td>
+            <td><a href="faq.html">http://commons.apache.org/bsf/faq.html</a></td>
           </tr>
         </table>
       </subsection>

Modified: commons/proper/bsf/trunk/src/site/xdoc/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/xdoc/stylesheets/project.xml?rev=1169442&r1=1158660&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/src/site/xdoc/stylesheets/project.xml (original)
+++ commons/proper/bsf/trunk/src/site/xdoc/stylesheets/project.xml Sun Sep 11 12:59:01 2011
@@ -18,8 +18,8 @@
    limitations under the License.
 -->
 
-<project name="Jakarta BSF"
-         href="http://jakarta.apache.org/bsf/">
+<project name="Apache Commons BSF"
+         href="http://commons.apache.org/bsf/">
 
     <title>Jakarta BSF</title>
     <logo href="images/bsf_logo.jpg">Jakarta BSF</logo>

Modified: commons/proper/bsf/trunk/src/site/xdoc/velocity.properties
URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/src/site/xdoc/velocity.properties?rev=1169442&r1=1158660&r2=1169442&view=diff
==============================================================================
--- commons/proper/bsf/trunk/src/site/xdoc/velocity.properties (original)
+++ commons/proper/bsf/trunk/src/site/xdoc/velocity.properties Sun Sep 11 12:59:01 2011
@@ -1,2 +1,2 @@
-file.resource.loader.path=xdocs/stylesheets
+file.resource.loader.path=src/site/xdoc/stylesheets
 velocimacro.library=templates.vm



Mime
View raw message