5:14 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-05-12 06:14:00 -0400 (Tue, 12 May 2009)
New Revision: 88713
Added:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/style/
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/style/osgishop.css
Modified:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/RequestHandler.java
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd
Log:
Add stylesheet to trailblazer
Modified:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java 2009-05-12
10:05:43 UTC (rev 88712)
+++
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java 2009-05-12
10:14:00 UTC (rev 88713)
@@ -134,13 +134,23 @@
private void renderHeader(HttpServletRequest req, HttpServletResponse res) throws
IOException
{
PrintWriter out = res.getWriter();
+
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<link rel='stylesheet' href='" +
req.getServletPath() + "/style/osgishop.css' type='text/css'>");
+ out.println("</head>");
+ out.println("<body>");
+
out.println("<a href='" + req.getServletPath() +
"'>home</a>");
out.println("<a href='" + req.getServletPath() +
"/cart'>cart</a>");
out.println("<p/>");
}
- private void renderFooter(HttpServletRequest req, HttpServletResponse res)
+ private void renderFooter(HttpServletRequest req, HttpServletResponse res) throws
IOException
{
+ PrintWriter out = res.getWriter();
+ out.println("</body>");
+ out.println("</html>");
}
}
Modified:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/RequestHandler.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/RequestHandler.java 2009-05-12
10:05:43 UTC (rev 88712)
+++
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/RequestHandler.java 2009-05-12
10:14:00 UTC (rev 88713)
@@ -68,7 +68,7 @@
}
else
{
- out.println("No active shops, please try later.");
+ out.println("<p>No active shops, please try later.</p>");
}
}
@@ -95,13 +95,6 @@
out.println("</table>");
}
- public void renderConfirmPage(HttpServletRequest req, HttpServletResponse res) throws
IOException
- {
- PrintWriter out = res.getWriter();
- Shop shop = getShopFromRequestParam(req);
- out.println("Thanks for shopping with " + shop.getName());
- }
-
public void renderCartPage(HttpServletRequest req, HttpServletResponse res) throws
IOException
{
PrintWriter out = res.getWriter();
@@ -112,7 +105,7 @@
Set<Shop> shops = shoppingCart.getShops();
if (shops.size() == 0)
{
- out.println("Your shopping cart is empty");
+ out.println("<p>Your shopping cart is empty</p>");
return;
}
@@ -121,7 +114,7 @@
Integer total = new Integer(0);
String shopName = shop.getName();
- out.println("<h4><a href='" + req.getServletPath() +
"/list?shop=" + shopName + "'>" + shopName +
"</a></h4>");
+ out.println("<h3><a href='" + req.getServletPath() +
"/list?shop=" + shopName + "'>" + shopName +
"</a></h3>");
out.println("<table>");
out.println("<tr><th>Product</th><th>Price</th></tr>");
for (Product p : shoppingCart.getProductsByShop(shop))
@@ -152,11 +145,18 @@
}
else
{
- out.println("Payment service not available, please try later.");
+ out.println("<p>Payment service not available, please try
later.</p>");
}
}
}
+ public void renderConfirmPage(HttpServletRequest req, HttpServletResponse res) throws
IOException
+ {
+ PrintWriter out = res.getWriter();
+ Shop shop = getShopFromRequestParam(req);
+ out.println("<p>Thanks for shopping with <b>" +
shop.getName() + "</b></p>");
+ }
+
public void actionAddToCart(HttpServletRequest req, HttpServletResponse res)
{
Shop shopService = getShopFromRequestParam(req);
Modified:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java 2009-05-12
10:05:43 UTC (rev 88712)
+++
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java 2009-05-12
10:14:00 UTC (rev 88713)
@@ -61,6 +61,7 @@
log.log(LogService.LOG_INFO, "Register " + CONTEXT_PATH);
HttpRenderServlet servlet = new HttpRenderServlet(context);
httpService.registerServlet(CONTEXT_PATH, servlet, null, null);
+ httpService.registerResources(CONTEXT_PATH + "/style",
"/style", null);
}
catch (Exception ex)
{
Added:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/style/osgishop.css
===================================================================
---
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/style/osgishop.css
(rev 0)
+++
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/META-INF/style/osgishop.css 2009-05-12
10:14:00 UTC (rev 88713)
@@ -0,0 +1,39 @@
+p {
+ font-family: Helvetica,Arial,sans-serif;
+ font-size: 14;
+}
+
+th {
+ font-family: Helvetica,Arial,sans-serif;
+ font-weight: bold;
+ font-size: 14;
+}
+
+td {
+ font-family: Helvetica,Arial,sans-serif;
+ font-size: 14;
+}
+
+a {
+ font-family: Helvetica,Arial,sans-serif;
+ font-size: 14;
+}
+
+h1 {
+ font-family: Helvetica,Arial,sans-serif;
+ font-weight: bold;
+ font-size: 20;
+}
+
+h2 {
+ font-family: Helvetica,Arial,sans-serif;
+ font-weight: bold;
+ font-size: 18;
+}
+
+h3 {
+ font-family: Helvetica,Arial,sans-serif;
+ font-weight: bold;
+ font-size: 16;
+}
+
Modified:
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd
===================================================================
---
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd 2009-05-12
10:05:43 UTC (rev 88712)
+++
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd 2009-05-12
10:14:00 UTC (rev 88713)
@@ -13,3 +13,4 @@
org.jboss.test.osgi.trailblazer, \
org.jboss.test.osgi.trailblazer.types
+Include-Resource: style/osgishop.css=../META-INF/style/osgishop.css
\ No newline at end of file