[jboss-cvs] JBossBlog SVN: r160 - in trunk: resources/META-INF and 10 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Dec 19 12:53:26 EST 2007


Author: adamw
Date: 2007-12-19 12:53:26 -0500 (Wed, 19 Dec 2007)
New Revision: 160

Added:
   trunk/src/services/
   trunk/src/services/org/
   trunk/src/services/org/jboss/
   trunk/src/services/org/jboss/blog/
   trunk/src/services/org/jboss/blog/service/
   trunk/src/services/org/jboss/blog/service/FeedNotFoundException.java
   trunk/src/services/org/jboss/blog/service/FeedsService.java
Removed:
   trunk/src/action/org/jboss/blog/service/
   trunk/src/action/org/jboss/blog/session/template/
   trunk/src/action/org/jboss/blog/session/xml/velocity/tools/
   trunk/src/model/org/jboss/blog/model/TemplateType.java
   trunk/src/services/org/jboss/blog/service/FeedNotFoundException.java
   trunk/src/services/org/jboss/blog/service/FeedsService.java
Modified:
   trunk/blog.iml
   trunk/build.xml
   trunk/resources/META-INF/persistence-dev.xml
   trunk/resources/META-INF/persistence-prod.xml
Log:


Modified: trunk/blog.iml
===================================================================
--- trunk/blog.iml	2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/blog.iml	2007-12-19 17:53:26 UTC (rev 160)
@@ -22,6 +22,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/action" isTestSource="false" />
       <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" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/exploded-archives" />

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/build.xml	2007-12-19 17:53:26 UTC (rev 160)
@@ -13,6 +13,7 @@
     <property name="dist.dir" value="dist" />
     <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.test.dir" value="src/test" />
     <property name="lib.dir" value="lib" />
     <property name="ear.dir" value="exploded-archives/${project.name}.ear" />
@@ -51,8 +52,7 @@
     </target>
 
     <target name="compile" depends="init"
-            description="Compile the Java source code"
-            unless="eclipse.running">
+            description="Compile the Java source code">
         <javac classpathref="build.classpath"
                destdir="${jar.dir}"
                debug="${javac.debug}"
@@ -60,23 +60,11 @@
                nowarn="on">
             <src path="${src.model.dir}" />
             <src path="${src.action.dir}" />
+            <src path="${src.services.dir}" />
         </javac>
     </target>
 
-    <target name="copyclasses" depends="init"
-            description="Copy the classes that were compiled by eclipse"
-            if="eclipse.running">
-        <copy todir="${jar.dir}">
-            <fileset dir="classes/model">
-                <include name="**/*.class"/>
-            </fileset>
-            <fileset dir="classes/action">
-                <include name="**/*.class"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="jar" depends="compile,copyclasses"
+    <target name="jar" depends="compile"
             description="Build the distribution .jar file">
         <copy todir="${jar.dir}">
             <fileset dir="${basedir}/resources">

Modified: trunk/resources/META-INF/persistence-dev.xml
===================================================================
--- trunk/resources/META-INF/persistence-dev.xml	2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/resources/META-INF/persistence-dev.xml	2007-12-19 17:53:26 UTC (rev 160)
@@ -8,6 +8,12 @@
     <persistence-unit name="blog">
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         <jta-data-source>java:/blogDatasource</jta-data-source>
+        <class>org.jboss.blog.model.Feed</class>
+        <class>org.jboss.blog.model.RemoteFeed</class>
+        <class>org.jboss.blog.model.AggregatedFeed</class>
+        <class>org.jboss.blog.model.Category</class>
+        <class>org.jboss.blog.model.Post</class>
+        <class>org.jboss.blog.model.Template</class>
         <properties>
             <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>

Modified: trunk/resources/META-INF/persistence-prod.xml
===================================================================
--- trunk/resources/META-INF/persistence-prod.xml	2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/resources/META-INF/persistence-prod.xml	2007-12-19 17:53:26 UTC (rev 160)
@@ -8,6 +8,12 @@
     <persistence-unit name="blog">
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         <jta-data-source>java:/blogDatasource</jta-data-source>
+        <class>org.jboss.blog.model.Feed</class>
+        <class>org.jboss.blog.model.RemoteFeed</class>
+        <class>org.jboss.blog.model.AggregatedFeed</class>
+        <class>org.jboss.blog.model.Category</class>
+        <class>org.jboss.blog.model.Post</class>
+        <class>org.jboss.blog.model.Template</class>
         <properties>
             <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>

