You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by he...@apache.org on 2007/01/04 10:57:11 UTC
svn commit: r492485 - in
/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache:
doxia/velocity/plugin/ doxia/velocity/renderer/ doxia/velocity/util/
velocity/ velocity/site/ velocity/site/doxia/ velocity/site/doxia/plugin/
velocity...
Author: henning
Date: Thu Jan 4 01:57:09 2007
New Revision: 492485
URL: http://svn.apache.org/viewvc?view=rev&rev=492485
Log:
move packages to org.apache.velocity.site
Added:
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/plugin/
- copied from r492475, velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/doxia/velocity/plugin/
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/
- copied from r492475, velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/doxia/velocity/renderer/
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/
- copied from r492475, velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/doxia/velocity/util/
Removed:
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/doxia/velocity/plugin/
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/doxia/velocity/renderer/
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/doxia/velocity/util/
Modified:
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/plugin/DoxiaVelocityRendererPlugin.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/AbstractVelocityRenderer.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptRenderer.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptSiteModule.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocRenderer.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocSiteModule.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/AbstractDoxiaResourceLoader.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaLibraryLoader.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaVelocityContextFactory.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaLibraryLoader.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaResourceLoader.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaVelocityContextFactory.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/PlexusLogger.java
velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/VelocityTool.java
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/plugin/DoxiaVelocityRendererPlugin.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/plugin/DoxiaVelocityRendererPlugin.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/plugin/DoxiaVelocityRendererPlugin.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/plugin/DoxiaVelocityRendererPlugin.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.plugin;
+package org.apache.velocity.site.doxia.plugin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,12 +22,12 @@
import java.io.File;
import java.util.List;
-import org.apache.doxia.velocity.util.DoxiaLibraryLoader;
-import org.apache.doxia.velocity.util.DoxiaVelocityContextFactory;
-import org.apache.doxia.velocity.util.VelocityTool;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.project.MavenProject;
+import org.apache.velocity.site.doxia.util.DoxiaLibraryLoader;
+import org.apache.velocity.site.doxia.util.DoxiaVelocityContextFactory;
+import org.apache.velocity.site.doxia.util.VelocityTool;
/**
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/AbstractVelocityRenderer.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/AbstractVelocityRenderer.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/AbstractVelocityRenderer.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/AbstractVelocityRenderer.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.renderer;
+package org.apache.velocity.site.doxia.renderer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,10 +29,6 @@
import org.apache.commons.collections.ExtendedProperties;
import org.apache.commons.collections.iterators.ArrayIterator;
import org.apache.commons.lang.StringUtils;
-import org.apache.doxia.velocity.util.DoxiaLibraryLoader;
-import org.apache.doxia.velocity.util.DoxiaResourceLoader;
-import org.apache.doxia.velocity.util.DoxiaVelocityContextFactory;
-import org.apache.doxia.velocity.util.PlexusLogger;
import org.apache.maven.doxia.parser.AbstractParser;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.Parser;
@@ -41,6 +37,10 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.site.doxia.util.DoxiaLibraryLoader;
+import org.apache.velocity.site.doxia.util.DoxiaResourceLoader;
+import org.apache.velocity.site.doxia.util.DoxiaVelocityContextFactory;
+import org.apache.velocity.site.doxia.util.PlexusLogger;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -86,7 +86,7 @@
* we are not inside the Mojo API here, we must use the Plexus requirement annotation, not
* the Mojo component annotation. Yes, this is important (and confusing, too).
*
- * @plexus.requirement role="org.apache.doxia.velocity.util.DoxiaVelocityContextFactory"
+ * @plexus.requirement role="org.apache.velocity.site.doxia.util.DoxiaVelocityContextFactory"
*/
private DoxiaVelocityContextFactory doxiaVelocityContextFactory;
@@ -95,7 +95,7 @@
* we are not inside the Mojo API here, we must use the Plexus requirement annotation, not
* the Mojo component annotation. Yes, this is important (and confusing, too).
*
- * @plexus.requirement role="org.apache.doxia.velocity.util.DoxiaLibraryLoader"
+ * @plexus.requirement role="org.apache.velocity.site.doxia.util.DoxiaLibraryLoader"
*/
private DoxiaLibraryLoader doxiaLibraryLoader;
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptRenderer.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptRenderer.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptRenderer.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptRenderer.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.renderer;
+package org.apache.velocity.site.doxia.renderer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptSiteModule.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptSiteModule.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptSiteModule.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityAptSiteModule.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.renderer;
+package org.apache.velocity.site.doxia.renderer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocRenderer.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocRenderer.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocRenderer.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocRenderer.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.renderer;
+package org.apache.velocity.site.doxia.renderer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocSiteModule.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocSiteModule.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocSiteModule.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/renderer/VelocityXdocSiteModule.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.renderer;
+package org.apache.velocity.site.doxia.renderer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/AbstractDoxiaResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/AbstractDoxiaResourceLoader.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/AbstractDoxiaResourceLoader.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/AbstractDoxiaResourceLoader.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaLibraryLoader.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaLibraryLoader.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaLibraryLoader.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaLibraryLoader.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -38,9 +38,9 @@
* for security reasons) from the <code>${siteDirectory}/velocity/resources</code> directory.
*
* This is a plexus-managed component which gets configured by the {@link
- * org.apache.doxia.velocity.plugin.DoxiaVelocityRendererPlugin} during the post-site phase.
+ * org.apache.velocity.site.doxia.plugin.DoxiaVelocityRendererPlugin} during the post-site phase.
*
- * @plexus.component role="org.apache.doxia.velocity.util.DoxiaLibraryLoader"
+ * @plexus.component role="org.apache.velocity.site.doxia.util.DoxiaLibraryLoader"
*
* @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a>
* @version $Revision$
@@ -76,7 +76,7 @@
}
/**
- * Sets the list of known library. This is called from the {@link org.apache.doxia.velocity.plugin.DoxiaVelocityRendererPlugin}.
+ * Sets the list of known library. This is called from the {@link org.apache.velocity.site.doxia.plugin.DoxiaVelocityRendererPlugin}.
*
* @param knownLibraries An Array of Strings with the names of libraries to load. Can be null.
*/
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaVelocityContextFactory.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaVelocityContextFactory.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaVelocityContextFactory.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DefaultDoxiaVelocityContextFactory.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,11 +32,11 @@
* This factory returns configured {@link VelocityContext} objects for the renderers.
*
* This is a plexus managed singleton which gets configured by the {@link
- * org.apache.doxia.velocity.plugin.DoxiaVelocityRendererPlugin} during the pre-site phase.
+ * org.apache.velocity.site.doxia.plugin.DoxiaVelocityRendererPlugin} during the pre-site phase.
*
* The various Velocity renderer then instantiate the configured Factory through Plexus in the actual site phase.
*
- * @plexus.component role="org.apache.doxia.velocity.util.DoxiaVelocityContextFactory"
+ * @plexus.component role="org.apache.velocity.site.doxia.util.DoxiaVelocityContextFactory"
*
* @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a>
* @version $Revision$
@@ -50,7 +50,7 @@
/**
* List of user configured Velocity Tools.
*
- * @see org.apache.doxia.velocity.plugin.DoxiaVelocityRendererPlugin#tools.
+ * @see org.apache.velocity.site.doxia.plugin.DoxiaVelocityRendererPlugin#tools.
*/
private VelocityTool [] tools;
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaLibraryLoader.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaLibraryLoader.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaLibraryLoader.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaLibraryLoader.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,7 +34,7 @@
String ROLE = DoxiaLibraryLoader.class.getName();
/**
- * Sets the list of known library. This is called from the {@link org.apache.doxia.velocity.plugin.DoxiaVelocityRendererPlugin}.
+ * Sets the list of known library. This is called from the {@link org.apache.velocity.site.doxia.plugin.DoxiaVelocityRendererPlugin}.
*
* @param knownLibraries An Array of Strings with the names of libraries to load. Can be null.
*/
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaResourceLoader.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaResourceLoader.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaResourceLoader.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaVelocityContextFactory.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaVelocityContextFactory.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaVelocityContextFactory.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/DoxiaVelocityContextFactory.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/PlexusLogger.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/PlexusLogger.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/PlexusLogger.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/PlexusLogger.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/VelocityTool.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/VelocityTool.java?view=diff&rev=492485&r1=492475&r2=492485
==============================================================================
--- velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/VelocityTool.java (original)
+++ velocity/site/tools/velocity-site-doxia-renderer/src/main/java/org/apache/velocity/site/doxia/util/VelocityTool.java Thu Jan 4 01:57:09 2007
@@ -1,4 +1,4 @@
-package org.apache.doxia.velocity.util;
+package org.apache.velocity.site.doxia.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one