You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by ap...@apache.org on 2010/07/07 18:14:37 UTC
svn commit: r961427 - in /velocity/sandbox/maven-reorg/engine/trunk:
velocity-engine-assembly/ velocity-engine-assembly/src/main/assembly/
velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/
velocity-engine-core/src/main/java/org/...
Author: apetrelli
Date: Wed Jul 7 16:14:36 2010
New Revision: 961427
URL: http://svn.apache.org/viewvc?rev=961427&view=rev
Log:
VELOCITYSB-4
Moved example files to a package.
Added javadocs, excludeed JIRA report for the moment.
Added:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContext.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example2.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Log4jLoggerExample.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Log4jLoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/LoggerExample.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/LoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/TreeMapContext.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java
- copied, changed from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/XMLTest.java
Removed:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContext.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example2.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Log4jLoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/LoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/TreeMapContext.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/XMLTest.java
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/LogDisplayWrapper.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.bat
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.sh
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.bat
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.sh
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/context_example/dbcontexttest.sh
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/event_example/README.txt
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.bat
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.sh
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.bat
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.sh
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml Wed Jul 7 16:14:36 2010
@@ -101,6 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<phase>deploy</phase>
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml Wed Jul 7 16:14:36 2010
@@ -80,8 +80,32 @@
</includes>
</fileSet>
<fileSet>
- <directory>../velocity-engine</directory>
- <outputDirectory>src/velocity-engine</outputDirectory>
+ <directory>../velocity-engine-core</directory>
+ <outputDirectory>src/velocity-engine-core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-commons-logging</directory>
+ <outputDirectory>src/velocity-engine-commons-logging</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-log4j</directory>
+ <outputDirectory>src/velocity-engine-log4j</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-servlet</directory>
+ <outputDirectory>src/velocity-engine-servlet</outputDirectory>
<includes>
<include>pom.xml</include>
<include>src/</include>
@@ -97,6 +121,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../velocity-engine-uberjar</directory>
+ <outputDirectory>src/velocity-engine-uberjar</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../velocity-engine-assembly</directory>
<outputDirectory>src/velocity-engine-assembly
</outputDirectory>
@@ -110,8 +142,24 @@
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../velocity-engine/target/site</directory>
- <outputDirectory>docs/velocity-engine</outputDirectory>
+ <directory>../velocity-engine-core/target/site</directory>
+ <outputDirectory>docs/velocity-engine-core</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-commons-logging/target/site</directory>
+ <outputDirectory>docs/velocity-engine-commons-logging</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-log4j/target/site</directory>
+ <outputDirectory>docs/velocity-engine-log4j</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-servlet/target/site</directory>
+ <outputDirectory>docs/velocity-engine-servlet</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-uberjar/target/site</directory>
+ <outputDirectory>docs/velocity-engine-uberjar</outputDirectory>
</fileSet>
<fileSet>
<directory>../velocity-engine-examples/target/site</directory>
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java Wed Jul 7 16:14:36 2010
@@ -16,7 +16,7 @@ package org.apache.velocity.runtime.dire
* "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.
+ * under the License.
*/
import java.io.IOException;
@@ -105,9 +105,9 @@ public abstract class Directive implemen
{
return column;
}
-
+
/**
- * @return The template file name this directive was defined in, or null if not
+ * @return The template file name this directive was defined in, or null if not
* defined in a file.
*/
public String getTemplateName()
@@ -116,7 +116,7 @@ public abstract class Directive implemen
}
/**
- * @returns the name to be used when a scope control is provided for this
+ * @return the name to be used when a scope control is provided for this
* directive.
*/
public String getScopeName()
@@ -154,7 +154,7 @@ public abstract class Directive implemen
* The Parser calls this method during template parsing to check the arguments
* types. Be aware that this method is called pre init, so not all data
* is available in this method. The default implementation does not peform any
- * checking. We do this so that Custom directives do not trigger any parse
+ * checking. We do this so that Custom directives do not trigger any parse
* errors in IDEs.
* @param argtypes type, Array of argument types of each argument to the directive
* for example ParserTreeConstants.JJTWORD
@@ -163,9 +163,9 @@ public abstract class Directive implemen
*/
public void checkArgs(ArrayList<Integer> argtypes, Token t, String templateName)
throws ParseException
- {
+ {
}
-
+
/**
* How this directive is to be rendered
* @param context
@@ -212,7 +212,7 @@ public abstract class Directive implemen
{
String name = getScopeName();
Object obj = context.get(name);
-
+
try
{
Scope scope = (Scope)obj;
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/LogDisplayWrapper.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/LogDisplayWrapper.java?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/LogDisplayWrapper.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/LogDisplayWrapper.java Wed Jul 7 16:14:36 2010
@@ -16,7 +16,7 @@ package org.apache.velocity.runtime.log;
* "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.
+ * under the License.
*/
/**
@@ -64,13 +64,13 @@ public class LogDisplayWrapper
}
/**
- * @see Log#log(int, Object)
+ * @see Log#log(int, Object, Object...)
*/
protected void log(final int level, final Object message)
{
log(outputMessages, level, message);
}
-
+
protected void log(final boolean doLogging, final int level, final Object message)
{
if (doLogging)
@@ -80,13 +80,13 @@ public class LogDisplayWrapper
}
/**
- * @see Log#log(int, Object, Throwable)
+ * @see Log#log(int, Object, Throwable, Object...)
*/
protected void log(final int level, final Object message, final Throwable t)
{
log(outputMessages, level, message);
}
-
+
protected void log(final boolean doLogging, final int level, final Object message, final Throwable t)
{
if (doLogging)
@@ -94,7 +94,7 @@ public class LogDisplayWrapper
getLogChute().log(level, prefix + String.valueOf(message), t);
}
}
-
+
/**
* Log a trace message.
* @param doLogging Log only if this parameter is true.
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.bat
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.bat?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.bat (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.bat Wed Jul 7 16:14:36 2010
@@ -14,14 +14,16 @@ rem software distributed under the Licen
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
-rem under the License.
+rem under the License.
set VELCP=.
-for %%i in (..\..\bin\*.jar) do call appendVELCP %%i
-for %%i in (..\..\bin\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\*.jar) do call appendVELCP %%i
+for %%i in (..\..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\..\*.jar) do call appendVELCP %%i
echo Using classpath: %VELCP%
-java -cp %VELCP% Example example.vm
+java -cp %VELCP% org.apache.velocity.example.Example example.vm
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.sh
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.sh?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.sh (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example1/example.sh Wed Jul 7 16:14:36 2010
@@ -15,18 +15,28 @@
# "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.
+# under the License.
echo "Running Example with input file 'example.vm'"
_VELCP=.
-for i in ../../bin/*.jar
+for i in ../lib/*.jar
do
_VELCP=$_VELCP:"$i"
done
-for i in ../../build/lib/*.jar
+for i in ../*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../*.jar
do
_VELCP=$_VELCP:"$i"
done
@@ -36,5 +46,5 @@ if [ "$OSTYPE" = "cygwin32" ] || [ "$OST
_VELCP=`cygpath --path --windows "$_VELCP"`
fi
-java -cp $_VELCP Example example.vm
+java -cp $_VELCP org.apache.velocity.example.Example example.vm
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.bat
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.bat?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.bat (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.bat Wed Jul 7 16:14:36 2010
@@ -14,14 +14,16 @@ rem software distributed under the Licen
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
-rem under the License.
+rem under the License.
set VELCP=.
-for %%i in (..\..\bin\*.jar) do call appendVELCP %%i
-for %%i in (..\..\bin\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\*.jar) do call appendVELCP %%i
+for %%i in (..\..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\..\*.jar) do call appendVELCP %%i
echo Using classpath: %VELCP%
-java -cp %VELCP% Example2
+java -cp %VELCP% org.apache.velocity.example.Example2
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.sh
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.sh?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.sh (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/app_example2/example2.sh Wed Jul 7 16:14:36 2010
@@ -15,16 +15,26 @@
# "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.
+# under the License.
_VELCP=.
-for i in ../../bin/*.jar
+for i in ../lib/*.jar
do
_VELCP=$_VELCP:"$i"
done
-for i in ../../build/lib/*.jar
+for i in ../*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../*.jar
do
_VELCP=$_VELCP:"$i"
done
@@ -34,5 +44,5 @@ if [ "$OSTYPE" = "cygwin32" ] || [ "$OST
_VELCP=`cygpath --path --windows "$_VELCP"`
fi
-java -cp $_VELCP Example2
+java -cp $_VELCP org.apache.velocity.example.Example2
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/context_example/dbcontexttest.sh
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/context_example/dbcontexttest.sh?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/context_example/dbcontexttest.sh (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/context_example/dbcontexttest.sh Wed Jul 7 16:14:36 2010
@@ -15,10 +15,32 @@
# "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.
+# under the License.
echo "DBContextTest : please ensure MySQL is set up and jdbc drivers are in classpath. See DBContextTest.java for clues"
echo "This is an unsupported demo."
-java -cp .:../bin/velocity-0.71.jar:$CLASSPATH DBContextTest dbtest.vm
+_VELCP=.
+
+for i in ../lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+java -cp $_VELCP org.apache.velocity.example.DBContextTest dbtest.vm
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/event_example/README.txt
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/event_example/README.txt?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/event_example/README.txt (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/event_example/README.txt Wed Jul 7 16:14:36 2010
@@ -6,17 +6,17 @@ As always, the if you have any questions
2) Review documentation included in this package, or online at
http://jakarta.apache.org/velocity/
3) Ask on the velocity-user list. This is a great source of support information.
- To join, read http://jakarta.apache.org/site/mail.html and then follow the
+ To join, read http://jakarta.apache.org/site/mail.html and then follow the
link at the bottom to join the lists.
event_example
-------------
-This simple example demonstrates the event handling features of
+This simple example demonstrates the event handling features of
the Velocity Template Engine.
Note that this is considered a more advanced topic - you don't need
-to know this to use 99% of the features of Velocity, so if this
+to know this to use 99% of the features of Velocity, so if this
seems like too much at first - ignore it!
This is a standalone program. It is compiled by the 'examples' build
@@ -31,7 +31,7 @@ if the .jar's are not in your classpath,
java -cp \
../../bin/velocity-[VERSION].jar:../../build/lib/commons-collections.jar:. \
-EventExample
+org.apache.velocity.example.EventExample
(NOTE: make sure that the jarname is correct - this document might get
out of synch with the release version numbers.)
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.bat
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.bat?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.bat (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.bat Wed Jul 7 16:14:36 2010
@@ -14,14 +14,16 @@ rem software distributed under the Licen
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
-rem under the License.
+rem under the License.
set VELCP=.
-for %%i in (..\..\bin\*.jar) do call appendVELCP %%i
-for %%i in (..\..\bin\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\*.jar) do call appendVELCP %%i
+for %%i in (..\..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\..\*.jar) do call appendVELCP %%i
echo Using classpath: %VELCP%
-java -cp %VELCP% LoggerExample
+java -cp %VELCP% org.apache.velocity.example.LoggerExample
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.sh
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.sh?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.sh (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/logger_example/logger_example.sh Wed Jul 7 16:14:36 2010
@@ -15,18 +15,28 @@
# "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.
+# under the License.
echo "Running LoggerExample:"
_VELCP=.
-for i in ../../bin/*.jar
+for i in ../lib/*.jar
do
_VELCP=$_VELCP:"$i"
done
-for i in ../../bin/lib/*.jar
+for i in ../*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../*.jar
do
_VELCP=$_VELCP:"$i"
done
@@ -36,5 +46,5 @@ if [ "$OSTYPE" = "cygwin32" ] || [ "$OST
_VELCP=`cygpath --path --windows "$_VELCP"`
fi
-java -cp $_VELCP LoggerExample
+java -cp $_VELCP org.apache.velocity.example.LoggerExample
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.bat
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.bat?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.bat (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.bat Wed Jul 7 16:14:36 2010
@@ -14,14 +14,16 @@ rem software distributed under the Licen
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
-rem under the License.
+rem under the License.
set VELCP=.
-for %%i in (..\..\bin\*.jar) do call appendVELCP %%i
-for %%i in (..\..\bin\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\*.jar) do call appendVELCP %%i
+for %%i in (..\..\lib\*.jar) do call appendVELCP %%i
+for %%i in (..\..\*.jar) do call appendVELCP %%i
echo Using classpath: %VELCP%
-java -cp %VELCP% XMLTest xml.vm
+java -cp %VELCP% org.apache.velocity.example.XMLTest xml.vm
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.sh
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.sh?rev=961427&r1=961426&r2=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.sh (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/xmlapp_example.sh Wed Jul 7 16:14:36 2010
@@ -15,16 +15,26 @@
# "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.
+# under the License.
_VELCP=.
-for i in ../../build/lib/*.jar
+for i in ../lib/*.jar
do
_VELCP=$_VELCP:"$i"
done
-for i in ../../bin/*.jar
+for i in ../*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
+for i in ../../*.jar
do
_VELCP=$_VELCP:"$i"
done
@@ -34,5 +44,5 @@ if [ "$OSTYPE" = "cygwin32" ] || [ "$OST
_VELCP=`cygpath --path --windows "$_VELCP"`
fi
-java -cp $_VELCP XMLTest xml.vm
+java -cp $_VELCP org.apache.velocity.example.XMLTest xml.vm
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContext.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContext.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContext.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -14,12 +15,17 @@
* "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.
+ * under the License.
*/
-import java.sql.*;
-import java.io.Serializable;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
import org.apache.velocity.context.AbstractContext;
import org.apache.velocity.context.Context;
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContextTest.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,13 +21,10 @@
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
import java.io.Writer;
-
import java.util.Hashtable;
-import java.util.Vector;
import java.util.Properties;
import org.apache.velocity.Template;
-
import org.apache.velocity.runtime.RuntimeSingleton;
/**
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example2.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example2.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example2.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example2.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -14,16 +15,15 @@
* "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.
+ * under the License.
*/
import java.io.StringWriter;
-import java.util.Properties;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
/**
* This class is a simple demonstration of how the Velocity Template Engine
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Log4jLoggerExample.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Log4jLoggerExample.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Log4jLoggerExample.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Log4jLoggerExample.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Log4jLoggerExample.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Log4jLoggerExample.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Log4jLoggerExample.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/LoggerExample.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/LoggerExample.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/LoggerExample.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/LoggerExample.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/LoggerExample.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/LoggerExample.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/LoggerExample.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/TreeMapContext.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/TreeMapContext.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/TreeMapContext.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -14,11 +15,11 @@
* "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.
+ * under the License.
*/
import java.util.TreeMap;
-import java.io.Serializable;
+
import org.apache.velocity.context.AbstractContext;
import org.apache.velocity.context.Context;
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java (from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/XMLTest.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/XMLTest.java&r1=959747&r2=961427&rev=961427&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/XMLTest.java (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java Wed Jul 7 16:14:36 2010
@@ -1,3 +1,4 @@
+package org.apache.velocity.example;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file