(no commit message)

diff --git a/.classpath b/.classpath
index 918f2c28c4f6fc96f2005afbeafa99c411320fad..7b60329bd00788fba64ad491c085f3ce320e36da 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,70 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry output="crawler/basic/build/bin" kind="src" path="crawler/basic/src"/>
-       <classpathentry output="gps/build/bin" kind="src" path="gps/src"/>
-       <classpathentry output="crawler/kissweb/build/testbin" kind="src" path="crawler/kissweb/test"/>
-       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="crawler/kissweb/src"/>
-       <classpathentry output="crawler/basic/build/testbin" kind="src" path="crawler/basic/test"/>
-       <classpathentry output="crawler/kiss/build/bin" kind="src" path="crawler/kiss/src"/>
-       <classpathentry output="support/build/bin" kind="src" path="support/src"/>
-       <classpathentry output="support/build/testbin" kind="src" path="support/test"/>
-       <classpathentry exported="true" kind="lib" path="crawler/basic/lib/external/jtidy-4aug2000r7-dev.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/basic/lib/test/dbunit-2.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/basic/lib/test/jmock-1.0.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/basic/lib/test/jmock-cglib-1.0.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/basic/lib/test/junit-3.8.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/commons-httpclient-3.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/jtidy-4aug2000r7-dev.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/test/jmock-1.0.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/test/jmock-cglib-1.0.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/dom4j-1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/ehcache-1.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/log4j-1.2.9.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/antlr-2.7.5H3.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/asm.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/asm-attrs.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/cglib-2.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/hibernate-3.0.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/jmock-1.0.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/jmock-cglib-1.0.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/jta.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/oro-2.0.6.jar"/>
-       <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/commons-codec-1.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/jaxen-1.1-beta-4.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/activation.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/mail.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/xerces-2.4.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="crawler/kiss/lib/external/commons-email-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/emma_ant-2.0.5312.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/test/emma-2.0.5312.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/resources/test"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/commons-beanutils-1.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/commons-logging-1.0.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/jaxen-1.1-beta-4.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/commons-collections-3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="support/lib/external/spring-1.2.5.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/activation.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-codec-1.3.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-email-1.0.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-httpclient-3.0.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-logging-1.0.2.jar"/>
-       <classpathentry sourcepath="/usr/java/dom4j/src/java" kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/dom4j-1.6.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/jaxen-1.1-beta-4.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/jstl-1.1.2.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/jtidy-4aug2000r7-dev.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/log4j-1.2.9.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/mail.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/quartz-1.5.1.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/servletapi-2.4.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/spring-1.2.5.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/standard-1.1.2.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/wamblee-crawler-basic.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/wamblee-crawler-kiss.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/wamblee-support.jar"/>
-       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/xerces-2.4.0.jar"/>
-       <classpathentry kind="lib" path="gps/lib/external/jcommon-1.0.0.jar"/>
-       <classpathentry sourcepath="/usr/java/jfreechart/source" kind="lib" path="gps/lib/external/jfreechart-1.0.1.jar"/>
+       <classpathentry kind="src" path="support/src/main/java"/>
+       <classpathentry kind="src" path="support/src/test/java"/>
+       <classpathentry excluding="**" output="support/src/main/resources" kind="src" path="support/src/main/resources"/>
+       <classpathentry excluding="**" output="support/src/test/resources" kind="src" path="support/src/test/resources"/>
+       <classpathentry kind="src" path="socketproxy/src/main/java"/>
+       <classpathentry kind="src" path="socketproxy/src/test/java"/>
+       <classpathentry excluding="**" output="socketproxy/src/test/resources" kind="src" path="socketproxy/src/test/resources"/>
+       <classpathentry kind="src" path="crawler/basic/src/main/java"/>
+       <classpathentry kind="src" path="crawler/basic/src/test/java"/>
+       <classpathentry excluding="**" output="crawler/basic/src/test/resources" kind="src" path="crawler/basic/src/test/resources"/>
+       <classpathentry kind="src" path="crawler/kiss/src/main/java"/>
+       <classpathentry kind="src" path="crawler/kiss/src/test/java"/>
+       <classpathentry excluding="**" output="crawler/kiss/src/main/resources" kind="src" path="crawler/kiss/src/main/resources"/>
+       <classpathentry excluding="**" output="crawler/kiss/src/test/resources" kind="src" path="crawler/kiss/src/test/resources"/>
+       <classpathentry kind="src" path="crawler/kissweb/src/main/java"/>
+       <classpathentry kind="src" path="crawler/kissweb/src/test/java"/>
+       <classpathentry excluding="**" output="crawler/kissweb/src/main/resources" kind="src" path="crawler/kissweb/src/main/resources"/>
+       <classpathentry excluding="**" output="crawler/kissweb/src/test/resources" kind="src" path="crawler/kissweb/src/test/resources"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="output" path="crawler/basic/build/bin"/>
 </classpath>

diff --git a/.mymetadata b/.mymetadata
index d2fe841ae181f559027517bd6afbb332eb0cd71f..abd10aa5d83ada37ffb06357dc11a982b3943865 100644 (file)
--- a/.mymetadata
+++ b/.mymetadata
@@ -7,7 +7,7 @@
   j2ee-spec="1.4"
   archive="utils.war">\r
   <attributes>\r
-    <attribute name="webrootdir" value="/crawler/kissweb/WebRoot" />\r
+    <attribute name="webrootdir" value="/crawler/kissweb/src/webapp" />\r
   </attributes>\r
 </project-module>\r
 \r

diff --git a/.project b/.project
index 42411d06e6b745e55d7bda0d2c81ae1c3589ba3f..8895fe5e89c946883c0eac771c659a08a8cbf3d3 100644 (file)
--- a/.project
+++ b/.project
@@ -40,10 +40,16 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
                <nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
        </natures>
 </projectDescription>