From: erik Date: Sat, 2 Sep 2006 17:37:04 +0000 (+0000) Subject: Migration to maven almost complete. At least everything builds and works X-Git-Tag: MYTHTV_EAR_NO_MSG_LINKING~78 X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=fe85d022196c8578bb549945260a6e3c2017c33c;p=utils Migration to maven almost complete. At least everything builds and works again. --- diff --git a/crawler/basic/pom.xml b/crawler/basic/pom.xml new file mode 100644 index 00000000..ba70b3d8 --- /dev/null +++ b/crawler/basic/pom.xml @@ -0,0 +1,42 @@ + + + + org.wamblee + crawler + 0.2-SNAPSHOT + + + 4.0.0 + org.wamblee + crawler-basic + jar + wamblee.org Basic crawler framework + http://wamblee.org + + + org.wamblee + support + + + + commons-httpclient + commons-httpclient + + + jtidy + jtidy + + + dom4j + dom4j + + + xerces + xerces + + + + + diff --git a/crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java b/crawler/basic/src/main/java/org/wamblee/crawler/AbstractPageRequest.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java rename to crawler/basic/src/main/java/org/wamblee/crawler/AbstractPageRequest.java diff --git a/crawler/basic/src/org/wamblee/crawler/Action.java b/crawler/basic/src/main/java/org/wamblee/crawler/Action.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/Action.java rename to crawler/basic/src/main/java/org/wamblee/crawler/Action.java diff --git a/crawler/basic/src/org/wamblee/crawler/Configuration.java b/crawler/basic/src/main/java/org/wamblee/crawler/Configuration.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/Configuration.java rename to crawler/basic/src/main/java/org/wamblee/crawler/Configuration.java diff --git a/crawler/basic/src/org/wamblee/crawler/Crawler.java b/crawler/basic/src/main/java/org/wamblee/crawler/Crawler.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/Crawler.java rename to crawler/basic/src/main/java/org/wamblee/crawler/Crawler.java diff --git a/crawler/basic/src/org/wamblee/crawler/GetPageRequest.java b/crawler/basic/src/main/java/org/wamblee/crawler/GetPageRequest.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/GetPageRequest.java rename to crawler/basic/src/main/java/org/wamblee/crawler/GetPageRequest.java diff --git a/crawler/basic/src/org/wamblee/crawler/Page.java b/crawler/basic/src/main/java/org/wamblee/crawler/Page.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/Page.java rename to crawler/basic/src/main/java/org/wamblee/crawler/Page.java diff --git a/crawler/basic/src/org/wamblee/crawler/PageException.java b/crawler/basic/src/main/java/org/wamblee/crawler/PageException.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/PageException.java rename to crawler/basic/src/main/java/org/wamblee/crawler/PageException.java diff --git a/crawler/basic/src/org/wamblee/crawler/PageRequest.java b/crawler/basic/src/main/java/org/wamblee/crawler/PageRequest.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/PageRequest.java rename to crawler/basic/src/main/java/org/wamblee/crawler/PageRequest.java diff --git a/crawler/basic/src/org/wamblee/crawler/PageType.java b/crawler/basic/src/main/java/org/wamblee/crawler/PageType.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/PageType.java rename to crawler/basic/src/main/java/org/wamblee/crawler/PageType.java diff --git a/crawler/basic/src/org/wamblee/crawler/PostPageRequest.java b/crawler/basic/src/main/java/org/wamblee/crawler/PostPageRequest.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/PostPageRequest.java rename to crawler/basic/src/main/java/org/wamblee/crawler/PostPageRequest.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/ActionImpl.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/ActionImpl.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/ActionImpl.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/ActionImpl.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/App.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/App.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/App.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/App.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/ConfigItem.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigItem.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/ConfigItem.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigItem.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/ConfigurationImpl.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationImpl.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/ConfigurationImpl.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationImpl.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/ConfigurationParser.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationParser.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/ConfigurationParser.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationParser.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/CrawlerImpl.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/CrawlerImpl.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/CrawlerImpl.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/CrawlerImpl.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/PageImpl.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/PageImpl.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/PageImpl.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/PageImpl.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/PageTypeConfig.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/PageTypeConfig.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/PageTypeConfig.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/PageTypeConfig.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/UrlConfig.java b/crawler/basic/src/main/java/org/wamblee/crawler/impl/UrlConfig.java similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/UrlConfig.java rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/UrlConfig.java diff --git a/crawler/basic/src/org/wamblee/crawler/impl/package.html b/crawler/basic/src/main/java/org/wamblee/crawler/impl/package.html similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/impl/package.html rename to crawler/basic/src/main/java/org/wamblee/crawler/impl/package.html diff --git a/crawler/basic/src/org/wamblee/crawler/package.html b/crawler/basic/src/main/java/org/wamblee/crawler/package.html similarity index 100% rename from crawler/basic/src/org/wamblee/crawler/package.html rename to crawler/basic/src/main/java/org/wamblee/crawler/package.html diff --git a/crawler/kiss-application.xml b/crawler/kiss-application.xml new file mode 100644 index 00000000..7eb1717a --- /dev/null +++ b/crawler/kiss-application.xml @@ -0,0 +1,60 @@ + + kissbin + + dir + + false + + + + + org.wamblee:crawler-kiss + + + true + lib + false + + + + + + + + kiss/conf/kiss + + conf + + config.xml.example + programs.xml + org.wamblee.crawler.properties + + + + + kiss/conf/kiss + + bin + + run.* + + + + + kiss/target + + lib + + *.jar + + + + + + + runtime + + + + + diff --git a/crawler/kiss/forrest.properties b/crawler/kiss/forrest.properties index 9999cf15..ab7e802a 100644 --- a/crawler/kiss/forrest.properties +++ b/crawler/kiss/forrest.properties @@ -46,6 +46,8 @@ # Parent properties must be set. This usually means uncommenting # project.content-dir if any other property using it is uncommented +project.build-dir=${project.home}/target/forrest + #project.status=status.xml project.content-dir=docs #project.raw-content-dir=${project.content-dir}/content diff --git a/crawler/kiss/pom.xml b/crawler/kiss/pom.xml new file mode 100644 index 00000000..564b150e --- /dev/null +++ b/crawler/kiss/pom.xml @@ -0,0 +1,30 @@ + + + + org.wamblee + crawler + 0.2-SNAPSHOT + + + 4.0.0 + org.wamblee + crawler-kiss + jar + wamblee.org KiSS crawler + http://wamblee.org + + + + org.wamblee + crawler-basic + + + commons-email + commons-email + + + + + diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/AbstractVisitor.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/AbstractVisitor.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/AbstractVisitor.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/AbstractVisitor.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Channel.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Channel.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/Channel.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Channel.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/MatchVisitor.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/MatchVisitor.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/MatchVisitor.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/MatchVisitor.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/PrintVisitor.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/PrintVisitor.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/PrintVisitor.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/PrintVisitor.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Program.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Program.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/Program.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Program.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/TVGuide.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/TVGuide.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/TVGuide.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/TVGuide.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Time.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Time.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/Time.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Time.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/TimeInterval.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/TimeInterval.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/TimeInterval.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/TimeInterval.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Visitor.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Visitor.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/Visitor.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/Visitor.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/guide/package.html b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/package.html similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/guide/package.html rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/guide/package.html diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/InterestingProgramAction.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/InterestingProgramAction.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/InterestingProgramAction.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/InterestingProgramAction.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramAction.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramAction.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramAction.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramAction.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramFilter.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramFilter.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramFilter.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/ProgramFilter.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/RecordProgramAction.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/RecordProgramAction.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/RecordProgramAction.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/RecordProgramAction.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/Report.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/Report.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/Report.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/Report.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/SystemProperties.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/SystemProperties.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/SystemProperties.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/SystemProperties.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/package.html b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/package.html similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/main/package.html rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/package.html diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailNotifier.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/MailNotifier.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailNotifier.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/MailNotifier.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/MailServer.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/MailServer.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/NotificationException.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/NotificationException.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/notification/NotificationException.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/NotificationException.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/Notifier.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/Notifier.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/notification/Notifier.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/Notifier.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/UsernamePasswordAuthenticator.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/UsernamePasswordAuthenticator.java similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/notification/UsernamePasswordAuthenticator.java rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/UsernamePasswordAuthenticator.java diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/package.html b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/package.html similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/notification/package.html rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/notification/package.html diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/package.html b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/package.html similarity index 100% rename from crawler/kiss/src/org/wamblee/crawler/kiss/package.html rename to crawler/kiss/src/main/java/org/wamblee/crawler/kiss/package.html diff --git a/crawler/kiss/src/channel-overview.xsl b/crawler/kiss/src/main/resources/channel-overview.xsl similarity index 100% rename from crawler/kiss/src/channel-overview.xsl rename to crawler/kiss/src/main/resources/channel-overview.xsl diff --git a/crawler/kiss/src/channel-right-now-graphic.xsl b/crawler/kiss/src/main/resources/channel-right-now-graphic.xsl similarity index 100% rename from crawler/kiss/src/channel-right-now-graphic.xsl rename to crawler/kiss/src/main/resources/channel-right-now-graphic.xsl diff --git a/crawler/kiss/src/channel-right-now-mobile.xsl b/crawler/kiss/src/main/resources/channel-right-now-mobile.xsl similarity index 100% rename from crawler/kiss/src/channel-right-now-mobile.xsl rename to crawler/kiss/src/main/resources/channel-right-now-mobile.xsl diff --git a/crawler/kiss/src/channel-right-now-output.xml b/crawler/kiss/src/main/resources/channel-right-now-output.xml similarity index 100% rename from crawler/kiss/src/channel-right-now-output.xml rename to crawler/kiss/src/main/resources/channel-right-now-output.xml diff --git a/crawler/kiss/src/channel-right-now.xsl b/crawler/kiss/src/main/resources/channel-right-now.xsl similarity index 100% rename from crawler/kiss/src/channel-right-now.xsl rename to crawler/kiss/src/main/resources/channel-right-now.xsl diff --git a/crawler/kiss/src/channels-favorites-graphic.xsl b/crawler/kiss/src/main/resources/channels-favorites-graphic.xsl similarity index 100% rename from crawler/kiss/src/channels-favorites-graphic.xsl rename to crawler/kiss/src/main/resources/channels-favorites-graphic.xsl diff --git a/crawler/kiss/src/channels-favorites.xsl b/crawler/kiss/src/main/resources/channels-favorites.xsl similarity index 100% rename from crawler/kiss/src/channels-favorites.xsl rename to crawler/kiss/src/main/resources/channels-favorites.xsl diff --git a/crawler/kiss/src/crawler-standalone.xml b/crawler/kiss/src/main/resources/crawler-standalone.xml similarity index 100% rename from crawler/kiss/src/crawler-standalone.xml rename to crawler/kiss/src/main/resources/crawler-standalone.xml diff --git a/crawler/kiss/src/identity.xsl b/crawler/kiss/src/main/resources/identity.xsl similarity index 100% rename from crawler/kiss/src/identity.xsl rename to crawler/kiss/src/main/resources/identity.xsl diff --git a/crawler/kiss/src/login-graphic.xsl b/crawler/kiss/src/main/resources/login-graphic.xsl similarity index 100% rename from crawler/kiss/src/login-graphic.xsl rename to crawler/kiss/src/main/resources/login-graphic.xsl diff --git a/crawler/kiss/src/login-mobile.xsl b/crawler/kiss/src/main/resources/login-mobile.xsl similarity index 100% rename from crawler/kiss/src/login-mobile.xsl rename to crawler/kiss/src/main/resources/login-mobile.xsl diff --git a/crawler/kiss/src/login.xsl b/crawler/kiss/src/main/resources/login.xsl similarity index 100% rename from crawler/kiss/src/login.xsl rename to crawler/kiss/src/main/resources/login.xsl diff --git a/crawler/kiss/src/mainpage.xsl b/crawler/kiss/src/main/resources/mainpage.xsl similarity index 100% rename from crawler/kiss/src/mainpage.xsl rename to crawler/kiss/src/main/resources/mainpage.xsl diff --git a/crawler/kiss/src/org.wamblee.crawler.notification.xml b/crawler/kiss/src/main/resources/org.wamblee.crawler.notification.xml similarity index 100% rename from crawler/kiss/src/org.wamblee.crawler.notification.xml rename to crawler/kiss/src/main/resources/org.wamblee.crawler.notification.xml diff --git a/crawler/kiss/src/org.wamblee.crawler.properties.xml b/crawler/kiss/src/main/resources/org.wamblee.crawler.properties.xml similarity index 100% rename from crawler/kiss/src/org.wamblee.crawler.properties.xml rename to crawler/kiss/src/main/resources/org.wamblee.crawler.properties.xml diff --git a/crawler/kiss/src/program-info-mobile.xsl b/crawler/kiss/src/main/resources/program-info-mobile.xsl similarity index 100% rename from crawler/kiss/src/program-info-mobile.xsl rename to crawler/kiss/src/main/resources/program-info-mobile.xsl diff --git a/crawler/kiss/src/program-info.xsl b/crawler/kiss/src/main/resources/program-info.xsl similarity index 100% rename from crawler/kiss/src/program-info.xsl rename to crawler/kiss/src/main/resources/program-info.xsl diff --git a/crawler/kiss/src/recorded.xsl b/crawler/kiss/src/main/resources/recorded.xsl similarity index 100% rename from crawler/kiss/src/recorded.xsl rename to crawler/kiss/src/main/resources/recorded.xsl diff --git a/crawler/kiss/src/reportToHtml.xsl b/crawler/kiss/src/main/resources/reportToHtml.xsl similarity index 100% rename from crawler/kiss/src/reportToHtml.xsl rename to crawler/kiss/src/main/resources/reportToHtml.xsl diff --git a/crawler/kiss/src/reportToText.xsl b/crawler/kiss/src/main/resources/reportToText.xsl similarity index 100% rename from crawler/kiss/src/reportToText.xsl rename to crawler/kiss/src/main/resources/reportToText.xsl diff --git a/crawler/kiss/src/utilities.xsl b/crawler/kiss/src/main/resources/utilities.xsl similarity index 100% rename from crawler/kiss/src/utilities.xsl rename to crawler/kiss/src/main/resources/utilities.xsl diff --git a/crawler/kissweb/pom.xml b/crawler/kissweb/pom.xml new file mode 100644 index 00000000..a2bc4e07 --- /dev/null +++ b/crawler/kissweb/pom.xml @@ -0,0 +1,56 @@ + + + + org.wamblee + crawler + 0.2-SNAPSHOT + + + 4.0.0 + org.wamblee + crawler-kissweb + war + wamblee.org KiSS crawler web interface + http://wamblee.org + + + + org.wamblee + crawler-kiss + + + quartz + quartz + + + javax.servlet + servlet-api + + + jstl + jstl + + + taglibs + standard + + + + + + + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/src/webapp/WEB-INF/web.xml + wamblee-crawler-kissweb + src/webapp + + + + + + diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutor.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerExecutorImpl.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerScheduler.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/CrawlerStatus.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/CrawlerJob.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/scheduling/quartz/QuartzCrawlerScheduler.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/Application.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/Application.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/Application.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/Application.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/servlet/CrawlerServlet.java diff --git a/crawler/kissweb/src/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java similarity index 100% rename from crawler/kissweb/src/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java rename to crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java diff --git a/crawler/kissweb/src/beanRefContext.xml b/crawler/kissweb/src/main/resources/beanRefContext.xml similarity index 100% rename from crawler/kissweb/src/beanRefContext.xml rename to crawler/kissweb/src/main/resources/beanRefContext.xml diff --git a/crawler/kissweb/src/org.wamblee.beanfactory.properties b/crawler/kissweb/src/main/resources/org.wamblee.beanfactory.properties similarity index 100% rename from crawler/kissweb/src/org.wamblee.beanfactory.properties rename to crawler/kissweb/src/main/resources/org.wamblee.beanfactory.properties diff --git a/crawler/kissweb/src/org.wamblee.crawler.kiss.xml b/crawler/kissweb/src/main/resources/org.wamblee.crawler.kiss.xml similarity index 100% rename from crawler/kissweb/src/org.wamblee.crawler.kiss.xml rename to crawler/kissweb/src/main/resources/org.wamblee.crawler.kiss.xml diff --git a/crawler/kissweb/src/org.wamblee.crawler.properties b/crawler/kissweb/src/main/resources/org.wamblee.crawler.properties similarity index 100% rename from crawler/kissweb/src/org.wamblee.crawler.properties rename to crawler/kissweb/src/main/resources/org.wamblee.crawler.properties diff --git a/crawler/kissweb/WebRoot/META-INF/MANIFEST.MF b/crawler/kissweb/src/webapp/META-INF/MANIFEST.MF similarity index 100% rename from crawler/kissweb/WebRoot/META-INF/MANIFEST.MF rename to crawler/kissweb/src/webapp/META-INF/MANIFEST.MF diff --git a/crawler/kissweb/WebRoot/WEB-INF/overview.jsp b/crawler/kissweb/src/webapp/WEB-INF/overview.jsp similarity index 100% rename from crawler/kissweb/WebRoot/WEB-INF/overview.jsp rename to crawler/kissweb/src/webapp/WEB-INF/overview.jsp diff --git a/crawler/kissweb/WebRoot/WEB-INF/web.xml b/crawler/kissweb/src/webapp/WEB-INF/web.xml similarity index 100% rename from crawler/kissweb/WebRoot/WEB-INF/web.xml rename to crawler/kissweb/src/webapp/WEB-INF/web.xml diff --git a/crawler/pom.xml b/crawler/pom.xml new file mode 100644 index 00000000..5c88c6c1 --- /dev/null +++ b/crawler/pom.xml @@ -0,0 +1,55 @@ + + + org.wamblee + utils + 0.2-SNAPSHOT + + 4.0.0 + org.wamblee + crawler + pom + 0.2-SNAPSHOT + wamblee.org KiSS crawler all + http://wamblee.org + + basic + kiss + kissweb + + + + + + + + org.wamblee + crawler-basic + ${project.version} + + + org.wamblee + crawler-kiss + ${project.version} + + + + + + + + + maven-assembly-plugin + 2.1 + + + kiss-application.xml + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..c856e888 --- /dev/null +++ b/pom.xml @@ -0,0 +1,205 @@ + + 4.0.0 + org.wamblee + utils + pom + 0.2-SNAPSHOT + wamblee.org utility libraries + http://wamblee.org + + support + socketproxy + crawler + + + + junit + junit + 3.8.1 + test + + + dbunit + dbunit + 2.1 + test + + + jmock + jmock-cglib + 1.1.0 + test + + + cglib + cglib-full + + + + + + + + + org.wamblee + support + ${project.version} + + + org.wamblee + socketproxy + ${project.version} + + + org.wamblee + crawler + ${project.version} + + + org.wamblee + crawler-basic + ${project.version} + + + + javax.servlet + servlet-api + 2.3 + jar + provided + + + quartz + quartz + 1.5.1 + + + jtidy + jtidy + 4aug2000r7-dev + + + + oro + oro + 2.0.6 + + + commons-logging + commons-logging + 1.0.2 + + + commons-httpclient + commons-httpclient + 3.0 + + + commons-beanutils + commons-beanutils + 1.7.0 + + + org.springframework + spring-beans + 1.2.8 + + + org.springframework + spring-hibernate + 1.2.8 + + + + log4j + log4j + 1.2.8 + + + dom4j + dom4j + 1.6 + + + xml-apis + xml-apis + + + + + ehcache + ehcache + 1.1 + + + xerces + xerces + 2.4.0 + + + org.hibernate + hibernate + 3.0.5 + + + commons-email + commons-email + 1.0 + + + jaxen + jaxen + 1.1-beta-9 + + + xom + xom + + + xerces + xmlParserAPIs + + + + + jstl + jstl + 1.1.2 + + + taglibs + standard + 1.1.2 + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.java + + + + + + + + diff --git a/socketproxy/pom.xml b/socketproxy/pom.xml new file mode 100644 index 00000000..e71342ea --- /dev/null +++ b/socketproxy/pom.xml @@ -0,0 +1,25 @@ + + + + org.wamblee + utils + 0.2-SNAPSHOT + + + 4.0.0 + org.wamblee + socketproxy + jar + + wamblee.org socket proxy + http://wamblee.org + + + org.wamblee + support + + + + diff --git a/socketproxy/src/org/wamblee/socketproxy/Barrier.java b/socketproxy/src/main/java/org/wamblee/socketproxy/Barrier.java similarity index 100% rename from socketproxy/src/org/wamblee/socketproxy/Barrier.java rename to socketproxy/src/main/java/org/wamblee/socketproxy/Barrier.java diff --git a/socketproxy/src/org/wamblee/socketproxy/ForwarderThread.java b/socketproxy/src/main/java/org/wamblee/socketproxy/ForwarderThread.java similarity index 100% rename from socketproxy/src/org/wamblee/socketproxy/ForwarderThread.java rename to socketproxy/src/main/java/org/wamblee/socketproxy/ForwarderThread.java diff --git a/socketproxy/src/org/wamblee/socketproxy/SocketProxy.java b/socketproxy/src/main/java/org/wamblee/socketproxy/SocketProxy.java similarity index 100% rename from socketproxy/src/org/wamblee/socketproxy/SocketProxy.java rename to socketproxy/src/main/java/org/wamblee/socketproxy/SocketProxy.java diff --git a/support/pom.xml b/support/pom.xml new file mode 100644 index 00000000..8f6bd460 --- /dev/null +++ b/support/pom.xml @@ -0,0 +1,66 @@ + + + + org.wamblee + utils + 0.2-SNAPSHOT + + + 4.0.0 + org.wamblee + support + jar + wamblee.org support library + http://wamblee.org + + + commons-logging + commons-logging + + + commons-beanutils + commons-beanutils + + + org.springframework + spring-beans + + + org.springframework + spring-hibernate + + + + log4j + log4j + + + dom4j + dom4j + + + ehcache + ehcache + + + xerces + xerces + + + org.hibernate + hibernate + + + jaxen + jaxen + + + oro + oro + + + + + diff --git a/support/src/org/wamblee/cache/Cache.java b/support/src/main/java/org/wamblee/cache/Cache.java similarity index 100% rename from support/src/org/wamblee/cache/Cache.java rename to support/src/main/java/org/wamblee/cache/Cache.java diff --git a/support/src/org/wamblee/cache/CachedObject.java b/support/src/main/java/org/wamblee/cache/CachedObject.java similarity index 100% rename from support/src/org/wamblee/cache/CachedObject.java rename to support/src/main/java/org/wamblee/cache/CachedObject.java diff --git a/support/src/org/wamblee/cache/EhCache.java b/support/src/main/java/org/wamblee/cache/EhCache.java similarity index 100% rename from support/src/org/wamblee/cache/EhCache.java rename to support/src/main/java/org/wamblee/cache/EhCache.java diff --git a/support/src/org/wamblee/cache/ForeverCache.java b/support/src/main/java/org/wamblee/cache/ForeverCache.java similarity index 100% rename from support/src/org/wamblee/cache/ForeverCache.java rename to support/src/main/java/org/wamblee/cache/ForeverCache.java diff --git a/support/src/org/wamblee/cache/ZeroCache.java b/support/src/main/java/org/wamblee/cache/ZeroCache.java similarity index 100% rename from support/src/org/wamblee/cache/ZeroCache.java rename to support/src/main/java/org/wamblee/cache/ZeroCache.java diff --git a/support/src/org/wamblee/cache/package.html b/support/src/main/java/org/wamblee/cache/package.html similarity index 100% rename from support/src/org/wamblee/cache/package.html rename to support/src/main/java/org/wamblee/cache/package.html diff --git a/support/src/org/wamblee/concurrency/JvmLock.java b/support/src/main/java/org/wamblee/concurrency/JvmLock.java similarity index 100% rename from support/src/org/wamblee/concurrency/JvmLock.java rename to support/src/main/java/org/wamblee/concurrency/JvmLock.java diff --git a/support/src/org/wamblee/concurrency/Lock.java b/support/src/main/java/org/wamblee/concurrency/Lock.java similarity index 100% rename from support/src/org/wamblee/concurrency/Lock.java rename to support/src/main/java/org/wamblee/concurrency/Lock.java diff --git a/support/src/org/wamblee/concurrency/LockAdvice.java b/support/src/main/java/org/wamblee/concurrency/LockAdvice.java similarity index 100% rename from support/src/org/wamblee/concurrency/LockAdvice.java rename to support/src/main/java/org/wamblee/concurrency/LockAdvice.java diff --git a/support/src/org/wamblee/concurrency/ReadWriteLock.java b/support/src/main/java/org/wamblee/concurrency/ReadWriteLock.java similarity index 100% rename from support/src/org/wamblee/concurrency/ReadWriteLock.java rename to support/src/main/java/org/wamblee/concurrency/ReadWriteLock.java diff --git a/support/src/org/wamblee/concurrency/package.html b/support/src/main/java/org/wamblee/concurrency/package.html similarity index 100% rename from support/src/org/wamblee/concurrency/package.html rename to support/src/main/java/org/wamblee/concurrency/package.html diff --git a/support/src/org/wamblee/conditions/AndCondition.java b/support/src/main/java/org/wamblee/conditions/AndCondition.java similarity index 100% rename from support/src/org/wamblee/conditions/AndCondition.java rename to support/src/main/java/org/wamblee/conditions/AndCondition.java diff --git a/support/src/org/wamblee/conditions/Condition.java b/support/src/main/java/org/wamblee/conditions/Condition.java similarity index 100% rename from support/src/org/wamblee/conditions/Condition.java rename to support/src/main/java/org/wamblee/conditions/Condition.java diff --git a/support/src/org/wamblee/conditions/FixedCondition.java b/support/src/main/java/org/wamblee/conditions/FixedCondition.java similarity index 100% rename from support/src/org/wamblee/conditions/FixedCondition.java rename to support/src/main/java/org/wamblee/conditions/FixedCondition.java diff --git a/support/src/org/wamblee/conditions/OrCondition.java b/support/src/main/java/org/wamblee/conditions/OrCondition.java similarity index 100% rename from support/src/org/wamblee/conditions/OrCondition.java rename to support/src/main/java/org/wamblee/conditions/OrCondition.java diff --git a/support/src/org/wamblee/conditions/PropertyRegexCondition.java b/support/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java similarity index 100% rename from support/src/org/wamblee/conditions/PropertyRegexCondition.java rename to support/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java diff --git a/support/src/org/wamblee/conditions/package.html b/support/src/main/java/org/wamblee/conditions/package.html similarity index 100% rename from support/src/org/wamblee/conditions/package.html rename to support/src/main/java/org/wamblee/conditions/package.html diff --git a/support/src/org/wamblee/general/BeanFactory.java b/support/src/main/java/org/wamblee/general/BeanFactory.java similarity index 100% rename from support/src/org/wamblee/general/BeanFactory.java rename to support/src/main/java/org/wamblee/general/BeanFactory.java diff --git a/support/src/org/wamblee/general/BeanFactoryException.java b/support/src/main/java/org/wamblee/general/BeanFactoryException.java similarity index 100% rename from support/src/org/wamblee/general/BeanFactoryException.java rename to support/src/main/java/org/wamblee/general/BeanFactoryException.java diff --git a/support/src/org/wamblee/general/BeanKernel.java b/support/src/main/java/org/wamblee/general/BeanKernel.java similarity index 100% rename from support/src/org/wamblee/general/BeanKernel.java rename to support/src/main/java/org/wamblee/general/BeanKernel.java diff --git a/support/src/org/wamblee/general/Pair.java b/support/src/main/java/org/wamblee/general/Pair.java similarity index 100% rename from support/src/org/wamblee/general/Pair.java rename to support/src/main/java/org/wamblee/general/Pair.java diff --git a/support/src/org/wamblee/general/SpringBeanFactory.java b/support/src/main/java/org/wamblee/general/SpringBeanFactory.java similarity index 100% rename from support/src/org/wamblee/general/SpringBeanFactory.java rename to support/src/main/java/org/wamblee/general/SpringBeanFactory.java diff --git a/support/src/org/wamblee/general/package.html b/support/src/main/java/org/wamblee/general/package.html similarity index 100% rename from support/src/org/wamblee/general/package.html rename to support/src/main/java/org/wamblee/general/package.html diff --git a/support/src/org/wamblee/io/ClassPathResource.java b/support/src/main/java/org/wamblee/io/ClassPathResource.java similarity index 100% rename from support/src/org/wamblee/io/ClassPathResource.java rename to support/src/main/java/org/wamblee/io/ClassPathResource.java diff --git a/support/src/org/wamblee/io/FileResource.java b/support/src/main/java/org/wamblee/io/FileResource.java similarity index 100% rename from support/src/org/wamblee/io/FileResource.java rename to support/src/main/java/org/wamblee/io/FileResource.java diff --git a/support/src/org/wamblee/io/InputResource.java b/support/src/main/java/org/wamblee/io/InputResource.java similarity index 100% rename from support/src/org/wamblee/io/InputResource.java rename to support/src/main/java/org/wamblee/io/InputResource.java diff --git a/support/src/org/wamblee/io/StreamResource.java b/support/src/main/java/org/wamblee/io/StreamResource.java similarity index 100% rename from support/src/org/wamblee/io/StreamResource.java rename to support/src/main/java/org/wamblee/io/StreamResource.java diff --git a/support/src/org/wamblee/io/package.html b/support/src/main/java/org/wamblee/io/package.html similarity index 100% rename from support/src/org/wamblee/io/package.html rename to support/src/main/java/org/wamblee/io/package.html diff --git a/support/src/org/wamblee/observer/DefaultObserverNotifier.java b/support/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java similarity index 100% rename from support/src/org/wamblee/observer/DefaultObserverNotifier.java rename to support/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java diff --git a/support/src/org/wamblee/observer/Observable.java b/support/src/main/java/org/wamblee/observer/Observable.java similarity index 100% rename from support/src/org/wamblee/observer/Observable.java rename to support/src/main/java/org/wamblee/observer/Observable.java diff --git a/support/src/org/wamblee/observer/Observer.java b/support/src/main/java/org/wamblee/observer/Observer.java similarity index 100% rename from support/src/org/wamblee/observer/Observer.java rename to support/src/main/java/org/wamblee/observer/Observer.java diff --git a/support/src/org/wamblee/observer/ObserverNotifier.java b/support/src/main/java/org/wamblee/observer/ObserverNotifier.java similarity index 100% rename from support/src/org/wamblee/observer/ObserverNotifier.java rename to support/src/main/java/org/wamblee/observer/ObserverNotifier.java diff --git a/support/src/org/wamblee/observer/package.html b/support/src/main/java/org/wamblee/observer/package.html similarity index 100% rename from support/src/org/wamblee/observer/package.html rename to support/src/main/java/org/wamblee/observer/package.html diff --git a/support/src/org/wamblee/persistence/AbstractPersistent.java b/support/src/main/java/org/wamblee/persistence/AbstractPersistent.java similarity index 100% rename from support/src/org/wamblee/persistence/AbstractPersistent.java rename to support/src/main/java/org/wamblee/persistence/AbstractPersistent.java diff --git a/support/src/org/wamblee/persistence/Persistent.java b/support/src/main/java/org/wamblee/persistence/Persistent.java similarity index 100% rename from support/src/org/wamblee/persistence/Persistent.java rename to support/src/main/java/org/wamblee/persistence/Persistent.java diff --git a/support/src/org/wamblee/persistence/hibernate/HibernateMappingFiles.java b/support/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java similarity index 100% rename from support/src/org/wamblee/persistence/hibernate/HibernateMappingFiles.java rename to support/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java diff --git a/support/src/org/wamblee/persistence/hibernate/HibernateSupport.java b/support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java similarity index 100% rename from support/src/org/wamblee/persistence/hibernate/HibernateSupport.java rename to support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java diff --git a/support/src/org/wamblee/persistence/hibernate/package.html b/support/src/main/java/org/wamblee/persistence/hibernate/package.html similarity index 100% rename from support/src/org/wamblee/persistence/hibernate/package.html rename to support/src/main/java/org/wamblee/persistence/hibernate/package.html diff --git a/support/src/org/wamblee/persistence/package.html b/support/src/main/java/org/wamblee/persistence/package.html similarity index 100% rename from support/src/org/wamblee/persistence/package.html rename to support/src/main/java/org/wamblee/persistence/package.html diff --git a/support/src/org/wamblee/xml/ClasspathUriResolver.java b/support/src/main/java/org/wamblee/xml/ClasspathUriResolver.java similarity index 100% rename from support/src/org/wamblee/xml/ClasspathUriResolver.java rename to support/src/main/java/org/wamblee/xml/ClasspathUriResolver.java diff --git a/support/src/org/wamblee/xml/DomUtils.java b/support/src/main/java/org/wamblee/xml/DomUtils.java similarity index 100% rename from support/src/org/wamblee/xml/DomUtils.java rename to support/src/main/java/org/wamblee/xml/DomUtils.java diff --git a/support/src/org/wamblee/xml/XMLException.java b/support/src/main/java/org/wamblee/xml/XMLException.java similarity index 100% rename from support/src/org/wamblee/xml/XMLException.java rename to support/src/main/java/org/wamblee/xml/XMLException.java diff --git a/support/src/org/wamblee/xml/XslTransformer.java b/support/src/main/java/org/wamblee/xml/XslTransformer.java similarity index 100% rename from support/src/org/wamblee/xml/XslTransformer.java rename to support/src/main/java/org/wamblee/xml/XslTransformer.java diff --git a/support/src/org/wamblee/xml/package.html b/support/src/main/java/org/wamblee/xml/package.html similarity index 100% rename from support/src/org/wamblee/xml/package.html rename to support/src/main/java/org/wamblee/xml/package.html diff --git a/support/conf/properties/log4j.properties b/support/src/main/resources/log4j.properties similarity index 98% rename from support/conf/properties/log4j.properties rename to support/src/main/resources/log4j.properties index 313cd7ab..65256149 100644 --- a/support/conf/properties/log4j.properties +++ b/support/src/main/resources/log4j.properties @@ -10,7 +10,7 @@ log4j.rootLogger=ERROR, console # Log level for wamblee.org -log4j.logger.org.wamblee=WARN +log4j.logger.org.wamblee=INFO log4j.logger.org.wamblee.usermgt.UserAdministrationImplTest=INFO log4j.logger.org.wamblee.security.authorization=ERROR log4j.logger.org.wamblee.cache=INFO diff --git a/support/test/org/wamblee/cache/CachedObjectTest.java b/support/src/test/java/org/wamblee/cache/CachedObjectTest.java similarity index 100% rename from support/test/org/wamblee/cache/CachedObjectTest.java rename to support/src/test/java/org/wamblee/cache/CachedObjectTest.java diff --git a/support/test/org/wamblee/concurrency/AbstractLockTestCase.java b/support/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java similarity index 100% rename from support/test/org/wamblee/concurrency/AbstractLockTestCase.java rename to support/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java diff --git a/support/test/org/wamblee/concurrency/JvmLockTest.java b/support/src/test/java/org/wamblee/concurrency/JvmLockTest.java similarity index 100% rename from support/test/org/wamblee/concurrency/JvmLockTest.java rename to support/src/test/java/org/wamblee/concurrency/JvmLockTest.java diff --git a/support/test/org/wamblee/concurrency/LockAdviceTest.java b/support/src/test/java/org/wamblee/concurrency/LockAdviceTest.java similarity index 100% rename from support/test/org/wamblee/concurrency/LockAdviceTest.java rename to support/src/test/java/org/wamblee/concurrency/LockAdviceTest.java diff --git a/support/test/org/wamblee/concurrency/ReadWriteLockTest.java b/support/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java similarity index 100% rename from support/test/org/wamblee/concurrency/ReadWriteLockTest.java rename to support/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java diff --git a/support/test/org/wamblee/conditions/AndConditionTest.java b/support/src/test/java/org/wamblee/conditions/AndConditionTest.java similarity index 100% rename from support/test/org/wamblee/conditions/AndConditionTest.java rename to support/src/test/java/org/wamblee/conditions/AndConditionTest.java diff --git a/support/test/org/wamblee/conditions/GreaterThanCondition.java b/support/src/test/java/org/wamblee/conditions/GreaterThanCondition.java similarity index 100% rename from support/test/org/wamblee/conditions/GreaterThanCondition.java rename to support/src/test/java/org/wamblee/conditions/GreaterThanCondition.java diff --git a/support/test/org/wamblee/conditions/LessThanCondition.java b/support/src/test/java/org/wamblee/conditions/LessThanCondition.java similarity index 100% rename from support/test/org/wamblee/conditions/LessThanCondition.java rename to support/src/test/java/org/wamblee/conditions/LessThanCondition.java diff --git a/support/test/org/wamblee/conditions/OrConditionTest.java b/support/src/test/java/org/wamblee/conditions/OrConditionTest.java similarity index 100% rename from support/test/org/wamblee/conditions/OrConditionTest.java rename to support/src/test/java/org/wamblee/conditions/OrConditionTest.java diff --git a/support/test/org/wamblee/conditions/PropertyRegexConditionTest.java b/support/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java similarity index 100% rename from support/test/org/wamblee/conditions/PropertyRegexConditionTest.java rename to support/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java diff --git a/support/test/org/wamblee/conditions/TestBean.java b/support/src/test/java/org/wamblee/conditions/TestBean.java similarity index 100% rename from support/test/org/wamblee/conditions/TestBean.java rename to support/src/test/java/org/wamblee/conditions/TestBean.java diff --git a/support/test/org/wamblee/general/BeanKernelTest.java b/support/src/test/java/org/wamblee/general/BeanKernelTest.java similarity index 100% rename from support/test/org/wamblee/general/BeanKernelTest.java rename to support/src/test/java/org/wamblee/general/BeanKernelTest.java diff --git a/support/test/org/wamblee/general/PairTest.java b/support/src/test/java/org/wamblee/general/PairTest.java similarity index 100% rename from support/test/org/wamblee/general/PairTest.java rename to support/src/test/java/org/wamblee/general/PairTest.java diff --git a/support/test/org/wamblee/general/SpringBeanFactoryTest.java b/support/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java similarity index 100% rename from support/test/org/wamblee/general/SpringBeanFactoryTest.java rename to support/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java diff --git a/support/test/org/wamblee/general/TestBeanFactory.java b/support/src/test/java/org/wamblee/general/TestBeanFactory.java similarity index 100% rename from support/test/org/wamblee/general/TestBeanFactory.java rename to support/src/test/java/org/wamblee/general/TestBeanFactory.java diff --git a/support/test/org/wamblee/io/ClassPathResourceTest.java b/support/src/test/java/org/wamblee/io/ClassPathResourceTest.java similarity index 100% rename from support/test/org/wamblee/io/ClassPathResourceTest.java rename to support/src/test/java/org/wamblee/io/ClassPathResourceTest.java diff --git a/support/test/org/wamblee/io/FileResourceTest.java b/support/src/test/java/org/wamblee/io/FileResourceTest.java similarity index 100% rename from support/test/org/wamblee/io/FileResourceTest.java rename to support/src/test/java/org/wamblee/io/FileResourceTest.java diff --git a/support/test/org/wamblee/io/FileSystemUtils.java b/support/src/test/java/org/wamblee/io/FileSystemUtils.java similarity index 98% rename from support/test/org/wamblee/io/FileSystemUtils.java rename to support/src/test/java/org/wamblee/io/FileSystemUtils.java index 34ab13af..99a8d2e7 100644 --- a/support/test/org/wamblee/io/FileSystemUtils.java +++ b/support/src/test/java/org/wamblee/io/FileSystemUtils.java @@ -38,12 +38,12 @@ public final class FileSystemUtils { /** * Test output directory relative to the sub project. */ - private static final String TEST_OUTPUT_DIR = "resources/testoutput"; + private static final String TEST_OUTPUT_DIR = "../target/testoutput"; /** * Test input directory relative to the sub project. */ - private static final String TEST_INPUT_DIR = "../resources/test"; + private static final String TEST_INPUT_DIR = "../src/test/resources"; /* * Disabled. diff --git a/support/test/org/wamblee/io/StreamResourceTest.java b/support/src/test/java/org/wamblee/io/StreamResourceTest.java similarity index 100% rename from support/test/org/wamblee/io/StreamResourceTest.java rename to support/src/test/java/org/wamblee/io/StreamResourceTest.java diff --git a/support/test/org/wamblee/io/TestResource.java b/support/src/test/java/org/wamblee/io/TestResource.java similarity index 100% rename from support/test/org/wamblee/io/TestResource.java rename to support/src/test/java/org/wamblee/io/TestResource.java diff --git a/support/test/org/wamblee/observer/ObservableTest.java b/support/src/test/java/org/wamblee/observer/ObservableTest.java similarity index 100% rename from support/test/org/wamblee/observer/ObservableTest.java rename to support/src/test/java/org/wamblee/observer/ObservableTest.java diff --git a/support/test/org/wamblee/test/AssertionUtils.java b/support/src/test/java/org/wamblee/test/AssertionUtils.java similarity index 100% rename from support/test/org/wamblee/test/AssertionUtils.java rename to support/src/test/java/org/wamblee/test/AssertionUtils.java diff --git a/support/test/org/wamblee/test/EventTracker.java b/support/src/test/java/org/wamblee/test/EventTracker.java similarity index 100% rename from support/test/org/wamblee/test/EventTracker.java rename to support/src/test/java/org/wamblee/test/EventTracker.java diff --git a/support/test/org/wamblee/test/HibernateExporter.java b/support/src/test/java/org/wamblee/test/HibernateExporter.java similarity index 100% rename from support/test/org/wamblee/test/HibernateExporter.java rename to support/src/test/java/org/wamblee/test/HibernateExporter.java diff --git a/support/test/org/wamblee/test/HibernateUpdater.java b/support/src/test/java/org/wamblee/test/HibernateUpdater.java similarity index 100% rename from support/test/org/wamblee/test/HibernateUpdater.java rename to support/src/test/java/org/wamblee/test/HibernateUpdater.java diff --git a/support/test/org/wamblee/test/HibernateUtils.java b/support/src/test/java/org/wamblee/test/HibernateUtils.java similarity index 100% rename from support/test/org/wamblee/test/HibernateUtils.java rename to support/src/test/java/org/wamblee/test/HibernateUtils.java diff --git a/support/test/org/wamblee/test/SpringConfigFiles.java b/support/src/test/java/org/wamblee/test/SpringConfigFiles.java similarity index 100% rename from support/test/org/wamblee/test/SpringConfigFiles.java rename to support/src/test/java/org/wamblee/test/SpringConfigFiles.java diff --git a/support/test/org/wamblee/test/SpringTestCase.java b/support/src/test/java/org/wamblee/test/SpringTestCase.java similarity index 100% rename from support/test/org/wamblee/test/SpringTestCase.java rename to support/src/test/java/org/wamblee/test/SpringTestCase.java diff --git a/support/test/org/wamblee/test/TestSpringBeanFactory.java b/support/src/test/java/org/wamblee/test/TestSpringBeanFactory.java similarity index 100% rename from support/test/org/wamblee/test/TestSpringBeanFactory.java rename to support/src/test/java/org/wamblee/test/TestSpringBeanFactory.java diff --git a/support/test/org/wamblee/test/TestSupport.java b/support/src/test/java/org/wamblee/test/TestSupport.java similarity index 100% rename from support/test/org/wamblee/test/TestSupport.java rename to support/src/test/java/org/wamblee/test/TestSupport.java diff --git a/support/test/org/wamblee/test/TestTransactionCallback.java b/support/src/test/java/org/wamblee/test/TestTransactionCallback.java similarity index 100% rename from support/test/org/wamblee/test/TestTransactionCallback.java rename to support/src/test/java/org/wamblee/test/TestTransactionCallback.java diff --git a/support/test/org/wamblee/test/TestTransactionCallbackWithoutResult.java b/support/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java similarity index 100% rename from support/test/org/wamblee/test/TestTransactionCallbackWithoutResult.java rename to support/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java diff --git a/support/test/org/wamblee/test/TimingUtils.java b/support/src/test/java/org/wamblee/test/TimingUtils.java similarity index 100% rename from support/test/org/wamblee/test/TimingUtils.java rename to support/src/test/java/org/wamblee/test/TimingUtils.java diff --git a/support/test/org/wamblee/xml/ClasspathUriResolverTest.java b/support/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java similarity index 100% rename from support/test/org/wamblee/xml/ClasspathUriResolverTest.java rename to support/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java diff --git a/support/test/org/wamblee/xml/XmlUtils.java b/support/src/test/java/org/wamblee/xml/XmlUtils.java similarity index 100% rename from support/test/org/wamblee/xml/XmlUtils.java rename to support/src/test/java/org/wamblee/xml/XmlUtils.java diff --git a/support/test/org/wamblee/xml/XslTransformerTest.java b/support/src/test/java/org/wamblee/xml/XslTransformerTest.java similarity index 100% rename from support/test/org/wamblee/xml/XslTransformerTest.java rename to support/src/test/java/org/wamblee/xml/XslTransformerTest.java diff --git a/support/resources/test/org/wamblee/cache/ehcache.xml b/support/src/test/resources/org/wamblee/cache/ehcache.xml similarity index 100% rename from support/resources/test/org/wamblee/cache/ehcache.xml rename to support/src/test/resources/org/wamblee/cache/ehcache.xml diff --git a/support/resources/test/org/wamblee/general/beanRefContext.xml b/support/src/test/resources/org/wamblee/general/beanRefContext.xml similarity index 100% rename from support/resources/test/org/wamblee/general/beanRefContext.xml rename to support/src/test/resources/org/wamblee/general/beanRefContext.xml diff --git a/support/resources/test/org/wamblee/general/beankernel-wrong.properties b/support/src/test/resources/org/wamblee/general/beankernel-wrong.properties similarity index 100% rename from support/resources/test/org/wamblee/general/beankernel-wrong.properties rename to support/src/test/resources/org/wamblee/general/beankernel-wrong.properties diff --git a/support/resources/test/org/wamblee/general/beankernel.properties b/support/src/test/resources/org/wamblee/general/beankernel.properties similarity index 100% rename from support/resources/test/org/wamblee/general/beankernel.properties rename to support/src/test/resources/org/wamblee/general/beankernel.properties diff --git a/support/resources/test/org/wamblee/general/spring1.xml b/support/src/test/resources/org/wamblee/general/spring1.xml similarity index 100% rename from support/resources/test/org/wamblee/general/spring1.xml rename to support/src/test/resources/org/wamblee/general/spring1.xml diff --git a/support/resources/test/org/wamblee/io/myresource.txt b/support/src/test/resources/org/wamblee/io/myresource.txt similarity index 100% rename from support/resources/test/org/wamblee/io/myresource.txt rename to support/src/test/resources/org/wamblee/io/myresource.txt diff --git a/support/resources/test/org/wamblee/xml/output-reportToHtml-report.xml b/support/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml similarity index 100% rename from support/resources/test/org/wamblee/xml/output-reportToHtml-report.xml rename to support/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml diff --git a/support/resources/test/org/wamblee/xml/report.xml b/support/src/test/resources/org/wamblee/xml/report.xml similarity index 100% rename from support/resources/test/org/wamblee/xml/report.xml rename to support/src/test/resources/org/wamblee/xml/report.xml diff --git a/support/resources/test/org/wamblee/xml/reportToHtml-invalid.xsl b/support/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl similarity index 100% rename from support/resources/test/org/wamblee/xml/reportToHtml-invalid.xsl rename to support/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl diff --git a/support/resources/test/org/wamblee/xml/reportToHtml-nonwellformed.xsl b/support/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl similarity index 100% rename from support/resources/test/org/wamblee/xml/reportToHtml-nonwellformed.xsl rename to support/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl diff --git a/support/resources/test/org/wamblee/xml/reportToHtml.xsl b/support/src/test/resources/org/wamblee/xml/reportToHtml.xsl similarity index 100% rename from support/resources/test/org/wamblee/xml/reportToHtml.xsl rename to support/src/test/resources/org/wamblee/xml/reportToHtml.xsl diff --git a/support/resources/test/org/wamblee/xml/reportToHtml2.xsl b/support/src/test/resources/org/wamblee/xml/reportToHtml2.xsl similarity index 100% rename from support/resources/test/org/wamblee/xml/reportToHtml2.xsl rename to support/src/test/resources/org/wamblee/xml/reportToHtml2.xsl diff --git a/support/resources/test/org/wamblee/xml/reportToText.xsl b/support/src/test/resources/org/wamblee/xml/reportToText.xsl similarity index 100% rename from support/resources/test/org/wamblee/xml/reportToText.xsl rename to support/src/test/resources/org/wamblee/xml/reportToText.xsl diff --git a/support/resources/test/org/wamblee/xml/utilities.xsl b/support/src/test/resources/org/wamblee/xml/utilities.xsl similarity index 100% rename from support/resources/test/org/wamblee/xml/utilities.xsl rename to support/src/test/resources/org/wamblee/xml/utilities.xsl