You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2007/05/14 23:59:07 UTC
svn commit: r538000 - in /velocity/dvsl/trunk/src: conf/
java/org/apache/dvsl/ java/org/apache/dvsl/directive/
java/org/apache/dvsl/dom4j/
Author: cbrisson
Date: Mon May 14 14:59:05 2007
New Revision: 538000
URL: http://svn.apache.org/viewvc?view=rev&rev=538000
Log:
still getting rid of o.a.tools.dvsl in favour of o.a.dvsl
Modified:
velocity/dvsl/trunk/src/conf/MANIFEST.MF
velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogChute.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogSystem.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSL.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLContext.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNode.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNodeContext.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLTask.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/TemplateHandler.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/TransformTool.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/Transformer.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/MatchDirective.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/NameDirective.java
velocity/dvsl/trunk/src/java/org/apache/dvsl/dom4j/Dom4jNodeImpl.java
Modified: velocity/dvsl/trunk/src/conf/MANIFEST.MF
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/conf/MANIFEST.MF?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/conf/MANIFEST.MF (original)
+++ velocity/dvsl/trunk/src/conf/MANIFEST.MF Mon May 14 14:59:05 2007
@@ -3,4 +3,4 @@
Specification-Version: 1.0
Implementation-Vendor: Apache Software Foundation
Implementation-Version: @version@
-Main-class: org.apache.tools.dvsl.DVSL
+Main-class: org.apache.dvsl.DVSL
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogChute.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogChute.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogChute.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogChute.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogSystem.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogSystem.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogSystem.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/AntLogSystem.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSL.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSL.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSL.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSL.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -376,14 +376,14 @@
* register our template() directive
*/
- ve.setProperty("userdirective", "org.apache.tools.dvsl.directive.MatchDirective");
+ ve.setProperty("userdirective", "org.apache.dvsl.directive.MatchDirective");
ve.init();
/*
* add our template accumulator
*/
- ve.setApplicationAttribute("org.apache.tools.dvsl.TemplateHandler", templateHandler);
+ ve.setApplicationAttribute("org.apache.dvsl.TemplateHandler", templateHandler);
/*
* load and render the stylesheet
@@ -402,7 +402,7 @@
*/
InputStream is = this.getClass().getClassLoader()
- .getResourceAsStream("org/apache/tools/dvsl/resource/defaultroot.dvsl");
+ .getResourceAsStream("org/apache/dvsl/resource/defaultroot.dvsl");
if (is == null)
{
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLContext.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLContext.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLContext.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLContext.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNode.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNode.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNode.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNode.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNodeContext.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNodeContext.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNodeContext.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLNodeContext.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLTask.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLTask.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLTask.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/DVSLTask.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -144,12 +144,12 @@
if (stylesheet == null)
{
- throw new BuildException("no stylesheet specified", location);
+ throw new BuildException("no stylesheet specified", getLocation());
}
if (baseDir == null)
{
- baseDir = project.resolveFile(".");
+ baseDir = getProject().resolveFile(".");
}
/*
@@ -165,7 +165,7 @@
*/
if (classpath != null)
{
- classLoader = new AntClassLoader(project, classpath);
+ classLoader = new AntClassLoader(getProject(), classpath);
dvsl.setClassLoader(classLoader);
}
@@ -476,7 +476,7 @@
{
if (classpath == null)
{
- classpath = new Path(project);
+ classpath = new Path(getProject());
}
return classpath.createPath();
}
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/TemplateHandler.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/TemplateHandler.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/TemplateHandler.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/TemplateHandler.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/TransformTool.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/TransformTool.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/TransformTool.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/TransformTool.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/Transformer.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/Transformer.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/Transformer.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/Transformer.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl;
+package org.apache.dvsl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -38,7 +38,7 @@
import org.dom4j.DocumentException;
import org.dom4j.io.SAXReader;
-import org.apache.tools.dvsl.dom4j.Dom4jNodeImpl;
+import org.apache.dvsl.dom4j.Dom4jNodeImpl;
/**
* <p>
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/MatchDirective.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/MatchDirective.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/MatchDirective.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/MatchDirective.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl.directive;
+package org.apache.dvsl.directive;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@
import org.apache.velocity.runtime.parser.ParserTreeConstants;
import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.tools.dvsl.TemplateHandler;
+import org.apache.dvsl.TemplateHandler;
/**
* Velocity Directive to handle template registration of
@@ -65,7 +65,7 @@
try
{
String element =(String)((SimpleNode) node.jjtGetChild(0)).value( context );
- TemplateHandler th = (TemplateHandler) rsvc.getApplicationAttribute("org.apache.tools.dvsl.TemplateHandler");
+ TemplateHandler th = (TemplateHandler) rsvc.getApplicationAttribute("org.apache.dvsl.TemplateHandler");
th.registerMatch( element, (SimpleNode) node.jjtGetChild( node.jjtGetNumChildren() - 1 ) );
}
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/NameDirective.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/NameDirective.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/NameDirective.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/directive/NameDirective.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl.directive;
+package org.apache.dvsl.directive;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/dvsl/trunk/src/java/org/apache/dvsl/dom4j/Dom4jNodeImpl.java
URL: http://svn.apache.org/viewvc/velocity/dvsl/trunk/src/java/org/apache/dvsl/dom4j/Dom4jNodeImpl.java?view=diff&rev=538000&r1=537999&r2=538000
==============================================================================
--- velocity/dvsl/trunk/src/java/org/apache/dvsl/dom4j/Dom4jNodeImpl.java (original)
+++ velocity/dvsl/trunk/src/java/org/apache/dvsl/dom4j/Dom4jNodeImpl.java Mon May 14 14:59:05 2007
@@ -1,4 +1,4 @@
-package org.apache.tools.dvsl.dom4j;
+package org.apache.dvsl.dom4j;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -41,7 +41,7 @@
import org.dom4j.io.XMLWriter;
-import org.apache.tools.dvsl.DVSLNode;
+import org.apache.dvsl.DVSLNode;
/**