velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r962887 - in /velocity/sandbox/maven-reorg/tools/trunk: velocity-tools-view-engine2/ velocity-tools-view-engine2/src/main/java/org/ velocity-tools-view-engine2/src/main/java/org/apache/ velocity-tools-view-engine2/src/main/java/org/apache/v...
Date Sat, 10 Jul 2010 17:12:40 GMT
Author: apetrelli
Date: Sat Jul 10 17:12:39 2010
New Revision: 962887

URL: http://svn.apache.org/viewvc?rev=962887&view=rev
Log:
VELOCITYSB-5
Moved code to velocity-tools-view-engine2.
Fixed dependencies.

Added:
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/view/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/view/engine2/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/view/engine2/WebappUberspector.java
      - copied, changed from r962811, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/velocity.properties
  (with props)
Removed:
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x
Modified:
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/pom.xml

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/pom.xml?rev=962887&r1=962886&r2=962887&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/pom.xml Sat Jul 10
17:12:39 2010
@@ -10,4 +10,29 @@
   <version>2.1.0-SNAPSHOT</version>
   <name>Apache Velocity Tools - View tools - Velocity Engine 2.x support</name>
   <description>Velocity View Tools: support for Velocity Engine 2.x.</description>
+  <dependencies>
+  	<dependency>
+  		<groupId>org.apache.velocity</groupId>
+  		<artifactId>velocity-engine-core</artifactId>
+  		<version>2.0.0-SNAPSHOT</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>javax.servlet</groupId>
+  		<artifactId>servlet-api</artifactId>
+  		<version>2.3</version>
+  		<scope>provided</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.velocity</groupId>
+  		<artifactId>velocity-tools-view</artifactId>
+  		<version>2.1.0-SNAPSHOT</version>
+  		<scope>runtime</scope>
+        <exclusions>
+            <exclusion>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+            </exclusion>
+        </exclusions>
+  	</dependency>
+  </dependencies>
 </project>
\ No newline at end of file

Copied: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/view/engine2/WebappUberspector.java
(from r962811, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/view/engine2/WebappUberspector.java?p2=velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/view/engine2/WebappUberspector.java&p1=velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x&r1=962811&r2=962887&rev=962887&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x
(original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/java/org/apache/velocity/tools/view/engine2/WebappUberspector.java
Sat Jul 10 17:12:39 2010
@@ -1,4 +1,4 @@
-package org.apache.velocity.tools.view;
+package org.apache.velocity.tools.view.engine2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Added: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/velocity.properties
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/velocity.properties?rev=962887&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/velocity.properties
(added)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/velocity.properties
Sat Jul 10 17:12:39 2010
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "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.
+
+# default to servletlogger, which logs to the servlet engines log
+runtime.log.logsystem.class = org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.tools.view.ServletLogChute
+
+# by default, load resources with webapp resource loader and string resource loader (in that
order)
+resource.loader = webapp,string
+webapp.resource.loader.class = org.apache.velocity.tools.view.WebappResourceLoader
+string.resource.loader.class = org.apache.velocity.runtime.resource.loader.StringResourceLoader
+
+# allows getting and setting $request, $session and $application attributes using Velocity
syntax,
+# like in #set($session.foo = 'bar'), instead of $session.setAttribute('foo','bar')
+runtime.introspector.uberspect = org.apache.velocity.util.introspection.UberspectImpl,org.apache.velocity.tools.view.engine2.WebappUberspector

Propchange: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/velocity.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view-engine2/src/main/resources/org/apache/velocity/tools/view/engine2/velocity.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Mime
View raw message