velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r741147 - in /velocity/engine/branches/2.0_Exp: build/ src/java/org/apache/velocity/anakia/ src/java/org/apache/velocity/convert/ src/java/org/apache/velocity/runtime/defaults/ src/java/org/apache/velocity/runtime/directive/ src/java/org/ap...
Date Thu, 05 Feb 2009 15:42:48 GMT
Author: nbubna
Date: Thu Feb  5 15:42:47 2009
New Revision: 741147

URL: http://svn.apache.org/viewvc?rev=741147&view=rev
Log:
remove deprecated Anakia, Texen, #literal, WebMacro conversion, LogSystem and VelocityServlet

Removed:
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/anakia/
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/convert/
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Literal.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/LogChuteSystem.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/LogSystem.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/NullLogSystem.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/servlet/
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/texen/
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/AnakiaTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/TexenClasspathTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/TexenTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/VelocityServletTestCase.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity355And552TestCase.java
    velocity/engine/branches/2.0_Exp/test/anakia/
    velocity/engine/branches/2.0_Exp/test/templates/compare/literal.cmp
    velocity/engine/branches/2.0_Exp/test/templates/literal.vm
    velocity/engine/branches/2.0_Exp/test/texen/
    velocity/engine/branches/2.0_Exp/test/texen-classpath/
Modified:
    velocity/engine/branches/2.0_Exp/build/testcases.xml
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/defaults/directive.properties
    velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/LogManager.java
    velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
    velocity/engine/branches/2.0_Exp/test/templates/templates.properties

Modified: velocity/engine/branches/2.0_Exp/build/testcases.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/build/testcases.xml?rev=741147&r1=741146&r2=741147&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/build/testcases.xml (original)
+++ velocity/engine/branches/2.0_Exp/build/testcases.xml Thu Feb  5 15:42:47 2009
@@ -51,15 +51,12 @@
   <!-- =================================================================== -->
   <target name="test-clean">
     <!-- Delete the results directories -->
-    <delete dir="${build.test}/anakia" quiet="true"/>
     <delete dir="${build.test}/cpload" quiet="true"/>
     <delete dir="${build.test}/multiloader" quiet="true"/>
-    <delete dir="${build.test}/texen" quiet="true"/>
   </target>
 
   <target name="test-all"
-          depends="test-cpload,test-anakia,test-texen,
-                   test-texen-classpath,test-multiloader"/>
+          depends="test-cpload,test-multiloader"/>
 
   <target name="test-cpload">
     <echo message="Running Classpath Resource tests..."/>
@@ -74,96 +71,6 @@
     </java>
   </target>
 
-  <target name="test-anakia">
-    <echo message="Running Anakia tests..."/>
-
-    <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"
-             classpathref="velocity.test.classpath"/>
-
-    <anakia basedir="${test.dir}/anakia/xdocs" destdir="${build.test}/anakia"
-            extension=".html" style="./site.vsl"
-            projectFile="./stylesheets/project.xml"
-            excludes="**/stylesheets/**"
-            includes="**/*.xml"
-            templatePath="${test.dir}/anakia/xdocs/stylesheets"
-            velocityPropertiesFile="${test.dir}/anakia/velocity.properties"
-            lastModifiedCheck="false">
-    </anakia>
-
-    <anakia basedir="${test.dir}/anakia/xdocs"
-            destdir="${build.test}/anakia"
-        extension=".context.html" style="./site_contexts.vsl"
-        projectFile="./stylesheets/project.xml"
-        excludes="**/stylesheets/**"
-        includes="**/*.xml"
-        templatePath="${test.dir}/anakia/xdocs/stylesheets"
-        lastModifiedCheck="false">
-
-        <context name="customContext" file="./stylesheets/customContext.xml"/>
-    </anakia>
-
-    <java classname="${test.runner}" fork="yes" dir="${velocity.dir}" failonerror="${test.haltonerror}"
-          classpathref="velocity.test.classpath">
-      <arg value="org.apache.velocity.test.AnakiaTestCase"/>
-    </java>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- T E X E N  T E S T                                               -->
-  <!-- ================================================================ -->
-  <!-- Generate turbine service code via Texen                          -->
-  <!-- ================================================================ -->
-
-  <target name="test-texen">
-
-    <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask"
-             classpathref="velocity.test.classpath"/>
-
-    <texen
-      contextProperties="${test.dir}/texen/service.props,${test.dir}/texen/additional.props"
-      controlTemplate="Control.vm"
-      outputDirectory="${build.test}/texen"
-      templatePath="${test.dir}/texen/templates"
-      outputFile="report"
-    />
-
-    <java classname="${test.runner}" fork="yes" dir="${velocity.dir}" failonerror="${test.haltonerror}"
-          classpathref="velocity.test.classpath">
-      <arg value="org.apache.velocity.test.TexenTestCase"/>
-    </java>
-
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- T E X E N  C L A S S P A T H                                     -->
-  <!-- ================================================================ -->
-  <!-- Generate turbine service code via Texen with all the templates   -->
-  <!-- and ancillary files in a JAR.                                    -->
-  <!-- ================================================================ -->
-
-  <target name="test-texen-classpath">
-    <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask">
-      <classpath>
-        <pathelement location="${test.dir}/texen-classpath/test.jar"/>
-        <path refid="velocity.test.classpath"/>
-      </classpath>
-    </taskdef>
-
-    <texen
-      useClassPath="true"
-      contextProperties="service.props"
-      controlTemplate="Control.vm"
-      outputDirectory="${build.test}/texen-classpath"
-      outputFile="report"
-    />
-
-    <java classname="${test.runner}" fork="yes" dir="${velocity.dir}" failonerror="${test.haltonerror}"
-          classpathref="velocity.test.classpath">
-      <arg value="org.apache.velocity.test.TexenClasspathTestCase"/>
-    </java>
-
-  </target>
-
   <target name="test-multiloader">
     <echo message="Running MultiLoader tests..."/>
 

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/defaults/directive.properties
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/defaults/directive.properties?rev=741147&r1=741146&r2=741147&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/defaults/directive.properties
(original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/defaults/directive.properties
Thu Feb  5 15:42:47 2009
@@ -18,7 +18,6 @@
 directive.2=org.apache.velocity.runtime.directive.Include
 directive.3=org.apache.velocity.runtime.directive.Parse
 directive.4=org.apache.velocity.runtime.directive.Macro
-directive.5=org.apache.velocity.runtime.directive.Literal
-directive.6=org.apache.velocity.runtime.directive.Evaluate
-directive.7=org.apache.velocity.runtime.directive.Break
-directive.8=org.apache.velocity.runtime.directive.Define
+directive.5=org.apache.velocity.runtime.directive.Evaluate
+directive.6=org.apache.velocity.runtime.directive.Break
+directive.7=org.apache.velocity.runtime.directive.Define

Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/LogManager.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/LogManager.java?rev=741147&r1=741146&r2=741147&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/LogManager.java
(original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/LogManager.java
Thu Feb  5 15:42:47 2009
@@ -67,7 +67,7 @@
     {
         Log log = rsvc.getLog();
 
-        /* If a LogChute or LogSystem instance was set as a configuration
+        /* If a LogChute instance was set as a configuration
          * value, use that.  This is any class the user specifies.
          */
         Object o = rsvc.getProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM);
@@ -88,25 +88,6 @@
                     throw new VelocityException(msg, e);
                 }
             }
