geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r677361 - in /geronimo/samples/branches/2.1: ./ buildutil/ buildutil/src/ buildutil/src/main/ buildutil/src/main/java/ buildutil/src/main/java/org/ buildutil/src/main/java/org/apache/ buildutil/src/main/java/org/apache/geronimo/ buildutil/s...
Date Wed, 16 Jul 2008 17:54:09 GMT
Author: linsun
Date: Wed Jul 16 10:54:08 2008
New Revision: 677361

URL: http://svn.apache.org/viewvc?rev=677361&view=rev
Log:
move buildutil up one level - related to GERONIMO-4194 

Added:
    geronimo/samples/branches/2.1/buildutil/
    geronimo/samples/branches/2.1/buildutil/README.txt   (with props)
    geronimo/samples/branches/2.1/buildutil/pom.xml   (with props)
    geronimo/samples/branches/2.1/buildutil/src/
    geronimo/samples/branches/2.1/buildutil/src/main/
    geronimo/samples/branches/2.1/buildutil/src/main/java/
    geronimo/samples/branches/2.1/buildutil/src/main/java/org/
    geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/
    geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/
    geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/
    geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/
    geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java
  (with props)
Removed:
    geronimo/samples/branches/2.1/samples/buildutil/
Modified:
    geronimo/samples/branches/2.1/pom.xml
    geronimo/samples/branches/2.1/samples/pom.xml

Added: geronimo/samples/branches/2.1/buildutil/README.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/buildutil/README.txt?rev=677361&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/buildutil/README.txt (added)
+++ geronimo/samples/branches/2.1/buildutil/README.txt Wed Jul 16 10:54:08 2008
@@ -0,0 +1,10 @@
+This is not a sample, it is a built until used by the sample.
+
+Tomcat has an Ant based util called txt2html 
+(see http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_17/java/org/apache/tomcat/buildutil/Txt2Html.java).
  
+This util is only used in tomcat build time and don't seem to be available in a standalone
tomcat jar.
+
+This module borrows the Txt2Html.java from tomcat and enables the jsp and servlet samples

+in geronimo to generate html files for source files.
+
+ 
\ No newline at end of file

Propchange: geronimo/samples/branches/2.1/buildutil/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/buildutil/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/buildutil/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.1/buildutil/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/buildutil/pom.xml?rev=677361&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/buildutil/pom.xml (added)
+++ geronimo/samples/branches/2.1/buildutil/pom.xml Wed Jul 16 10:54:08 2008
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>samples-parent</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>buildutil</artifactId>
+    <name>Geronimo Samples :: Buildutil</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.6.5</version>
+        </dependency>
+    </dependencies>
+
+</project>
+

Propchange: geronimo/samples/branches/2.1/buildutil/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/buildutil/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/buildutil/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java?rev=677361&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java
(added)
+++ geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java
Wed Jul 16 10:54:08 2008
@@ -0,0 +1,164 @@
+/*
+* 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.
+*/
+
+package org.apache.geronimo.samples.buildutil;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+
+/**
+ * Ant task to convert a given set of files from Text to HTML.
+ * Inserts an HTML header including pre tags and replaces special characters
+ * with their HTML escaped equivalents.
+ *
+ * <p>This task is currently used by the ant script to build our examples</p>
+ *
+ * @author Mark Roth
+ */
+public class Txt2Html 
+    extends Task 
+{
+    
+    /** The directory to contain the resulting files */
+    private File todir;
+    
+    /** The file to be converted into HTML */
+    private List<FileSet> filesets = new LinkedList<FileSet>();
+    
+    /**
+     * Sets the directory to contain the resulting files
+     *
+     * @param todir The directory
+     */
+    public void setTodir( File todir ) {
+        this.todir = todir;
+    }
+    
+    /**
+     * Sets the files to be converted into HTML
+     *
+     * @param fileset The fileset to be converted.
+     */
+    public void addFileset( FileSet fs ) {
+        filesets.add( fs );
+    }
+    
+    /**
+     * Perform the conversion
+     *
+     * @param BuildException Thrown if an error occurs during execution of
+     *    this task.
+     */
+    public void execute() 
+        throws BuildException 
+    {
+        int count = 0;
+        
+        // Step through each file and convert.
+        Iterator iter = filesets.iterator();
+        while( iter.hasNext() ) {
+            FileSet fs = (FileSet)iter.next();
+            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            File basedir = ds.getBasedir();
+            String[] files = ds.getIncludedFiles();
+            for( int i = 0; i < files.length; i++ ) {
+                File from = new File( basedir, files[i] );
+                File to = new File( todir, files[i] + ".html" );
+                if( !to.exists() || 
+                    (from.lastModified() > to.lastModified()) ) 
+                {
+                    log( "Converting file '" + from.getAbsolutePath() + 
+                        "' to '" + to.getAbsolutePath(), Project.MSG_VERBOSE );
+                    try {
+                        convert( from, to );
+                    }
+                    catch( IOException e ) {
+                        throw new BuildException( "Could not convert '" + 
+                            from.getAbsolutePath() + "' to '" + 
+                            to.getAbsolutePath() + "'", e );
+                    }
+                    count++;
+                }
+            }
+            if( count > 0 ) {
+                log( "Converted " + count + " file" + (count > 1 ? "s" : "") + 
+                    " to " + todir.getAbsolutePath() );
+            }
+        }
+    }
+    
+    /**
+     * Perform the actual copy and conversion
+     *
+     * @param from The input file
+     * @param to The output file
+     * @throws IOException Thrown if an error occurs during the conversion
+     */
+    private void convert( File from, File to )
+        throws IOException
+    {
+        // Open files:
+        BufferedReader in = new BufferedReader( new FileReader( from ) );
+        PrintWriter out = new PrintWriter( new FileWriter( to ) );
+        
+        // Output header:
+        out.println( "<html><body><pre>" );
+        
+        // Convert, line-by-line:
+        String line;
+        while( (line = in.readLine()) != null ) {
+            StringBuffer result = new StringBuffer();
+            int len = line.length();
+            for( int i = 0; i < len; i++ ) {
+                char c = line.charAt( i );
+                switch( c ) {
+                    case '&':
+                        result.append( "&amp;" );
+                        break;
+                    case '<':
+                        result.append( "&lt;" );
+                        break;
+                    default:
+                        result.append( c );
+                }
+            }
+            out.println( result.toString() );
+        }
+        
+        // Output footer:
+        out.println( "</pre></body></html>" );
+        
+        // Close streams:
+        out.close();
+        in.close();
+    }
+    
+}
+
+

Propchange: geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=677361&r1=677360&r2=677361&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Wed Jul 16 10:54:08 2008
@@ -60,6 +60,7 @@
     </distributionManagement>
 
     <modules>
+        <module>buildutil</module>
         <module>geronimo-samples-archetype</module>
         <module>samples</module>
     </modules>

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=677361&r1=677360&r2=677361&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Wed Jul 16 10:54:08 2008
@@ -52,7 +52,6 @@
     </properties>
 
     <modules>
-        <module>buildutil</module>
         <module>sample-datasource</module>
         <module>customer</module>
         <module>bank</module>



Mime
View raw message