(no commit message)

diff --git a/crawler/kiss-application.xml b/crawler/kiss-application.xml
new file mode 100644 (file)
index 0000000..3fd2c23
--- /dev/null
+++ b/crawler/kiss-application.xml
@@ -0,0 +1,60 @@
+<assembly>
+  <id>kissbin</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  
+  <moduleSets>
+    <moduleSet>
+         <includes> 
+               <include>org.wamblee:crawler-kiss</include>
+         </includes>
+         <binaries>
+           <includeDependencies>true</includeDependencies>
+               <outputDirectory>lib</outputDirectory>
+               <unpack>false</unpack>
+         </binaries>
+       </moduleSet>
+       
+  </moduleSets>
+  
+  <fileSets>
+    <fileSet>
+         <directory>kiss/conf/kiss</directory>
+        
+         <outputDirectory>conf</outputDirectory>
+         <includes>
+           <include>config.xml.example</include>
+               <include>programs.xml</include>
+               <include>org.wamblee.crawler.properties</include>
+         </includes>
+       </fileSet>
+       
+       <fileSet>
+         <directory>kiss/conf/kiss</directory>
+        
+         <outputDirectory>bin</outputDirectory>
+         <includes>
+           <include>run.*</include>
+         </includes>
+       </fileSet>
+       
+       <fileSet>
+         <directory>kiss/target</directory>
+        
+         <outputDirectory>lib</outputDirectory>
+         <includes>
+           <include>*.jar</include>
+         </includes>
+       </fileSet>
+  </fileSets>
+  
+  <dependencySets>
+    <dependencySet>
+         <scope>runtime</scope>
+       </dependencySet>
+  </dependencySets>
+  
+ 
+</assembly>

diff --git a/crawler/kiss/pom.xml b/crawler/kiss/pom.xml
index 01051f75a171b0d24401600db77c5cbbd0f6261d..b378ce61fb8978b9542f86aba57c229fdceacb0f 100644 (file)
--- a/crawler/kiss/pom.xml
+++ b/crawler/kiss/pom.xml
@@ -14,6 +14,7 @@
   <packaging>jar</packaging>
   <name>wamblee.org basic crawler framework</name>
   <url>http://wamblee.org</url>
+  
   <dependencies>
     <dependency>
         <groupId>org.wamblee</groupId>

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 2d65c4c4891fa969b3c4c20b5349722ad7c2c3fd..cdac51ab262b4ab5ea652ba44d4336faff09af8b 100644 (file)
--- a/crawler/pom.xml
+++ b/crawler/pom.xml
@@ -31,5 +31,20 @@
 
     </dependencies>   
   </dependencyManagement>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+                 <descriptors>
+            <descriptor>kiss-application.xml</descriptor>
+                 </descriptors>
+        
+        </configuration>
+      </plugin>
+     </plugins>
+  </build>
 
 </project>

diff --git a/pom.xml b/pom.xml
index a999eda12acf6c427ce6fe2bc78b4fedfcec01ca..c5caa5337d5b23c341707bdac69b746d8ef7400e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -119,8 +119,13 @@
         <artifactId>commons-email</artifactId>
         <version>1.0</version>
       </dependency>
+      <dependency>
+        <groupId>jaxen</groupId>
+        <artifactId>jaxen</artifactId>
+        <version>1.1-beta-9</version>
+      </dependency>
 
-    </dependencies>   
+    </dependencies>
   </dependencyManagement>
 
   <build>
@@ -145,6 +150,5 @@
       </plugin>
     </plugins>
 
-
   </build>
 </project>

diff --git a/support/pom.xml b/support/pom.xml
index 13ba039116f84a80b5fc28690e6bdf5bf88ace78..909ee00bc9d7ad92800fe7c82115dc81d739f651 100644 (file)
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -52,6 +52,10 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+    </dependency>
    
 
   </dependencies>

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 313cd7ab4761b15a1977e859a90220cf57734da5..652561490df3476ebabe327405f6966f07fc3d66 100644 (file)
--- 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