(no commit message)

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/beanRefContext.xml b/branches/TO_MAVEN/crawler/kissweb/src/main/java/beanRefContext.xml
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/beanRefContext.xml
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/beanRefContext.xml

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org.wamblee.beanfactory.properties b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org.wamblee.beanfactory.properties
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org.wamblee.beanfactory.properties
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org.wamblee.beanfactory.properties

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org.wamblee.crawler.kiss.xml b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org.wamblee.crawler.kiss.xml
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org.wamblee.crawler.kiss.xml
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org.wamblee.crawler.kiss.xml

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org.wamblee.crawler.properties b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org.wamblee.crawler.properties
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org.wamblee.crawler.properties
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org.wamblee.crawler.properties

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/Application.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/Application.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/Application.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/Application.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java b/branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/kissweb/src/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java
rename to branches/TO_MAVEN/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/webapp/META-INF/MANIFEST.MF b/branches/TO_MAVEN/crawler/kissweb/src/webapp/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..5e94951
--- /dev/null
+++ b/branches/TO_MAVEN/crawler/kissweb/src/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0\r
+Class-Path: \r
+\r

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/webapp/WEB-INF/overview.jsp b/branches/TO_MAVEN/crawler/kissweb/src/webapp/WEB-INF/overview.jsp
new file mode 100644 (file)
index 0000000..ce74949
--- /dev/null
+++ b/branches/TO_MAVEN/crawler/kissweb/src/webapp/WEB-INF/overview.jsp
@@ -0,0 +1,74 @@
+
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>KiSS Crawler overview page</title>
+    
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="cache-control" content="no-cache">
+    <meta http-equiv="expires" content="0">
+    <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+    <meta http-equiv="description" content="This is my page">
+    
+    <!--
+    <link rel="stylesheet" type="text/css" href="styles.css">
+    -->
+  </head>
+  
+  <body>
+    <h1>KiSS Crawler Overview</h1>
+    
+    <TABLE border="1">
+      <tr>
+        <td>
+           Currently running:
+        </td>
+        <td>
+           <c:out value="${running}"/>
+        </td>
+      </tr>
+      <c:if test="${lastReport != null}">
+            <tr>
+        <td>
+          Last executed at:
+        </td>
+        <td>
+          <c:out value="${lastExecuted}"/>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Last result: 
+        </td>
+        <td>
+          <c:out value="${lastResult}"/>
+        </td>
+      </tr>
+        <tr>
+        <td>
+          Last message: 
+        </td>
+        <td>
+          <c:out value="${lastMessage}" escapeXml="false"/>
+        </td>
+        </tr>
+        <tr>
+        <td>
+          Last report: 
+        </td>
+        <td>
+          <a href="?details=1">details</a>
+        </td>
+        </tr>
+      </c:if>
+    </TABLE>
+    <c:if test="${!running}">
+    <FORM action="runnow">
+      <INPUT type="submit" name="runnow" value="Run Crawler as soon as possible">
+    </FORM>
+    </c:if>
+  </body>
+</html>

diff --git a/branches/TO_MAVEN/crawler/kissweb/src/webapp/WEB-INF/web.xml b/branches/TO_MAVEN/crawler/kissweb/src/webapp/WEB-INF/web.xml
new file mode 100644 (file)
index 0000000..2ff8779
--- /dev/null
+++ b/branches/TO_MAVEN/crawler/kissweb/src/webapp/WEB-INF/web.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 
+       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">
+
+    <listener>
+        <listener-class>org.wamblee.crawler.kiss.servlet.Application</listener-class>
+    </listener>
+    
+    <servlet>
+        <servlet-name>CrawlerServlet</servlet-name>
+        <servlet-class>org.wamblee.crawler.kiss.servlet.CrawlerServlet</servlet-class>
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>CrawlerServlet</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+</web-app>