[jboss-svn-commits] JBoss Portal SVN: r5269 - in trunk/theme: . src/main/org/jboss/portal/test/theme src/main/org/jboss/portal/test/theme/servlet src/resources src/resources/test-portal-ajax-war src/resources/test-portal-ajax-war/WEB-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 27 14:51:03 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-09-27 14:51:02 -0400 (Wed, 27 Sep 2006)
New Revision: 5269
Added:
trunk/theme/src/main/org/jboss/portal/test/theme/servlet/
trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java
trunk/theme/src/resources/test-portal-ajax-war/
trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/
trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/jboss-web.xml
trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/web.xml
Modified:
trunk/theme/build.xml
Log:
JBPORTAL-1009 - fixed build to cimply with new testsuite
JBPORTAL-1009 - added ajax test structure
Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml 2006-09-27 03:53:07 UTC (rev 5268)
+++ trunk/theme/build.xml 2006-09-27 18:51:02 UTC (rev 5269)
@@ -141,10 +141,11 @@
<fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
</jar>
- <!-- -->
- <jar jarfile="${build.lib}/portal-theme-test-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
- </jar>
+ <!--
+ <jar jarfile="${build.lib}/portal-theme-test-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
+ </jar>
+ -->
<copy todir="${build.resources}/portal-ajax-war">
<fileset dir="${source.bin}/portal-ajax-war"/>
@@ -192,8 +193,34 @@
</xslt>
</target>
- <target name="test" depends="init">
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+
+ <!-- Packages all the test related artifacts. Note that compilation should have be-->
+ <target name="package-tests" depends="package-ajax-test"
+ description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before
+ calling this task."/>
+
+ <!-- AJAX tests -->
+ <target name="package-ajax-test" description="Generate the AJAX test artifacts" depends="init">
+
+ <jar jarfile="${build.lib}/portal-theme-test-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
+ </jar>
+
+ <copy todir="${build.resources}/test-portal-ajax-war/WEB-INF/lib">
+ <fileset dir="${build.lib}/" includes="portal-theme-test-lib.jar"/>
+ </copy>
+
+ <jar jarfile="${build.lib}/test-portal-ajax.war">
+ <fileset dir="${build.resources}/test-portal-ajax-war"/>
+ </jar>
+
+ </target>
+
+ <target name="tests" depends="init">
<property name="build.testlog" value="${module.output}/log"/>
<echo><![CDATA[
@@ -232,17 +259,15 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-->
- <!--
- <test name="org.jboss.portal.test.portal.kernel.RegistrationTestCase"/>
- <test name="org.jboss.portal.test.portal.kernel.LifeCycleTestCase"/>
- <test name="org.jboss.portal.test.portal.kernel.StateMachineTestCase"/>
- <test name="org.jboss.portal.test.portal.util.ParametersTestCase"/>
- <test name="org.jboss.portal.test.portal.util.ServerObjectIDTestCase"/>
- <test name="org.jboss.portal.test.portal.util.PropertiesTestCase"/>
- <test name="org.jboss.portal.test.portal.model.TreeCacheTestCase"/>
- <test name="org.jboss.portal.test.portal.model.ModelTestCase"/>
- <test name="org.jboss.portal.test.portal.model.ReplicatedModelTestCase"/>
- -->
+ <test name="org.jboss.portal.test.portal.kernel.RegistrationTestCase"/>
+ <test name="org.jboss.portal.test.portal.kernel.LifeCycleTestCase"/>
+ <test name="org.jboss.portal.test.portal.kernel.StateMachineTestCase"/>
+ <test name="org.jboss.portal.test.portal.util.ParametersTestCase"/>
+ <test name="org.jboss.portal.test.portal.util.ServerObjectIDTestCase"/>
+ <test name="org.jboss.portal.test.portal.util.PropertiesTestCase"/>
+ <test name="org.jboss.portal.test.portal.model.TreeCacheTestCase"/>
+ <test name="org.jboss.portal.test.portal.model.ModelTestCase"/>
+ <test name="org.jboss.portal.test.portal.model.ReplicatedModelTestCase"/>
<test name="org.jboss.portal.test.theme.metadata.TestLayoutStrategySetMetaData"/>
<test name="org.jboss.portal.test.theme.metadata.TestPortalLayoutMetaData"/>
@@ -261,6 +286,7 @@
</classpath>
</junit>
+
</target>
</project>
Added: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java 2006-09-27 03:53:07 UTC (rev 5268)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java 2006-09-27 18:51:02 UTC (rev 5269)
@@ -0,0 +1,131 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.test.theme.servlet;
+
+import org.jboss.logging.Logger;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Enumeration;
+
+/**
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
+ */
+
+public class TestAJAXServlet extends HttpServlet
+{
+ private final static Logger log = Logger.getLogger(TestAJAXServlet.class);
+
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException
+ {
+ doPost(req, resp);
+ }
+
+ public void doPost(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException
+ {
+ Enumeration paramNames = req.getParameterNames();
+ while(paramNames.hasMoreElements())
+ {
+ String name = (String) paramNames.nextElement();
+ //log.info("Parameter: " + name + " = " + req.getParameter(name));
+ System.out.println("Parameter: " + name + " = " + req.getParameter(name));
+ }
+
+
+ sendResp(resp, "BLAH");
+
+/*
+ if(req.getParameter("action") != null)
+ {
+ if(req.getParameter("action").equals(PERSIST))
+ {
+ if(req.getParameter("positionNo") == null
+ || req.getParameter("windowId") == null
+ || req.getParameter("oldRegionId") == null
+ || req.getParameter("newRegionId") == null)
+ {
+ resp.sendError(400, "Not enought parameters");
+ return;
+ }
+
+ if(!testMode)
+ {
+ persistance.persistPosition(req.getParameter("positionNo"),
+ req.getParameter("windowId"), req
+ .getParameter("oldRegionId"), req
+ .getParameter("newRegionId"));
+ }
+
+ sendResp(resp, "Position persisted");
+ }
+ else if(req.getParameter("action").equals(TEST_MODE))
+ {
+ if(req.getParameter("mode") != null)
+ {
+ try
+ {
+ testMode = Boolean.valueOf(req.getParameter("mode"))
+ .booleanValue();
+ }
+ catch(RuntimeException e)
+ {
+ resp.sendError(400, "Bad arguments");
+ return;
+ }
+
+ sendResp(resp, ((testMode) ? "Test mode ON" : "Test mode OFF"));
+
+ }
+ else
+ {
+ resp.sendError(400, "Not enought parameters");
+ return;
+ }
+ }
+ else
+ {
+ resp.sendError(400, "Unknown ajax call");
+ return;
+ }
+ }
+*/
+ }
+
+ private void sendResp(HttpServletResponse resp, String respData)
+ throws IOException
+ {
+ resp.setHeader("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
+ resp.setDateHeader("Last-Modified", new Date().getTime());
+ resp.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
+ resp.addHeader("Cache-Control", "post-check=0, pre-check=0");
+ resp.setContentType("text/html");
+
+ resp.getWriter().write(respData);
+ }
+}
Added: trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/jboss-web.xml 2006-09-27 03:53:07 UTC (rev 5268)
+++ trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/jboss-web.xml 2006-09-27 18:51:02 UTC (rev 5269)
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<jboss-web>
+ <context-root>/test</context-root>
+</jboss-web>
\ No newline at end of file
Added: trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/web.xml
===================================================================
--- trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/web.xml 2006-09-27 03:53:07 UTC (rev 5268)
+++ trunk/theme/src/resources/test-portal-ajax-war/WEB-INF/web.xml 2006-09-27 18:51:02 UTC (rev 5269)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <servlet>
+ <servlet-name>TestAJAXServlet</servlet-name>
+ <servlet-class>org.jboss.portal.test.theme.servlet.TestAJAXServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestAJAXServlet</servlet-name>
+ <url-pattern>/testajax/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list