[jboss-svn-commits] JBL Code SVN: r10227 - in labs/shotoku/trunk: lib and 10 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Mar 15 09:21:48 EDT 2007


Author: adamw
Date: 2007-03-15 09:21:47 -0400 (Thu, 15 Mar 2007)
New Revision: 10227

Added:
   labs/shotoku/trunk/lib/jboss-blog/
   labs/shotoku/trunk/lib/jboss-blog/jboss-blog-common.jar
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/FeedsService.java
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/data/
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/data/Feed.java
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedDoesNotExistException.java
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedEntryDoesNotExistException.java
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedsException.java
Removed:
   labs/shotoku/trunk/shotoku-feeds/lib/jboss-blog-common.jar
   labs/shotoku/trunk/shotoku-feeds/lib/rome-0.7.jar
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsService.java
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/Feed.java
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/exceptions/
Modified:
   labs/shotoku/trunk/project.properties
   labs/shotoku/trunk/shotoku-base/project.xml
   labs/shotoku/trunk/shotoku-base/shotoku-base.iml
   labs/shotoku/trunk/shotoku-feeds/maven.xml
   labs/shotoku/trunk/shotoku-feeds/project.properties
   labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml
Log:
Fixing the so-called dependency management for the so-called classloading to work

Added: labs/shotoku/trunk/lib/jboss-blog/jboss-blog-common.jar
===================================================================
(Binary files differ)


Property changes on: labs/shotoku/trunk/lib/jboss-blog/jboss-blog-common.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/shotoku/trunk/project.properties
===================================================================
--- labs/shotoku/trunk/project.properties	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/project.properties	2007-03-15 13:21:47 UTC (rev 10227)
@@ -40,3 +40,5 @@
 maven.jar.shotoku-svn=${shotoku.root.dir}/shotoku-svn/target/shotoku-svn.jar
 maven.jar.shotoku-aop=${shotoku.root.dir}/shotoku-aop/target/shotoku-aop.jar
 maven.jar.shotoku-tags=${shotoku.root.dir}/shotoku-tags/target/shotoku-tags.jar
+
+maven.jar.jboss-blog-common=${shotoku.root.dir}/lib/jboss-blog/jboss-blog-common.jar

Modified: labs/shotoku/trunk/shotoku-base/project.xml
===================================================================
--- labs/shotoku/trunk/shotoku-base/project.xml	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/shotoku-base/project.xml	2007-03-15 13:21:47 UTC (rev 10227)
@@ -40,6 +40,12 @@
             <artifactId>jboss-annotations-ejb3</artifactId>
             <jar>jboss-annotations-ejb3.jar</jar>
         </dependency>
+
+        <dependency>
+            <groupId>jboss-blog</groupId>
+            <artifactId>jboss-blog-common</artifactId>
+            <jar>jboss-blog-common.jar</jar>
+        </dependency>
     </dependencies>
 
     <build>

Modified: labs/shotoku/trunk/shotoku-base/shotoku-base.iml
===================================================================
--- labs/shotoku/trunk/shotoku-base/shotoku-base.iml	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/shotoku-base/shotoku-base.iml	2007-03-15 13:21:47 UTC (rev 10227)
@@ -12,6 +12,15 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jboss" level="application" />
     <orderEntry type="library" name="velocity" level="application" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/jboss-blog/jboss-blog-common.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Copied: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/FeedsService.java (from rev 10219, labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsService.java)
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/FeedsService.java	                        (rev 0)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/FeedsService.java	2007-03-15 13:21:47 UTC (rev 10227)
@@ -0,0 +1,14 @@
+package org.jboss.shotoku.feeds;
+
+import org.jboss.shotoku.service.AdministratedService;
+import org.jboss.shotoku.feeds.data.Feed;
+import org.jboss.shotoku.feeds.exceptions.FeedDoesNotExistException;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public interface FeedsService extends AdministratedService {
+    public String getProperty(String id, String name);
+    public Feed getFeed(String id, String name, String type)
+            throws FeedDoesNotExistException;
+}

