svn commit: r492491 - in /velocity/site/tools/velocity-site-news/extension/src/main: java/org/apache/velocity/news/ java/org/apache/velocity/news/macro/ java/org/apache/velocity/news/utils/ java/org/apache/velocity/site/ java/org/apache/velocity/site/n...

[he...@apache.org]

Author: henning
Date: Thu Jan  4 02:03:50 2007
New Revision: 492491

URL: http://svn.apache.org/viewvc?view=rev&rev=492491
Log:
Change packages to org.apache.velocity.site

Added:
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/DefaultNewsContainer.java
      - copied, changed from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/DefaultNewsContainer.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsBlockGenerator.java
      - copied, changed from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsBlockGenerator.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsContainer.java
      - copied, changed from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsContainer.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsReport.java
      - copied, changed from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsReport.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsException.java
      - copied, changed from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/VelocityNewsException.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsUtils.java
      - copied, changed from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/utils/VelocityNewsUtils.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/
      - copied from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/macro/
Removed:
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/DefaultNewsContainer.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsBlockGenerator.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsContainer.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsReport.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/VelocityNewsException.java
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/macro/
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/utils/
Modified:
    velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java
    velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo

Copied: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/DefaultNewsContainer.java (from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/DefaultNewsContainer.java)
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/DefaultNewsContainer.java?view=diff&rev=492491&p1=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/DefaultNewsContainer.java&r1=492487&p2=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/DefaultNewsContainer.java&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/DefaultNewsContainer.java (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/DefaultNewsContainer.java Thu Jan  4 02:03:50 2007
@@ -1,4 +1,4 @@
-package org.apache.velocity.news;
+package org.apache.velocity.site.news;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -6,15 +6,15 @@
 import java.io.InputStreamReader;
 
 import org.apache.maven.doxia.parser.Parser;
-import org.apache.velocity.maven.plugin.news.model.NewsModel;
-import org.apache.velocity.maven.plugin.news.model.io.xpp3.NewsXpp3Reader;
+import org.apache.velocity.site.news.model.NewsModel;
+import org.apache.velocity.site.news.model.io.xpp3.NewsXpp3Reader;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
  * This is the container that keeps the news model for us.
- * @plexus.component role="org.apache.velocity.news.NewsContainer"
+ * @plexus.component role="org.apache.velocity.site.news.NewsContainer"
  */
 public class DefaultNewsContainer
         implements NewsContainer,LogEnabled {

Copied: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsBlockGenerator.java (from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsBlockGenerator.java)
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsBlockGenerator.java?view=diff&rev=492491&p1=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsBlockGenerator.java&r1=492487&p2=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsBlockGenerator.java&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsBlockGenerator.java (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsBlockGenerator.java Thu Jan  4 02:03:50 2007
@@ -1,4 +1,4 @@
-package org.apache.velocity.news;
+package org.apache.velocity.site.news;
 
 import java.io.StringReader;
 import java.text.DateFormat;
@@ -8,8 +8,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.velocity.maven.plugin.news.model.Item;
-import org.apache.velocity.news.utils.VelocityNewsUtils;
+import org.apache.velocity.site.news.model.Item;
 
 /**
  * Render the news teasers for the Macro.

Copied: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsContainer.java (from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsContainer.java)
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsContainer.java?view=diff&rev=492491&p1=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsContainer.java&r1=492487&p2=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsContainer.java&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsContainer.java (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsContainer.java Thu Jan  4 02:03:50 2007
@@ -1,9 +1,9 @@
-package org.apache.velocity.news;
+package org.apache.velocity.site.news;
 
 import java.io.File;
 
 import org.apache.maven.doxia.parser.Parser;
-import org.apache.velocity.maven.plugin.news.model.NewsModel;
+import org.apache.velocity.site.news.model.NewsModel;
 
 /**
  * Plexus role description.

Copied: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsReport.java (from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsReport.java)
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsReport.java?view=diff&rev=492491&p1=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsReport.java&r1=492487&p2=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsReport.java&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/NewsReport.java (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsReport.java Thu Jan  4 02:03:50 2007
@@ -1,4 +1,4 @@
-package org.apache.velocity.news;
+package org.apache.velocity.site.news;
 
 import java.util.Locale;
 import java.util.ResourceBundle;

Copied: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsException.java (from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/VelocityNewsException.java)
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsException.java?view=diff&rev=492491&p1=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/VelocityNewsException.java&r1=492487&p2=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsException.java&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/VelocityNewsException.java (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsException.java Thu Jan  4 02:03:50 2007
@@ -1,4 +1,4 @@
-package org.apache.velocity.news;
+package org.apache.velocity.site.news;
 
 /**
  * Generic Exception for the news extension.

Copied: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsUtils.java (from r492487, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/utils/VelocityNewsUtils.java)
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsUtils.java?view=diff&rev=492491&p1=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/utils/VelocityNewsUtils.java&r1=492487&p2=velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsUtils.java&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/news/utils/VelocityNewsUtils.java (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsUtils.java Thu Jan  4 02:03:50 2007
@@ -1,4 +1,4 @@
-package org.apache.velocity.news.utils;
+package org.apache.velocity.site.news;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -9,8 +9,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.apache.velocity.maven.plugin.news.model.Item;
-import org.apache.velocity.news.VelocityNewsException;
+import org.apache.velocity.site.news.model.Item;
 
 /**
  * Some Utility Code.

Modified: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java?view=diff&rev=492491&r1=492487&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java Thu Jan  4 02:03:50 2007
@@ -1,4 +1,4 @@
-package org.apache.velocity.news.macro;
+package org.apache.velocity.site.news.macro;
 
 import java.util.Iterator;
 import java.util.List;
@@ -10,13 +10,13 @@
 import org.apache.maven.doxia.macro.MacroRequest;
 import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.velocity.maven.plugin.news.model.Item;
-import org.apache.velocity.maven.plugin.news.model.NewsModel;
-import org.apache.velocity.news.NewsBlockGenerator;
-import org.apache.velocity.news.NewsContainer;
-import org.apache.velocity.news.NewsReport;
-import org.apache.velocity.news.VelocityNewsException;
-import org.apache.velocity.news.utils.VelocityNewsUtils;
+import org.apache.velocity.site.news.NewsBlockGenerator;
+import org.apache.velocity.site.news.NewsContainer;
+import org.apache.velocity.site.news.NewsReport;
+import org.apache.velocity.site.news.VelocityNewsException;
+import org.apache.velocity.site.news.VelocityNewsUtils;
+import org.apache.velocity.site.news.model.Item;
+import org.apache.velocity.site.news.model.NewsModel;
 
 
 /**
@@ -30,7 +30,7 @@
     /**
      * The news container.
      *
-     * @plexus.requirement role="org.apache.velocity.news.NewsContainer"
+     * @plexus.requirement role="org.apache.velocity.site.news.NewsContainer"
      */
     private NewsContainer newsContainer;
 

Modified: velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo?view=diff&rev=492491&r1=492490&r2=492491
==============================================================================
--- velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo (original)
+++ velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo Thu Jan  4 02:03:50 2007
@@ -11,7 +11,7 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.apache.velocity.site.news.plugin.model</value>
+      <value>org.apache.velocity.site.news.model</value>
     </default>
   </defaults>
   <classes>