You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2005/01/20 03:05:28 UTC
svn commit: r125693 - in struts/tiles/trunk: . tiles-documentation tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel
Author: jmitchell
Date: Wed Jan 19 18:05:26 2005
New Revision: 125693
URL: http://svn.apache.org/viewcvs?view=rev&rev=125693
Log:
fix tiles-documentation reference to the removed digester package and clean up build
Added:
struts/tiles/trunk/maven.xml (contents, props changed)
Modified:
struts/tiles/trunk/project.xml
struts/tiles/trunk/tiles-documentation/project.xml
struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/Channels.java
struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java
Added: struts/tiles/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/struts/tiles/trunk/maven.xml?view=auto&rev=125693
==============================================================================
--- (empty file)
+++ struts/tiles/trunk/maven.xml Wed Jan 19 18:05:26 2005
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<project default="apps:build-all"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+ <goal name="war">
+
+ <ant:echo>==============================================</ant:echo>
+ <ant:echo> </ant:echo>
+ <ant:echo> Building: ${pom.artifactId} </ant:echo>
+ <ant:echo> </ant:echo>
+ <ant:echo> </ant:echo>
+ <ant:echo>==============================================</ant:echo>
+
+ <maven:reactor basedir="${basedir}"
+ includes="*/project.xml"
+ goals="war"
+ banner="Building default mailreader app"
+ ignoreFailures="false"/>
+
+ </goal>
+
+</project>
\ No newline at end of file
Modified: struts/tiles/trunk/project.xml
Url: http://svn.apache.org/viewcvs/struts/tiles/trunk/project.xml?view=diff&rev=125693&p1=struts/tiles/trunk/project.xml&r1=125692&p2=struts/tiles/trunk/project.xml&r2=125693
==============================================================================
--- struts/tiles/trunk/project.xml (original)
+++ struts/tiles/trunk/project.xml Wed Jan 19 18:05:26 2005
@@ -2,8 +2,9 @@
<project>
<pomVersion>3</pomVersion>
<id>struts-tiles</id>
- <groupId>struts</groupId>
+
<name>Struts Tiles</name>
+ <groupId>struts</groupId>
<currentVersion>1.3.0-dev</currentVersion>
<organization>
Modified: struts/tiles/trunk/tiles-documentation/project.xml
Url: http://svn.apache.org/viewcvs/struts/tiles/trunk/tiles-documentation/project.xml?view=diff&rev=125693&p1=struts/tiles/trunk/tiles-documentation/project.xml&r1=125692&p2=struts/tiles/trunk/tiles-documentation/project.xml&r2=125693
==============================================================================
--- struts/tiles/trunk/tiles-documentation/project.xml (original)
+++ struts/tiles/trunk/tiles-documentation/project.xml Wed Jan 19 18:05:26 2005
@@ -14,23 +14,9 @@
<dependency>
<groupId>struts</groupId>
<artifactId>struts-tiles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.3.0-dev</version>
</dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- </dependency>
-
- <dependency>
- <id>commons-beanutils</id>
- <version>1.7.0</version>
- </dependency>
-
- <dependency>
- <id>commons-digester</id>
- <version>1.5</version>
- </dependency>
</dependencies>
Modified: struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/Channels.java
Url: http://svn.apache.org/viewcvs/struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/Channels.java?view=diff&rev=125693&p1=struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/Channels.java&r1=125692&p2=struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/Channels.java&r2=125693
==============================================================================
--- struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/Channels.java (original)
+++ struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/Channels.java Wed Jan 19 18:05:26 2005
@@ -25,8 +25,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.digester.rss.Channel;
-import org.apache.commons.digester.rss.RSSDigester;
+//import org.apache.commons.digester.rss.Channel;
+//import org.apache.commons.digester.rss.RSSDigester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
@@ -101,30 +101,30 @@
// -- Loop through channels --
ArrayList channelBeans = new ArrayList(channels.size());
- try {
- for (int i = 0; i < channels.size(); i++) {
- RSSDigester digester = new RSSDigester();
- String url = (String) channels.get(i);
- // Add application path if needed
- if (url.startsWith("/")) {
- url = toFullUrl(request, url);
- }
-
- log.debug("Channel url=" + url);
-
- Channel obj = (Channel) digester.parse(url);
-
- log.debug("Channel:" + obj);
-
- channelBeans.add(obj);
- }
- } catch (Throwable t) {
- errors.add(
- ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("rss.access.error"));
-
- servlet.log(t.toString());
- }
+// try {
+// for (int i = 0; i < channels.size(); i++) {
+// RSSDigester digester = new RSSDigester();
+// String url = (String) channels.get(i);
+// // Add application path if needed
+// if (url.startsWith("/")) {
+// url = toFullUrl(request, url);
+// }
+//
+// log.debug("Channel url=" + url);
+//
+// Channel obj = (Channel) digester.parse(url);
+//
+// log.debug("Channel:" + obj);
+//
+// channelBeans.add(obj);
+// }
+// } catch (Throwable t) {
+// errors.add(
+// ActionMessages.GLOBAL_MESSAGE,
+// new ActionMessage("rss.access.error"));
+//
+// servlet.log(t.toString());
+// }
// -- Handle Errors ---
if (!errors.isEmpty()) {
Modified: struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java
Url: http://svn.apache.org/viewcvs/struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java?view=diff&rev=125693&p1=struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java&r1=125692&p2=struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java&r2=125693
==============================================================================
--- struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java (original)
+++ struts/tiles/trunk/tiles-documentation/src/java/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java Wed Jan 19 18:05:26 2005
@@ -24,8 +24,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.digester.rss.Channel;
-import org.apache.commons.digester.rss.RSSDigester;
+//import org.apache.commons.digester.rss.Channel;
+//import org.apache.commons.digester.rss.RSSDigester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
@@ -112,31 +112,31 @@
// -- Loop through channels --
List channelBeans = new ArrayList(channels.size());
- try {
- for (int i = 0; i < channels.size(); i++) {
- RSSDigester digester = new RSSDigester();
- String url = (String) channels.get(i);
- // Add application path if needed
- if (url.startsWith("/")) {
- url = toFullUrl(request, url);
- }
-
- log.debug("Channel url=" + url);
-
- Channel obj = (Channel) digester.parse(url);
-
- log.debug("Channel:" + obj);
-
- channelBeans.add(obj);
- }
-
- } catch (Throwable t) {
- errors.add(
- ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("rss.access.error"));
-
- servlet.log(t.toString());
- }
+// try {
+// for (int i = 0; i < channels.size(); i++) {
+// RSSDigester digester = new RSSDigester();
+// String url = (String) channels.get(i);
+// // Add application path if needed
+// if (url.startsWith("/")) {
+// url = toFullUrl(request, url);
+// }
+//
+// log.debug("Channel url=" + url);
+//
+// Channel obj = (Channel) digester.parse(url);
+//
+// log.debug("Channel:" + obj);
+//
+// channelBeans.add(obj);
+// }
+//
+// } catch (Throwable t) {
+// errors.add(
+// ActionMessages.GLOBAL_MESSAGE,
+// new ActionMessage("rss.access.error"));
+//
+// servlet.log(t.toString());
+// }
// -- Handle Errors ---
if (!errors.isEmpty()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org