Deleted: trunk/src/model/org/jboss/blog/model/TemplateType.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/TemplateType.java	2007-12-10 11:16:30 UTC (rev 159)
+++ trunk/src/model/org/jboss/blog/model/TemplateType.java	2007-12-19 17:53:26 UTC (rev 160)
@@ -1,29 +0,0 @@
-package org.jboss.blog.model;
-
-import org.jboss.blog.session.template.tools.TemplateTools;
-import org.jboss.blog.session.template.tools.Rss2TemplateTools;
-import org.jboss.blog.session.template.tools.AtomTemplateTools;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
-public enum TemplateType {
-    ATOM("application/atom+xml", AtomTemplateTools.class),
-    RSS2("application/xhtml+xml", Rss2TemplateTools.class);
-
-    private final String contentType;
-    private final Class<? extends TemplateTools> tools;
-
-    public String contentType() {
-        return contentType;
-    }
-
-    public Class<? extends TemplateTools> tools() {
-        return tools;
-    }
-
-    TemplateType(String contentType, Class<? extends TemplateTools> tools) {
-        this.contentType = contentType;
-        this.tools = tools;
-    }
-}

Copied: trunk/src/services/org/jboss/blog/service (from rev 140, trunk/src/action/org/jboss/blog/service)

Deleted: trunk/src/services/org/jboss/blog/service/FeedNotFoundException.java
===================================================================
--- trunk/src/action/org/jboss/blog/service/FeedNotFoundException.java	2007-11-27 10:01:42 UTC (rev 140)
+++ trunk/src/services/org/jboss/blog/service/FeedNotFoundException.java	2007-12-19 17:53:26 UTC (rev 160)
@@ -1,21 +0,0 @@
-package org.jboss.blog.service;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
-public class FeedNotFoundException extends RuntimeException {
-    public FeedNotFoundException() {
-    }
-
-    public FeedNotFoundException(String message) {
-        super(message);
-    }
-
-    public FeedNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public FeedNotFoundException(Throwable cause) {
-        super(cause);
-    }
-}

Copied: trunk/src/services/org/jboss/blog/service/FeedNotFoundException.java (from rev 159, trunk/src/action/org/jboss/blog/service/FeedNotFoundException.java)
===================================================================
--- trunk/src/services/org/jboss/blog/service/FeedNotFoundException.java	                        (rev 0)
+++ trunk/src/services/org/jboss/blog/service/FeedNotFoundException.java	2007-12-19 17:53:26 UTC (rev 160)
@@ -0,0 +1,21 @@
+package org.jboss.blog.service;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class FeedNotFoundException extends RuntimeException {
+    public FeedNotFoundException() {
+    }
+
+    public FeedNotFoundException(String message) {
+        super(message);
+    }
+
+    public FeedNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public FeedNotFoundException(Throwable cause) {
+        super(cause);
+    }
+}

Deleted: trunk/src/services/org/jboss/blog/service/FeedsService.java
===================================================================
--- trunk/src/action/org/jboss/blog/service/FeedsService.java	2007-11-27 10:01:42 UTC (rev 140)
+++ trunk/src/services/org/jboss/blog/service/FeedsService.java	2007-12-19 17:53:26 UTC (rev 160)
@@ -1,24 +0,0 @@
-package org.jboss.blog.service;
-
-import org.jboss.blog.model.Feed;
-import org.jboss.blog.model.Post;
-import org.jboss.blog.service.FeedNotFoundException;
-
-import javax.ejb.Local;
-import java.util.List;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
- at Local
-public interface FeedsService {
-    public List<Feed> getAllFeeds();
-
-    public Feed getFeed(String feedName) throws FeedNotFoundException;
-
-    public List<Post> getPosts(String feedName, int from, int to) throws FeedNotFoundException;
-
-    public List<Post> getPosts(Feed feed, int from, int to);
-
-    public void remove();
-}

Copied: trunk/src/services/org/jboss/blog/service/FeedsService.java (from rev 159, trunk/src/action/org/jboss/blog/service/FeedsService.java)
===================================================================
--- trunk/src/services/org/jboss/blog/service/FeedsService.java	                        (rev 0)
+++ trunk/src/services/org/jboss/blog/service/FeedsService.java	2007-12-19 17:53:26 UTC (rev 160)
@@ -0,0 +1,24 @@
+package org.jboss.blog.service;
+
+import org.jboss.blog.model.Feed;
+import org.jboss.blog.model.Post;
+import org.jboss.blog.service.FeedNotFoundException;
+
+import javax.ejb.Local;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+ at Local
+public interface FeedsService {
+    public List<Feed> getAllFeeds();
+
+    public Feed getFeed(String feedName) throws FeedNotFoundException;
+
+    public List<Post> getPosts(String feedName, int from, int to) throws FeedNotFoundException;
+
+    public List<Post> getPosts(Feed feed, int from, int to);
+
+    public void remove();
+}




More information about the jboss-cvs-commits mailing list