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/03/17 14:50:30 UTC
svn commit: r519314 - in /velocity/site/tools/velocity-site-news: ./
extension/src/main/java/org/ extension/src/main/mdo/ plugin/
plugin/src/main/java/org/apache/velocity/site/news/
plugin/src/main/java/org/apache/velocity/site/news/macro/ plugin/src/m...
Author: henning
Date: Sat Mar 17 06:50:28 2007
New Revision: 519314
URL: http://svn.apache.org/viewvc?view=rev&rev=519314
Log:
Fold extension into plugin. Required for maven 2.0.5
Added:
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/DefaultNewsContainer.java
- copied unchanged from r518083, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/DefaultNewsContainer.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/NewsBlockGenerator.java
- copied unchanged from r518083, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsBlockGenerator.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/NewsContainer.java
- copied unchanged from r518083, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsContainer.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/NewsReport.java
- copied unchanged from r518083, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/NewsReport.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/VelocityNewsException.java
- copied unchanged from r518083, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsException.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/VelocityNewsUtils.java
- copied unchanged from r518083, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/VelocityNewsUtils.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/macro/
- copied from r518083, velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/
velocity/site/tools/velocity-site-news/plugin/src/main/mdo/
- copied from r518083, velocity/site/tools/velocity-site-news/extension/src/main/mdo/
Removed:
velocity/site/tools/velocity-site-news/extension/src/main/java/org/
velocity/site/tools/velocity-site-news/extension/src/main/mdo/
Modified:
velocity/site/tools/velocity-site-news/plugin/pom.xml
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/AbstractVelocityNewsPlugin.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsPlugin.java
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java
velocity/site/tools/velocity-site-news/pom.xml
Modified: velocity/site/tools/velocity-site-news/plugin/pom.xml
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/plugin/pom.xml?view=diff&rev=519314&r1=519313&r2=519314
==============================================================================
--- velocity/site/tools/velocity-site-news/plugin/pom.xml (original)
+++ velocity/site/tools/velocity-site-news/plugin/pom.xml Sat Mar 17 06:50:28 2007
@@ -42,6 +42,43 @@
<inceptionYear>2006</inceptionYear>
<packaging>maven-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>descriptor</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>xpp3-writer</goal>
+ <goal>java</goal>
+ <goal>xpp3-reader</goal>
+ <goal>xsd</goal>
+ </goals>
+ <configuration>
+ <model>src/main/mdo/news.mdo</model>
+ <version>1.0.0</version>
+ </configuration>
+ </execution>
+ <execution>
+ <id>descriptor-site</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xdoc</goal>
+ <goal>xsd</goal>
+ </goals>
+ <configuration>
+ <model>src/main/mdo/news.mdo</model>
+ <version>1.0.0</version>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>commons-collections</groupId>
@@ -64,8 +101,16 @@
<artifactId>maven-reporting-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-news-extension</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
</dependency>
<dependency>
<groupId>rome</groupId>
Modified: velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/AbstractVelocityNewsPlugin.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/AbstractVelocityNewsPlugin.java?view=diff&rev=519314&r1=519313&r2=519314
==============================================================================
--- velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/AbstractVelocityNewsPlugin.java (original)
+++ velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/AbstractVelocityNewsPlugin.java Sat Mar 17 06:50:28 2007
@@ -5,6 +5,7 @@
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.velocity.site.news.NewsContainer;
+import org.apache.velocity.site.news.VelocityNewsException;
/**
* Generate news items for the site.
@@ -67,8 +68,22 @@
public String getNewsFileName() {
return newsFileName;
}
-
+
public String getBaseUrl() {
return baseUrl;
+ }
+
+ protected void updateNewsContainer() throws VelocityNewsException {
+ getNewsContainer().load(new File(getSiteDirectory(), "/" + getNewsFileName() + ".xml"));
+
+ // This is a kludge to avoid a Plexus lockup. Plexus can not resolve cyclic
+ // dependencies and we need the Apt parser inside a macro which in turn is
+ // needed inside the Apt parser.
+ getNewsContainer().setAptParser(getAptParser());
+
+ //
+ // Page name can be configured inside the plugin.
+ //
+ getNewsContainer().setNewsPageName(getNewsFileName());
}
}
Modified: velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsPlugin.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsPlugin.java?view=diff&rev=519314&r1=519313&r2=519314
==============================================================================
--- velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsPlugin.java (original)
+++ velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsPlugin.java Sat Mar 17 06:50:28 2007
@@ -24,18 +24,8 @@
NewsModel newsModel = getNewsContainer().getNewsModel();
if (newsModel == null) {
- getNewsContainer().load(new File(getSiteDirectory(), "/" + getNewsFileName() + ".xml"));
+ updateNewsContainer();
}
-
- // This is a kludge to avoid a Plexus lockup. Plexus can not resolve cyclic
- // dependencies and we need the Apt parser inside a macro which in turn is
- // needed inside the Apt parser.
- getNewsContainer().setAptParser(getAptParser());
-
- //
- // Page name can be configured inside the plugin.
- //
- getNewsContainer().setNewsPageName(getNewsFileName());
} catch (VelocityNewsException vne) {
getLog().error("While loading news information: ", vne);
Modified: velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java?view=diff&rev=519314&r1=519313&r2=519314
==============================================================================
--- velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java (original)
+++ velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java Sat Mar 17 06:50:28 2007
@@ -51,6 +51,11 @@
NewsModel newsModel = getNewsContainer().getNewsModel();
+ if (newsModel == null) {
+ updateNewsContainer();
+ newsModel = newsContainer.getNewsModel();
+ }
+
if (newsModel != null) {
generateNewsPage(newsModel, locale);
generateNewsRssFeed(newsModel);
Modified: velocity/site/tools/velocity-site-news/pom.xml
URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/pom.xml?view=diff&rev=519314&r1=519313&r2=519314
==============================================================================
--- velocity/site/tools/velocity-site-news/pom.xml (original)
+++ velocity/site/tools/velocity-site-news/pom.xml Sat Mar 17 06:50:28 2007
@@ -41,7 +41,6 @@
<packaging>pom</packaging>
<modules>
- <module>extension</module>
<module>plugin</module>
</modules>
@@ -64,12 +63,6 @@
<dependencyManagement>
<dependencies>
-
- <dependency>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-news-extension</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>commons-collections</groupId>