Copied: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/data/Feed.java (from rev 10219, labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/Feed.java)
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/data/Feed.java	                        (rev 0)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/data/Feed.java	2007-03-15 13:21:47 UTC (rev 10227)
@@ -0,0 +1,81 @@
+package org.jboss.shotoku.feeds.data;
+
+import org.jboss.blog.model.BlogModel;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.OutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * A base interface for feeds.
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public interface Feed {
+    /**
+     * Writes the feed data to the given output stream.
+     * @param os Output stream to write to.
+     * @param request
+     * @throws java.io.IOException
+     */
+    public void write(OutputStream os,
+                      HttpServletRequest request) throws IOException;
+    /**
+     * Writes the feed data to the given http servlet response, setting an
+     * appropriate content type.
+     * @param response Response to write to.
+     * @param request
+     * @throws IOException
+     */
+    public void write(HttpServletResponse response,
+                      HttpServletRequest request) throws IOException;
+    /**
+     * Gets the name of this feed.
+     * @return Name of this feed.
+     */
+    public String getName();
+    /**
+     * Gets the display name of this feed.
+     * @return Display name of this feed.
+     */
+    public String getDisplayName();
+    /**
+     * Gets the type of this feed.
+     * @return Type of this feed.
+     */
+    public String getType();
+    /**
+     * Gets the id of the feed configuration group in which this feed
+     * was defined.
+     * @return Id of the feed configuration group to which this feed
+     * belongs.
+     */
+    public String getId();
+    /**
+     * Called when this feed is no longer needed, so that any resources can
+     * be released (like temporary files).
+     */
+    public void release();
+
+    /**
+     * Gets attributes of this feed, which are transformed attributes
+     * of the corresponding node in the xml definition file.
+     * @return Attributes of this feed.
+     */
+    public Map<String, Object> getAttributes();
+
+    /**
+     * All entries that this feed containes in a parsed form. Should only
+     * be called after a feed is generated. Currently works only for
+     * normal feeds.
+     * @return Entries of this feed.
+     */
+    public BlogModel getBlogModel();
+
+    /**
+     * Gets a unique identifier of this feed.
+     * @return A unique identifier of this feed.
+     */
+    public String getGuid();
+}

Copied: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedDoesNotExistException.java (from rev 10139, labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/exceptions/FeedDoesNotExistException.java)
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedDoesNotExistException.java	                        (rev 0)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedDoesNotExistException.java	2007-03-15 13:21:47 UTC (rev 10227)
@@ -0,0 +1,21 @@
+package org.jboss.shotoku.feeds.exceptions;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public class FeedDoesNotExistException extends FeedsException {
+    public FeedDoesNotExistException() {
+    }
+
+    public FeedDoesNotExistException(String message) {
+        super(message);
+    }
+
+    public FeedDoesNotExistException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public FeedDoesNotExistException(Throwable cause) {
+        super(cause);
+    }
+}

Copied: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedEntryDoesNotExistException.java (from rev 10139, labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/exceptions/FeedEntryDoesNotExistException.java)
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedEntryDoesNotExistException.java	                        (rev 0)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedEntryDoesNotExistException.java	2007-03-15 13:21:47 UTC (rev 10227)
@@ -0,0 +1,21 @@
+package org.jboss.shotoku.feeds.exceptions;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public class FeedEntryDoesNotExistException extends FeedDoesNotExistException {
+    public FeedEntryDoesNotExistException() {
+    }
+
+    public FeedEntryDoesNotExistException(String message) {
+        super(message);
+    }
+
+    public FeedEntryDoesNotExistException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public FeedEntryDoesNotExistException(Throwable cause) {
+        super(cause);
+    }
+}

Copied: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedsException.java (from rev 10139, labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/exceptions/FeedsException.java)
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedsException.java	                        (rev 0)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/feeds/exceptions/FeedsException.java	2007-03-15 13:21:47 UTC (rev 10227)
@@ -0,0 +1,21 @@
+package org.jboss.shotoku.feeds.exceptions;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public abstract class FeedsException extends Exception {
+    public FeedsException() {
+    }
+
+    public FeedsException(String message) {
+        super(message);
+    }
+
+    public FeedsException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public FeedsException(Throwable cause) {
+        super(cause);
+    }
+}

Deleted: labs/shotoku/trunk/shotoku-feeds/lib/jboss-blog-common.jar
===================================================================
(Binary files differ)

Deleted: labs/shotoku/trunk/shotoku-feeds/lib/rome-0.7.jar
===================================================================
(Binary files differ)

