[seam-commits] Seam SVN: r9075 - in trunk: build and 2 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sun Sep 21 19:44:52 EDT 2008
Author: danielc.roth
Date: 2008-09-21 19:44:52 -0400 (Sun, 21 Sep 2008)
New Revision: 9075
Added:
trunk/build/rss.pom.xml
Removed:
trunk/src/rss/build.xml
Modified:
trunk/build.xml
trunk/build/build.xml
trunk/build/classpath.tmpl
trunk/build/common.build.xml
trunk/build/root.pom.xml
trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java
Log:
JBSEAM-3423 RSS feed as module. yarfraw and httpclient-3.1 added in mvn repo.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -46,6 +46,7 @@
<deployWithSources pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar"/>
<deployWithSources pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/>
<deployWithSources pom="${excel.pom}" jar="${lib.dir}/jboss-seam-excel.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-excel-sources.jar"/>
+ <deployWithSources pom="${rss.pom}" jar="${lib.dir}/jboss-seam-rss.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-rss-sources.jar"/>
<deployWithSources pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/>
<deployWithSources pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/>
<deployWithSources pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/>
@@ -124,6 +125,7 @@
<offline pom="remoting.pom" repository="${offline.repository.jboss.org}" />
<offline pom="pdf.pom" repository="${offline.repository.jboss.org}" />
<offline pom="excel.pom" repository="${offline.repository.jboss.org}" />
+ <offline pom="rss.pom" repository="${offline.repository.jboss.org}" />
<offline pom="mail.pom" repository="${offline.repository.jboss.org}" />
<offline pom="ioc.pom" repository="${offline.repository.jboss.org}" />
<offline pom="gen.pom" repository="${offline.repository.jboss.org}" />
Modified: trunk/build/classpath.tmpl
===================================================================
--- trunk/build/classpath.tmpl 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/classpath.tmpl 2008-09-21 23:44:52 UTC (rev 9075)
@@ -9,7 +9,8 @@
<classpathentry kind="src" path="src/mail"/>
<classpathentry kind="src" path="src/pdf"/>
<classpathentry kind="src" path="src/excel"/>
- <classpathentry kind="src" path="src/debug"/>
+ <classpathentry kind="src" path="src/excel"/>
+ <classpathentry kind="src" path="src/rss"/>
<classpathentry kind="src" path="src/gen"/>
<classpathentry kind="src" path="src/interop/jul"/>
<classpathentry kind="src" path="src/test/unit"/>
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/common.build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -107,6 +107,7 @@
<pomfile name="mail.pom" value="${build.dir}/mail.pom.xml" />
<pomfile name="pdf.pom" value="${build.dir}/pdf.pom.xml" />
<pomfile name="excel.pom" value="${build.dir}/excel.pom.xml" />
+ <pomfile name="rss.pom" value="${build.dir}/rss.pom.xml" />
<pomfile name="remoting.pom" value="${build.dir}/remoting.pom.xml" />
<pomfile name="ui.pom" value="${build.dir}/ui.pom.xml" />
<pomfile name="docs.pom" value="${build.dir}/docs.pom.xml" />
@@ -132,6 +133,7 @@
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="compile" />
+ <copyDependencies id="rss" pom="${rss.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" />
@@ -150,6 +152,8 @@
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-resteasy" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-excel" version="${complete.version}" />
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-rss" version="${complete.version}" />
</copyInlineDependencies>
<property name="copyseamdone" value="true" />
</target>
@@ -187,6 +191,7 @@
<deploy pom="${resteasy.pom}" jar="${seam.dir}/lib/jboss-seam-resteasy.jar" repositoryId="@{repositoryId}" />
<deploy pom="${pdf.pom}" jar="${seam.dir}/lib/jboss-seam-pdf.jar" repositoryId="@{repositoryId}" />
<deploy pom="${excel.pom}" jar="${seam.dir}/lib/jboss-seam-excel.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${rss.pom}" jar="${seam.dir}/lib/jboss-seam-rss.jar" repositoryId="@{repositoryId}" />
<deploy pom="${mail.pom}" jar="${seam.dir}/lib/jboss-seam-mail.jar" repositoryId="@{repositoryId}" />
<deploy pom="${ioc.pom}" jar="${seam.dir}/lib/jboss-seam-ioc.jar" repositoryId="@{repositoryId}" />
<deploy pom="${gen.pom}" jar="${seam.dir}/lib/jboss-seam-gen.jar" repositoryId="@{repositoryId}" />
@@ -212,7 +217,6 @@
<propertyref name="remoting.pom" />
<propertyref name="resteasy.pom" />
<propertyref name="gen.pom" />
- <propertyref name="pdf.pom" />
<propertyref name="excel.pom" />
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/root.pom.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -549,6 +549,30 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.yarfraw</groupId>
+ <artifactId>yarfraw</artifactId>
+ <version>0.92</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>javassist</groupId>
Added: trunk/build/rss.pom.xml
===================================================================
--- trunk/build/rss.pom.xml (rev 0)
+++ trunk/build/rss.pom.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-rss</artifactId>
+
+
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
+
+ <!-- See parent pom for notes on how to declare dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.yarfraw</groupId>
+ <artifactId>yarfraw</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -18,6 +18,7 @@
<property name="classes.excel.dir" value="${classes.dir}/excelclasses" />
<property name="classes.ioc.dir" value="${classes.dir}/iocclasses" />
<property name="classes.mail.dir" value="${classes.dir}/mailclasses" />
+ <property name="classes.rss.dir" value="${classes.dir}/rssclasses" />
<property name="classes.debug.dir" value="${classes.dir}/debugclasses" />
<property name="classes.wicket.dir" value="${classes.dir}/wicketclasses" />
<property name="classes.jul.dir" value="${classes.dir}/julclasses" />
@@ -39,6 +40,7 @@
<property name="src.ioc.dir" value="src/ioc" />
<property name="src.mail.dir" value="src/mail" />
<property name="src.debug.dir" value="src/debug" />
+ <property name="src.rss.dir" value="src/rss" />
<property name="src.wicket.dir" value="src/wicket" />
<property name="src.jul.dir" value="src/interop/jul" />
<property name="src.resteasy.dir" value="src/resteasy" />
@@ -73,6 +75,7 @@
<property name="dist.src.pdf.dir" value="${dist.dir}/src/pdf" />
<property name="dist.src.ioc.dir" value="${dist.dir}/src/ioc" />
<property name="dist.src.mail.dir" value="${dist.dir}/src/mail" />
+ <property name="dist.src.rss.dir" value="${dist.dir}/src/rss" />
<property name="dist.src.debug.dir" value="${dist.dir}/src/debug" />
<property name="dist.src.wicket.dir" value="${dist.dir}/src/wicket" />
<property name="dist.src.jul.dir" value="${dist.dir}/src/interop/jul" />
@@ -163,7 +166,7 @@
<delete dir="${lib.dir}" quiet="${quietclean}" />
</target>
- <target name="build" depends="jarcore,jarexcel,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
+ <target name="build" depends="jarcore,jarexcel,jarrss,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
<target name="select-compiler">
<available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
@@ -248,6 +251,21 @@
</target>
+ <!-- ########################### RSS TARGETS ###########################-->
+
+ <target name="initrss" depends="init, jarcore, jarui">
+ <init classesdir="${classes.rss.dir}" srcdir="${src.rss.dir}" modulename="rss" pom="${rss.pom}" />
+ </target>
+
+ <target name="compilerss" depends="initrss, select-compiler">
+ <compile classesdir="${classes.rss.dir}" srcdir="${src.rss.dir}" classpath="compile.rss.path" />
+ </target>
+
+ <target name="jarrss" depends="compilerss" description="Build the distribution .jar file for the RSS package">
+ <archive classesdir="${classes.rss.dir}" module="jboss-seam-rss" pom="${rss.pom}" srcdir="${src.rss.dir}" />
+ </target>
+
+
<!-- ########################### IOC TARGETS ###########################-->
<target name="initioc" depends="init, jarcore">
@@ -501,6 +519,7 @@
<target name="copysource">
<copysource destdir="${dist.src.core.dir}" srcdir="${src.core.dir}" />
<copysource destdir="${dist.src.pdf.dir}" srcdir="${src.pdf.dir}" />
+ <copysource destdir="${dist.src.rss.dir}" srcdir="${src.rss.dir}" />
<copysource destdir="${dist.src.excel.dir}" srcdir="${src.excel.dir}" />
<copysource destdir="${dist.src.ioc.dir}" srcdir="${src.ioc.dir}" />
<copysource destdir="${dist.src.remoting.dir}" srcdir="${src.remoting.dir}" />
@@ -1055,6 +1074,7 @@
<propertyref name="gen.pom" />
<propertyref name="pdf.pom" />
<propertyref name="excel.pom" />
+ <propertyref name="rss.pom" />
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
@@ -1077,6 +1097,7 @@
<dependenciesWithSources id="mail" scope="compile" pom="${mail.pom}" />
<dependenciesWithSources id="pdf" scope="compile" pom="${pdf.pom}" />
<dependenciesWithSources id="excel" scope="compile" pom="${excel.pom}" />
+ <dependenciesWithSources id="rss" scope="compile" pom="${rss.pom}" />
<dependenciesWithSources id="remoting" scope="compile" pom="${remoting.pom}" />
<dependenciesWithSources id="ui" scope="compile" pom="${ui.pom}" />
</target>
@@ -1097,6 +1118,7 @@
<dependencies id="mail" scope="compile" pom="${mail.pom}" />
<dependencies id="pdf" scope="compile" pom="${pdf.pom}" />
<dependencies id="excel" scope="compile" pom="${excel.pom}" />
+ <dependencies id="rss" scope="compile" pom="${rss.pom}" />
<dependencies id="remoting" scope="compile" pom="${remoting.pom}" />
<dependencies id="ui" scope="compile" pom="${ui.pom}" />
<eclipseClasspath tofile=".classpath" file="${build.dir}/classpath.tmpl" filterProperty="automagic.classpath.entries">
@@ -1107,6 +1129,7 @@
<path refid="compile.mail.path" />
<path refid="compile.pdf.path" />
<path refid="compile.excel.path" />
+ <path refid="compile.rss.path" />
<path refid="compile.remoting.path" />
<path refid="compile.ui.path" />
<path refid="compile.jul.path" />
Deleted: trunk/src/rss/build.xml
===================================================================
--- trunk/src/rss/build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/src/rss/build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<project name="Concept" default="jar" basedir=".">
-
- <fileset id="lib" dir="../../lib">
- <include name="*.jar" />
- </fileset>
-
- <fileset id="yarfraw" dir="c:/java/lib/yarfraw-0.92-bin-all">
- <include name="*.jar" />
- </fileset>
-
- <path id="build.classpath">
- <fileset refid="lib" />
- <fileset refid="yarfraw" />
- </path>
-
- <target name="compile">
- <javac srcdir="." destdir="." classpathref="build.classpath" debug="on" source="1.5" />
- </target>
-
- <target name="jar" depends="compile">
- <jar destfile="jboss-seam-rss.jar" basedir="." />
- </target>
-</project>
Modified: trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java
===================================================================
--- trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java 2008-09-21 23:44:52 UTC (rev 9075)
@@ -75,7 +75,11 @@
try {
FeedWriter.writeChannel(DEFAULT_FEED_FORMAT, channelFeed, byteStream);
} catch (YarfrawException e) {
- throw new IOException("Could not create feed", e);
+ /**
+ * Was IOException, but 1.5 does not have this constructor
+ * http://java.sun.com/j2se/1.5.0/docs/api/java/io/IOException.html
+ */
+ throw new RuntimeException("Could not create feed", e);
}
Writer responseWriter = ((HttpServletResponse)facesContext.getExternalContext().getResponse()).getWriter();
HttpServletResponse response = (HttpServletResponse)facesContext.getExternalContext().getResponse();
More information about the seam-commits
mailing list