[jboss-cvs] JBossBlog SVN: r128 - in trunk: blog-feeds and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 25 07:22:13 EDT 2007
Author: adamw
Date: 2007-06-25 07:22:12 -0400 (Mon, 25 Jun 2007)
New Revision: 128
Added:
trunk/blog-feeds/
trunk/blog-feeds/.classpath
trunk/blog-feeds/.project
trunk/blog-feeds/build.xml
trunk/blog-feeds/src/
trunk/blog-feeds/src/etc/
trunk/blog-feeds/src/etc/META-INF/
trunk/blog-feeds/src/etc/META-INF/jboss-service.xml
trunk/blog-feeds/src/java/
trunk/blog-feeds/src/java/org/
trunk/blog-feeds/src/java/org/jboss/
trunk/blog-feeds/src/java/org/jboss/blog/
trunk/blog-feeds/src/java/org/jboss/blog/feeds/
trunk/blog-feeds/src/java/org/jboss/blog/feeds/FeedsServlet.java
trunk/blog-feeds/src/web/
trunk/blog-feeds/src/web/WEB-INF/
trunk/blog-feeds/src/web/WEB-INF/jboss-app.xml
trunk/blog-feeds/src/web/WEB-INF/jboss-web.xml
trunk/blog-feeds/src/web/WEB-INF/web.xml
trunk/blog-view/${dist.war.dir}/
trunk/blog-view/${dist.war.dir}/WEB-INF/
trunk/blog-view/${dist.war.dir}/WEB-INF/lib/
trunk/blog-view/${dist.war.dir}/WEB-INF/lib/jstl.jar
trunk/blog-view/${dist.war.dir}/WEB-INF/lib/standard.jar
trunk/src/
trunk/src/etc/
trunk/src/etc/META-INF/
trunk/src/etc/META-INF/jboss-service.xml
Modified:
trunk/blog-services/build.xml
trunk/blog-view/build.xml
trunk/build.xml
Log:
Adding feeds
Property changes on: trunk/blog-feeds
___________________________________________________________________
Name: svn:ignore
+ bin
target
build
Added: trunk/blog-feeds/.classpath
===================================================================
--- trunk/blog-feeds/.classpath (rev 0)
+++ trunk/blog-feeds/.classpath 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/blog-common"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Apache"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Informa"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JBoss"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Rome"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/blog-feeds/.project
===================================================================
--- trunk/blog-feeds/.project (rev 0)
+++ trunk/blog-feeds/.project 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>blog-feeds</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/blog-feeds/build.xml
===================================================================
--- trunk/blog-feeds/build.xml (rev 0)
+++ trunk/blog-feeds/build.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<project name="JBoss Blog Feeds">
+ <!-- Classpath for building the application: includes all dependency jars -->
+ <path id="base.jars">
+ <fileset refid="rome.jars" />
+ <fileset refid="jboss.jars" />
+ <fileset refid="servlet.jars" />
+ <fileset refid="log4j.jars" />
+ </path>
+
+ <!-- BUILD TARGETS -->
+
+ <target name="init">
+
+ </target>
+
+ <target name="build">
+ <mkdir dir="${build}" />
+ <!-- Compiling the source -->
+ <javac srcdir="${src.java}" destdir="${build}" target="1.5" source="1.5">
+ <classpath refid="base.jars" />
+ <!-- Dependency on the blog-common classes -->
+ <classpath path="../blog-common/${build}" />
+ </javac>
+ <!-- Copying any xmls -->
+ <copy todir="${build}">
+ <fileset dir="${src.java}">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="dist">
+ <mkdir dir="${dist.lib.dir}" />
+
+ <!-- Copying the meta information -->
+ <mkdir dir="${dist.main.dir}/jboss-blog-feeds.sar" />
+ <copy todir="${dist.main.dir}/jboss-blog-feeds.sar">
+ <fileset dir="${src.meta}"><include name="**/*" /></fileset>
+ </copy>
+
+ <!-- Creating the jar with the classes -->
+ <jar destfile="${dist.lib.dir}/jboss-blog-feeds.jar" basedir="${build}" />
+
+ <!-- Copying dependency jars -->
+ <copy todir="${dist.lib.dir}"><fileset refid="rome.jars"/></copy>
+
+ <!-- Creating the web application -->
+ <mkdir dir="${dist.main.dir}/jboss-blog-feeds.sar/jboss-blog-feeds.war" />
+ <copy todir="${dist.main.dir}/jboss-blog-feeds.sar/jboss-blog-feeds.war">
+ <fileset dir="${src.web}"><include name="**/*" /></fileset>
+ </copy>
+ </target>
+
+ <target name="clean">
+ <delete dir="${build}" />
+ </target>
+</project>
Added: trunk/blog-feeds/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-feeds/src/etc/META-INF/jboss-service.xml (rev 0)
+++ trunk/blog-feeds/src/etc/META-INF/jboss-service.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server
+ PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd">
+<server>
+
+</server>
\ No newline at end of file
Added: trunk/blog-feeds/src/java/org/jboss/blog/feeds/FeedsServlet.java
===================================================================
--- trunk/blog-feeds/src/java/org/jboss/blog/feeds/FeedsServlet.java (rev 0)
+++ trunk/blog-feeds/src/java/org/jboss/blog/feeds/FeedsServlet.java 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,49 @@
+package org.jboss.blog.feeds;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class FeedsServlet extends HttpServlet {
+ private void invalidRequest(HttpServletResponse response, String msg)
+ throws IOException {
+ response.setContentType("text/html");
+ response.getOutputStream().println("The feed you requested is not available: " + msg + ".");
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ String requestURI = request.getRequestURI();
+
+ // Getting rid of the /war-name/.
+ requestURI = requestURI.split("[/]", 3)[2];
+
+ // Getting rid of the possible '/' at the end of the request.
+ if (requestURI.endsWith("/"))
+ requestURI = requestURI.substring(0, requestURI.length()-1);
+
+ // Splitting the URI into name, data and type.
+ int firstSlash = requestURI.indexOf('/');
+ int lastSlash = requestURI.lastIndexOf('/');
+
+ if (lastSlash == -1) {
+ invalidRequest(response, "Invalid path");
+ return;
+ }
+
+ String name = requestURI.substring(0, firstSlash);
+ String data = firstSlash != lastSlash ? requestURI.substring(firstSlash+1, lastSlash) : null;
+ String type = requestURI.substring(lastSlash+1);
+
+ try {
+ System.out.println("Requested feed: " + name + "; " + data + "; " + type);
+ } catch (Exception e) {
+ invalidRequest(response, e.getMessage());
+ }
+ }
+
+}
Added: trunk/blog-feeds/src/web/WEB-INF/jboss-app.xml
===================================================================
--- trunk/blog-feeds/src/web/WEB-INF/jboss-app.xml (rev 0)
+++ trunk/blog-feeds/src/web/WEB-INF/jboss-app.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,3 @@
+<jboss-app>
+ <app-name>feeds</app-name>
+</jboss-app>
Added: trunk/blog-feeds/src/web/WEB-INF/jboss-web.xml
===================================================================
--- trunk/blog-feeds/src/web/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/blog-feeds/src/web/WEB-INF/jboss-web.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<jboss-web>
+ <context-root>feeds</context-root>
+</jboss-web>
Added: trunk/blog-feeds/src/web/WEB-INF/web.xml
===================================================================
--- trunk/blog-feeds/src/web/WEB-INF/web.xml (rev 0)
+++ trunk/blog-feeds/src/web/WEB-INF/web.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+ <!-- Main feeds servlet -->
+
+ <servlet>
+ <servlet-name>feedsServlet</servlet-name>
+ <servlet-class>org.jboss.blog.feeds.FeedsServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>feedsServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Modified: trunk/blog-services/build.xml
===================================================================
--- trunk/blog-services/build.xml 2007-06-21 13:09:59 UTC (rev 127)
+++ trunk/blog-services/build.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -36,7 +36,8 @@
<mkdir dir="${dist.lib.dir}" />
<!-- Copying the meta information -->
- <copy todir="${dist.main.dir}">
+ <mkdir dir="${dist.main.dir}/jboss-blog-services.sar" />
+ <copy todir="${dist.main.dir}/jboss-blog-services.sar">
<fileset dir="${src.meta}"><include name="**/*" /></fileset>
</copy>
Added: trunk/blog-view/${dist.war.dir}/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/blog-view/${dist.war.dir}/WEB-INF/lib/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/blog-view/${dist.war.dir}/WEB-INF/lib/standard.jar
===================================================================
(Binary files differ)
Property changes on: trunk/blog-view/${dist.war.dir}/WEB-INF/lib/standard.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/blog-view/build.xml
===================================================================
--- trunk/blog-view/build.xml 2007-06-21 13:09:59 UTC (rev 127)
+++ trunk/blog-view/build.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -42,12 +42,12 @@
<jar destfile="${dist.lib.dir}/jboss-blog-view.jar" basedir="${build}" />
<!-- Creating the web application -->
- <mkdir dir="${dist.war.dir}" />
- <copy todir="${dist.war.dir}">
+ <mkdir dir="${dist.main.dir}/jboss-blog-view.war" />
+ <copy todir="${dist.main.dir}/jboss-blog-view.war">
<fileset dir="${src.web}"><include name="**/*" /></fileset>
</copy>
- <copy todir="${dist.war.dir}/WEB-INF/lib"><fileset refid="jstl.jars"/></copy>
+ <copy todir="${dist.main.dir}/jboss-blog-view.war/WEB-INF/lib"><fileset refid="jstl.jars"/></copy>
<!--<antcall target="copy-libs-for-servlet" />-->
</target>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-06-21 13:09:59 UTC (rev 127)
+++ trunk/build.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -9,8 +9,6 @@
<!-- Name of the service archive which will contain the blog application -->
<property name="sar.name" value="portal-blog.sar" />
- <!-- Name of the web application that will be contained in the sar -->
- <property name="war.name" value="jboss-blog.war" />
<!-- Configuration of source/ target directories -->
<property name="src" value="src"/>
@@ -23,7 +21,6 @@
<!-- Helper properties: built using the above ones -->
<property name="dist.main.dir" value="${dist}/${sar.name}" />
<property name="dist.lib.dir" value="${dist.main.dir}/lib" />
- <property name="dist.war.dir" value="${dist.main.dir}/${war.name}" />
<property name="deploy.dir" value="${jboss.home}/server/${jboss.conf}/deploy" />
<!-- Dependency jars filesets definitions -->
@@ -54,6 +51,7 @@
<ant dir="blog-common" inheritrefs="true" target="${target.name}" />
<ant dir="blog-services" inheritrefs="true" target="${target.name}" />
<ant dir="blog-view" inheritrefs="true" target="${target.name}" />
+ <ant dir="blog-feeds" inheritrefs="true" target="${target.name}" />
</target>
<!-- Main tasks -->
@@ -71,6 +69,12 @@
</target>
<target name="dist" depends="build">
+ <!-- Copying the meta information -->
+ <mkdir dir="${dist.main.dir}" />
+ <copy todir="${dist.main.dir}">
+ <fileset dir="${src.meta}"><include name="**/*" /></fileset>
+ </copy>
+
<antcall target="each-module">
<param name="target.name" value="dist" />
</antcall>
Added: trunk/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/src/etc/META-INF/jboss-service.xml (rev 0)
+++ trunk/src/etc/META-INF/jboss-service.xml 2007-06-25 11:22:12 UTC (rev 128)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server
+ PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd">
+<server>
+
+</server>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list