From 0837bc5e98c778e65d94c7e48f66cb75378316cf Mon Sep 17 00:00:00 2001 From: erik Date: Sat, 2 Sep 2006 14:28:51 +0000 Subject: [PATCH 1/1] --- crawler/kiss-application.xml | 60 +++++++++++++++++++ crawler/kiss/pom.xml | 1 + .../{ => main/resources}/channel-overview.xsl | 0 .../resources}/channel-right-now-graphic.xsl | 0 .../resources}/channel-right-now-mobile.xsl | 0 .../resources}/channel-right-now-output.xml | 0 .../resources}/channel-right-now.xsl | 0 .../resources}/channels-favorites-graphic.xsl | 0 .../resources}/channels-favorites.xsl | 0 .../resources}/crawler-standalone.xml | 0 .../src/{ => main/resources}/identity.xsl | 0 .../{ => main/resources}/login-graphic.xsl | 0 .../src/{ => main/resources}/login-mobile.xsl | 0 .../kiss/src/{ => main/resources}/login.xsl | 0 .../src/{ => main/resources}/mainpage.xsl | 0 .../org.wamblee.crawler.notification.xml | 0 .../org.wamblee.crawler.properties.xml | 0 .../resources}/program-info-mobile.xsl | 0 .../src/{ => main/resources}/program-info.xsl | 0 .../src/{ => main/resources}/recorded.xsl | 0 .../src/{ => main/resources}/reportToHtml.xsl | 0 .../src/{ => main/resources}/reportToText.xsl | 0 .../src/{ => main/resources}/utilities.xsl | 0 crawler/pom.xml | 15 +++++ pom.xml | 10 +++- support/pom.xml | 4 ++ .../main/resources}/log4j.properties | 2 +- 27 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 crawler/kiss-application.xml rename crawler/kiss/src/{ => main/resources}/channel-overview.xsl (100%) rename crawler/kiss/src/{ => main/resources}/channel-right-now-graphic.xsl (100%) rename crawler/kiss/src/{ => main/resources}/channel-right-now-mobile.xsl (100%) rename crawler/kiss/src/{ => main/resources}/channel-right-now-output.xml (100%) rename crawler/kiss/src/{ => main/resources}/channel-right-now.xsl (100%) rename crawler/kiss/src/{ => main/resources}/channels-favorites-graphic.xsl (100%) rename crawler/kiss/src/{ => main/resources}/channels-favorites.xsl (100%) rename crawler/kiss/src/{ => main/resources}/crawler-standalone.xml (100%) rename crawler/kiss/src/{ => main/resources}/identity.xsl (100%) rename crawler/kiss/src/{ => main/resources}/login-graphic.xsl (100%) rename crawler/kiss/src/{ => main/resources}/login-mobile.xsl (100%) rename crawler/kiss/src/{ => main/resources}/login.xsl (100%) rename crawler/kiss/src/{ => main/resources}/mainpage.xsl (100%) rename crawler/kiss/src/{ => main/resources}/org.wamblee.crawler.notification.xml (100%) rename crawler/kiss/src/{ => main/resources}/org.wamblee.crawler.properties.xml (100%) rename crawler/kiss/src/{ => main/resources}/program-info-mobile.xsl (100%) rename crawler/kiss/src/{ => main/resources}/program-info.xsl (100%) rename crawler/kiss/src/{ => main/resources}/recorded.xsl (100%) rename crawler/kiss/src/{ => main/resources}/reportToHtml.xsl (100%) rename crawler/kiss/src/{ => main/resources}/reportToText.xsl (100%) rename crawler/kiss/src/{ => main/resources}/utilities.xsl (100%) rename support/{conf/properties => src/main/resources}/log4j.properties (98%) diff --git a/crawler/kiss-application.xml b/crawler/kiss-application.xml new file mode 100644 index 00000000..3fd2c231 --- /dev/null +++ b/crawler/kiss-application.xml @@ -0,0 +1,60 @@ + + kissbin + + dir + + true + + + + + 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/pom.xml b/crawler/kiss/pom.xml index 01051f75..b378ce61 100644 --- a/crawler/kiss/pom.xml +++ b/crawler/kiss/pom.xml @@ -14,6 +14,7 @@ jar wamblee.org basic crawler framework http://wamblee.org + org.wamblee 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/pom.xml b/crawler/pom.xml index 2d65c4c4..cdac51ab 100644 --- a/crawler/pom.xml +++ b/crawler/pom.xml @@ -31,5 +31,20 @@ + + + + + maven-assembly-plugin + 2.1 + + + kiss-application.xml + + + + + + diff --git a/pom.xml b/pom.xml index a999eda1..c5caa533 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ test - + @@ -119,8 +119,13 @@ commons-email 1.0 + + jaxen + jaxen + 1.1-beta-9 + - + @@ -145,6 +150,5 @@ - diff --git a/support/pom.xml b/support/pom.xml index 13ba0391..909ee00b 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -52,6 +52,10 @@ org.hibernate hibernate + + jaxen + jaxen + 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 -- 2.31.1