-            // then check for a LogSystem
-            else if (o instanceof LogSystem)
-            {
-                // inform the user about the deprecation
-                log.debug("LogSystem has been deprecated. Please use a LogChute implementation.");
-                try
-                {
-                    // wrap the LogSystem into a chute.
-                    LogChute chute = new LogChuteSystem((LogSystem)o);
-                    chute.init(rsvc);
-                    return chute;
-                }
-                catch (Exception e)
-                {
-                    String msg = "Could not init runtime.log.logsystem " + o;
-                    log.error(msg, e);
-                    throw new VelocityException(msg, e);
-                }
-            }
             else
             {
                 String msg = o.getClass().getName() + " object set as runtime.log.logsystem
is not a valid log implementation.";
@@ -158,14 +139,6 @@
                         log.debug("Using logger class " + claz);
                         return (LogChute)o;
                     }
-                    else if (o instanceof LogSystem)
-                    {
-                        // inform the user about the deprecation
-                        log.debug("LogSystem has been deprecated. Please use a LogChute implementation.");
-                        LogChute chute = new LogChuteSystem((LogSystem)o);
-                        chute.init(rsvc);
-                        return chute;
-                    }
                     else
                     {
                         String msg = "The specified logger class " + claz +

Modified: velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java?rev=741147&r1=741146&r2=741147&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
(original)
+++ velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
Thu Feb  5 15:42:47 2009
@@ -94,7 +94,9 @@
         }
         catch (Exception e)
         {
-            fail("Cannot setup AbsoluteFileResourceLoaderTest!");
+            String msg = "Cannot setup AbsoluteFileResourceLoaderTest!";
+            info(msg, e);
+            fail(msg);
         }
     }
 

Modified: velocity/engine/branches/2.0_Exp/test/templates/templates.properties
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/test/templates/templates.properties?rev=741147&r1=741146&r2=741147&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/test/templates/templates.properties (original)
+++ velocity/engine/branches/2.0_Exp/test/templates/templates.properties Thu Feb  5 15:42:47
2009
@@ -45,22 +45,21 @@
 test.template.28 = interpolation
 test.template.29 = vm_test1
 test.template.30 = map
-test.template.31 = literal
-test.template.32 = ifstatement
-test.template.33 = math
-test.template.34 = range
-test.template.35 = get
-test.template.36 = velocimacro2
-test.template.37 = foreach-type
-test.template.38 = foreach-introspect
-test.template.39 = settest
-test.template.40 = newline
-test.template.41 = logical2
-test.template.42 = string
-test.template.43 = stop1
-test.template.44 = stop2
-test.template.45 = foreach-null-list
-test.template.46 = curly-directive
-test.template.47 = comment-eof
-test.template.48 = commas
-test.template.49 = stop3
+test.template.31 = ifstatement
+test.template.32 = math
+test.template.33 = range
+test.template.34 = get
+test.template.35 = velocimacro2
+test.template.36 = foreach-type
+test.template.37 = foreach-introspect
+test.template.38 = settest
+test.template.39 = newline
+test.template.40 = logical2
+test.template.41 = string
+test.template.42 = stop1
+test.template.43 = stop2
+test.template.44 = foreach-null-list
+test.template.45 = curly-directive
+test.template.46 = comment-eof
+test.template.47 = commas
+test.template.48 = stop3



Mime
View raw message