seade 2005/05/31 19:35:31
Modified: src/macros TurbineMacros.vm
xdocs changes.xml
Log:
The velocity page formatting macros have been updated to generate xhtml
compatible html.
Updated license to ASF 2.0.
Revision Changes Path
1.4 +20 -57 jakarta-turbine-2/src/macros/TurbineMacros.vm
Index: TurbineMacros.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/macros/TurbineMacros.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineMacros.vm 2 Sep 2003 04:39:30 -0000 1.3
+++ TurbineMacros.vm 1 Jun 2005 02:35:31 -0000 1.4
@@ -1,56 +1,19 @@
-## ====================================================================
-## The Apache Software License, Version 1.1
-##
-## Copyright (c) 2001-2003 The Apache Software Foundation. All rights
-## reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions
-## are met:
-##
-## 1. Redistributions of source code must retain the above copyright
-## notice, this list of conditions and the following disclaimer.
-##
-## 2. Redistributions in binary form must reproduce the above copyright
-## notice, this list of conditions and the following disclaimer in
-## the documentation and/or other materials provided with the
-## distribution.
-##
-## 3. The end-user documentation included with the redistribution,
-## if any, must include the following acknowledgment:
-## "This product includes software developed by the
-## Apache Software Foundation (http://www.apache.org/)."
-## Alternately, this acknowledgment may appear in the software itself,
-## if and wherever such third-party acknowledgments normally appear.
-##
-## 4. The names "Apache" and "Apache Software Foundation" and
-## "Apache Turbine" must not be used to endorse or promote products
-## derived from this software without prior written permission. For
-## written permission, please contact [EMAIL PROTECTED]
-##
-## 5. Products derived from this software may not be called "Apache",
-## "Apache Turbine", nor may "Apache" appear in their name, without
-## prior written permission of the Apache Software Foundation.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-## DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-## ====================================================================
-##
-## This software consists of voluntary contributions made by many
-## individuals on behalf of the Apache Software Foundation. For more
-## information on the Apache Software Foundation, please see
-## <http://www.apache.org/>.
-##
+/*
+ * Copyright 2001-2005 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.
+ */
+
## @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
## @version $Id$
@@ -65,12 +28,12 @@
#end
#if ($page.MetaTags.size() > 0)
#foreach($metaTag in $page.MetaTags.keySet())
- <meta name="$metaTag" content="$page.MetaTags.get($metaTag)">
+ <meta name="$metaTag" content="$page.MetaTags.get($metaTag)" />
#end
#end
#if ($page.HttpEquivs.size() > 0)
#foreach($httpEquiv in $page.HttpEquivs.keySet())
- <meta http-equiv="$httpEquiv"
content="$page.HttpEquivs.get($httpEquiv)">
+ <meta http-equiv="$httpEquiv"
content="$page.HttpEquivs.get($httpEquiv)" />
#end
#end
#if ($page.StyleSheets.size() > 0)
@@ -79,7 +42,7 @@
#if($!styleSheet.Type) type="$styleSheet.Type" #end
#if($!styleSheet.Media) media="$styleSheet.Media" #end
#if($!styleSheet.Title) title="$styleSheet.Title" #end
- >
+ />
#end
#end
#if ($page.Styles.size() > 0)
1.98 +14 -10 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- changes.xml 19 May 2005 08:54:55 -0000 1.97
+++ changes.xml 1 Jun 2005 02:35:31 -0000 1.98
@@ -26,43 +26,47 @@
<release version="2.4-M2" date="in cvs">
<action dev="sgoeschl" type="update">
The AvalonComponentService does not use the deprecated Component
interface and ComponentException.
- </action>
+ </action>
<action dev="sgoeschl" type="update">
Restructured the dependency section to distinguish between ECM and
YAAFI dependencies.
- </action>
+ </action>
<action dev="sgoeschl" type="update">
Use the Fulcrum components from Fulcrum 3.0.0
- </action>
+ </action>
<action dev="sgoeschl" type="add">
Added YAAFI Avalon service container and the corresponding
TurbineYaafiComponentService.
- </action>
+ </action>
<action dev="sgoeschl" type="fix">
Removed remaining Merlin artifacts
- </action>
+ </action>
<action dev="epugh" type="fix" due-to="Leandro Rodrigo Saad Cruz">
Handle non US-ASCII encoding with multipart/form-data mimetype
better.
- </action>
+ </action>
<action dev="epugh" type="remove">
Remove Merlin service. When the replacement for Merlin (Metro) is
released, then
add back in support.
- </action>
+ </action>
<action dev="epugh" type="update">
Use RELEASED versions of Fulcrum components!
</action>
<action dev="epugh" type="remove">
Remove old security services based on couple Torque.
- </action>
+ </action>
<action dev="epugh" type="remove">
Remove dependencies on Stratum and Torque. Torque is now completely
optional for Turbine.
Stratum has been replaced by the AvalonComponentService.
- </action>
+ </action>
+ <action dev="seade" type="update">
+ The velocity page formatting macros have been updated to generate
xhtml
+ compatible html.
+ </action>
</release>
<release version="2.4-M1" date="2004-08-14" description="Milestone
release including Pipeline and PipelineData objects">
<action dev="epugh" type="update">
Update to Commons Configuration 1.0-RC1. TurbineConfiguration.xml
files should switch
from <dom4j
className="org.apache.commons.configuration.DOM4JConfiguration"
fileName="conf/test/TurbineResources.xml"/>
to <xml fileName="conf/test/TurbineResources.xml"/> syntax.
- </action>
+ </action>
<action dev="epugh" type="update">
Refactored how Turbine sets up it's ServerData object. Removed the
use
of RunData from the process.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
