You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/21 15:09:43 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/transformer Instructions.java SourceTransformer.java Transformation.java transformations.xml
jvanzyl 02/02/21 06:09:43
Modified: src/java/org/apache/maven/transformer Instructions.java
SourceTransformer.java Transformation.java
transformations.xml
Log:
- applying patches submitted by Stephane Bailliez
Revision Changes Path
1.2 +53 -2 jakarta-turbine-maven/src/java/org/apache/maven/transformer/Instructions.java
Index: Instructions.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/Instructions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Instructions.java 19 Feb 2002 18:10:11 -0000 1.1
+++ Instructions.java 21 Feb 2002 14:09:43 -0000 1.2
@@ -1,8 +1,59 @@
package org.apache.maven.transformer;
-
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Maven" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache Maven", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
/**
*/
1.2 +12 -12 jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java
Index: SourceTransformer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceTransformer.java 19 Feb 2002 18:10:11 -0000 1.1
+++ SourceTransformer.java 21 Feb 2002 14:09:43 -0000 1.2
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,12 +26,12 @@
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
+ * "Apache Maven" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Maven", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -56,19 +56,19 @@
import java.io.File;
import java.io.FileWriter;
-import java.util.ArrayList;
import java.util.Iterator;
+
import org.apache.oro.text.perl.Perl5Util;
-import org.apache.velocity.util.StringUtils;
+import org.apache.stratum.xo.Mapper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
-import org.apache.stratum.xo.Mapper;
+import org.apache.velocity.util.StringUtils;
/**
* @author <a href="mailto:jvanzyl@zenplex.com">Jason van Zyl</a>
*
- * @version $Id: SourceTransformer.java,v 1.1 2002/02/19 18:10:11 jvanzyl Exp $
+ * @version $Id: SourceTransformer.java,v 1.2 2002/02/21 14:09:43 jvanzyl Exp $
*/
public class SourceTransformer
extends Task
@@ -118,7 +118,7 @@
/**
* Set the source directory.
*
- * @param File source directory
+ * @param srcDir source directory
*/
public void setSrcDir(File srcDir)
{
@@ -138,7 +138,7 @@
/**
* Set the target directory.
*
- * @param File target directory
+ * @param targetDir target directory
*/
public void setTargetDir(File targetDir)
{
@@ -158,7 +158,7 @@
/**
* Set the transformation descriptor.
*
- * @param File transformation descriptor
+ * @param descriptor transformation descriptor
*/
public void setDescriptor(File descriptor)
{
@@ -249,8 +249,8 @@
/**
* Apply find/replace regexes to our Turbine source file.
*
- * @param String source file to migrate.
- * @return String migrated source file.
+ * @param sourceFile source file to migrate.
+ * @return migrated source file.
*/
private String convertSourceFile(String sourceFile)
{
1.2 +55 -2 jakarta-turbine-maven/src/java/org/apache/maven/transformer/Transformation.java
Index: Transformation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/Transformation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Transformation.java 19 Feb 2002 18:10:11 -0000 1.1
+++ Transformation.java 21 Feb 2002 14:09:43 -0000 1.2
@@ -1,4 +1,57 @@
package org.apache.maven.transformer;
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Maven" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache Maven", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
/**
* RegexTransform represents a transformation to
@@ -21,7 +74,7 @@
/**
* Set the target regex.
*
- * @param String targetRegex
+ * @param target targetRegex
*/
public void setTarget(String target)
{
@@ -41,7 +94,7 @@
/**
* Set the result .
*
- * @param String result
+ * @param result
*/
public void setResult(String result)
{
1.2 +1 -1 jakarta-turbine-maven/src/java/org/apache/maven/transformer/transformations.xml
Index: transformations.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/transformations.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- transformations.xml 19 Feb 2002 18:10:12 -0000 1.1
+++ transformations.xml 21 Feb 2002 14:09:43 -0000 1.2
@@ -211,4 +211,4 @@
<!-- Turbine Security Service Extensions -->
-<instructions>
+</instructions>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>