[jboss-cvs] JBossAS SVN: r90140 - in projects/spider/trunk/deployers/src: main/java/org/jboss/spider/deployers/dsl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 12 06:06:46 EDT 2009
Author: wolfc
Date: 2009-06-12 06:06:46 -0400 (Fri, 12 Jun 2009)
New Revision: 90140
Added:
projects/spider/trunk/deployers/src/main/java/org/jboss/spider/deployers/dsl/
projects/spider/trunk/deployers/src/main/java/org/jboss/spider/deployers/dsl/WebBuilder.java
Modified:
projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java
Log:
JBAS-7001: create domain specific language builder and made servlet test pass
Added: projects/spider/trunk/deployers/src/main/java/org/jboss/spider/deployers/dsl/WebBuilder.java
===================================================================
--- projects/spider/trunk/deployers/src/main/java/org/jboss/spider/deployers/dsl/WebBuilder.java (rev 0)
+++ projects/spider/trunk/deployers/src/main/java/org/jboss/spider/deployers/dsl/WebBuilder.java 2009-06-12 10:06:46 UTC (rev 90140)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.spider.deployers.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.Arrays;
+
+import org.jboss.metadata.annotation.creator.web.Web25MetaDataCreator;
+import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.metadata.web.spec.ServletsMetaData;
+import org.jboss.metadata.web.spec.Web25MetaData;
+
+/**
+ * Build web meta data with domain specific language syntax.
+ *
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class WebBuilder
+{
+ private Web25MetaData metaData;
+
+ public WebBuilder()
+ {
+ this(new Web25MetaData());
+ }
+
+ public WebBuilder(Web25MetaData metaData)
+ {
+ this.metaData = metaData;
+ }
+
+ public Web25MetaData getMetaData()
+ {
+ return metaData;
+ }
+
+ public WebBuilder servlet(Class<?> servlet)
+ {
+ ServletMetaData servletMetaData = new ServletMetaData();
+ servletMetaData.setServletName(servlet.getSimpleName());
+ servletMetaData.setServletClass(servlet.getName());
+ if(metaData.getServlets() == null)
+ metaData.setServlets(new ServletsMetaData());
+ metaData.getServlets().add(servletMetaData);
+ return this;
+ }
+
+ public WebBuilder servletMapping(String servletName, String... urlPatterns)
+ {
+ ServletMappingMetaData mapping = new ServletMappingMetaData();
+ mapping.setServletName(servletName);
+ mapping.setUrlPatterns(Arrays.asList(urlPatterns));
+ if(metaData.getServletMappings() == null)
+ metaData.setServletMappings(Arrays.asList(mapping));
+ else
+ metaData.getServletMappings().add(mapping);
+ return this;
+ }
+
+ public static WebBuilder web(Class<?>...servlets)
+ {
+ AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
+ Web25MetaDataCreator creator = new Web25MetaDataCreator(finder);
+ Web25MetaData metaData = creator.create(Arrays.asList(servlets));
+ WebBuilder builder = new WebBuilder(metaData);
+ for(Class<?> servlet : servlets)
+ {
+ builder.servlet(servlet);
+ }
+ return builder;
+ }
+}
Modified: projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java
===================================================================
--- projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java 2009-06-12 10:05:29 UTC (rev 90139)
+++ projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java 2009-06-12 10:06:46 UTC (rev 90140)
@@ -21,14 +21,19 @@
*/
package org.jboss.spider.deployers.test.servlet.unit;
+import static org.jboss.spider.deployers.dsl.WebBuilder.web;
+import static org.junit.Assert.assertEquals;
+
import java.io.File;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.spider.deployers.test.common.AbstractWebTestCase;
+import org.jboss.spider.deployers.test.servlet.GreeterServlet;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.junit.Test;
@@ -43,13 +48,17 @@
//@Ignore
public void test1() throws Exception
{
- deploy(deployment("servlet", WebMetaData.class, servlets(BasicServletTestCase.class)));
+ deploy(deployment("servlet", WebMetaData.class,
+ web(GreeterServlet.class).servletMapping("GreeterServlet", "/*").getMetaData()));
HttpClient client = new HttpClient();
+ client.setTimeout(1000);
GetMethod method = new GetMethod("http://localhost:8080/servlet");
- client.setTimeout(1000);
- int result = client.executeMethod(method);
- System.out.println("result = " + result);
+ method.setQueryString("name=test");
+ int responseCode = client.executeMethod(method);
+ assertEquals(HttpStatus.SC_OK, responseCode);
+ String result = method.getResponseBodyAsString();
+ assertEquals("Hello test\r\n", result);
}
@Test
@@ -64,7 +73,7 @@
HttpClient client = new HttpClient();
GetMethod method = new GetMethod("http://localhost:8080/dummy/dummy.jsp?visitor=me");
client.setTimeout(1000);
- int result = client.executeMethod(method);
- System.out.println("result = " + result);
+ int responseCode = client.executeMethod(method);
+ assertEquals(HttpStatus.SC_OK, responseCode);
}
}
More information about the jboss-cvs-commits
mailing list