Modified: labs/shotoku/trunk/shotoku-feeds/maven.xml
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/maven.xml	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/shotoku-feeds/maven.xml	2007-03-15 13:21:47 UTC (rev 10227)
@@ -41,7 +41,7 @@
                 file="lib/rome-0.9.jar" />
         <ant:copy
                 todir="${shotoku.jar.dest}" overwrite="true"
-                file="lib/jboss-blog-common.jar" />
+                file="../lib/jboss-blog/jboss-blog-common.jar" />
     </goal>
 
     <goal name="clean">

Modified: labs/shotoku/trunk/shotoku-feeds/project.properties
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/project.properties	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/shotoku-feeds/project.properties	2007-03-15 13:21:47 UTC (rev 10227)
@@ -7,7 +7,7 @@
 maven.jar.override=on
 maven.jar.informa=${shotoku.root.dir}/shotoku-feeds/lib/informa.jar
 maven.jar.rome=${shotoku.root.dir}/shotoku-feeds/lib/rome-0.9.jar
-maven.jar.blog-common=${shotoku.root.dir}/shotoku-feeds/lib/jboss-blog-common.jar
+maven.jar.blog-common=${shotoku.root.dir}/lib/jboss-blog/jboss-blog-common.jar
 
 maven.war.classes.includes=**/*Servlet*
 maven.ejb.excludes=**/*Servlet*,**/CommentRssModule*

Modified: labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml	2007-03-15 13:21:47 UTC (rev 10227)
@@ -30,7 +30,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jboss-blog-common.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/jboss-blog/jboss-blog-common.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsService.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsService.java	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsService.java	2007-03-15 13:21:47 UTC (rev 10227)
@@ -1,14 +0,0 @@
-package org.jboss.shotoku.feeds;
-
-import org.jboss.shotoku.service.AdministratedService;
-import org.jboss.shotoku.feeds.data.Feed;
-import org.jboss.shotoku.feeds.exceptions.FeedDoesNotExistException;
-
-/**
- * @author Adam Warski (adamw at aster.pl)
- */
-public interface FeedsService extends AdministratedService {
-    public String getProperty(String id, String name);
-    public Feed getFeed(String id, String name, String type)
-            throws FeedDoesNotExistException;
-}

Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/Feed.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/Feed.java	2007-03-15 13:17:04 UTC (rev 10226)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/Feed.java	2007-03-15 13:21:47 UTC (rev 10227)
@@ -1,81 +0,0 @@
-package org.jboss.shotoku.feeds.data;
-
-import org.jboss.blog.model.BlogModel;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * A base interface for feeds.
- * @author Adam Warski (adamw at aster.pl)
- */
-public interface Feed {
-    /**
-     * Writes the feed data to the given output stream.
-     * @param os Output stream to write to.
-     * @param request
-     * @throws java.io.IOException
-     */
-    public void write(OutputStream os,
-                      HttpServletRequest request) throws IOException;
-    /**
-     * Writes the feed data to the given http servlet response, setting an
-     * appropriate content type.
-     * @param response Response to write to.
-     * @param request
-     * @throws IOException
-     */
-    public void write(HttpServletResponse response,
-                      HttpServletRequest request) throws IOException;
-    /**
-     * Gets the name of this feed.
-     * @return Name of this feed.
-     */
-    public String getName();
-    /**
-     * Gets the display name of this feed.
-     * @return Display name of this feed.
-     */
-    public String getDisplayName();
-    /**
-     * Gets the type of this feed.
-     * @return Type of this feed.
-     */
-    public String getType();
-    /**
-     * Gets the id of the feed configuration group in which this feed
-     * was defined.
-     * @return Id of the feed configuration group to which this feed
-     * belongs.
-     */
-    public String getId();
-    /**
-     * Called when this feed is no longer needed, so that any resources can
-     * be released (like temporary files).
-     */
-    public void release();
-
-    /**
-     * Gets attributes of this feed, which are transformed attributes
-     * of the corresponding node in the xml definition file.
-     * @return Attributes of this feed.
-     */
-    public Map<String, Object> getAttributes();
-
-    /**
-     * All entries that this feed containes in a parsed form. Should only
-     * be called after a feed is generated. Currently works only for
-     * normal feeds.
-     * @return Entries of this feed.
-     */
-    public BlogModel getBlogModel();
-
-    /**
-     * Gets a unique identifier of this feed.
-     * @return A unique identifier of this feed.
-     */
-    public String getGuid();
-}




More information about the jboss-svn-commits mailing list