Author: apetrelli
Date: Fri Jun 25 10:09:15 2010
New Revision: 957871
URL: http://svn.apache.org/viewvc?rev=957871&view=rev
Log:
VELOCITYSB-4
Moved and fixed example code. Moved .vm and .xml as resources.
Added:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContext.java
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/DBContext.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java
- copied, changed from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/DBContextTest.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java
- copied, changed from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/event_example/EventExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example.java
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example1/Example.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Example2.java
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example2/Example2.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/Log4jLoggerExample.java
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/logger_example/Log4jLoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/LoggerExample.java
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/logger_example/LoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/TreeMapContext.java
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/TreeMapContext.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/XMLTest.java
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/xmlapp_example/XMLTest.java
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/resources/dbtest.vm
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/dbtest.vm
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/resources/example.vm
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example1/example.vm
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/resources/example2.vm
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example2/example2.vm
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/resources/test.xml
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/xmlapp_example/test.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/resources/velocity.properties
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example1/velocity.properties
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/resources/xml.vm
- copied unchanged from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/xmlapp_example/xml.vm
Removed:
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example1/Example.java
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example1/example.vm
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example1/velocity.properties
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example2/Example2.java
velocity/sandbox/maven-reorg/engine/trunk/examples/app_example2/example2.vm
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/DBContext.java
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/DBContextTest.java
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/TreeMapContext.java
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/dbtest.vm
velocity/sandbox/maven-reorg/engine/trunk/examples/event_example/EventExample.java
velocity/sandbox/maven-reorg/engine/trunk/examples/logger_example/Log4jLoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/examples/logger_example/LoggerExample.java
velocity/sandbox/maven-reorg/engine/trunk/examples/xmlapp_example/XMLTest.java
velocity/sandbox/maven-reorg/engine/trunk/examples/xmlapp_example/test.xml
velocity/sandbox/maven-reorg/engine/trunk/examples/xmlapp_example/xml.vm
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/pom.xml
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/pom.xml?rev=957871&r1=957870&r2=957871&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/pom.xml
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/pom.xml
Fri Jun 25 10:09:15 2010
@@ -10,4 +10,21 @@
<version>2.0.0-SNAPSHOT</version>
<name>Apache Velocity Engine - Examples</name>
<description>Very simple examples to use Velocity</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Copied:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java
(from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/DBContextTest.java)
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java&p1=velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/DBContextTest.java&r1=957229&r2=957871&rev=957871&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/engine/trunk/examples/context_example/DBContextTest.java
(original)
+++
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/DBContextTest.java
Fri Jun 25 10:09:15 2010
@@ -14,7 +14,7 @@
* "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.BufferedWriter;
@@ -66,7 +66,7 @@ public class DBContextTest
}
catch( Exception e )
{
- RuntimeSingleton.error(e);
+ RuntimeSingleton.getLog().error("Something funny happened", e);
}
}
Copied:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java
(from r957229,
velocity/sandbox/maven-reorg/engine/trunk/examples/event_example/EventExample.java)
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java&p1=velocity/sandbox/maven-reorg/engine/trunk/examples/event_example/EventExample.java&r1=957229&r2=957871&rev=957871&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/engine/trunk/examples/event_example/EventExample.java
(original)
+++
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/EventExample.java
Fri Jun 25 10:09:15 2010
@@ -14,26 +14,20 @@
* "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.exception.MethodInvocationException;
-
-import org.apache.velocity.runtime.log.LogChute;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
import org.apache.velocity.app.event.MethodExceptionEventHandler;
-import org.apache.velocity.app.event.NullSetEventHandler;
-
-import org.apache.velocity.context.Context;
+import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.runtime.log.LogChute;
/**
* This class is a simple demonstration of how the event handling
@@ -46,8 +40,7 @@ import org.apache.velocity.context.Conte
*/
public class EventExample implements ReferenceInsertionEventHandler,
- NullSetEventHandler,
MethodExceptionEventHandler,
- LogChute
+ MethodExceptionEventHandler, LogChute
{
private boolean logOutput = false;
