Author: vsiveton
Date: Tue Jul 17 05:21:49 2007
New Revision: 556900
URL: http://svn.apache.org/viewvc?view=rev&rev=556900
Log:
DOXIA-128: Bump to new release of plexus-velocity
o bump to velocity 1.5
o added component configuration for plexus-velocity like described in PLX-345
Added:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
(with props)
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?view=diff&rev=556900&r1=556899&r2=556900
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Tue Jul 17
05:21:49 2007
@@ -57,6 +57,21 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.1.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -82,7 +97,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-fml</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xdoc</artifactId>
@@ -90,6 +105,6 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xhtml</artifactId>
- </dependency>
+ </dependency>
</dependencies>
</project>
Added:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml?view=auto&rev=556900
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
(added)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
Tue Jul 17 05:21:49 2007
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<component-set>
+ <components>
+ <component>
+ <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+
<implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
+ <configuration>
+ <properties>
+ <property>
+ <name>resource.loader</name>
+ <value>classpath,site</value>
+ </property>
+ <property>
+ <name>classpath.resource.loader.class</name>
+
<value>org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader</value>
+ </property>
+ <property>
+ <name>site.resource.loader.class</name>
+ <value>org.codehaus.plexus.velocity.SiteResourceLoader</value>
+ </property>
+ <property>
+ <name>runtime.log.invalid.references</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>velocimacro.messages.on</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>resource.manager.logwhenfound</name>
+ <value>false</value>
+ </property>
+
+ <property>
+ <name>velocimacro.permissions.allow.inline.to.replace.global</name>
+ <value>true</value>
+ </property>
+ </properties>
+ </configuration>
+ </component>
+
+ <!-- The Renderer component -->
+ <component>
+ <role>org.apache.maven.doxia.siterenderer.Renderer</role>
+ <role-hint>default</role-hint>
+
<implementation>org.apache.maven.doxia.siterenderer.DefaultSiteRenderer</implementation>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+ <field-name>velocity</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.doxia.site.module.manager.SiteModuleManager</role>
+ <field-name>siteModuleManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ <field-name>i18n</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
+</component-set>
Propchange:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
