[DOXIASITETOOLS-161] Remove custom components.xml because it dupliates the default config in Plexus Velocity 1.2
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1733840 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index cc94f62..1141997 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -110,7 +110,6 @@
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.codehaus.plexus.velocity.SiteResourceLoader;
import org.codehaus.plexus.velocity.VelocityComponent;
/**
@@ -130,8 +129,7 @@
// Requirements
// ----------------------------------------------------------------------
- @Requirement( hint = "doxia-site-renderer" ) // DOXIA-147: dedicated component configuration hand-written
- // in component.xml
+ @Requirement
private VelocityComponent velocity;
@Requirement
@@ -368,8 +366,6 @@
getLogger().debug( "Processing Velocity for " + renderingContext.getInputName() );
try
{
- SiteResourceLoader.setResource( resource );
-
Context vc = createDocumentVelocityContext( renderingContext, siteContext );
StringWriter sw = new StringWriter();
diff --git a/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml b/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 522459f..0000000
--- a/doxia-site-renderer/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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>
- <role-hint>doxia-site-renderer</role-hint>
- <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
- <configuration>
- <properties>
- <property>
- <name>resource.loader</name>
- <value>skin,site</value>
- </property>
- <property>
- <name>skin.resource.loader.class</name>
- <value>org.apache.maven.doxia.siterenderer.SkinResourceLoader</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>
-
- <!-- DOXIA-147: doxia-site-renderer specific configuration (not in default from plexus-velocity) -->
- <property>
- <name>velocimacro.permissions.allow.inline.to.replace.global</name>
- <value>true</value>
- </property>
- </properties>
- </configuration>
- </component>
- </components>
-</component-set>
