[jboss-cvs] JBossBlog SVN: r162 - in trunk: resources/META-INF and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 20 05:40:08 EST 2007
Author: adamw
Date: 2007-12-20 05:40:08 -0500 (Thu, 20 Dec 2007)
New Revision: 162
Added:
trunk/src/action/org/jboss/blog/session/xml/velocity/tools/
trunk/src/tools/
trunk/src/tools/org/
trunk/src/tools/org/jboss/
trunk/src/tools/org/jboss/blog/
trunk/src/tools/org/jboss/blog/tools/
trunk/src/tools/org/jboss/blog/tools/StripHtmlBridge.java
Removed:
trunk/src/action/org/jboss/blog/session/feed/FeedPosts.java
trunk/src/action/org/jboss/blog/session/search/StripHtmlBridge.java
trunk/src/action/org/jboss/blog/session/xml/tools/
trunk/src/action/org/jboss/blog/tools/
Modified:
trunk/blog.iml
trunk/build.xml
trunk/resources/META-INF/application.xml
trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
trunk/src/action/org/jboss/blog/session/xml/velocity/tools/AtomXmlTools.java
trunk/src/action/org/jboss/blog/session/xml/velocity/tools/Rss2XmlTools.java
trunk/src/action/org/jboss/blog/session/xml/velocity/tools/XmlTools.java
trunk/src/model/org/jboss/blog/model/Post.java
trunk/src/model/org/jboss/blog/model/XmlType.java
Log:
Modified: trunk/blog.iml
===================================================================
--- trunk/blog.iml 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/blog.iml 2007-12-20 10:40:08 UTC (rev 162)
@@ -24,6 +24,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/model" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/services" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tools" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/exploded-archives" />
</content>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/build.xml 2007-12-20 10:40:08 UTC (rev 162)
@@ -14,16 +14,23 @@
<property name="src.model.dir" value="src/model" />
<property name="src.action.dir" value="src/action" />
<property name="src.services.dir" value="src/services" />
+ <property name="src.tools.dir" value="src/tools" />
<property name="src.test.dir" value="src/test" />
<property name="lib.dir" value="lib" />
+
+ <property name="jar.impl.name" value="${project.name}-impl.jar" />
+ <property name="jar.api.name" value="${project.name}.jar" />
+
<property name="ear.dir" value="exploded-archives/${project.name}.ear" />
- <property name="jar.dir" value="exploded-archives/${project.name}.jar" />
+ <property name="jar.impl.dir" value="exploded-archives/${jar.impl.name}" />
+ <property name="jar.api.dir" value="exploded-archives/${jar.api.name}" />
<property name="war.dir" value="exploded-archives/${project.name}.war" />
<property name="test.dir" value="test-build" />
<property name="bootstrap.dir" value="${basedir}/bootstrap" />
<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
+ <property name="deploy.lib.dir" value="${jboss.home}/server/default/lib" />
<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" />
- <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar" />
+ <property name="jar.deploy.dir" value="${ear.deploy.dir}/${jar.impl.name}" />
<property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war" />
<property name="testng.jar" value="${basedir}/lib/testng.jar" />
<property name="javac.debug" value="true" />
@@ -40,12 +47,18 @@
<include name="*.jar" />
</fileset>
- <path id="build.classpath">
+ <path id="build.api.classpath">
<fileset refid="lib" />
</path>
+ <path id="build.impl.classpath">
+ <fileset refid="lib" />
+ <pathelement path="${jar.api.dir}" />
+ </path>
+
<target name="init" description="Initialize the build">
- <mkdir dir="${jar.dir}" />
+ <mkdir dir="${jar.impl.dir}" />
+ <mkdir dir="${jar.api.dir}" />
<mkdir dir="${ear.dir}" />
<mkdir dir="${war.dir}" />
<mkdir dir="${dist.dir}" />
@@ -53,33 +66,44 @@
<target name="compile" depends="init"
description="Compile the Java source code">
- <javac classpathref="build.classpath"
- destdir="${jar.dir}"
+ <javac classpathref="build.api.classpath"
+ destdir="${jar.api.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
nowarn="on">
+ <src path="${src.tools.dir}" />
+ <src path="${src.services.dir}" />
<src path="${src.model.dir}" />
+ </javac>
+ <javac classpathref="build.impl.classpath"
+ destdir="${jar.impl.dir}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ nowarn="on">
<src path="${src.action.dir}" />
- <src path="${src.services.dir}" />
</javac>
</target>
<target name="jar" depends="compile"
description="Build the distribution .jar file">
- <copy todir="${jar.dir}">
+ <!-- Jars for model and services -->
+ <jar jarfile="${dist.dir}/${jar.api.name}" basedir="${jar.api.dir}"/>
+
+ <!-- Jar for action -->
+ <copy todir="${jar.impl.dir}">
<fileset dir="${basedir}/resources">
<include name="seam.properties" />
</fileset>
</copy>
- <copy todir="${jar.dir}/META-INF">
+ <copy todir="${jar.impl.dir}/META-INF">
<fileset dir="${basedir}/resources/META-INF">
<include name="ejb-jar.xml" />
</fileset>
</copy>
- <copy tofile="${jar.dir}/META-INF/persistence.xml"
+ <copy tofile="${jar.impl.dir}/META-INF/persistence.xml"
file="${basedir}/resources/META-INF/persistence-${profile}.xml"
overwrite="true"/>
- <copy tofile="${jar.dir}/import.sql"
+ <copy tofile="${jar.impl.dir}/import.sql"
file="${basedir}/resources/import-${profile}.sql"
overwrite="true"/>
</target>
@@ -179,7 +203,7 @@
<target name="archive" depends="jar,war,ear"
description="Package the archives">
- <jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/>
+ <jar jarfile="${dist.dir}/${jar.impl.name}" basedir="${jar.impl.dir}"/>
<jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/>
<jar jarfile="${dist.dir}/${project.name}.ear">
<fileset dir="${ear.dir}"/>
@@ -207,7 +231,7 @@
<mkdir dir="${war.deploy.dir}"/>
<copy todir="${jar.deploy.dir}">
- <fileset dir="${jar.dir}"/>
+ <fileset dir="${jar.impl.dir}"/>
</copy>
<copy todir="${war.deploy.dir}">
<fileset dir="${war.dir}"/>
@@ -215,6 +239,12 @@
<copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}"/>
</copy>
+
+ <copy todir="${deploy.dir}">
+ <fileset dir="${dist.dir}">
+ <include name="${jar.api.name}" />
+ </fileset>
+ </copy>
</target>
<target name="unexplode" description="Undeploy the exploded archive">
@@ -225,6 +255,8 @@
</delete>
<delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/>
<delete dir="${ear.deploy.dir}" failonerror="no"/>
+
+ <delete file="${deploy.dir}/${jar.api.name}" />
</target>
<target name="restart" depends="clean,unexplode,explode" description="Restart the exploded archive">
@@ -234,10 +266,12 @@
<target name="deploy" depends="archive,datasource" description="Deploy to JBoss AS">
<fail unless="jboss.home">jboss.home not set</fail>
<copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear" />
+ <copy todir="${deploy.dir}" file="${dist.dir}/${jar.api.name}" />
</target>
<target name="undeploy" description="Undeploy the example from JBoss">
<delete file="${deploy.dir}/${project.name}.ear" />
+ <delete file="${deploy.dir}/${jar.api.name}" />
<delete file="${deploy.dir}/${project.name}-dev-ds.xml" />
<delete file="${deploy.dir}/${project.name}-prod-ds.xml" />
</target>
@@ -246,7 +280,8 @@
<delete dir="${dist.dir}"/>
<delete dir="${ear.dir}"/>
<delete dir="${war.dir}"/>
- <delete dir="${jar.dir}"/>
+ <delete dir="${jar.impl.dir}"/>
+ <delete dir="${jar.api.dir}"/>
<delete dir="${src.schema.dir}" failonerror="no"/>
<delete dir="${basedir}/test-report"/>
<delete dir="${basedir}/test-output"/>
@@ -254,7 +289,7 @@
<target name="compiletest" unless="eclipse.running" description="Compile the Java source code for the tests">
<mkdir dir="${test.dir}"/>
- <javac classpathref="build.classpath"
+ <javac classpathref="build.impl.classpath"
destdir="${test.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
@@ -265,27 +300,8 @@
</javac>
</target>
- <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir">
- <mkdir dir="${test.dir}"/>
+ <target name="buildtest" depends="compiletest" description="Build the tests">
<copy todir="${test.dir}">
- <fileset dir="classes/model">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- <copy todir="${test.dir}">
- <fileset dir="classes/action">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- <copy todir="${test.dir}">
- <fileset dir="classes/test">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- </target>
-
- <target name="buildtest" depends="compiletest,copytestclasses" description="Build the tests">
- <copy todir="${test.dir}">
<fileset dir="${basedir}/resources">
<exclude name="META-INF/persistence*.xml"/>
<exclude name="import*.sql"/>
@@ -313,7 +329,7 @@
<include name="*.jar"/>
</fileset>
<path path="${bootstrap.dir}" />
- <path refid="build.classpath" />
+ <path refid="build.impl.classpath" />
</path>
<testng outputdir="${basedir}/test-report">
<classpath refid="test.path" />
Modified: trunk/resources/META-INF/application.xml
===================================================================
--- trunk/resources/META-INF/application.xml 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/resources/META-INF/application.xml 2007-12-20 10:40:08 UTC (rev 162)
@@ -14,7 +14,7 @@
</module>
<module>
- <ejb>blog.jar</ejb>
+ <ejb>blog-impl.jar</ejb>
</module>
<!-- Seam and EL -->
Deleted: trunk/src/action/org/jboss/blog/session/feed/FeedPosts.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/FeedPosts.java 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/src/action/org/jboss/blog/session/feed/FeedPosts.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -1,13 +0,0 @@
-package org.jboss.blog.session.feed;
-
-import org.jboss.blog.model.Feed;
-import org.jboss.blog.model.Post;
-
-import java.util.List;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
-public interface FeedPosts {
- public List<Post> getPosts(Feed feed, int from, int to);
-}
Deleted: trunk/src/action/org/jboss/blog/session/search/StripHtmlBridge.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/search/StripHtmlBridge.java 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/src/action/org/jboss/blog/session/search/StripHtmlBridge.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -1,17 +0,0 @@
-package org.jboss.blog.session.search;
-
-import org.hibernate.search.bridge.StringBridge;
-import org.jboss.blog.tools.StringTools;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
-public class StripHtmlBridge implements StringBridge {
- public String objectToString(Object o) {
- if (o == null) {
- return null;
- }
-
- return StringTools.stripHtml(o.toString());
- }
-}
Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -8,6 +8,9 @@
import org.jboss.blog.model.XmlType;
import org.jboss.blog.service.FeedsService;
import org.jboss.blog.session.xml.XmlService;
+import org.jboss.blog.session.xml.velocity.tools.XmlTools;
+import org.jboss.blog.session.xml.velocity.tools.AtomXmlTools;
+import org.jboss.blog.session.xml.velocity.tools.Rss2XmlTools;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -19,6 +22,8 @@
import javax.annotation.PostConstruct;
import java.util.List;
import java.util.Properties;
+import java.util.Map;
+import java.util.HashMap;
/**
* @author <a href="mailto:adam at warski.org">Adam Warski</a>
@@ -32,8 +37,14 @@
private VelocityEngine engine;
+ private Map<XmlType, XmlTools> xmlTools;
+
@PostConstruct
public void initVeloctiy() {
+ xmlTools = new HashMap<XmlType, XmlTools>();
+ xmlTools.put(XmlType.ATOM, new AtomXmlTools());
+ xmlTools.put(XmlType.RSS2, new Rss2XmlTools());
+
try {
Properties props = new Properties();
props.load(this.getClass().getResourceAsStream("/velocity.properties"));
@@ -67,7 +78,7 @@
VelocityContext context = new VelocityContext();
context.put("posts", posts);
context.put("feed", feed);
- context.put("tools", xmlType.tools().newInstance());
+ context.put("tools", xmlTools.get(xmlType));
context.put("xmlType", xmlType);
Template template = engine.getTemplate(feed.getTemplates().get(xmlType).getName());
Copied: trunk/src/action/org/jboss/blog/session/xml/velocity/tools (from rev 159, trunk/src/action/org/jboss/blog/session/xml/tools)
Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/tools/AtomXmlTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/tools/AtomXmlTools.java 2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/tools/AtomXmlTools.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -1,4 +1,4 @@
-package org.jboss.blog.session.xml.tools;
+package org.jboss.blog.session.xml.velocity.tools;
import java.text.SimpleDateFormat;
import java.util.Date;
Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/tools/Rss2XmlTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/tools/Rss2XmlTools.java 2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/tools/Rss2XmlTools.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -1,4 +1,4 @@
-package org.jboss.blog.session.xml.tools;
+package org.jboss.blog.session.xml.velocity.tools;
import java.text.SimpleDateFormat;
import java.util.Date;
Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/tools/XmlTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/tools/XmlTools.java 2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/tools/XmlTools.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -1,4 +1,4 @@
-package org.jboss.blog.session.xml.tools;
+package org.jboss.blog.session.xml.velocity.tools;
import org.jboss.blog.model.Feed;
import org.jboss.blog.model.Post;
Modified: trunk/src/model/org/jboss/blog/model/Post.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/Post.java 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/src/model/org/jboss/blog/model/Post.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -5,7 +5,7 @@
import org.hibernate.validator.NotEmpty;
import org.hibernate.validator.NotNull;
import org.hibernate.validator.Pattern;
-import org.jboss.blog.session.search.StripHtmlBridge;
+import org.jboss.blog.tools.StripHtmlBridge;
import org.jboss.blog.tools.StringTools;
import javax.persistence.*;
Modified: trunk/src/model/org/jboss/blog/model/XmlType.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/XmlType.java 2007-12-19 18:41:54 UTC (rev 161)
+++ trunk/src/model/org/jboss/blog/model/XmlType.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -1,29 +1,19 @@
package org.jboss.blog.model;
-import org.jboss.blog.session.xml.tools.Rss2XmlTools;
-import org.jboss.blog.session.xml.tools.XmlTools;
-import org.jboss.blog.session.xml.tools.AtomXmlTools;
-
/**
* @author <a href="mailto:adam at warski.org">Adam Warski</a>
*/
public enum XmlType {
- ATOM("application/atom+xml", AtomXmlTools.class),
- RSS2("application/xhtml+xml", Rss2XmlTools.class);
+ ATOM("application/atom+xml"),
+ RSS2("application/xhtml+xml");
private final String contentType;
- private final Class<? extends XmlTools> tools;
public String contentType() {
return contentType;
}
- public Class<? extends XmlTools> tools() {
- return tools;
- }
-
- XmlType(String contentType, Class<? extends XmlTools> tools) {
+ XmlType(String contentType) {
this.contentType = contentType;
- this.tools = tools;
}
}
Copied: trunk/src/tools/org/jboss/blog/tools (from rev 159, trunk/src/action/org/jboss/blog/tools)
Copied: trunk/src/tools/org/jboss/blog/tools/StripHtmlBridge.java (from rev 159, trunk/src/action/org/jboss/blog/session/search/StripHtmlBridge.java)
===================================================================
--- trunk/src/tools/org/jboss/blog/tools/StripHtmlBridge.java (rev 0)
+++ trunk/src/tools/org/jboss/blog/tools/StripHtmlBridge.java 2007-12-20 10:40:08 UTC (rev 162)
@@ -0,0 +1,17 @@
+package org.jboss.blog.tools;
+
+import org.hibernate.search.bridge.StringBridge;
+import org.jboss.blog.tools.StringTools;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class StripHtmlBridge implements StringBridge {
+ public String objectToString(Object o) {
+ if (o == null) {
+ return null;
+ }
+
+ return StringTools.stripHtml(o.toString());
+ }
+}
More information about the jboss-cvs-commits
mailing list