You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ma...@apache.org on 2004/02/20 13:54:12 UTC
cvs commit: jakarta-velocity-tools/examples/layout/WEB-INF toolbox.xml velocity.properties web.xml
marino 2004/02/20 04:54:12
Modified: examples/layout/WEB-INF toolbox.xml velocity.properties
web.xml
Log:
use Apache Software License 2.0
Revision Changes Path
1.2 +16 -1 jakarta-velocity-tools/examples/layout/WEB-INF/toolbox.xml
Index: toolbox.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/WEB-INF/toolbox.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- toolbox.xml 27 May 2003 23:15:39 -0000 1.1
+++ toolbox.xml 20 Feb 2004 12:54:11 -0000 1.2
@@ -1,6 +1,21 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2003 The Apache Software Foundation.
-<!-- $Id$ -->
+ Licensed 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.
+
+ $Id$
+-->
<toolbox>
<data type="string">
1.2 +21 -4 jakarta-velocity-tools/examples/layout/WEB-INF/velocity.properties
Index: velocity.properties
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/WEB-INF/velocity.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- velocity.properties 27 May 2003 23:15:39 -0000 1.1
+++ velocity.properties 20 Feb 2004 12:54:11 -0000 1.2
@@ -1,4 +1,21 @@
-# $Id$
+#*
+ * Copyright 2003 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ * $Id$
+ *#
+
#
# These are the default properties. So, this file is essentially
# unnecessary here, but is included just to demonstrate that these
@@ -11,7 +28,7 @@
# Directory for layout templates, relative to web application root directory
tools.view.servlet.layout.directory = layout/
-# Filepath of the default layout template
-# relative to the layout directory
+# Filepath of the default layout template
+# relative to the layout directory
# NOT relative to the root directory of the webapp!
-tools.view.servlet.layout.default.template = Default.vm
\ No newline at end of file
+tools.view.servlet.layout.default.template = Default.vm
1.2 +21 -15 jakarta-velocity-tools/examples/layout/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/layout/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 27 May 2003 23:15:39 -0000 1.1
+++ web.xml 20 Feb 2004 12:54:11 -0000 1.2
@@ -1,13 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+<!--
+ Copyright 2003 The Apache Software Foundation.
+
+ Licensed 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.
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-
-<!-- $Id$ -->
+ $Id$
+-->
<web-app>
-
- <!-- Define Velocity template rendererr -->
<servlet>
<servlet-name>velocity</servlet-name>
<servlet-class>org.apache.velocity.tools.view.servlet.VelocityLayoutServlet</servlet-class>
@@ -21,15 +31,11 @@
</init-param>
<load-on-startup>10</load-on-startup>
</servlet>
-
- <!-- Map *.vm files to Velocity -->
<servlet-mapping>
<servlet-name>velocity</servlet-name>
<url-pattern>*.vm</url-pattern>
</servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>index.vm</welcome-file>
- </welcome-file-list>
-
+ <welcome-file-list>
+ <welcome-file>index.vm</welcome-file>
+ </welcome-file-list>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org