openutils-svn

[Openutils-svn] SF.net SVN: openutils:[924] trunk

[<fg...@us...>]

Revision: 924
          http://openutils.svn.sourceforge.net/openutils/?rev=924&view=rev
Author:   fgiust
Date:     2008-11-02 15:37:36 +0000 (Sun, 02 Nov 2008)

Log Message:
-----------
update distribution management due to sourceforge new policy on shell server usage

Modified Paths:
--------------
    trunk/openutils-backup/pom.xml
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-configuration-dataobjects/pom.xml
    trunk/openutils-configuration-services/pom.xml
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-hibernate-security/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-maven-skin/pom.xml
    trunk/openutils-mgnlbootstrapsync/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlext/pom.xml
    trunk/openutils-mgnlspring/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnltasks/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-spring-remote-callback/pom.xml
    trunk/openutils-spring-rmibernate/pom.xml
    trunk/openutils-tags-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml
    trunk/openutils-usermanagement/pom.xml
    trunk/openutils-usermanagement-dataobjects/pom.xml
    trunk/openutils-web/pom.xml
    trunk/pom.xml

Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-backup/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-backup</artifactId>

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-bshd5/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-bshd5</artifactId>

Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-configuration-dataobjects/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-configuration-services/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-dbmigration/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-dbmigration</artifactId>

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-deployment/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-deployment</artifactId>

Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-hibernate-security/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>openutils</artifactId>
     <groupId>net.sourceforge.openutils</groupId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-log4j/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-log4j</artifactId>

Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-maven-skin/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-maven-skin</artifactId>

Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-mgnlcontrols/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-mgnlext/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-mgnlspring/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-mgnlstripes/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-mgnltasks/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-spring/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-spring</artifactId>

Modified: trunk/openutils-spring-remote-callback/pom.xml
===================================================================
--- trunk/openutils-spring-remote-callback/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-spring-remote-callback/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>openutils</artifactId>
     <groupId>net.sourceforge.openutils</groupId>
-    <version>7</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-spring-rmibernate/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-spring-rmibernate</artifactId>

Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-tags-spring/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-tags-spring</artifactId>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-testing/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing</artifactId>

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-testing-junit/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing-junit</artifactId>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-testing-testng/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing-testng</artifactId>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-testing4dwr/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>7</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr</artifactId>

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr-junit</artifactId>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr-testng</artifactId>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-testing4web/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -51,6 +52,12 @@
       <groupId>tomcat</groupId>
       <artifactId>naming-resources</artifactId>
       <version>5.5.15</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-usermanagement/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/openutils-web/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>8</version>
+    <version>9</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-web</artifactId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-09-18 19:41:17 UTC (rev 923)
+++ trunk/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
@@ -5,7 +5,7 @@
   <groupId>net.sourceforge.openutils</groupId>
   <artifactId>openutils</artifactId>
   <packaging>pom</packaging>
-  <version>8</version>
+  <version>9</version>
   <name>openutils</name>
   <description>openutils parent POM</description>
   <url>http://openutils.sourceforge.net</url>
@@ -88,16 +88,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-6</version>
+        <version>2.0-beta-7</version>
         <configuration>
           <stagingSiteURL>
-            scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/
+            scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/
           </stagingSiteURL>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-7</version>
+        <version>2.0-beta-8</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -124,6 +124,10 @@
         </executions>
       </plugin>
       <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+      <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
         <version>2.3</version>
         <configuration>
@@ -162,7 +166,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0-beta-3</version>
+        <version>2.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-changes-plugin</artifactId>
@@ -196,16 +200,16 @@
     <site>
       <id>sourceforge</id>
       <name>sourceforge</name>
-      <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/</url>
+      <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/</url>
     </site>
     <downloadUrl>http://prdownloads.sourceforge.net/150467</downloadUrl>
     <repository>
       <id>openutils</id>
-      <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url>
+      <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url>
     </repository>
     <snapshotRepository>
       <id>openutils.snapshots</id>
-      <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url>
+      <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url>
     </snapshotRepository>
   </distributionManagement>
   <modules>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[925] trunk

[<fg...@us...>]

Revision: 925
          http://openutils.svn.sourceforge.net/openutils/?rev=925&view=rev
Author:   fgiust
Date:     2008-11-10 15:26:41 +0000 (Mon, 10 Nov 2008)

Log Message:
-----------
shell access changed again in sourceforge (manual steps needed for a release... if needed: ask!)

Modified Paths:
--------------
    trunk/openutils-backup/pom.xml
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-configuration-dataobjects/pom.xml
    trunk/openutils-configuration-services/pom.xml
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
    trunk/openutils-deployment/pom.xml
    trunk/openutils-hibernate-security/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
    trunk/openutils-maven-skin/pom.xml
    trunk/openutils-mgnlbootstrapsync/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java
    trunk/openutils-mgnlext/pom.xml
    trunk/openutils-mgnlspring/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
    trunk/openutils-mgnltasks/pom.xml
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
    trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
    trunk/openutils-spring/pom.xml
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
    trunk/openutils-spring-remote-callback/pom.xml
    trunk/openutils-spring-rmibernate/pom.xml
    trunk/openutils-tags-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java
    trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java
    trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java
    trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml
    trunk/openutils-usermanagement/pom.xml
    trunk/openutils-usermanagement-dataobjects/pom.xml
    trunk/openutils-web/pom.xml
    trunk/pom.xml

Removed Paths:
-------------
    trunk/openutils-parent/

Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-backup/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-backup</artifactId>

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-bshd5/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-bshd5</artifactId>

Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-configuration-dataobjects/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-configuration-services/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-dbmigration/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-dbmigration</artifactId>

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -31,7 +31,7 @@
 /**
  * Task that executes if a given column exists.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class JdbcIfColumnExistsConditionalTask extends BaseConditionalTask
 {

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-deployment/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-deployment</artifactId>

Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-hibernate-security/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>openutils</artifactId>
     <groupId>net.sourceforge.openutils</groupId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-log4j/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-log4j</artifactId>

Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -36,7 +36,7 @@
  * <code>archive</code> <strong>Note that since DailyRollingFileAppender is not easily extendible, this class is
  * actually a copy and paste of all the code with slights modifications...</strong>
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class EnhancedDailyRollingFileAppender extends FileAppender
 {

Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-maven-skin/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-maven-skin</artifactId>

Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnlcontrols/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -53,7 +53,7 @@
 /**
  * similar to DialogFreemarker but with a fixed template, needed till MAGNOLIA-2175 is done
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public abstract class ConfigurableFreemarkerDialog extends DialogBox
 {

Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnlext/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnlspring/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnlstripes/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -43,7 +43,7 @@
 /**
  * An implementation of MultipartWrapper that delegates to the standard magnolia multipart form handling.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class MagnoliaMultipartWrapper implements MultipartWrapper
 {

Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -36,7 +36,7 @@
 /**
  * Sets or add permissions on a repository:path for a given role.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class AddPermissionTask extends AbstractRepositoryTask implements Task
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -41,7 +41,7 @@
  * An abstract task that check for invalid templates/paragraphs. Should not be used directly, see
  * {@link CheckMissingTemplatesTask} and {@link CheckMissingParagraphsTask} instead.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public abstract class BaseCheckMissingTask extends AbstractRepositoryTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -37,7 +37,7 @@
  * A task that changes the password of an user if the current password is the default one. Useful to forbide
  * superuser/superuser accounts on a live instance ;)
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class ChangeDefaultPasswordTask extends AbstractRepositoryTask implements Task
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -32,7 +32,7 @@
 /**
  * Creates a user if not already existing.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class CheckAndCreateUserTask extends AbstractRepositoryTask implements Task
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -22,7 +22,7 @@
  * Please note that this task collect the paragraph list extracting any direct subnode of the "paragraphs" nodes in each
  * installed module, and not using ParagraphManager (not yet initialized at startup).
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class CheckMissingParagraphsTask extends BaseCheckMissingTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -22,7 +22,7 @@
  * Please note that this task collect the template list extracting any direct subnode of the "templates" nodes in each
  * installed module, and not using TemplateManager (not yet initialized at startup).
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class CheckMissingTemplatesTask extends BaseCheckMissingTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -27,7 +27,7 @@
 /**
  * A base abstract class for tasks that bootstrap a resource based on a condition.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public abstract class ConditionalBootstrapResource extends BootstrapSingleResource
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -38,7 +38,7 @@
  * Adds a default repository permissions for all the configured users, only if there is no acl set for the given
  * repository.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class CreateDefaultRepositoryAclForAllUsersTask extends AbstractRepositoryTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -28,7 +28,7 @@
 /**
  * Deletes a node (if existing).
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class DeleteNodeTask extends AbstractRepositoryTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -34,7 +34,7 @@
 /**
  * Disable any configured subscriber.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class DisableSubscribersTask extends AbstractRepositoryTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -36,7 +36,7 @@
  * A task to bootstrap a module. Can be used to fully re-bootstrap a custom module after an update (useful to reload
  * templates, dialogs, etc). This task will always ignore bootstrap files for the <code>website</code> repository.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class ModuleConfigBootstrapTask extends BootstrapResourcesTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -35,7 +35,7 @@
 /**
  * Sorts a list of nodes alphabetically.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class NodeSortTask extends AbstractRepositoryTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -34,7 +34,7 @@
 /**
  * A task that replace any occurrence of a given template with another at startup (handy for renamed templates).
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class ReplaceTemplateTask extends AbstractRepositoryTask
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -36,7 +36,7 @@
  * A base module version handler that re-bootstrap its configuration each time the version number changes. Can be used
  * as is or subclassed (usually overriding getStartupTasks() for configuration tweacks).
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class SimpleModuleVersionHandler extends DefaultModuleVersionHandler
 {

Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -32,7 +32,7 @@
 /**
  * A task that updates the current version of a module stored in the config repository.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class UpdateModuleVersionTask extends AbstractRepositoryTask
 {

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-spring/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-spring</artifactId>

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -17,7 +17,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class FileMessageStore implements MessageStore
 {

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -5,7 +5,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public interface MessageStore
 {

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -22,7 +22,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public interface TemplatedMailSender
 {

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -42,7 +42,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class TemplatedMailSenderImpl implements TemplatedMailSender
 {

Modified: trunk/openutils-spring-remote-callback/pom.xml
===================================================================
--- trunk/openutils-spring-remote-callback/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-spring-remote-callback/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>openutils</artifactId>
     <groupId>net.sourceforge.openutils</groupId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-spring-rmibernate/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-spring-rmibernate</artifactId>

Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-tags-spring/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-tags-spring</artifactId>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing</artifactId>

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -26,7 +26,7 @@
 /**
  * A DbUnitConfiguration can contain one or more {@link DbUnitExecution}.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -37,7 +37,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public final class DbUnitUtils
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -24,7 +24,7 @@
 /**
  * A table filter that excludes tables mathing the given regexp.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class RegExpTableFilter extends AbstractTableFilter
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -23,7 +23,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public final class TestUtils
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -23,7 +23,7 @@
  * Mimics the standard <code>DatabaseOperation.CLEAN_INSERT</code> operation with an empty constructor (can be used in
  * annotations).
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class CleanInsertOperation extends CompositeOperation
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -24,7 +24,7 @@
  * annotation. Wraps a <code>DatabaseOperation.CLEAN_INSERT</code> operation.
  * @see org.dbunit.ext.mssql.InsertIdentityOperation
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class MsSqlIndentityCleanInsertOperation extends InsertIdentityOperation
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -24,7 +24,7 @@
  * annotation. Wraps a <code>DatabaseOperation.INSERT</code> operation.
  * @see org.dbunit.ext.mssql.InsertIdentityOperation
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class MsSqlIndentityInsertOperation extends InsertIdentityOperation
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -30,7 +30,7 @@
 /**
  * Extended operation for dbunit that disables FK checks.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class MySqlAbstractNoFkOperation extends AbstractOperation
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -21,7 +21,7 @@
 /**
  * Extended operation for dbunit that disables FK checks.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class MySqlNoFkCleanInsertOperation extends MySqlAbstractNoFkOperation
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -21,7 +21,7 @@
 /**
  * Extended operation for dbunit that disables FK checks.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class MySqlNoFkInsertOperation extends MySqlAbstractNoFkOperation
 {

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -21,7 +21,7 @@
 /**
  * Extended operation for dbunit that disables FK checks.
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class MySqlNoFkTruncateOperation extends MySqlAbstractNoFkOperation
 {

Modified: trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java
===================================================================
--- trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -6,7 +6,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 @DbUnitExecution
 public class RegExpTableFilterTest

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-junit/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing-junit</artifactId>

Modified: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java
===================================================================
--- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -25,7 +25,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class AbstractDbUnitJunitSpringContextTests extends AbstractJUnit4SpringContextTests
 {

Modified: trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -24,7 +24,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 @ContextConfiguration(locations = {"/spring-tests.xml" })
 @DbUnitConfiguration(dbUnitExecutions = {

Modified: trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -28,7 +28,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 @ContextConfiguration(locations = {"/spring-tests.xml" })
 @DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1", insertOperation = InsertOperation.class)

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-testng/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing-testng</artifactId>

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -25,7 +25,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class AbstractDbUnitTestNGSpringContextTests extends AbstractTestNGSpringContextTests
 {

Modified: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -24,7 +24,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 @ContextConfiguration(locations = {"/spring-tests.xml" })
 @DbUnitConfiguration(dbUnitExecutions = {

Modified: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	2008-11-10 15:26:41 UTC (rev 925)
@@ -28,7 +28,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 @ContextConfiguration(locations = {"/spring-tests.xml" })
 @DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1", insertOperation = InsertOperation.class)

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing4dwr/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr</artifactId>

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr-junit</artifactId>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr-testng</artifactId>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-testing4web/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>7</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4web</artifactId>

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-usermanagement/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/openutils-web/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>9</version>
+    <version>10</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-web</artifactId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-11-02 15:37:36 UTC (rev 924)
+++ trunk/pom.xml	2008-11-10 15:26:41 UTC (rev 925)
@@ -5,7 +5,7 @@
   <groupId>net.sourceforge.openutils</groupId>
   <artifactId>openutils</artifactId>
   <packaging>pom</packaging>
-  <version>9</version>
+  <version>10</version>
   <name>openutils</name>
   <description>openutils parent POM</description>
   <url>http://openutils.sourceforge.net</url>
@@ -91,7 +91,7 @@
         <version>2.0-beta-7</version>
         <configuration>
           <stagingSiteURL>
-            scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/
+            scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/
           </stagingSiteURL>
         </configuration>
       </plugin>
@@ -200,16 +200,16 @@
     <site>
       <id>sourceforge</id>
       <name>sourceforge</name>
-      <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/</url>
+      <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/</url>
     </site>
     <downloadUrl>http://prdownloads.sourceforge.net/150467</downloadUrl>
     <repository>
       <id>openutils</id>
-      <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url>
+      <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url>
     </repository>
     <snapshotRepository>
       <id>openutils.snapshots</id>
-      <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url>
+      <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url>
     </snapshotRepository>
   </distributionManagement>
   <modules>
@@ -237,10 +237,18 @@
     <module>openutils-mgnlspring</module>
     <module>openutils-mgnlstripes</module>
     <module>openutils-mgnltasks</module>
-	<module>openutils-mgnlbootstrapsync</module>
-	<module>openutils-mgnlext</module>
-	<module>openutils-mgnlcontrols</module>
+    <module>openutils-mgnlbootstrapsync</module>
+    <module>openutils-mgnlext</module>
+    <module>openutils-mgnlcontrols</module>
     <module>openutils-spring-rmibernate</module>
+    <!--
+    <module>openutils-elfunctions</module>
+    <module>openutils-mgnlmessages</module>
+    <module>openutils-mgnlrating</module>
+    <module>openutils-mgnlcas</module>
+    <module>openutils-mgnlgroovy</module>
+    <module>openutils-mgnlmedia</module>
+     -->
     <!-- <module>openutils-spring-remote-callback</module>-->
   </modules>
   <dependencyManagement>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[926] trunk

[<fg...@us...>]

Revision: 926
          http://openutils.svn.sourceforge.net/openutils/?rev=926&view=rev
Author:   fgiust
Date:     2008-11-10 15:40:59 +0000 (Mon, 10 Nov 2008)

Log Message:
-----------
mgnlmedia first import - draft

Added Paths:
-----------
    trunk/openutils-mgnlmedia/
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmedia/src/
    trunk/openutils-mgnlmedia/src/main/
    trunk/openutils-mgnlmedia/src/main/java/
    trunk/openutils-mgnlmedia/src/main/java/net/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
    trunk/openutils-mgnlmedia/src/main/resources/
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/imageTag.tag
    trunk/openutils-mgnlmedia/src/main/resources/dialog/
    trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
    trunk/openutils-mgnlmedia/src/main/resources/info/
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileAudio.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileImage.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileVideo.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.mediaSelection.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.audio.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.image.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.video.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.youtube.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaBrowser.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaFolderSelection.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaFolderView.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-jcr.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.server.URI2RepositoryMapping.mappings.media.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_en.properties
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_it.properties
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-nodetypes/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-nodetypes/media/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-nodetypes/media/magnolia-nodetypes.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/failed.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/file.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/progress-bar/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/progress-bar/bar.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/progress-bar/progress.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/success.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/uploading.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/bubble.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/close.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/left.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/leftDisabled.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/loader.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/right.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/rightDisabled.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/multibox.css
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/upload.css
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/arrow_right_green_inactive.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audio.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audioThumb.jpg
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/browse16.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit_inactive.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film_inactive.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/folder16.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icon24.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/image16.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/image16_inactive.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/link_go.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/photo.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/screensaver.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search16.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/wallpaper.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/zip.gif
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/miframe.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootips.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2-core.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2-more.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/overlay.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/swfobject.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/FancyUpload2.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Fx.ProgressBar.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Swiff.Uploader.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Swiff.Uploader.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/FLVPlayer_Progressive.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/flvplayer.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/mp3player.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/player.swf
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/yt.swf
    trunk/openutils-mgnlmedia/src/main/resources/net/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.html
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/UploadZipFilePage.html
    trunk/openutils-mgnlmedia/src/test/
    trunk/openutils-mgnlmedia/src/test/java/
    trunk/openutils-mgnlmedia/src/test/resources/


Property changes on: trunk/openutils-mgnlmedia
___________________________________________________________________
Added: svn:ignore
   + 
.settings

.checkstyle

.classpath

.project

target


Added: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/pom.xml	2008-11-10 15:40:59 UTC (rev 926)
@@ -0,0 +1,72 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>10</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <artifactId>openutils-mgnlmedia</artifactId>
+  <name>openutils-mgnlmedia</name>
+  <version>1.0-SNAPSHOT</version>
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+    </license>
+  </licenses>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/magnolia/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-admininterface</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnltasks</artifactId>
+      <version>3.5.5</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlext</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <classifier>jdk15</classifier>
+      <version>5.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlmedia/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java	2008-11-10 15:40:59 UTC (rev 926)
@@ -0,0 +1,172 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.commands;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.exchange.ExchangeException;
+import info.magnolia.cms.i18n.MessagesManager;
+import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ExclusiveWrite;
+import info.magnolia.context.Context;
+import info.magnolia.module.admininterface.commands.ActivationCommand;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public class MediaActivationCommand extends ActivationCommand
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(MediaActivationCommand.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean execute(Context ctx)
+    {
+        synchronized (ExclusiveWrite.getInstance())
+        {
+            try
+            {
+                Content thisState = getNode(ctx);
+                String parentPath = StringUtils.substringBeforeLast(thisState.getHandle(), "/");
+                if (StringUtils.isEmpty(parentPath))
+                {
+                    parentPath = "/";
+                }
+                // make multiple activations instead of a big bulp
+                if (super.isRecursive())
+                {
+                    List versionMap = getVersionMap();
+                    if (versionMap == null)
+                    {
+                        activateRecursive(parentPath, thisState, ctx);
+                    }
+                    else
+                    {
+                        activateRecursive(ctx, versionMap);
+                    }
+                }
+                else
+                {
+                    if (StringUtils.isNotEmpty(getVersion()))
+                    {
+                        try
+                        {
+                            thisState = thisState.getVersionedContent(getVersion());
+                        }
+                        catch (RepositoryException re)
+                        {
+                            log.error("Failed to get version " + getVersion() + " for " + thisState.getHandle(), re);
+                        }
+                    }
+                    activateRecursiveOneLevel(parentPath, thisState);
+                }
+            }
+            catch (Exception e)
+            {
+                log.error("can't activate", e);
+                AlertUtil.setException(MessagesManager.get("tree.error.activate"), e, ctx);
+                return false;
+            }
+            log.info("exec successfully.");
+            return true;
+        }
+    }
+
+    public void activateRecursiveOneLevel(String parentPath, Content node) throws RepositoryException,
+        ExchangeException
+    {
+        getSyndicator().activate(parentPath, node, getOrderingInfo(node));
+
+        Iterator children = node.getChildren(new Content.ContentFilter()
+        {
+
+            public boolean accept(Content content)
+            {
+                try
+                {
+                    return !getRule().isAllowed(content.getNodeTypeName())
+                        && !ItemType.CONTENT.getSystemName().equals(content.getNodeTypeName())
+                        && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+                }
+                catch (RepositoryException e)
+                {
+                    log.error("can't get nodetype", e);
+                    return false;
+                }
+            }
+        }).iterator();
+
+        while (children.hasNext())
+        {
+            activateRecursiveOneLevel(node.getHandle(), (Content) children.next());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void activateRecursive(String parentPath, Content node, Context ctx) throws ExchangeException,
+        RepositoryException
+    {
+        getSyndicator().activate(parentPath, node, getOrderingInfo(node));
+
+        Iterator children = node.getChildren(new Content.ContentFilter()
+        {
+
+            public boolean accept(Content content)
+            {
+                try
+                {
+                    return !getRule().isAllowed(content.getNodeTypeName())
+                        && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+                }
+                catch (RepositoryException e)
+                {
+                    log.error("can't get nodetype", e);
+                    return false;
+                }
+            }
+        }).iterator();
+
+        while (children.hasNext())
+        {
+            this.activateRecursive(node.getHandle(), ((Content) children.next()), ctx);
+        }
+    }
+
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2008-11-10 15:40:59 UTC (rev 926)
@@ -0,0 +1,381 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.configuration;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.beans.config.ObservedManager;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
+import info.magnolia.cms.beans.config.URI2RepositoryMapping;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.search.Query;
+import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.search.QueryResult;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.FactoryUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.query.InvalidQueryException;
+
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
+import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ */
+public class MediaConfigurationManager extends ObservedManager
+{
+
+    private static final String MGNL_MEDIA_TYPE = "mgnl:media";
+
+    private static final String MGNL_RESOLUTION_TYPE = "mgnl:resolutions";
+
+    /**
+     * Folder type
+     */
+    public static final ItemType FOLDER = ItemType.CONTENT;
+
+    /**
+     * Media type
+     */
+    public static final ItemType MEDIA = new ItemType(MGNL_MEDIA_TYPE);
+
+    /**
+     *
+     */
+    public static final ItemType RESOLUTIONS = new ItemType(MGNL_RESOLUTION_TYPE);
+
+    private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class);
+
+    private Map<String, MediaTypeConfiguration> types = new LinkedHashMap<String, MediaTypeConfiguration>();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onClear()
+    {
+        types.clear();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    protected void onRegister(Content node)
+    {
+        for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
+        {
+            Content typeNode = (Content) iter.next();
+
+            try
+            {
+                MediaTypeConfiguration conf = new MediaTypeConfiguration();
+                conf.setName(typeNode.getName());
+                conf.setDialog(NodeDataUtil.getString(typeNode, "dialog"));
+                conf.setLabel(NodeDataUtil.getString(typeNode, "label"));
+                conf.setMenuIcon(NodeDataUtil.getString(typeNode, "menuIcon"));
+                String extensions = NodeDataUtil.getString(typeNode, "extensions");
+                if (!StringUtils.isEmpty(extensions))
+                {
+                    conf.setExtensions(Arrays.asList(StringUtils.split(extensions, ",")));
+                }
+                else
+                {
+                    conf.setExtensions(new ArrayList<String>());
+                }
+                String classNameHandler = NodeDataUtil.getString(typeNode, "handler");
+                Class classHandler = Class.forName(classNameHandler);
+                if (!MediaTypeHandler.class.isAssignableFrom(classHandler))
+                {
+                    log
+                        .error(
+                            "Error getting media type configuration for {}: handler class {} not implements MediaTypeHanlder",
+                            typeNode.getHandle(),
+                            classHandler);
+                    continue;
+                }
+                conf.setHandler((MediaTypeHandler) classHandler.newInstance());
+                conf.getHandler().init(typeNode);
+
+                types.put(typeNode.getName(), conf);
+            }
+            catch (InstantiationException ex)
+            {
+                log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex);
+            }
+            catch (IllegalAccessException ex)
+            {
+                log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex);
+            }
+            catch (ClassNotFoundException ex)
+            {
+                log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex);
+            }
+            catch (RuntimeException ex)
+            {
+                log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex);
+            }
+        }
+    }
+
+    public static MediaConfigurationManager getInstance()
+    {
+        return (MediaConfigurationManager) FactoryUtil.getSingleton(MediaConfigurationManager.class);
+    }
+
+    public static MediaTypeConfiguration getMediaHandlerFromExtension(String extension)
+    {
+        for (Map.Entry<String, MediaTypeConfiguration> entry : MediaConfigurationManager
+            .getInstance()
+            .getTypes()
+            .entrySet())
+        {
+            if (entry.getValue().getExtensions().contains(extension.toLowerCase()))
+            {
+                return entry.getValue();
+            }
+        }
+        return null;
+    }
+
+    public Map<String, MediaTypeConfiguration> getTypes()
+    {
+        return types;
+    }
+
+    /**
+     * Get all media nodes in a folder
+     * @param folder folder
+     * @return all media nodes
+     */
+    public Collection<Content> getMediaNodes(Content folder)
+    {
+        return getMediaNodes(folder, null, MediaFolderViewPage.SORT_BY_MODIFICATIONDATE);
+    }
+
+    /**
+     * Get the list of web pages where a media is used
+     * @param uuid uuid of media
+     * @return list of web pages where a media is used
+     * @throws InvalidQueryException invalid query
+     * @throws RepositoryException repository exception
+     */
+    @SuppressWarnings("unchecked")
+    public List<String> getUsedInWebPages(String uuid) throws InvalidQueryException, RepositoryException
+    {
+        List<String> handles = new ArrayList<String>();
+        QueryManager qm = MgnlContext.getQueryManager(ContentRepository.WEBSITE);
+
+        Query q = qm.createQuery("select * from nt:base where contains(., '" + uuid + "')", Query.SQL);
+        QueryResult qr = q.execute();
+        Collection<Content> nodes = qr.getContent(ItemType.CONTENT.getSystemName());
+        if (nodes != null)
+        {
+            for (Content c : nodes)
+            {
+                if (!handles.contains(c.getHandle()))
+                {
+                    handles.add(c.getHandle());
+                }
+
+            }
+        }
+        return handles;
+    }
+
+    /**
+     * Get all media nodes of passed type in a folder
+     * @param folder folder
+     * @param type media
+     * @param sorting sorting
+     * @return all media nodes of passed type
+     */
+    @SuppressWarnings("unchecked")
+    public Collection<Content> getMediaNodes(final Content folder, final String type, final String sorting)
+    {
+        List<Content> medias = (List<Content>) folder.getChildren(new Content.ContentFilter()
+        {
+
+            /**
+             * {@inheritDoc}
+             */
+            @Override
+            public boolean accept(Content content)
+            {
+                try
+                {
+                    return content.getItemType().equals(MEDIA) && NodeDataUtil.getString(content, "type").equals(type);
+                }
+                catch (RepositoryException e)
+                {
+                    log.error("Error getting item type on node {} module media", folder.getHandle(), e);
+                }
+                return false;
+            }
+
+        });
+        final MediaConfigurationManager mcm = this;
+        Collections.sort(medias, new Comparator<Content>()
+        {
+
+            private Map<String, Integer> mapNpages = new HashMap<String, Integer>();
+
+            /**
+             * {@inheritDoc}
+             */
+            @Override
+            public int compare(Content o1, Content o2)
+            {
+                if (sorting.equals(MediaFolderViewPage.SORT_BY_FILENAME))
+                {
+                    return o1.getName().compareTo(o2.getName());
+                }
+                else if (sorting.equals(MediaFolderViewPage.SORT_BY_MODIFICATIONDATE))
+                {
+                    Calendar o1c = o1.getMetaData().getModificationDate() == null
+                        ? o1.getMetaData().getCreationDate()
+                        : o1.getMetaData().getModificationDate();
+                    Calendar o2c = o2.getMetaData().getModificationDate() == null
+                        ? o2.getMetaData().getCreationDate()
+                        : o2.getMetaData().getModificationDate();
+                    return o1c.compareTo(o2c);
+                }
+                else if (sorting.equals(MediaFolderViewPage.SORT_BY_USAGE))
+                {
+                    Integer nPages1 = mapNpages.get(o1.getHandle());
+                    Integer nPages2 = mapNpages.get(o1.getHandle());
+                    if (nPages1 == null)
+                    {
+                        try
+                        {
+                            nPages1 = mcm.getUsedInWebPages(o1.getUUID()).size();
+                        }
+                        catch (InvalidQueryException e)
+                        {
+                            nPages1 = 0;
+                            log.error("Exception getting web pages for media {}", o1.getHandle(), e);
+                        }
+                        catch (RepositoryException e)
+                        {
+                            nPages1 = 0;
+                            log.error("Exception getting web pages for media {}", o1.getHandle(), e);
+                        }
+                        mapNpages.put(o1.getHandle(), nPages1);
+                    }
+                    if (nPages2 == null)
+                    {
+                        try
+                        {
+                            nPages2 = mcm.getUsedInWebPages(o2.getUUID()).size();
+                        }
+                        catch (InvalidQueryException e)
+                        {
+                            nPages2 = 0;
+                            log.error("Exception getting web pages for media {}", o2.getHandle(), e);
+                        }
+                        catch (RepositoryException e)
+                        {
+                            nPages2 = 0;
+                            log.error("Exception getting web pages for media {}", o2.getHandle(), e);
+                        }
+                        mapNpages.put(o2.getHandle(), nPages2);
+                    }
+                    return nPages1.compareTo(nPages2);
+                }
+                else
+                {
+                    try
+                    {
+                        return (o1.getIndex() >= o2.getIndex()) ? 1 : -1;
+                    }
+                    catch (RepositoryException e)
+                    {
+                        return 0;
+                    }
+                }
+            }
+
+        });
+
+        return medias;
+    }
+
+    /**
+     * Get the type configuration for a media
+     * @param media media
+     * @return type configuration
+     */
+    public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Content media)
+    {
+        try
+        {
+            if (!media.getItemType().equals(MEDIA))
+            {
+                return null;
+            }
+        }
+        catch (RepositoryException e)
+        {
+            log.error("Error getting item type on node {} module media", media.getHandle(), e);
+            return null;
+        }
+
+        return types.get(NodeDataUtil.getString(media, "type"));
+    }
+
+    /**
+     * Get uri mapping for repo
+     * @return uri mapping for repo
+     */
+    @SuppressWarnings("unchecked")
+    public String getURIMappingPrefix()
+    {
+        for (URI2RepositoryMapping mapping : (Collection<URI2RepositoryMapping>) URI2RepositoryManager
+            .getInstance()
+            .getMappings())
+        {
+            if (mapping.getRepository().equals(MediaModuleLifecycle.REPO))
+            {
+                return mapping.getURIPrefix();
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java	2008-11-10 15:40:59 UTC (rev 926)
@@ -0,0 +1,152 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.configuration;
+
+import java.util.List;
+
+import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public class MediaTypeConfiguration
+{
+
+    private String name;
+
+    private String label;
+
+    private String menuIcon;
+
+    private String dialog;
+
+    private MediaTypeHandler handler;
+
+    private List<String> extensions;
+
+    /**
+     * Returns the label.
+     * @return the label
+     */
+    public String getLabel()
+    {
+        return label;
+    }
+
+    /**
+     * Sets the label.
+     * @param label the label to set
+     */
+    public void setLabel(String label)
+    {
+        this.label = label;
+    }
+
+    /**
+     * Returns the handler.
+     * @return the handler
+     */
+    public MediaTypeHandler getHandler()
+    {
+        return handler;
+    }
+
+    /**
+     * Sets the handler.
+     * @param handler the handler to set
+     */
+    public void setHandler(MediaTypeHandler handler)
+    {
+        this.handler = handler;
+    }
+
+    /**
+     * Returns the menuIcon.
+     * @return the menuIcon
+     */
+    public String getMenuIcon()
+    {
+        return menuIcon;
+    }
+
+    /**
+     * Sets the menuIcon.
+     * @param menuIcon the menuIcon to set
+     */
+    public void setMenuIcon(String menuIcon)
+    {
+        this.menuIcon = menuIcon;
+    }
+
+    /**
+     * Returns the dialog.
+     * @return the dialog
+     */
+    public String getDialog()
+    {
+        return dialog;
+    }
+
+    /**
+     * Sets the dialog.
+     * @param dialog the dialog to set
+     */
+    public void setDialog(String dialog)
+    {
+        this.dialog = dialog;
+    }
+
+    /**
+     * Returns the name.
+     * @return the name
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * Sets the name.
+     * @param name the name to set
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    /**
+     * Returns the extensions.
+     * @return the extensions
+     */
+    public List<String> getExtensions()
+    {
+        return extensions;
+    }
+
+    /**
+     * Sets the extensions.
+     * @param extensions the extensions to set
+     */
+    public void setExtensions(List<String> extensions)
+    {
+        this.extensions = extensions;
+    }
+
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java	2008-11-10 15:40:59 UTC (rev 926)
@@ -0,0 +1,74 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.dialog.DialogBox;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public class DialogCustomSaveHandler extends DialogBox
+{
+
+    private Content configNode;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void init(HttpServletRequest request, HttpServletResponse response, Content storageNode, Content configNode)
+        throws RepositoryException
+    {
+        this.configNode = configNode;
+        super.init(request, response, storageNode, configNode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void drawHtmlPost(Writer out) throws IOException
+    {
+        out.write(this.getHtmlDescription());
+
+        out.write("<input type=\"hidden\" name=\"");
+        out.write(this.getName());
+        out.write("_saveHandler\" value=\"");
+        out.write("net.sourceforge.openutils.mgnlmedia.media.save.MediaCustomSaveHandler");
+        out.write("\" />");
+
+        out.write("<input type=\"hidden\" name=\"");
+        out.write(this.getName());
+        out.write("_configNode\" value=\"");
+        out.write(configNode.getHandle());
+        out.write("\" />");
+
+        out.write("</td></tr>\n"); //$NON-NLS-1$
+    }
+
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java	2008-11-10 15:40:59 UTC (rev 926)
@@ -0,0 +1,194 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+import info.magnolia.cms.beans.config.MIMEMapping;
+import info.magnolia.cms.gui.control.File;
+import info.magnolia.cms.gui.dialog.DialogFile;
+import info.magnolia.cms.gui.misc.CssConstants;
+import info.magnolia.cms.gui.misc.Spacer;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.jcr.PropertyType;
+
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+
+
+/**
+ * @author molaschi
+ * @version Id:
+ */
+public class DialogFileAudio extends DialogFile
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void initImageExtensions()
+    {
+        this.getImageExtensions().add("mp3");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void drawHtml(Writer out) throws IOException
+    {
+        File control = getFileControl();
+        control.setType(this.getConfigValue("type", PropertyType.TYPENAME_STRING)); //$NON-NLS-1$
+        control.setSaveInfo(false); // set manualy below
+        control.setCssClass(CssConstants.CSSCLASS_FILE);
+        control.setCssClassFileName(CssConstants.CSSCLASS_EDIT);
+        control.setCssStyles("width", this.getConfigValue("width", "100%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+        this.drawHtmlPre(out);
+
+        String width = this.getConfigValue("width", "100%"); //$NON-NLS-1$ //$NON-NLS-2$
+
+        final boolean preview = Boolean.valueOf(getConfigValue("preview", "true")).booleanValue();
+        final boolean extensionIsDisplayableImage = this.getImageExtensions().contains(
+            control.getExtension().toLowerCase());
+        final boolean showImage = extensionIsDisplayableImage && preview;
+
+        String htmlControlBrowse = control.getHtmlBrowse();
+        StringBuffer htmlControlFileName = new StringBuffer();
+        htmlControlFileName.append("<span class=\"" //$NON-NLS-1$
+            + CssConstants.CSSCLASS_DESCRIPTION
+            + "\">" //$NON-NLS-1$
+            + getMessage("dialog.file.filename") //$NON-NLS-1$
+            + "</span>"); //$NON-NLS-1$
+        htmlControlFileName.append(Spacer.getHtml(1, 1));
+        htmlControlFileName.append(control.getHtmlFileName() + "<span id=\"" //$NON-NLS-1$
+            + this.getName()
+            + "_fileNameExtension\">." //$NON-NLS-1$
+            + control.getExtension()
+            + "</span>"); //$NON-NLS-1$
+        String htmlContentEmpty = htmlControlBrowse + Spacer.getHtml(0, 0) + htmlControlFileName;
+        out.write("<div id=\"" + this.getName() + "_contentDiv\" style=\"width:100%;\">"); //$NON-NLS-1$ //$NON-NLS-2$
+        boolean exists = false;
+
+        if (this.getStorageNode() != null)
+        {
+            exists = this.getStorageNode().getNodeData(this.getName()).isExist();
+        }
+
+        if (!exists)
+        {
+            out.write(htmlContentEmpty);
+            out.write("</div>"); //$NON-NLS-1$
+        }
+        else
+        {
+            if (showImage)
+            {
+
+                out.write("\n<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"" + width + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
+                out.write("<tr><td class=\"" + CssConstants.CSSCLASS_FILEIMAGE + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
+
+                out.write("\n<div id=\"container");
+                out.write(this.getName());
+                out
+                    .write("\"><a href=\"http://www.macromedia.com/go/getflashplayer\">Get the Flash Player</a> to see this player.</div>");
+
+                out.write("<script type=\"text/javascript\" src=\"");
+                out.write(this.getRequest().getContextPath());
+                out.write("/.resources/media/js/swfobject.js\"></script>");
+                out.write("\n<script type=\"text/javascript\" src=\"");
+                out.write(this.getRequest().getContextPath());
+                out.write("/.resources/media/js/swfobject.js\"></script>");
+
+                out.write("\n<script type=\"text/javascript\">");
+                out.write("\nvar s1 = new SWFObject(\"");
+                out.write(this.getRequest().getContextPath());
+                out.write("/.resources/media/players/player.swf\",\"ply\",\"320\",\"20\",\"9\",\"#FFFFFF\");");
+                out.write("\ns1.addParam(\"flashvars\",\"file=");
+                out.write(this.getRequest().getContextPath());
+                out.write(MediaConfigurationManager.getInstance().getURIMappingPrefix());
+                out.write(getFileURI(control));
+                out.write("/");
+                out.write(control.getFileName());
+                out.write(".mp3");
+                out.write("\");");
+                out.write("\ns1.write(\"container");
+                out.write(this.getName());
+
+                out.write("\");\n</script>");
+
+                /*
+                 * // flash movie out.write("<object type=\"application/x-shockwave-flash\" data=\"");
+                 * out.write(this.getRequest().getContextPath()); out.write("/.resources/media/players/player.swf");
+                 * out.write("\" title=\""); out.write(control.getFileName()); out.write("\" ");
+                 * out.write("width=\"320\" "); out.write("height=\"30\" "); out.write(">"); out.write("<param
+                 * name=\"movie\" value=\""); out.write(this.getRequest().getContextPath());
+                 * out.write("/.resources/media/players/player.swf"); out.write("\"/>"); out.write("<param
+                 * name=\"flashvars\" value=\"file="); out.write(this.getRequest().getContextPath());
+                 * out.write(getFileURI(control)); out.write("\"/>"); out.write("</object>\n");
+                 */
+                out.write("</td></tr><tr><td>"); //$NON-NLS-1$
+
+            }
+            out.write(htmlControlFileName.toString());
+            if (!showImage)
+            {
+                String iconPath = MIMEMapping.getMIMETypeIcon(control.getExtension());
+
+                out.write(Spacer.getHtml(0, 0));
+                out.write("<a href=" + this.getRequest().getContextPath() + control.getPath() + " target=\"_blank\">"); //$NON-NLS-1$ //$NON-NLS-2$
+                out.write("<img src=\"" //$NON-NLS-1$
+                    + this.getRequest().getContextPath()
+                    + iconPath
+                    + "\" class=\"" //$NON-NLS-1$
+                    + CssConstants.CSSCLASS_FILEICON
+                    + "\" border=\"0\">"); //$NON-NLS-1$
+                out.write(control.getFileName() + "." + control.getExtension() + "</a>"); //$NON-NLS-1$ //$NON-NLS-2$
+            }
+            out.write(Spacer.getHtml(12, 12));
+            out.write(control.getHtmlRemove("mgnlDialogFileRemove('" + this.getName() + "');")); //$NON-NLS-1$ //$NON-NLS-2$
+            if (showImage)
+            {
+                out.write("</td></tr></table>"); //$NON-NLS-1$
+            }
+            out.write("</div>\n"); //$NON-NLS-1$
+            out.write("<div style=\"position:absolute;top:-500px;left:-500px;visibility:hidden;\">\n<textarea id=\""); //$NON-NLS-1$
+            out.write(this.getName());
+            out.write("_contentEmpty\">");//$NON-NLS-1$
+            out.write(htmlContentEmpty);
+
+            // @todo should be escaped, but we need to test it
+            // out.write(StringEscapeUtils.escapeXml(htmlContentEmpty));
+            out.write("</textarea>\n</div>\n"); //$NON-NLS-1$
+        }
+        control.setSaveInfo(true);
+        out.write(control.getHtmlSaveInfo());
+        control.setNodeDataTemplate(this.getConfigValue("nodeDataTemplate", null)); //$NON-NLS-1$
+        out.write(control.getHtmlNodeDataTemplate());
+        this.drawHtmlPost(out);
+    }
+
+    private String getPreviewUrl()
+    {
+        return MediaConfigurationManager.getInstance().getURIMappingPrefix()
+            + this.getStorageNode().getHandle()
+            + "/resolutions/thumbnail/data.jpg";
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java	2008-11-10 15:40:59 UTC (rev 926)
@@ -0,0 +1,240 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+import info.magnolia.cms.beans.config.MIMEMapping;
+import info.magnolia.cms.gui.control.File;
+import info.magnolia.cms.gui.dialog.DialogFile;
+import info.magnolia.cms.gui.misc.CssConstants;
+import info.magnolia.cms.gui.misc.Spacer;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.jcr.PropertyType;
+
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author molaschi
+ * @version Id:
+ */
+public class DialogFileImage extends DialogFile
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void initImageExtensions()
+    {
+        this.getImageExtensions().add("jpg");
+        this.getImageExtensions().add("jpeg");
+        this.getImageExtensions().add("gif");
+        this.getImageExtensions().add("png");
+        this.getImageExtensions().add("bmp");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void drawHtml(Writer out) throws IOException
+    {
+        File control = getFileControl();
+        control.setType(this.getConfigValue("type", PropertyType.TYPENAME_STRING));
+        control.setSaveInfo(false); // set manualy below
+        control.setCssClass(CssConstants.CSSCLASS_FILE);
+        control.setCssClassFileName(CssConstants.CSSCLASS_EDIT);
+        control.setCssStyles("width", this.getConfigValue("width", "100%")); //$NON-NLS-3$
+
+        this.drawHtmlPre(out);
+
+        String width = this.getConfigValue("width", "100%");
+
+        final boolea...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[927] trunk

[<mol...@us...>]

Revision: 927
          http://openutils.svn.sourceforge.net/openutils/?rev=927&view=rev
Author:   molaschi
Date:     2008-12-03 15:10:19 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
add openutils mgnlmessages module

Modified Paths:
--------------
    trunk/pom.xml

Added Paths:
-----------
    trunk/openutils-mgnlmessages/
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlmessages/src/
    trunk/openutils-mgnlmessages/src/main/
    trunk/openutils-mgnlmessages/src/main/java/
    trunk/openutils-mgnlmessages/src/main/java/info/
    trunk/openutils-mgnlmessages/src/main/java/info/magnolia/
    trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/
    trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/
    trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java
    trunk/openutils-mgnlmessages/src/main/java/net/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/
    trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java
    trunk/openutils-mgnlmessages/src/main/resources/
    trunk/openutils-mgnlmessages/src/main/resources/META-INF/
    trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/
    trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.adminInterface.config.menu.messages.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.adminInterface.config.menu.tools.messagesExtract.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.adminInterface.config.menu.tools.messagesJCR.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.basenames.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.locales.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesEdit.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesExtract.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesImportExport.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.trees.xml
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_en.properties
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-messages/messages/messages_it.properties
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/css/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/css/messagespanel.css
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/icons/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/icons/delete.gif
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MainPanel.js
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesPanel.js
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js
    trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/TabCloseMenu.js
    trunk/openutils-mgnlmessages/src/main/resources/net/
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.html
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html
    trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.html
    trunk/openutils-mgnlmessages/src/test/
    trunk/openutils-mgnlmessages/src/test/java/
    trunk/openutils-mgnlmessages/src/test/resources/

Added: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	                        (rev 0)
+++ trunk/openutils-mgnlmessages/pom.xml	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,85 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>10</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <artifactId>openutils-mgnlmessages</artifactId>
+  <name>openutils-mgnlmessages</name>
+  <version>1.0-SNAPSHOT</version>
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+    </license>
+  </licenses>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/magnolia/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-admininterface</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnltasks</artifactId>
+      <version>3.5.5</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlext</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <classifier>jdk15</classifier>
+      <version>5.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>repository.magnolia.info</id>
+      <name>magnolia repository</name>
+      <url>http://svn.magnolia.info/maven/m2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+</project>

Added: trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,456 @@
+/**
+ * This file Copyright (c) 2003-2008 Magnolia International
+ * Ltd.  (http://www.magnolia.info). All rights reserved.
+ *
+ *
+ * This file is dual-licensed under both the Magnolia
+ * Network Agreement and the GNU General Public License.
+ * You may elect to use one or the other of these licenses.
+ *
+ * This file is distributed in the hope that it will be
+ * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
+ * Redistribution, except as permitted by whichever of the GPL
+ * or MNA you select, is prohibited.
+ *
+ * 1. For the GPL license (GPL), you can redistribute and/or
+ * modify this file under the terms of the GNU General
+ * Public License, Version 3, as published by the Free Software
+ * Foundation.  You should have received a copy of the GNU
+ * General Public License, Version 3 along with this program;
+ * if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 2. For the Magnolia Network Agreement (MNA), this file
+ * and the accompanying materials are made available under the
+ * terms of the MNA which accompanies this distribution, and
+ * is available at http://www.magnolia.info/mna.html
+ *
+ * Any modifications to this file must keep this entire header
+ * intact.
+ *
+ */
+package info.magnolia.cms.i18n;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.context.Context;
+import info.magnolia.context.MgnlContext;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventListener;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.jstl.core.Config;
+
+import net.sourceforge.openutils.mgnlmessages.i18n.RepositoryMessagesImpl;
+
+import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections.map.LazyMap;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * From this class you get the i18n messages. You should pass a a request, but if you can't the getMessages method will
+ * handle it properly. The get() methods are easy to use.
+ * @author philipp
+ */
+public final class MessagesManager
+{
+
+    /**
+     * Use this locale if no other provided
+     */
+    public static final String FALLBACK_LOCALE = "en"; //$NON-NLS-1$
+
+    /**
+     * Use this basename if no other is provided
+     */
+    public static final String DEFAULT_BASENAME = "info.magnolia.module.admininterface.messages"; //$NON-NLS-1$
+
+    /**
+     * Logger.
+     */
+    protected static Logger log = LoggerFactory.getLogger(AbstractMessagesImpl.class);
+
+    /**
+     * The node name where the configuration for i18n is stored
+     */
+    private static final String I18N_CONFIG_PATH = "/server/i18n/system"; //$NON-NLS-1$
+
+    /**
+     * The name of the property to store the current system language
+     */
+    private static final String FALLBACK_NODEDATA = "fallbackLanguage"; //$NON-NLS-1$
+
+    /**
+     * Under this node all the available languages are stored. They are showed in the user dialog.
+     */
+    private static final String LANGUAGES_NODE_NAME = "languages"; //$NON-NLS-1$
+
+    /**
+     * The current locale of the application
+     */
+    private static Locale applicationLocale;
+
+    /**
+     * List of the available locales
+     */
+    private static Collection availableLocales = new ArrayList();
+
+    /**
+     * The context used for the messages
+     */
+    private static ServletContext context;
+
+    /**
+     * LRU Map for the messages
+     */
+    private static Map messages;
+
+    /**
+     * Util has no public constructor
+     */
+    private MessagesManager()
+    {
+    }
+
+    static
+    {
+        // setting default language (en)
+        MessagesManager.setDefaultLocale(FALLBACK_LOCALE);
+
+        initLRUMap();
+    }
+
+    /**
+     * Called through the initialization process (startup of the container)
+     * @param context servlet context
+     */
+    public static void init(ServletContext context)
+    {
+        MessagesManager.context = context;
+
+        // setting fallback
+        context.setAttribute(Config.FMT_FALLBACK_LOCALE + ".application", FALLBACK_LOCALE); //$NON-NLS-1$
+        // setting basename
+        context.setAttribute(Config.FMT_LOCALIZATION_CONTEXT + ".application", MessagesManager.DEFAULT_BASENAME); //$NON-NLS-1$
+        // for Resin and other J2EE Containers
+        context.setAttribute(Config.FMT_LOCALIZATION_CONTEXT, MessagesManager.DEFAULT_BASENAME);
+
+        load();
+        registerEventListener();
+    }
+
+    /**
+     * The lazzy LRU Map creates messages objects with a faul back to the default locale.
+     */
+    private static void initLRUMap()
+    {
+        // FIXME use LRU
+        // Map map = new LRUMap(20);
+        Map map = new HashMap();
+        map = LazyMap.decorate(map, new Transformer()
+        {
+
+            public Object transform(Object input)
+            {
+                MessagesID id = (MessagesID) input;
+                // check http://jira.magnolia.info/browse/MAGNOLIA-1060
+                // We are now chaining current user (LOCALE) messages with system default messages
+                // so that it fallsback to default locale if string is not found instead of displaying broken
+                // ???LABELS???
+                Messages msgs = new MessagesChain(new RepositoryMessagesImpl(id.basename, id.locale))
+                    .chain(new DefaultMessagesImpl(id.basename, id.locale));
+                if (!MessagesManager.getDefaultLocale().equals(id.locale))
+                {
+                    msgs = new MessagesChain(msgs).chain(MessagesManager.getMessages(id.basename, MessagesManager
+                        .getDefaultLocale()));
+                }
+                return msgs;
+            }
+        });
+        messages = Collections.synchronizedMap(map);
+    }
+
+    /**
+     * Load i18n configuration.
+     */
+    public static void load()
+    {
+
+        // reading the configuration from the repository, no need for context
+        HierarchyManager hm = ContentRepository.getHierarchyManager(ContentRepository.CONFIG);
+
+        try
+        {
+            log.info("Config : loading i18n configuration - " + I18N_CONFIG_PATH); //$NON-NLS-1$
+
+            // checks if node exists
+            if (!hm.isExist(I18N_CONFIG_PATH))
+            {
+                // configNode = ContentUtil.createPath(hm, I18N_CONFIG_PATH, ItemType.CONTENT, true);
+                log.warn(I18N_CONFIG_PATH + " does not exist yet; skipping.");
+                return;
+            }
+
+            final Content configNode = hm.getContent(I18N_CONFIG_PATH); //$NON-NLS-1$
+
+            MessagesManager.setDefaultLocale(NodeDataUtil.getString(configNode, FALLBACK_NODEDATA, FALLBACK_LOCALE));
+
+            // get the available languages - creates it if it does not exist - necessary to update to 3.5
+            final Content languagesNode;
+            if (configNode.hasContent(LANGUAGES_NODE_NAME))
+            {
+                languagesNode = configNode.getContent(LANGUAGES_NODE_NAME);
+            }
+            else
+            {
+                languagesNode = configNode.createContent(LANGUAGES_NODE_NAME, ItemType.CONTENT);
+            }
+
+            Map languageDefinitions = Content2BeanUtil.toMap(languagesNode, true, LocaleDefinition.class);
+
+            // clear collection for reload
+            MessagesManager.availableLocales.clear();
+
+            for (Iterator iter = languageDefinitions.values().iterator(); iter.hasNext();)
+            {
+                LocaleDefinition ld = (LocaleDefinition) iter.next();
+                if (ld.isEnabled())
+                {
+                    availableLocales.add(ld.getLocale());
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("Config : Failed to load i18n configuration - " + I18N_CONFIG_PATH, e); //$NON-NLS-1$
+        }
+    }
+
+    /**
+     * Register an event listener: reload configuration when something changes.
+     */
+    private static void registerEventListener()
+    {
+
+        log.info("Registering event listener for i18n"); //$NON-NLS-1$
+        ObservationUtil.registerChangeListener(ContentRepository.CONFIG, I18N_CONFIG_PATH, new EventListener()
+        {
+
+            public void onEvent(EventIterator iterator)
+            {
+                // reload everything
+                reload();
+            }
+        });
+    }
+
+    /**
+     * Reload i18n configuration.
+     */
+    public static void reload()
+    {
+        try
+        {
+            reloadBundles();
+        }
+        catch (Exception e)
+        {
+            log.error("can't reload i18n messages", e);
+        }
+        initLRUMap();
+        load();
+    }
+
+    public static Messages getMessages()
+    {
+        return getMessages(MessagesManager.DEFAULT_BASENAME, MgnlContext.getLocale());
+    }
+
+    public static Messages getMessages(String basename)
+    {
+        return getMessages(basename, MgnlContext.getLocale());
+    }
+
+    public static Messages getMessages(Locale locale)
+    {
+        return getMessages(MessagesManager.DEFAULT_BASENAME, locale);
+    }
+
+    public static Messages getMessages(String basename, Locale locale)
+    {
+        if (StringUtils.isEmpty(basename))
+        {
+            basename = MessagesManager.DEFAULT_BASENAME;
+        }
+        return (Messages) messages.get(new MessagesID(basename, locale));
+    }
+
+    public static String get(String key)
+    {
+        return MgnlContext.getMessages().get(key);
+    }
+
+    /**
+     * Get a message with parameters inside: the value {0} must be a number
+     * @param key key to find
+     * @param args replacement strings
+     * @return message
+     */
+
+    public static String get(String key, Object[] args)
+    {
+        return MgnlContext.getMessages().get(key, args);
+    }
+
+    /**
+     * Use a default string.
+     * @param key key to find
+     * @param defaultMsg default message
+     * @return message
+     */
+
+    public static String getWithDefault(String key, String defaultMsg)
+    {
+        return MgnlContext.getMessages().getWithDefault(key, defaultMsg);
+    }
+
+    /**
+     * Get a message with parameters inside: the value {0} must be a number. Use a default message.
+     * @param key key to find
+     * @param args replacement strings
+     * @param defaultMsg default message
+     * @return message
+     */
+    public static String getWithDefault(String key, Object[] args, String defaultMsg)
+    {
+        return MgnlContext.getMessages().getWithDefault(key, args, defaultMsg);
+    }
+
+    /**
+     * @return Returns the defaultLocale.
+     */
+    public static Locale getDefaultLocale()
+    {
+        return applicationLocale;
+    }
+
+    /**
+     * Deprectated! Use MgnlContext
+     * @return Returns the current locale for the current user
+     * @deprecated
+     */
+    public static Locale getCurrentLocale(HttpServletRequest request)
+    {
+        try
+        {
+            return MgnlContext.getLocale();
+        }
+        catch (Exception e)
+        {
+            return getDefaultLocale();
+        }
+    }
+
+    /**
+     * @param defaultLocale The defaultLocale to set.
+     */
+    public static void setDefaultLocale(String defaultLocale)
+    {
+        MessagesManager.applicationLocale = new Locale(defaultLocale);
+        MgnlContext.getSystemContext().setLocale(applicationLocale);
+
+        if (context != null)
+        {
+            context.setAttribute(Config.FMT_LOCALE + ".application", defaultLocale); //$NON-NLS-1$
+        }
+    }
+
+    /**
+     * @return Returns the availableLocals.
+     */
+    public static Collection getAvailableLocales()
+    {
+        return availableLocales;
+    }
+
+    /**
+     * Set the user language in the session
+     * @param language lagnguage to ste
+     * @param session current session
+     * @deprecated since 3.5, use MgnlContext instead (this is not used - can be safely removed)
+     */
+    public static void setUserLanguage(String language, HttpSession session)
+    {
+        MgnlContext.setAttribute(Config.FMT_LOCALE + ".session", language, Context.SESSION_SCOPE); //$NON-NLS-1$
+    }
+
+    public static void reloadBundles() throws Exception
+    {
+        // reload all present
+        for (Iterator iter = messages.values().iterator(); iter.hasNext();)
+        {
+            Messages msgs = (Messages) iter.next();
+            msgs.reload();
+        }
+    }
+
+    /**
+     * Getter for <code>context</code>.
+     * @return Returns the context.
+     */
+    public static ServletContext getContext()
+    {
+        return context;
+    }
+
+    /**
+     * Used as the key in the LRUMap
+     * @author Philipp Bracher
+     * @version $Revision: 878 $ ($Author: manuel $)
+     */
+    static private class MessagesID
+    {
+
+        String basename;
+
+        Locale locale;
+
+        public MessagesID(String basename, Locale locale)
+        {
+            this.basename = basename;
+            this.locale = locale;
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return basename.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object id)
+        {
+            return ((MessagesID) id).basename.equals(basename) && ((MessagesID) id).locale.equals(locale);
+        }
+    }
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,193 @@
+package net.sourceforge.openutils.mgnlmessages.configuration;
+
+import info.magnolia.api.MgnlException;
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.beans.config.ObservedManager;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.FactoryUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ */
+public class MessagesConfigurationManager extends ObservedManager
+{
+
+    /**
+     * Folder type
+     */
+    public static final ItemType FOLDER = ItemType.CONTENT;
+
+    private Logger log = LoggerFactory.getLogger(MessagesConfigurationManager.class);
+
+    private List<Locale> locales = new ArrayList<Locale>();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onClear()
+    {
+        locales.clear();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    protected void onRegister(Content node)
+    {
+        if (node.getNodeDataCollection() != null)
+        {
+            locales.clear();
+
+            for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
+            {
+                Content langNode = (Content) iter.next();
+                locales.add(new Locale(NodeDataUtil.getString(langNode, "language"), NodeDataUtil.getString(
+                    langNode,
+                    "country")));
+            }
+
+            Collections.sort(locales, new Comparator<Locale>()
+            {
+
+                /**
+                 * {@inheritDoc}
+                 */
+                @Override
+                public int compare(Locale o1, Locale o2)
+                {
+                    if (o1.getLanguage().equals(o2.getLanguage()))
+                    {
+                        return o1.getCountry().compareTo(o2.getCountry());
+                    }
+
+                    return o1.getLanguage().compareTo(o2.getLanguage());
+                }
+
+            });
+        }
+    }
+
+    public static MessagesConfigurationManager getInstance()
+    {
+        return (MessagesConfigurationManager) FactoryUtil.getSingleton(MessagesConfigurationManager.class);
+    }
+
+    public static List<Locale> getAvaiableLocales()
+    {
+        return getInstance().getLocales();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static List<String> getBaseNames()
+    {
+        HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(ContentRepository.CONFIG);
+        try
+        {
+            Content basenamesNode = mgr.getContent("/modules/messages/basenames");
+            if (basenamesNode == null || !basenamesNode.hasChildren(ItemType.CONTENTNODE.getSystemName()))
+            {
+                return new ArrayList<String>();
+            }
+            List<String> basenames = new ArrayList<String>();
+            for (Iterator it = basenamesNode.getChildren(ItemType.CONTENTNODE.getSystemName()).iterator(); it.hasNext();)
+            {
+                Content bn = (Content) it.next();
+                basenames.add(NodeDataUtil.getString(bn, "basename"));
+            }
+            return basenames;
+        }
+        catch (RepositoryException e)
+        {
+            return new ArrayList<String>();
+        }
+    }
+
+    public static void saveKeyValue(String key, String value, String locale) throws RepositoryException
+    {
+        HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MessagesModuleLifecycle.REPO);
+        String path = "/" + StringUtils.replace(key, ".", "/");
+        Content content = getOrCreateFullPath(mgr, path);
+
+        if (!StringUtils.isEmpty(locale))
+        {
+            NodeData nd = NodeDataUtil.getOrCreate(content, locale);
+            if (!StringUtils.isEmpty(value))
+            {
+                nd.setValue(value);
+            }
+            else
+            {
+                nd.delete();
+            }
+        }
+
+        mgr.save();
+    }
+
+    private static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
+    {
+        try
+        {
+            return mgr.getContent(path);
+        }
+        catch (RepositoryException ex)
+        {
+            String parent = StringUtils.substringBeforeLast(path, "/");
+            String label = StringUtils.substringAfterLast(path, "/");
+            if (!StringUtils.isEmpty(parent))
+            {
+                getOrCreateFullPath(mgr, parent);
+            }
+            else
+            {
+                parent = "/";
+            }
+
+            return mgr.createContent(parent, label, ItemType.CONTENTNODE.getSystemName());
+        }
+    }
+
+    /**
+     * Returns the locales.
+     * @return the locales
+     */
+    public List<Locale> getLocales()
+    {
+        return locales;
+    }
+
+    /**
+     * Sets the languages.
+     * @param languages the languages to set
+     */
+    public void setLocales(List<Locale> locales)
+    {
+        this.locales = locales;
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,63 @@
+package net.sourceforge.openutils.mgnlmessages.i18n;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.ResourceBundle;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class EmptyResourceBundle extends ResourceBundle
+{
+
+    /**
+     * 
+     */
+    public EmptyResourceBundle()
+    {
+        super();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Enumeration<String> getKeys()
+    {
+
+        return new Enumeration<String>()
+        {
+
+            /**
+             * {@inheritDoc}
+             */
+            @Override
+            public boolean hasMoreElements()
+            {
+                return false;
+            }
+
+            /**
+             * {@inheritDoc}
+             */
+            @Override
+            public String nextElement()
+            {
+                return null;
+            }
+
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Object handleGetObject(String arg0)
+    {
+        return null;
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ModulePropertyMessagesImpl.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,91 @@
+package net.sourceforge.openutils.mgnlmessages.i18n;
+
+import info.magnolia.cms.i18n.AbstractMessagesImpl;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.module.ModuleRegistry;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class ModulePropertyMessagesImpl extends AbstractMessagesImpl
+{
+
+    List<Messages> messages = new ArrayList<Messages>();
+
+    /**
+     * @param basename
+     * @param locale
+     */
+    @SuppressWarnings("unchecked")
+    public ModulePropertyMessagesImpl(Locale locale)
+    {
+        super("", locale);
+        ModuleRegistry reg = ModuleRegistry.Factory.getInstance();
+        for (String name : (Set<String>) reg.getModuleNames())
+        {
+            messages.add(new SimpleMessagesImpl("mgnl-messages." + name + ".messages", locale));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String get(String key)
+    {
+        String value;
+        for (Messages m : messages)
+        {
+            value = m.get(key);
+            if (value != null)
+            {
+                return value;
+            }
+        }
+        if (key == null)
+        {
+            return "??????";
+        }
+        return "???" + key + "???";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public Iterator keys()
+    {
+        List<String> keys = new ArrayList<String>();
+        for (Messages m : messages)
+        {
+            Iterator it = m.keys();
+            while (it.hasNext())
+            {
+                keys.add((String) it.next());
+            }
+        }
+        return keys.iterator();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void reload() throws Exception
+    {
+        for (Messages m : messages)
+        {
+            m.reload();
+        }
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,134 @@
+package net.sourceforge.openutils.mgnlmessages.i18n;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.search.Query;
+import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.search.QueryResult;
+import info.magnolia.cms.i18n.AbstractMessagesImpl;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author molaschi
+ * @version $Id: RepositoryMessagesImpl.java 4465 2008-09-28 10:59:58Z fgiust $
+ */
+public class RepositoryMessagesImpl extends AbstractMessagesImpl
+{
+
+    private static final String MESS_REPO = "messages";
+
+    private List<String> keys;
+
+    /**
+     * @param basename
+     * @param locale
+     */
+    public RepositoryMessagesImpl(String basename, Locale locale)
+    {
+        super(basename, locale);
+    }
+
+    /**
+     * Get the message from the bundle
+     * @param key the key
+     * @return message
+     */
+    public String get(String key)
+    {
+        if (key == null)
+        {
+            return "??????";
+        }
+        try
+        {
+            String handle = StringUtils.replace(key, ".", "/");
+            HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(MESS_REPO);
+            Content c = hm.getContent(handle);
+            String locale1 = this.locale.getLanguage() + "_" + this.locale.getCountry();
+            String locale2 = this.locale.getLanguage();
+            if (c == null || (!c.hasNodeData(locale1) && !c.hasNodeData(locale2)))
+            {
+                return "???" + key + "???";
+            }
+            if (c.hasNodeData(locale1))
+            {
+                return NodeDataUtil.getString(c, locale1);
+            }
+            else
+            {
+                return NodeDataUtil.getString(c, locale2);
+            }
+        }
+        catch (MissingResourceException e)
+        {
+            return "???" + key + "???";
+        }
+        catch (RepositoryException e)
+        {
+            return "???" + key + "???";
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void reload() throws Exception
+    {
+        keys = null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public Iterator keys()
+    {
+
+        long ms = System.currentTimeMillis();
+
+        if (keys == null)
+        {
+
+            keys = new ArrayList<String>();
+
+            try
+            {
+                QueryManager qm = MgnlContext.getSystemContext().getQueryManager(MESS_REPO);
+                Query q = qm.createQuery("//*", Query.XPATH);
+                QueryResult qr = q.execute();
+                for (Content c : (Collection<Content>) qr.getContent(ItemType.CONTENTNODE.getSystemName()))
+                {
+                    if (c.getNodeDataCollection().size() > 0)
+                    {
+                        keys.add(StringUtils.replace(c.getHandle(), "/", ".").substring(1));
+                    }
+                }
+            }
+            catch (RepositoryException e)
+            {
+
+            }
+        }
+
+        log.debug("Messages loaded in {} ms", System.currentTimeMillis() - ms);
+
+        return keys.iterator();
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,132 @@
+package net.sourceforge.openutils.mgnlmessages.i18n;
+
+import info.magnolia.cms.i18n.AbstractMessagesImpl;
+import info.magnolia.cms.i18n.MessagesManager;
+import info.magnolia.cms.util.ClasspathResourcesUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.io.IOUtils;
+
+
+/**
+ * @author Philipp Bracher
+ * @version $Revision: 14052 $ ($Author: gjoseph $)
+ */
+public class SimpleMessagesImpl extends AbstractMessagesImpl
+{
+
+    /**
+     * @param basename
+     * @param locale
+     */
+    protected SimpleMessagesImpl(String basename, Locale locale)
+    {
+        super(basename, locale);
+    }
+
+    /**
+     * Get the message from the bundle
+     * @param key the key
+     * @return message
+     */
+    public String get(String key)
+    {
+        if (key == null)
+        {
+            return null;
+        }
+        try
+        {
+            return getBundle().getString(key);
+        }
+        catch (MissingResourceException e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * @return Returns the bundle for the current basename
+     */
+    protected ResourceBundle getBundle()
+    {
+        if (bundle == null)
+        {
+            InputStream stream = null;
+            try
+            {
+                stream = ClasspathResourcesUtil.getStream("/"
+                    + StringUtils.replace(basename, ".", "/")
+                    + "_"
+                    + getLocale().getLanguage()
+                    + "_"
+                    + getLocale().getCountry()
+                    + ".properties", false);
+                if (stream == null)
+                {
+                    stream = ClasspathResourcesUtil.getStream("/"
+                        + StringUtils.replace(basename, ".", "/")
+                        + "_"
+                        + getLocale().getLanguage()
+                        + ".properties", false);
+                }
+                if (stream == null)
+                {
+                    stream = ClasspathResourcesUtil.getStream("/"
+                        + StringUtils.replace(basename, ".", "/")
+                        + "_"
+                        + MessagesManager.getDefaultLocale().getLanguage()
+                        + ".properties", false);
+                }
+                if (stream == null)
+                {
+                    stream = ClasspathResourcesUtil.getStream("/"
+                        + StringUtils.replace(basename, ".", "/")
+                        + ".properties", false);
+                }
+
+                if (stream != null)
+                {
+                    bundle = new PropertyResourceBundle(stream);
+                }
+                else
+                {
+                    bundle = new EmptyResourceBundle();
+                }
+            }
+            catch (IOException e)
+            {
+                log.error("can't load messages for " + basename);
+            }
+            finally
+            {
+                IOUtils.closeQuietly(stream);
+            }
+        }
+        return bundle;
+    }
+
+    public void reload() throws Exception
+    {
+        this.bundle = null;
+    }
+
+    /**
+     * Iterate over the keys
+     */
+    @SuppressWarnings("unchecked")
+    public Iterator keys()
+    {
+        return IteratorUtils.asIterator(this.getBundle().getKeys());
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,43 @@
+package net.sourceforge.openutils.mgnlmessages.lifecycle;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ */
+public class MessagesModuleLifecycle implements ModuleLifecycle
+{
+
+    /**
+     * 
+     */
+    public static final String REPO = "messages";
+
+    private Logger log = LoggerFactory.getLogger(MessagesModuleLifecycle.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void start(ModuleLifecycleContext ctx)
+    {
+        log.info("Starting module messages");
+        ctx.registerModuleObservingComponent("locales", MessagesConfigurationManager.getInstance());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void stop(ModuleLifecycleContext ctx)
+    {
+        log.info("Stopping module messages");
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/DefaultMessagesImpl.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,95 @@
+package net.sourceforge.openutils.mgnlmessages.pages;
+
+import info.magnolia.cms.util.ClasspathResourcesUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Locale;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author molaschi
+ * @version $Id: DefaultMessagesImpl.java 4124 2008-09-22 14:56:46Z fgiust $
+ */
+public class DefaultMessagesImpl extends info.magnolia.cms.i18n.DefaultMessagesImpl
+{
+
+    /**
+     * @param basename
+     * @param locale
+     */
+    public DefaultMessagesImpl(String basename, Locale locale)
+    {
+        super(basename, locale);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String get(String key)
+    {
+        if (this.getBundle() == null)
+        {
+            return "??????";
+        }
+        return super.get(key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected ResourceBundle getBundle()
+    {
+        if (bundle == null)
+        {
+            InputStream stream = null;
+            try
+            {
+                if (StringUtils.isEmpty(getLocale().getCountry()))
+                {
+                    stream = ClasspathResourcesUtil.getStream("/"
+                        + StringUtils.replace(basename, ".", "/")
+                        + "_"
+                        + getLocale().getLanguage()
+                        + ".properties", false);
+                }
+                else
+                {
+                    stream = ClasspathResourcesUtil.getStream("/"
+                        + StringUtils.replace(basename, ".", "/")
+                        + "_"
+                        + getLocale().getLanguage()
+                        + "_"
+                        + getLocale().getCountry()
+                        + ".properties", false);
+                }
+
+                if (stream != null)
+                {
+                    bundle = new PropertyResourceBundle(stream);
+                }
+                else
+                {
+                    bundle = null;
+                }
+            }
+            catch (IOException e)
+            {
+                log.error("can't load messages for " + basename);
+            }
+            finally
+            {
+                IOUtils.closeQuietly(stream);
+            }
+        }
+        return bundle;
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,207 @@
+package net.sourceforge.openutils.mgnlmessages.pages;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.core.search.Query;
+import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.search.QueryResult;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class ExtractMessagesFromDialogsPage extends TemplatedMVCHandler
+{
+
+    private List<String> dialogsRoot;
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(ExtractMessagesFromDialogsPage.class);
+
+    /**
+     * @param name
+     * @param request
+     * @param response
+     */
+    public ExtractMessagesFromDialogsPage(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+        super(name, request, response);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String show()
+    {
+        dialogsRoot = new ArrayList<String>();
+        QueryManager qm = MgnlContext.getQueryManager(ContentRepository.CONFIG);
+        Query q;
+        try
+        {
+            q = qm.createQuery("//dialogs", Query.XPATH);
+
+            QueryResult qr = q.execute();
+            Collection<Content> dialogs = qr.getContent();
+            for (Content dialog : dialogs)
+            {
+                dialogsRoot.add(dialog.getHandle());
+            }
+
+            q = qm.createQuery("//paragraphs", Query.XPATH);
+
+            qr = q.execute();
+            dialogs = qr.getContent();
+            for (Content dialog : dialogs)
+            {
+                dialogsRoot.add(dialog.getHandle());
+            }
+        }
+        catch (RepositoryException e)
+        {
+
+        }
+
+        return super.show();
+    }
+
+    public String extract()
+    {
+        HierarchyManager hmConfig = MgnlContext.getHierarchyManager(ContentRepository.CONFIG);
+        QueryManager qm = hmConfig.getQueryManager();
+        HierarchyManager hm = MgnlContext.getHierarchyManager(MessagesModuleLifecycle.REPO);
+        for (String dialogRoot : this.request.getParameterValues("dialogsRoots"))
+        {
+            Query q;
+            try
+            {
+                doExtraction(dialogRoot, "label", qm, hm, hmConfig);
+            }
+            catch (RepositoryException e)
+            {
+                log.error("Error extracting labels from dialogs and paragraphs", e);
+            }
+
+            try
+            {
+                doExtraction(dialogRoot, "description", qm, hm, hmConfig);
+            }
+            catch (RepositoryException e)
+            {
+                log.error("Error extracting description from dialogs and paragraphs", e);
+            }
+
+            try
+            {
+                doExtraction(dialogRoot, "title", qm, hm, hmConfig);
+            }
+            catch (RepositoryException e)
+            {
+                log.error("Error extracting description from dialogs and paragraphs", e);
+            }
+        }
+
+        return this.show();
+    }
+
+    private void doExtraction(String root, String property, QueryManager qm, HierarchyManager hmMessages,
+        HierarchyManager hmConfig) throws RepositoryException
+    {
+        Query q = qm.createQuery(root.substring(1) + "//*[@" + property + "]", Query.XPATH);
+
+        QueryResult qr = q.execute();
+        Collection<Content> labelParents = new ArrayList<Content>();
+        labelParents.addAll(qr.getContent(ItemType.CONTENTNODE.getSystemName()));
+        labelParents.addAll(qr.getContent(ItemType.CONTENT.getSystemName()));
+        for (Content labelParent : labelParents)
+        {
+            NodeData labelNd = labelParent.getNodeData(property);
+            String label = labelNd.getString();
+            if (!StringUtils.isEmpty(label) && MgnlContext.getMessages().get(label).startsWith("???"))
+            {
+                String parentPath = labelParent.getHandle();
+                parentPath = StringUtils.replace(parentPath, "/modules", "");
+                Content parent = getOrCreateFullPath(hmMessages, parentPath);
+                Content message = ContentUtil.getOrCreateContent(parent, property, ItemType.CONTENTNODE);
+                NodeData nd = NodeDataUtil.getOrCreate(message, "en");
+                nd.setValue(label);
+                nd = NodeDataUtil.getOrCreate(message, "it");
+                nd.setValue(label);
+
+                String messageKey = message.getHandle().substring(1);
+                messageKey = StringUtils.replace(messageKey, "/", ".");
+                labelNd.setValue(messageKey);
+            }
+        }
+        hmMessages.save();
+        hmConfig.save();
+    }
+
+    private Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
+    {
+        try
+        {
+            return mgr.getContent(path);
+        }
+        catch (RepositoryException ex)
+        {
+            String parent = StringUtils.substringBeforeLast(path, "/");
+            String label = StringUtils.substringAfterLast(path, "/");
+            if (!StringUtils.isEmpty(parent))
+            {
+                getOrCreateFullPath(mgr, parent);
+            }
+            else
+            {
+                parent = "/";
+            }
+
+            Content c = mgr.createContent(parent, label, ItemType.CONTENTNODE.getSystemName());
+            mgr.save();
+            return c;
+        }
+    }
+
+    /**
+     * Returns the dialogsRoot.
+     * @return the dialogsRoot
+     */
+    public List<String> getDialogsRoot()
+    {
+        return dialogsRoot;
+    }
+
+    /**
+     * Sets the dialogsRoot.
+     * @param dialogsRoot the dialogsRoot to set
+     */
+    public void setDialogsRoot(List<String> dialogsRoot)
+    {
+        this.dialogsRoot = dialogsRoot;
+    }
+
+}

Added: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java	                        (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java	2008-12-03 15:10:19 UTC (rev 927)
@@ -0,0 +1,387 @@
+package net.sourceforge.openutils.mgnlmessages.pages;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.exchange.ExchangeException;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author manuel
+ * @version $Id
+ */
+public class MessagesEditPage extends TemplatedMVCHandler
+{
+
+    private static final String JSON_VIEW = "js";
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(MessagesEditPage.class);
+
+    private List<String> keys;
+
+    private List<Locale> locales;
+
+    private String currentLanguage;
+
+    private String json;
+
+    private String key;
+
+    private String locale;
+
+    private String text;
+
+    private String newkey;
+
+    /**
+     * @param name
+     * @param request
+     * @param response
+     */
+    public MessagesEditPage(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+        super(name, request, response);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void init()
+    {
+
+        super.init();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void renderHtml(String view) throws IOException
+    {
+        if (JSON_VIEW.equals(view))
+        {
+            this.response.setContentType("text/json");
+            this.response.getWriter().write(json);
+        }
+        else
+        {
+
+            keys = new ArrayList<String>();
+            Iterator<String> it = MgnlContext.getMessages().keys();
+            while (it.hasNext())
+            {
+                keys.add(it.next());
+            }
+            Collections.sort(keys);
+
+            locales = MessagesConfigurationManager.getAvaiableLocales();
+
+            Locale loc = this.request.getLocale();
+            currentLanguage = loc.getLanguage();
+            if (loc.getCountry() != null && loc.getCountry().length() > 0)
+            {
+                currentLanguage += "_" + loc.getCountry();
+            }
+
+            super.renderHtml(view);
+        }
+    }
+
+    public String loadkey()
+    {
+        Locale locBk = MgnlContext.getLocale();
+        Locale newLoc = null;
+        if (locale.indexOf('_') > 0)
+        {
+            newLoc = new Locale(StringUtils.substringBefore(locale, "_"), StringUtils.substringAfter(locale, "_"));
+        }
+        else
+        {
+            newLoc = new Locale(locale);
+        }
+        MgnlContext.setLocale(newLoc);
+
+        json = "rootObj = {value: '"
+            + ((MgnlContext.getMessages().get(key) != null) ? StringUtils.replace(
+                MgnlContext.getMessages().get(key),
+                "'",
+                "\'") : "")
+            + "'}";
+
+        MgnlContext.setLocale(locBk);
+
+        return JSON_VIEW;
+    }
+
+    public String savekey()
+    {
+        try
+        {
+            MessagesConfigurationManager.saveKeyValue(key, text, locale);
+            json = "rootObj = {value: 'OK'}";
+        }
+        catch (RepositoryException e)
+        {
+            log.error("Error saving key", e);
+            json = "rootObj = {value: 'KO'}";
+        }
+
+        return JSON_VIEW;
+    }
+
+    public String removekey()
+    {
+        try
+        {
+            HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MessagesModuleLifecycle.REPO);
+            String path = "/" + StringUtils.replace(key, ".", "/");
+            mgr.delete(path);
+
+            mgr.save();
+
+            String parent = StringUtils.substringBeforeLast(path, "/");
+            if (!StringUtils.isEmpty(parent))
+            {
+                if (!mgr.getContent(parent).hasChildren(ItemType.CONTENTNODE.getSystemName()))
+                {
+                    key = StringUtils.replace(parent.substring(1), "/", ".");
+                    removekey();
+                }
+            }
+            json = "rootObj = {value: 'OK'}";
+        }
+        catch (PathNotFoundException e)
+        {
+            json = "rootObj = {value: 'NOTFOUND'}";
+        }
+        catch (RepositoryException e)
+        {
+            log.error("Error removing key", e);
+            json = "rootObj = {value: 'KO'}";
+        }
+
+        return JSON_VIEW;
+    }
+
+    public String renamekey()
+    {
+        try
+        {
+            moveNode("/" + StringUtils.replace(key, ".", "/"), "/" + StringUtils.replace(newkey, ".", "/"));
+            json = "rootObj = {value: 'OK'}";
+        }
+        catch (RepositoryException e)
+        {
+            log.error("Error removing ke...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[931] trunk

[<mol...@us...>]

Revision: 931
          http://openutils.svn.sourceforge.net/openutils/?rev=931&view=rev
Author:   molaschi
Date:     2008-12-03 16:06:59 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
add openutils mgnlcas module

Modified Paths:
--------------
    trunk/pom.xml

Added Paths:
-----------
    trunk/openutils-mgnlcas/
    trunk/openutils-mgnlcas/pom.xml
    trunk/openutils-mgnlcas/src/
    trunk/openutils-mgnlcas/src/main/
    trunk/openutils-mgnlcas/src/main/java/
    trunk/openutils-mgnlcas/src/main/java/info/
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/security/
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/security/auth/
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/security/auth/callback/
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/security/auth/callback/CompositeCallback.java
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/PatternDelegate.java
    trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/UrlPatternDelegate.java
    trunk/openutils-mgnlcas/src/main/java/net/
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasClientCallback.java
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java
    trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.java
    trunk/openutils-mgnlcas/src/main/resources/
    trunk/openutils-mgnlcas/src/site/

Added: trunk/openutils-mgnlcas/pom.xml
===================================================================
--- trunk/openutils-mgnlcas/pom.xml	                        (rev 0)
+++ trunk/openutils-mgnlcas/pom.xml	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,79 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>10</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <artifactId>openutils-cas</artifactId>
+  <name>openutils-cas</name>
+  <version>1.0-SNAPSHOT</version>
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+    </license>
+  </licenses>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/magnolia/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-jaas</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jasig.cas</groupId>
+      <artifactId>cas-client-core</artifactId>
+      <version>3.1.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>repository.magnolia.info</id>
+      <name>magnolia repository</name>
+      <url>http://svn.magnolia.info/maven/m2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>jasig-repository</id>
+      <name>JA-SIG Maven2 Repository</name>
+      <url>http://developer.ja-sig.org/maven2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+</project>

Added: trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/security/auth/callback/CompositeCallback.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/security/auth/callback/CompositeCallback.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/security/auth/callback/CompositeCallback.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,115 @@
+// DONE in magnolia 3.6.2
+/**
+ * This file Copyright (c) 2003-2008 Magnolia International
+ * Ltd.  (http://www.magnolia.info). All rights reserved.
+ *
+ *
+ * This file is dual-licensed under both the Magnolia
+ * Network Agreement and the GNU General Public License.
+ * You may elect to use one or the other of these licenses.
+ *
+ * This file is distributed in the hope that it will be
+ * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
+ * Redistribution, except as permitted by whichever of the GPL
+ * or MNA you select, is prohibited.
+ *
+ * 1. For the GPL license (GPL), you can redistribute and/or
+ * modify this file under the terms of the GNU General
+ * Public License, Version 3, as published by the Free Software
+ * Foundation.  You should have received a copy of the GNU
+ * General Public License, Version 3 along with this program;
+ * if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 2. For the Magnolia Network Agreement (MNA), this file
+ * and the accompanying materials are made available under the
+ * terms of the MNA which accompanies this distribution, and
+ * is available at http://www.magnolia.info/mna.html
+ *
+ * Any modifications to this file must keep this entire header
+ * intact.
+ *
+ */
+package info.magnolia.cms.security.auth.callback;
+
+import info.magnolia.cms.util.PatternDelegate;
+import info.magnolia.cms.util.UrlPatternDelegate;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.ArrayUtils;
+
+
+/**
+ * <p>
+ * A simple "composite" callback that delegates to other callbacks based on rules (a list of {@link PatternDelegate}).
+ * </p>
+ * <p>
+ * It can be used to configured different callbacks for different urls, see this sample configuration for an example:
+ * </p>
+ * 
+ * <pre>
+ * + clientCallback
+ *    + patterns
+ *      + admin
+ *        + delegate
+ *          - class      info.magnolia.cms.security.auth.callback.FormClientCallback
+ *          - loginForm  /mgnl-resources/loginForm/login.html
+ *          - realmName  Magnolia
+ *        - class        info.magnolia.cms.util.UrlPatternDelegate
+ *        - url          ./magnolia*
+ *      + public
+ *        + delegate
+ *          - class      info.magnolia.cms.security.auth.callback.FormClientCallback
+ *          - loginForm  /mgnl-resources/public-login.html
+ *          - realmName  Magnolia
+ *        - class        info.magnolia.cms.util.UrlPatternDelegate
+ *        - url          /*
+ *    - class            info.magnolia.cms.security.auth.callback.CompositeCallback
+ * </pre>
+ * @author fgiust
+ * @version $Id: CompositeCallback.java 4124 2008-09-22 14:56:46Z fgiust $
+ */
+public class CompositeCallback implements HttpClientCallback
+{
+
+    private PatternDelegate[] patterns = new UrlPatternDelegate[0];
+
+    /**
+     * Delegates the processing to the first matching Callback in patterns.
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     */
+    public void handle(HttpServletRequest request, HttpServletResponse response)
+    {
+        for (int i = 0; i < patterns.length; i++)
+        {
+            PatternDelegate currentPattern = patterns[i];
+            if (currentPattern.match(request))
+            {
+                ((HttpClientCallback) currentPattern.getDelegate()).handle(request, response);
+                break;
+            }
+        }
+    }
+
+    /**
+     * @return array of configured PatternDelegate.
+     */
+    public PatternDelegate[] getPatterns()
+    {
+        return this.patterns;
+    }
+
+    /**
+     * Adds a new PatternDelegate. Used by Content2Bean .
+     * @param pattern PatternDelegate instance
+     */
+    public void addPattern(PatternDelegate pattern)
+    {
+        this.patterns = (PatternDelegate[]) ArrayUtils.add(this.patterns, pattern);
+    }
+}
\ No newline at end of file

Added: trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/PatternDelegate.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/PatternDelegate.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/PatternDelegate.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,62 @@
+// DONE in magnolia 3.6.2
+/**
+ * This file Copyright (c) 2003-2008 Magnolia International
+ * Ltd.  (http://www.magnolia.info). All rights reserved.
+ *
+ *
+ * This file is dual-licensed under both the Magnolia
+ * Network Agreement and the GNU General Public License.
+ * You may elect to use one or the other of these licenses.
+ *
+ * This file is distributed in the hope that it will be
+ * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
+ * Redistribution, except as permitted by whichever of the GPL
+ * or MNA you select, is prohibited.
+ *
+ * 1. For the GPL license (GPL), you can redistribute and/or
+ * modify this file under the terms of the GNU General
+ * Public License, Version 3, as published by the Free Software
+ * Foundation.  You should have received a copy of the GNU
+ * General Public License, Version 3 along with this program;
+ * if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 2. For the Magnolia Network Agreement (MNA), this file
+ * and the accompanying materials are made available under the
+ * terms of the MNA which accompanies this distribution, and
+ * is available at http://www.magnolia.info/mna.html
+ *
+ * Any modifications to this file must keep this entire header
+ * intact.
+ *
+ */
+package info.magnolia.cms.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+/**
+ * A simple generic interface that can be used to configure anything that can be selected based on some conditions (i.e.
+ * a different login page based on the request URI or host).
+ * @author fgiust
+ * @version $Id: PatternDelegate.java 4124 2008-09-22 14:56:46Z fgiust $
+ */
+public interface PatternDelegate
+{
+
+    /**
+     * Does the current request match the expected condition?
+     * @param request HttpServletRequest
+     * @return <code>true</code> if the current request matches the expected conditions
+     */
+    boolean match(HttpServletRequest request);
+
+    /**
+     * Returns the delegate that this bean holds. This method is usually called to retrieve the delegate object after
+     * match() returns true.
+     * @return delegate object
+     */
+    Object getDelegate();
+}

Added: trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/UrlPatternDelegate.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/UrlPatternDelegate.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/info/magnolia/cms/util/UrlPatternDelegate.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,153 @@
+// DONE in magnolia 3.6.2
+/**
+ * This file Copyright (c) 2003-2008 Magnolia International
+ * Ltd.  (http://www.magnolia.info). All rights reserved.
+ *
+ *
+ * This file is dual-licensed under both the Magnolia
+ * Network Agreement and the GNU General Public License.
+ * You may elect to use one or the other of these licenses.
+ *
+ * This file is distributed in the hope that it will be
+ * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
+ * Redistribution, except as permitted by whichever of the GPL
+ * or MNA you select, is prohibited.
+ *
+ * 1. For the GPL license (GPL), you can redistribute and/or
+ * modify this file under the terms of the GNU General
+ * Public License, Version 3, as published by the Free Software
+ * Foundation.  You should have received a copy of the GNU
+ * General Public License, Version 3 along with this program;
+ * if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 2. For the Magnolia Network Agreement (MNA), this file
+ * and the accompanying materials are made available under the
+ * terms of the MNA which accompanies this distribution, and
+ * is available at http://www.magnolia.info/mna.html
+ *
+ * Any modifications to this file must keep this entire header
+ * intact.
+ *
+ */
+package info.magnolia.cms.util;
+
+import info.magnolia.context.MgnlContext;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+
+/**
+ * An implementation of {@link PatternDelegate} that evaluates as condition a request uri patter or a hostname pattern.
+ * @author fgiust
+ * @version $Id: UrlPatternDelegate.java 4124 2008-09-22 14:56:46Z fgiust $
+ */
+public class UrlPatternDelegate implements PatternDelegate
+{
+
+    private String url;
+
+    private SimpleUrlPattern urlPattern;
+
+    private String host;
+
+    private SimpleUrlPattern hostPattern;
+
+    private Object delegate;
+
+    /**
+     * The configured Url
+     * @return the configured Url
+     */
+    public String getUrl()
+    {
+        return url;
+    }
+
+    /**
+     * Sets the Url pattern (using {@link SimpleUrlPattern} internally)
+     * @param pattern url pattern
+     */
+    public void setUrl(String pattern)
+    {
+        this.url = pattern;
+        this.urlPattern = new SimpleUrlPattern(pattern);
+    }
+
+    /**
+     * The configured host
+     * @return the configured host
+     */
+    public String getHost()
+    {
+        return host;
+    }
+
+    /**
+     * Sets the host pattern (using {@link SimpleUrlPattern} internally)
+     * @param host host pattern
+     */
+    public void setHost(String host)
+    {
+        this.host = host;
+        this.hostPattern = new SimpleUrlPattern(host);
+    }
+
+    /**
+     * Compares the reques with the url and host patterns
+     * @param request HttpServletRequest
+     * @return <code>true</code> if the pattern matches the configured host (if set) and url (if set)
+     */
+    public boolean match(HttpServletRequest request)
+    {
+
+        boolean match = true;
+
+        if (hostPattern != null)
+        {
+            match = hostPattern.match(request.getServerName());
+        }
+
+        if (urlPattern != null)
+        {
+            match = urlPattern.match(MgnlContext.getAggregationState().getCurrentURI());
+        }
+
+        return match;
+    }
+
+    /**
+     * Sets the delegate.
+     * @param delegate the delegate to set
+     */
+    public void setDelegate(Object delegate)
+    {
+        this.delegate = delegate;
+    }
+
+    /**
+     * Returns the delegate.
+     * @return the delegate
+     */
+    public Object getDelegate()
+    {
+        return delegate;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String toString()
+    {
+        return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("url", this.url).append(
+            "host",
+            this.host).toString();
+    }
+
+}
\ No newline at end of file

Added: trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,412 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlcas;
+
+import info.magnolia.cms.security.User;
+import info.magnolia.cms.security.auth.Entity;
+import info.magnolia.cms.security.auth.GroupList;
+import info.magnolia.cms.security.auth.RoleList;
+import info.magnolia.cms.security.auth.callback.RealmCallback;
+import info.magnolia.cms.util.BooleanUtil;
+import info.magnolia.jaas.principal.EntityImpl;
+import info.magnolia.jaas.principal.GroupListImpl;
+import info.magnolia.jaas.principal.RoleListImpl;
+import info.magnolia.jaas.sp.AbstractLoginModule;
+import info.magnolia.jaas.sp.UserAwareLoginModule;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.TextInputCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.jasig.cas.client.authentication.AttributePrincipal;
+import org.jasig.cas.client.validation.Assertion;
+import org.jasig.cas.client.validation.Cas20ProxyTicketValidator;
+import org.jasig.cas.client.validation.TicketValidationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * This class implements a JAAS <code>LoginModule</code> that defers authentication to CAS. See the <a
+ * href="http://java.sun.com/j2se/1.4.2/docs/guide/security/jaas/JAASRefGuide.html"> JAAS documentation</a> for details
+ * about configuration and architecture.
+ * <p>
+ * The calling application's <code>CallbackHandler</code> MUST return the <strong>ticket</strong> for a
+ * <code>TextInputCallback</code> whose prompt is "ticket".
+ * <p>
+ * The CAS <strong>service</strong> MAY be hard-coded into the configuration; if it is not, the calling application's
+ * <code>CallbackHandler</code> MAY return the <strong>service</strong> in a <code>TextInputCallback</code> whose prompt
+ * is "service".
+ * <p>
+ * The <strong>cas_validate_url</strong> MUST be hard-coded in the configuration
+ * <p>
+ * Sample jaas.config configuration:
+ * </p>
+ * 
+ * <pre>
+ * magnolia {
+ *   net.sourceforge.openutils.mgnlcas.CASAuthenticationModule
+ *                  requisite
+ *                  realm=cas;
+ *  info.magnolia.jaas.sp.jcr.JCRAuthenticationModule
+ *                  requisite
+ *                  skip_on_previous_success=true;
+ *  info.magnolia.jaas.sp.jcr.JCRAuthorizationModule required;
+ * };
+ *
+ *
+ * </pre>
+ * @author fgiust
+ * @version $Id: CASAuthenticationModule.java 4124 2008-09-22 14:56:46Z fgiust $
+ */
+public class CASAuthenticationModule extends AbstractLoginModule implements LoginModule, UserAwareLoginModule
+{
+
+    protected Subject subject;
+
+    protected CallbackHandler callbackHandler;
+
+    protected String casValidateUrl;
+
+    protected String service;
+
+    protected AttributePrincipal principal;
+
+    protected User user;
+
+    private boolean skipOnPreviousSuccess;
+
+    private String defaultGroup;
+
+    private String defaultRole;
+
+    private String rolesAttribute = "roles";
+
+    private String groupsAttribute = "groups";
+
+    protected Logger log = LoggerFactory.getLogger(getClass());
+
+    /**
+     * @param subject
+     * @param callbackHandler
+     * @param sharedState
+     * @param options can contain
+     * <ul>
+     * <li><strong>cas_validate_url</strong> (required)</li>
+     * <li><strong>service</strong> (optional)</li>
+     * </ul>
+     */
+    @Override
+    public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options)
+    {
+        super.initialize(subject, callbackHandler, sharedState, options);
+        this.subject = subject;
+        this.callbackHandler = callbackHandler;
+        this.casValidateUrl = (String) options.get("cas_validate_url");
+        this.service = (String) options.get("service");
+        this.defaultGroup = (String) options.get("default_group");
+        this.defaultRole = (String) options.get("default_role");
+
+        if (options.get("roles_attribute") != null)
+        {
+            rolesAttribute = (String) options.get("roles_attribute");
+        }
+
+        if (options.get("groups_attribute") != null)
+        {
+            groupsAttribute = (String) options.get("groups_attribute");
+        }
+
+        // private on AbstractLoginModule
+        this.skipOnPreviousSuccess = BooleanUtil
+            .toBoolean((String) options.get(OPTION_SKIP_ON_PREVIOUS_SUCCESS), false);
+    }
+
+    @Override
+    public boolean login() throws LoginException
+    {
+        if (skipOnPreviousSuccess && this.getSharedStatus() == STATUS_SUCCEEDED)
+        {
+            return true;
+        }
+
+        if (this.callbackHandler == null)
+        {
+            throw new LoginException("Error: no CallbackHandler available");
+        }
+
+        List<Callback> callbacksList = new ArrayList<Callback>();
+
+        TextInputCallback ticketCallback = new TextInputCallback("ticket");
+        TextInputCallback serviceCallback = null;
+        TextInputCallback casValidateUrlCallback = null;
+        RealmCallback realmCallback = null;
+
+        callbacksList.add(ticketCallback);
+
+        if (StringUtils.isBlank(service))
+        {
+            // the service has not been hardcoded, so give the application
+            // a callback which can be used to specify it
+            serviceCallback = new TextInputCallback("service");
+            callbacksList.add(serviceCallback);
+        }
+
+        if (StringUtils.isBlank(service))
+        {
+            // the casValidateUrl has not been hardcoded, so give the application
+            // a callback which can be used to specify it
+            casValidateUrlCallback = new TextInputCallback("casValidateUrl");
+            callbacksList.add(casValidateUrlCallback);
+        }
+
+        // if the realm is not defined in the jaas configuration
+        // we ask use a callback to get the value
+        if (this.useRealmCallback)
+        {
+            realmCallback = new RealmCallback();
+            callbacksList.add(realmCallback);
+        }
+
+        this.success = false;
+
+        Callback[] callbacks = callbacksList.toArray(new Callback[callbacksList.size()]);
+
+        try
+        {
+            this.callbackHandler.handle(callbacks);
+
+        }
+        catch (IOException e)
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Exception caught", e);
+            }
+            throw new LoginException(e.toString());
+        }
+        catch (UnsupportedCallbackException e)
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug(e.getMessage(), e);
+            }
+            throw new LoginException(e.getCallback().toString() + " not available");
+        }
+
+        // this.name = ((NameCallback) callbacks[0]).getName();
+        // this.pswd = ((PasswordCallback) callbacks[1]).getPassword();
+        if (this.useRealmCallback)
+        {
+            this.realm = StringUtils.defaultIfEmpty(realmCallback.getRealm(), this.realm);
+        }
+
+        String ticket = ticketCallback.getText();
+        if (StringUtils.isNotEmpty(ticket))
+        {
+            if (serviceCallback != null)
+            {
+                service = serviceCallback.getText();
+            }
+
+            if (casValidateUrlCallback != null)
+            {
+                casValidateUrl = casValidateUrlCallback.getText();
+            }
+
+            Cas20ProxyTicketValidator pv = new Cas20ProxyTicketValidator(casValidateUrl);
+
+            Assertion assertion;
+            try
+            {
+                assertion = pv.validate(ticket, service);
+            }
+            catch (TicketValidationException e)
+            {
+                throw new LoginException(e.getMessage());
+            }
+
+            if (assertion.getPrincipal() != null)
+            {
+
+                principal = assertion.getPrincipal();
+                subject.getPrincipals().add(principal);
+
+                setEntity();
+
+                user = new CasMagnoliaUser(subject);
+
+                this.success = true;
+                this.setSharedStatus(STATUS_SUCCEEDED);
+            }
+
+        }
+
+        return this.success;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void validateUser() throws LoginException
+    {
+
+    }
+
+    @Override
+    public boolean commit() throws LoginException
+    {
+        if (principal != null)
+        {
+            subject.getPrincipals().add(principal);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public User getUser()
+    {
+        return user;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean release()
+    {
+        if (principal != null)
+        {
+            principal = null;
+            user = null;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setACL()
+    {
+        // delegate to the Authorization module
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void setEntity()
+    {
+        EntityImpl entity = new EntityImpl();
+        entity.addProperty(Entity.NAME, this.principal.getName());
+
+        Map<String, String> attributes = this.principal.getAttributes();
+
+        String fullName = attributes.get("title");
+        if (fullName != null)
+        {
+            entity.addProperty(Entity.FULL_NAME, fullName);
+        }
+
+        entity.addProperty(Entity.LANGUAGE, "en");
+
+        this.subject.getPrincipals().add(entity);
+
+        String[] roles = StringUtils.split(attributes.get(rolesAttribute));
+        String[] groups = StringUtils.split(attributes.get(groupsAttribute));
+
+        if (roles == null)
+        {
+            roles = new String[0];
+        }
+        if (groups == null)
+        {
+            groups = new String[0];
+        }
+
+        if (defaultGroup != null)
+        {
+            groups = (String[]) ArrayUtils.add(groups, defaultGroup);
+        }
+
+        if (defaultRole != null)
+        {
+            roles = (String[]) ArrayUtils.add(roles, defaultRole);
+        }
+
+        addGroups(groups);
+        addRoles(roles);
+
+    }
+
+    /**
+     * Set the list of groups, info.magnolia.jaas.principal.GroupList.
+     * @param groups array of group names
+     */
+    protected void addGroups(String[] groups)
+    {
+        GroupList groupList = new GroupListImpl();
+
+        for (int j = 0; j < groups.length; j++)
+        {
+            String group = groups[j];
+            groupList.add(group);
+            addGroupName(group);
+        }
+
+        this.subject.getPrincipals().add(groupList);
+    }
+
+    /**
+     * Set the list of roles, info.magnolia.jaas.principal.RoleList.
+     * @param roles array of role names
+     */
+    protected void addRoles(String[] roles)
+    {
+        RoleList roleList = new RoleListImpl();
+
+        for (int j = 0; j < roles.length; j++)
+        {
+            String role = roles[j];
+            roleList.add(role);
+            addRoleName(role);
+        }
+
+        this.subject.getPrincipals().add(roleList);
+    }
+
+}
\ No newline at end of file

Added: trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasClientCallback.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasClientCallback.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasClientCallback.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,216 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlcas;
+
+import info.magnolia.cms.security.auth.callback.AbstractHttpClientCallback;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.jasig.cas.client.util.CommonUtils;
+import org.jasig.cas.client.validation.Assertion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Magnolia CAS Callback, based on CAS org.jasig.cas.client.authentication.AuthenticationFilter
+ * @author fgiust
+ * @version $Id: CasClientCallback.java 4896 2008-10-08 16:23:10Z manuel $
+ */
+public class CasClientCallback extends AbstractHttpClientCallback
+{
+
+    /**
+     * Represents the constant for where the gateway flag will be located in session.
+     */
+    public static final String CONST_CAS_GATEWAY = "_const_cas_gateway_";
+
+    /**
+     * Represents the constant for where the assertion will be located in session.
+     */
+    public static final String CONST_CAS_ASSERTION = "_const_cas_assertion_";
+
+    private Logger log = LoggerFactory.getLogger(CasClientCallback.class);
+
+    /**
+     * Defines the parameter to look for for the artifact.
+     */
+    private String artifactParameterName = "ticket";
+
+    /**
+     * Defines the parameter to look for for the service.
+     */
+    private String serviceParameterName = "service";
+
+    /**
+     * Sets where response.encodeUrl should be called on service urls when constructed.
+     */
+    private boolean encodeServiceUrl = true;
+
+    /**
+     * The URL to the CAS Server login.
+     */
+    private String casServerLoginUrl;
+
+    /**
+     * Whether to send the renew request or not.
+     */
+    private boolean renew;
+
+    /**
+     * Whether to send the gateway request or not.
+     */
+    private boolean gateway;
+
+    public final void setRenew(final boolean renew)
+    {
+        this.renew = renew;
+    }
+
+    public final void setGateway(final boolean gateway)
+    {
+        this.gateway = gateway;
+    }
+
+    public final void setCasServerLoginUrl(final String casServerLoginUrl)
+    {
+        this.casServerLoginUrl = casServerLoginUrl;
+    }
+
+    /**
+     * Sets the artifactParameterName.
+     * @param artifactParameterName the artifactParameterName to set
+     */
+    public void setArtifactParameterName(String artifactParameterName)
+    {
+        this.artifactParameterName = artifactParameterName;
+    }
+
+    /**
+     * Sets the serviceParameterName.
+     * @param serviceParameterName the serviceParameterName to set
+     */
+    public void setServiceParameterName(String serviceParameterName)
+    {
+        this.serviceParameterName = serviceParameterName;
+    }
+
+    /**
+     * Sets the encodeServiceUrl.
+     * @param encodeServiceUrl the encodeServiceUrl to set
+     */
+    public void setEncodeServiceUrl(boolean encodeServiceUrl)
+    {
+        this.encodeServiceUrl = encodeServiceUrl;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void doCallback(HttpServletRequest request, HttpServletResponse response)
+    {
+
+        final HttpSession session = request.getSession(false);
+
+        if (session != null)
+        {
+            // don't redirect to cas if user is already logged in
+            if (session.getAttribute("info.magnolia.context.UserContextImpl.user") != null)
+            {
+                try
+                {
+                    request.getRequestDispatcher("/errors/401.html").forward(request, response);
+                }
+                catch (ServletException e)
+                {
+                    // ignore
+                }
+                catch (IOException e)
+                {
+                    // ignore
+                }
+                return;
+            }
+        }
+        final String ticket = request.getParameter(this.artifactParameterName);
+        final Assertion assertion = session != null ? (Assertion) session.getAttribute(CONST_CAS_ASSERTION) : null;
+        final boolean wasGatewayed = session != null && session.getAttribute(CONST_CAS_GATEWAY) != null;
+
+        if (CommonUtils.isBlank(ticket) && assertion == null && !wasGatewayed)
+        {
+
+            String service = RequestUtils.absoluteUrl(request);
+            log.debug("no ticket and no assertion found");
+            if (this.gateway)
+            {
+                log.debug("setting gateway attribute in session");
+                request.getSession(true).setAttribute(CONST_CAS_GATEWAY, "yes");
+            }
+
+            final String serviceUrl = CommonUtils.constructServiceUrl(
+                request,
+                response,
+                service,
+                null,
+                this.artifactParameterName,
+                this.encodeServiceUrl);
+
+            if (log.isDebugEnabled())
+            {
+                log.debug("Constructed service url: " + serviceUrl);
+            }
+
+            String urlToRedirectTo = CommonUtils.constructRedirectUrl(
+                this.casServerLoginUrl,
+                this.serviceParameterName,
+                serviceUrl,
+                this.renew,
+                this.gateway);
+
+            urlToRedirectTo = urlToRedirectTo + "&locale=" + request.getLocale().toString();
+
+            if (log.isDebugEnabled())
+            {
+                log.debug("redirecting to \"" + urlToRedirectTo + "\"");
+            }
+
+            try
+            {
+                response.sendRedirect(urlToRedirectTo);
+            }
+            catch (IOException e)
+            {
+                log.error(e.getMessage(), e);
+            }
+            return;
+        }
+
+        if (session != null)
+        {
+            log.debug("removing gateway attribute from session");
+            session.setAttribute(CONST_CAS_GATEWAY, null);
+        }
+    }
+
+}

Added: trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,242 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlcas;
+
+import info.magnolia.cms.security.SecuritySupport;
+import info.magnolia.cms.security.User;
+import info.magnolia.cms.security.auth.callback.RealmCallback;
+import info.magnolia.cms.security.auth.login.LoginHandler;
+import info.magnolia.cms.security.auth.login.LoginHandlerBase;
+import info.magnolia.cms.security.auth.login.LoginResult;
+
+import java.io.IOException;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.TextInputCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id: CasLogin.java 4266 2008-09-25 08:18:30Z daniela $
+ */
+public class CasLogin extends LoginHandlerBase implements LoginHandler
+{
+
+    private static final Logger log = LoggerFactory.getLogger(CasLogin.class);
+
+    /**
+     * Defines the parameter to look for for the artifact.
+     */
+    private String artifactParameterName = "ticket";
+
+    /**
+     * The JAAS chain/module to use.
+     */
+    private String jaasChain = "magnolia";
+
+    private String realm;
+
+    private String casValidateUrl;
+
+    /**
+     * Sets the artifactParameterName.
+     * @param artifactParameterName the artifactParameterName to set
+     */
+    public void setArtifactParameterName(String artifactParameterName)
+    {
+        this.artifactParameterName = artifactParameterName;
+    }
+
+    public String getJaasChain()
+    {
+        return this.jaasChain;
+    }
+
+    public void setJaasChain(String jaasChain)
+    {
+        this.jaasChain = jaasChain;
+    }
+
+    /**
+     * Returns the realm.
+     * @return the realm
+     */
+    public String getRealm()
+    {
+        return realm;
+    }
+
+    /**
+     * Sets the realm.
+     * @param realm the realm to set
+     */
+    public void setRealm(String realm)
+    {
+        this.realm = realm;
+    }
+
+    /**
+     * Returns the casValidateUrl.
+     * @return the casValidateUrl
+     */
+    public String getCasValidateUrl()
+    {
+        return casValidateUrl;
+    }
+
+    /**
+     * Sets the casValidateUrl.
+     * @param casValidateUrl the casValidateUrl to set
+     */
+    public void setCasValidateUrl(String casValidateUrl)
+    {
+        this.casValidateUrl = casValidateUrl;
+    }
+
+    public LoginResult handle(HttpServletRequest request, HttpServletResponse response)
+    {
+
+        final String ticket = request.getParameter(this.artifactParameterName);
+
+        if (StringUtils.isNotEmpty(ticket))
+        {
+            String service = RequestUtils.absoluteUrl(request);
+            // solo se è l'ultimo carattere
+            if (service.lastIndexOf("/") == (service.length() - 1))
+            {
+                service = service.substring(0, service.lastIndexOf("/"));
+            }
+            CasCallBackHandler handler = new CasCallBackHandler(service, ticket, realm);
+
+            return authenticateCas(handler, getJaasChain());
+        }
+
+        return LoginResult.NOT_HANDLED;
+    }
+
+    protected LoginResult authenticateCas(CasCallBackHandler callbackHandler, String customLoginModule)
+    {
+        Subject subject;
+        try
+        {
+            LoginContext loginContext = new LoginContext(
+                StringUtils.defaultString(customLoginModule, "magnolia"),
+                callbackHandler);
+
+            loginContext.login();
+            subject = loginContext.getSubject();
+            User user = SecuritySupport.Factory.getInstance().getUserManager().getUser(subject);
+
+            if (user != null)
+            {
+                user.setSubject(subject);
+            }
+            else
+            {
+                log
+                    .error("Unable to obtain a user from userManager, maybe the external user manager is not configured for the cas realm?");
+            }
+
+            return new LoginResult(LoginResult.STATUS_SUCCEEDED, user);
+        }
+        catch (LoginException e)
+        {
+            log.info("Can't login due to:", e);
+            return new LoginResult(LoginResult.STATUS_FAILED, e);
+        }
+    }
+
+    public class CasCallBackHandler implements CallbackHandler
+    {
+
+        private String service;
+
+        private String ticket;
+
+        private String realm;
+
+        public CasCallBackHandler(String service, String ticket, String realm)
+        {
+            this.service = service;
+            this.ticket = ticket;
+            this.realm = realm;
+        }
+
+        public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+        {
+            for (int i = 0; i < callbacks.length; i++)
+            {
+                if (callbacks[i] instanceof TextInputCallback)
+                {
+                    TextInputCallback text = (TextInputCallback) callbacks[i];
+                    if ("ticket".equals(text.getPrompt()))
+                    {
+                        log.info(getTicket());
+                        text.setText(getTicket());
+                    }
+                    else if ("service".equals(text.getPrompt()))
+                    {
+                        log.info(getService());
+                        text.setText(getService());
+                    }
+                    else if ("casValidateUrl".equals(text.getPrompt()))
+                    {
+                        log.info(casValidateUrl);
+                        text.setText(casValidateUrl);
+                    }
+                }
+                else if (callbacks[i] instanceof RealmCallback)
+                {
+                    log.info(this.realm);
+                    ((RealmCallback) callbacks[i]).setRealm(this.realm);
+                }
+                else
+                {
+                    throw (new UnsupportedCallbackException(callbacks[i], "Callback class not supported"));
+                }
+            }
+        }
+
+        public String getTicket()
+        {
+            return ticket;
+        }
+
+        public String getService()
+        {
+            return service;
+        }
+
+        public String getRealm()
+        {
+            return realm;
+        }
+
+    }
+}

Added: trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,45 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlcas;
+
+import info.magnolia.cms.security.ExternalUser;
+
+import javax.security.auth.Subject;
+
+
+/**
+ * @author fgiust
+ * @version $Id: CasMagnoliaUser.java 2244 2008-08-11 19:31:53Z fgiust $
+ */
+public class CasMagnoliaUser extends ExternalUser
+{
+
+    /**
+     * Stable serialVersionUID.
+     */
+    private static final long serialVersionUID = 42L;
+
+    /**
+     * @param subject
+     */
+    protected CasMagnoliaUser(Subject subject)
+    {
+        super(subject);
+    }
+
+}

Added: trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.java
===================================================================
--- trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.java	                        (rev 0)
+++ trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.java	2008-12-03 16:06:59 UTC (rev 931)
@@ -0,0 +1,55 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlcas;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+/**
+ * @author fgiust
+ * @version $Id: RequestUtils.java 4124 2008-09-22 14:56:46Z fgiust $
+ */
+public final class RequestUtils
+{
+
+    private RequestUtils()
+    {
+        // don't instantiate
+    }
+
+    public static String absoluteUrl(HttpServletRequest request)
+    {
+
+        String host = request.getServerName();
+        int port = request.getServerPort();
+        String scheme = request.getScheme();
+        StringBuilder sb = new StringBuilder();
+        sb.append(scheme);
+        sb.append("://");
+        sb.append(host);
+        if (port != 0 && port != 80 && port != 443)
+        {
+            sb.append(":");
+            sb.append(port);
+        }
+        sb.append(request.getRequestURI());
+
+        return sb.toString();
+
+    }
+}

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-12-03 15:14:24 UTC (rev 930)
+++ trunk/pom.xml	2008-12-03 16:06:59 UTC (rev 931)
@@ -242,6 +242,7 @@
     <module>openutils-mgnlcontrols</module>
     <module>openutils-spring-rmibernate</module>
     <module>openutils-mgnlmessages</module>
+    <module>openutils-mgnlcas</module>
     <!--
     <module>openutils-elfunctions</module>
     <module>openutils-mgnlmessages</module>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[949] trunk

[<fg...@us...>]

Revision: 949
          http://openutils.svn.sourceforge.net/openutils/?rev=949&view=rev
Author:   fgiust
Date:     2008-12-11 16:15:12 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
new projects

Added Paths:
-----------
    trunk/openutils-elfunctions/
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-elfunctions/src/
    trunk/openutils-elfunctions/src/main/
    trunk/openutils-elfunctions/src/main/java/
    trunk/openutils-elfunctions/src/main/java/net/
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java
    trunk/openutils-elfunctions/src/main/resources/
    trunk/openutils-elfunctions/src/main/resources/META-INF/
    trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld
    trunk/openutils-mgnlstruts11/
    trunk/openutils-mgnlstruts11/pom.xml
    trunk/openutils-mgnlstruts11/src/
    trunk/openutils-mgnlstruts11/src/main/
    trunk/openutils-mgnlstruts11/src/main/java/
    trunk/openutils-mgnlstruts11/src/main/java/it/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlFormFile.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlMultipartRequestHandler.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessor.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessorHelper.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlStrutsUtils.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/MgnlStrutsServlet.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsProcessingException.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/setup/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/setup/MgnlStrutsModuleVersionHandler.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlLinkTag.java
    trunk/openutils-mgnlstruts11/src/main/resources/
    trunk/openutils-mgnlstruts11/src/main/resources/META-INF/
    trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/
    trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml
    trunk/openutils-mgnlstruts11/src/main/resources/META-INF/mgnlstruts-html.tld
    trunk/openutils-mgnlstruts11/src/main/resources/it/
    trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/
    trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/
    trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/
    trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.adminInterface.config.menu.tools.struts.xml
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.adminInterface.config.menu.tools.strutsjcr.xml
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.pages.struts.xml
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.modules.struts11.paragraph-renderers.struts.xml
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.server.filters.cms.bypasses.struts.xml
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap/struts11/config.server.filters.gzip.bypasses.struts.xml
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-resources/
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-resources/struts/
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-resources/struts/struts-ico.png
    trunk/openutils-mgnlstruts11/src/main/resources/mgnl-resources/struts/struts.png
    trunk/openutils-mgnlstruts11/src/test/
    trunk/openutils-mgnlstruts11/src/test/java/
    trunk/openutils-mgnlstruts11/src/test/resources/


Property changes on: trunk/openutils-elfunctions
___________________________________________________________________
Added: svn:ignore
   + 
.settings

target

.checkstyle

.classpath

.project


Added: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	                        (rev 0)
+++ trunk/openutils-elfunctions/pom.xml	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>10</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <artifactId>openutils-elfunctions</artifactId>
+  <name>openutils-elfunctions</name>
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <classifier>jdk15</classifier>
+      <version>5.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>


Property changes on: trunk/openutils-elfunctions/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java
===================================================================
--- trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java	                        (rev 0)
+++ trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,110 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sourceforge.openutils.elfunctions;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Utility methods mapped to EL functions to allow usage in jsp pages.
+ * @author fgiust
+ * @version $Id$
+ */
+public class ElStringUtils
+{
+
+    public static String escapeXml(String value)
+    {
+        String esc = StringEscapeUtils.escapeXml(value);
+        return StringUtils.replace(esc, "&apos;", "&#39;");
+    }
+
+    /**
+     * The space character.
+     * @return the space character
+     */
+    public static String space()
+    {
+        return " ";
+    }
+
+    /**
+     * The tab character.
+     * @return the tab character
+     */
+    public static String tab()
+    {
+        return "\t";
+    }
+
+    /**
+     * The newline (<code>\n</code>) character.
+     * @return the newline (<code>\n</code>) character
+     */
+    public static String newline()
+    {
+        return "\n";
+    }
+
+    public static String escapeJsText(String text, boolean dbl)
+    {
+        String repl = dbl ? "\"" : "'";
+        String with = "\\" + repl;
+        return repl + (text != null ? StringUtils.replace(text, repl, with) : "") + repl;
+    }
+
+    public static String adaptStringLength(String value, int maxLength, String ellipses)
+    {
+        if (value != null && value.length() > maxLength)
+        {
+            return value.substring(0, maxLength) + ellipses;
+        }
+
+        return value;
+    }
+
+    public static String stripHtmlTags(String string)
+    {
+        if (StringUtils.isNotBlank(string))
+        {
+            return StringUtils.remove(StringUtils.remove(string.replaceAll("<(.|\n)+?>", ""), '\r'), '\n').trim();
+
+        }
+        return null;
+    }
+
+    /**
+     * Splits the given strings on newlines (<code>\n</code>)
+     * @param string string to be splitted
+     * @return splitted string
+     */
+    public static String[] splitNewlines(String string)
+    {
+        return StringUtils.splitPreserveAllTokens(string, '\n');
+    }
+
+    /**
+     * Splits the given strings on tabs (<code>\t</code>)
+     * @param string string to be splitted
+     * @return splitted string
+     */
+    public static String[] splitOnTabs(String string)
+    {
+        return StringUtils.splitPreserveAllTokens(string, '\t');
+    }
+
+}


Property changes on: trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld
===================================================================
--- trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld	                        (rev 0)
+++ trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,99 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+  version="2.0">
+  <description>Openutils EL functions: stringutils</description>
+  <display-name>Openutils EL functions: stringutils</display-name>
+  <tlib-version>1.0</tlib-version>
+  <short-name>su</short-name>
+  <uri>http://openutils.sf.net/openutils-stringutils</uri>
+  <function>
+    <name>capitaliseAllWords</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String capitaliseAllWords(java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>substringAfterLast</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String substringAfterLast(java.lang.String, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>substringBeforeLast</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String substringBeforeLast(java.lang.String, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>isBlank</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>boolean isBlank(java.lang.String )</function-signature>
+  </function>
+  <function>
+    <name>randomAlphanumeric</name>
+    <function-class>org.apache.commons.lang.RandomStringUtils</function-class>
+    <function-signature>java.lang.String randomAlphanumeric(int)</function-signature>
+  </function>
+  <function>
+    <name>escapeXml</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
+  </function>
+  <function>
+    <description>Unescapes a String</description>
+    <name>unescapeXml</name>
+    <function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
+    <function-signature>java.lang.String unescapeXml(java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>space</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String space()</function-signature>
+  </function>
+  <function>
+    <name>tab</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String tab()</function-signature>
+  </function>
+  <function>
+    <name>newline</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String newline()</function-signature>
+  </function>
+  <function>
+    <name>escJsTxt</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String escapeJsText(java.lang.String, boolean)</function-signature>
+  </function>
+  <function>
+    <name>adaptStringLength</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String adaptStringLength(java.lang.String, int, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>stripHtmlTags</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String stripHtmlTags(java.lang.String)</function-signature>
+  </function>
+  <function>
+    <description>Splits the given strings on newlines</description>
+    <name>splitNewlines</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String[] splitNewlines(java.lang.String)</function-signature>
+  </function>
+  <function>
+    <description>Splits the given string on tab characters</description>
+    <name>splitOnTabs</name>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String[] splitOnTabs(java.lang.String)</function-signature>
+  </function>
+  <function>
+    <description>Strips whitespaces from the start and the end of a String</description>
+    <name>strip</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String strip(java.lang.String)</function-signature>
+  </function>
+  <function>
+    <description>Returns either the passed in String, or if the String is empty or null, the value of defaultStr</description>
+    <name>defaultIfEmpty</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String defaultIfEmpty(java.lang.String, java.lang.String)</function-signature>
+  </function>
+</taglib>
\ No newline at end of file


Property changes on: trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision


Property changes on: trunk/openutils-mgnlstruts11
___________________________________________________________________
Added: svn:ignore
   + 
.settings

.checkstyle

.classpath

.project

target


Added: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/pom.xml	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,82 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>10</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-mgnlstruts11</artifactId>
+  <packaging>jar</packaging>
+  <name>openutils-mgnlstruts11</name>
+  <version>1.0-SNAPSHOT</version>
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+    </license>
+  </licenses>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/magnolia/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-admininterface</artifactId>
+      <version>3.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnltasks</artifactId>
+      <version>3.5.5</version>
+    </dependency>
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts</artifactId>
+      <version>1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.sql</groupId>
+          <artifactId>jdbc-stdext</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlstruts11/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,101 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnlstruts11.pages;
+
+import info.magnolia.cms.beans.config.ParagraphManager;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.i18n.TemplateMessagesUtil;
+import info.magnolia.module.admininterface.DialogHandlerManager;
+import info.magnolia.module.admininterface.DialogMVCHandler;
+import info.magnolia.module.admininterface.InvalidDialogHandlerException;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import it.openutils.mgnlstruts11.render.StrutsParagraph;
+import it.openutils.mgnlstruts11.render.StrutsParagraphRegister;
+
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * A magnolia page that lists all the Struts paragraphs.
+ * @author fgiust
+ * @version $Id$
+ */
+public class StrutsConfigurationPage extends TemplatedMVCHandler
+{
+
+    /**
+     * Required constructor.
+     * @param name page name
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     */
+    public StrutsConfigurationPage(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+        super(name, request, response);
+    }
+
+    public Set<StrutsParagraph> getStrutsParagraphs()
+    {
+        return StrutsParagraphRegister.getParagraphs();
+    }
+
+    public Messages getMessages()
+    {
+        return TemplateMessagesUtil.getMessages();
+    }
+
+    public ParagraphManager getParagraphManager()
+    {
+        return ParagraphManager.getInstance();
+    }
+
+    public boolean isDialogConfigured(String dialogName)
+    {
+        DialogMVCHandler handler = null;
+        try
+        {
+            handler = DialogHandlerManager.getInstance().getDialogHandler(dialogName, request, response);
+        }
+        catch (InvalidDialogHandlerException e)
+        {
+            return false;
+        }
+
+        return handler != null;
+    }
+
+    public String getDialogPath(String dialogName)
+    {
+        DialogMVCHandler handler = null;
+        try
+        {
+            handler = DialogHandlerManager.getInstance().getDialogHandler(dialogName, request, response);
+        }
+        catch (InvalidDialogHandlerException e)
+        {
+            return StringUtils.EMPTY;
+        }
+
+        return handler.getConfigNode().getHandle();
+    }
+}


Property changes on: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlFormFile.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlFormFile.java	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlFormFile.java	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,181 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnlstruts11.process;
+
+import info.magnolia.cms.beans.runtime.Document;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.struts.upload.FormFile;
+
+
+/**
+ * A FormFile implementation that wraps a Magnolia Multipart Document.
+ * @author fgiust
+ * @version $Id$
+ */
+class MgnlFormFile implements FormFile
+{
+
+    /**
+     * The <code>document</code> instance wrapped by this object.
+     */
+    private Document mgnlDocument;
+
+    public MgnlFormFile(Document fileItem)
+    {
+        this.mgnlDocument = fileItem;
+    }
+
+    /**
+     * Returns the content type for this file.
+     * @return A String representing content type.
+     */
+    public String getContentType()
+    {
+        return mgnlDocument.getExtension();
+    }
+
+    /**
+     * Sets the content type for this file.
+     * <p>
+     * NOTE: This method is not supported in this implementation.
+     * @param contentType A string representing the content type.
+     */
+    public void setContentType(String contentType)
+    {
+        throw new UnsupportedOperationException("The setContentType() method is not supported.");
+    }
+
+    /**
+     * Returns the size, in bytes, of this file.
+     * @return The size of the file, in bytes.
+     */
+    public int getFileSize()
+    {
+        return (int) mgnlDocument.getFile().length();
+    }
+
+    /**
+     * Sets the size, in bytes, for this file.
+     * <p>
+     * NOTE: This method is not supported in this implementation.
+     * @param filesize The size of the file, in bytes.
+     */
+    public void setFileSize(int filesize)
+    {
+        throw new UnsupportedOperationException("The setFileSize() method is not supported.");
+    }
+
+    /**
+     * Returns the (client-side) file name for this file.
+     * @return The client-size file name.
+     */
+    public String getFileName()
+    {
+        return getBaseFileName(mgnlDocument.getFileName());
+    }
+
+    /**
+     * Sets the (client-side) file name for this file.
+     * <p>
+     * NOTE: This method is not supported in this implementation.
+     * @param fileName The client-side name for the file.
+     */
+    public void setFileName(String fileName)
+    {
+        throw new UnsupportedOperationException("The setFileName() method is not supported.");
+    }
+
+    /**
+     * Returns the data for this file as a byte array. Note that this may result in excessive memory usage for large
+     * uploads. The use of the {@link #getInputStream() getInputStream} method is encouraged as an alternative.
+     * @return An array of bytes representing the data contained in this form file.
+     * @exception FileNotFoundException If some sort of file representation cannot be found for the FormFile
+     * @exception IOException If there is some sort of IOException
+     */
+    public byte[] getFileData() throws FileNotFoundException, IOException
+    {
+        return FileUtils.readFileToByteArray(mgnlDocument.getFile());
+    }
+
+    /**
+     * Get an InputStream that represents this file. This is the preferred method of getting file data.
+     * @exception FileNotFoundException If some sort of file representation cannot be found for the FormFile
+     * @exception IOException If there is some sort of IOException
+     */
+    public InputStream getInputStream() throws FileNotFoundException, IOException
+    {
+        return mgnlDocument.getStream();
+    }
+
+    /**
+     * Destroy all content for this form file. Implementations should remove any temporary files or any temporary file
+     * data stored somewhere
+     */
+    public void destroy()
+    {
+        mgnlDocument.delete();
+    }
+
+    /**
+     * Returns the base file name from the supplied file path. On the surface, this would appear to be a trivial task.
+     * Apparently, however, some Linux JDKs do not implement <code>File.getName()</code> correctly for Windows paths, so
+     * we attempt to take care of that here.
+     * @param filePath The full path to the file.
+     * @return The base file name, from the end of the path.
+     */
+    protected String getBaseFileName(String filePath)
+    {
+
+        // First, ask the JDK for the base file name.
+        String fileName = new File(filePath).getName();
+
+        // Now check for a Windows file name parsed incorrectly.
+        int colonIndex = fileName.indexOf(":");
+        if (colonIndex == -1)
+        {
+            // Check for a Windows SMB file path.
+            colonIndex = fileName.indexOf("\\\\");
+        }
+        int backslashIndex = fileName.lastIndexOf("\\");
+
+        if (colonIndex > -1 && backslashIndex > -1)
+        {
+            // Consider this filename to be a full Windows path, and parse it
+            // accordingly to retrieve just the base file name.
+            fileName = fileName.substring(backslashIndex + 1);
+        }
+
+        return fileName;
+    }
+
+    /**
+     * Returns the (client-side) file name for this file.
+     * @return The client-size file name.
+     */
+    @Override
+    public String toString()
+    {
+        return getFileName();
+    }
+}
\ No newline at end of file


Property changes on: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlFormFile.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlMultipartRequestHandler.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlMultipartRequestHandler.java	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlMultipartRequestHandler.java	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,200 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnlstruts11.process;
+
+import info.magnolia.cms.beans.runtime.Document;
+import info.magnolia.cms.beans.runtime.MultipartForm;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.Globals;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionServlet;
+import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.upload.FormFile;
+import org.apache.struts.upload.MultipartRequestHandler;
+
+
+/**
+ * A <code>MultipartRequestHandler</code> implementation that delegates to the stadard Magnolia Multipart parser.
+ * @author fgiust
+ * @version $Id$
+ */
+public class MgnlMultipartRequestHandler implements MultipartRequestHandler
+{
+
+    /**
+     * Commons Logging instance.
+     */
+    protected static Log log = LogFactory.getLog(MgnlMultipartRequestHandler.class);
+
+    /**
+     * The combined text and file request parameters.
+     */
+    private Hashtable elementsAll;
+
+    /**
+     * The file request parameters.
+     */
+    private Hashtable<String, FormFile> elementsFile;
+
+    /**
+     * The action mapping with which this handler is associated.
+     */
+    private ActionMapping mapping;
+
+    /**
+     * The servlet with which this handler is associated.
+     */
+    private ActionServlet servlet;
+
+    /**
+     * Magnolia multipart form
+     */
+    private MultipartForm mpf;
+
+    /**
+     * Retrieves the servlet with which this handler is associated.
+     * @return The associated servlet.
+     */
+    public ActionServlet getServlet()
+    {
+        return this.servlet;
+    }
+
+    /**
+     * Sets the servlet with which this handler is associated.
+     * @param servlet The associated servlet.
+     */
+    public void setServlet(ActionServlet servlet)
+    {
+        this.servlet = servlet;
+    }
+
+    /**
+     * Retrieves the action mapping with which this handler is associated.
+     * @return The associated action mapping.
+     */
+    public ActionMapping getMapping()
+    {
+        return this.mapping;
+    }
+
+    /**
+     * Sets the action mapping with which this handler is associated.
+     * @param mapping The associated action mapping.
+     */
+    public void setMapping(ActionMapping mapping)
+    {
+        this.mapping = mapping;
+    }
+
+    /**
+     * Parses the input stream and partitions the parsed items into a set of form fields and a set of file items. In the
+     * process, the parsed items are translated from Commons FileUpload <code>FileItem</code> instances to Struts
+     * <code>FormFile</code> instances.
+     * @param request The multipart request to be processed.
+     * @throws ServletException if an unrecoverable error occurs.
+     */
+    @SuppressWarnings("unchecked")
+    public void handleRequest(HttpServletRequest request) throws ServletException
+    {
+
+        // always made available by the renderer
+        mpf = (MultipartForm) request.getAttribute(MultipartForm.REQUEST_ATTRIBUTE_NAME);
+
+        // Create the hash tables to be populated.
+        elementsFile = new Hashtable<String, FormFile>();
+        elementsAll = new Hashtable();
+
+        Map<String, Document> docs = mpf.getDocuments();
+        for (Map.Entry<String, Document> doc : docs.entrySet())
+        {
+            addFileParameter(doc.getKey(), doc.getValue());
+        }
+
+        elementsAll.putAll(getTextElements());
+        elementsAll.putAll(elementsFile);
+
+    }
+
+    /**
+     * Returns a hash table containing the text (that is, non-file) request parameters.
+     * @return The text request parameters.
+     */
+    @SuppressWarnings("unchecked")
+    public Hashtable<String, String[]> getTextElements()
+    {
+        // not really safe, but internally mpf uses hashtables instances
+        return ((Hashtable<String, String[]>) mpf.getParameters());
+    }
+
+    /**
+     * Returns a hash table containing the file (that is, non-text) request parameters.
+     * @return The file request parameters.
+     */
+    @SuppressWarnings("unchecked")
+    public Hashtable getFileElements()
+    {
+        return this.elementsFile;
+    }
+
+    /**
+     * Returns a hash table containing both text and file request parameters.
+     * @return The text and file request parameters.
+     */
+    @SuppressWarnings("unchecked")
+    public Hashtable getAllElements()
+    {
+
+        return this.elementsAll;
+    }
+
+    /**
+     * Cleans up when a problem occurs during request processing.
+     */
+    public void rollback()
+    {
+        // nothing to do
+    }
+
+    /**
+     * Cleans up at the end of a request.
+     */
+    public void finish()
+    {
+        // nothing to do
+    }
+
+    /**
+     * Adds a file parameter to the set of file parameters for this request and also to the list of all parameters.
+     * @param item The file item for the parameter to add.
+     */
+    protected void addFileParameter(String name, Document item)
+    {
+        FormFile formFile = new MgnlFormFile(item);
+        elementsFile.put(name, formFile);
+    }
+
+}


Property changes on: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlMultipartRequestHandler.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessor.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessor.java	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessor.java	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,98 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnlstruts11.process;
+
+import it.openutils.mgnlstruts11.render.StrutsRenderer;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.RequestProcessor;
+import org.apache.struts.config.ForwardConfig;
+
+
+/**
+ * A request processor implementation that makes struts dispatching work inside magnolia.
+ * @author fgiust
+ * @version $Id$
+ */
+public class MgnlRequestProcessor extends RequestProcessor
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String processPath(HttpServletRequest request, HttpServletResponse response) throws IOException
+    {
+
+        String path = (String) request.getAttribute(StrutsRenderer.PARAGRAPH_PATH);
+        if (path != null)
+        {
+            log.debug("Processing path " + path);
+            return (path);
+        }
+
+        return super.processPath(request, response);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void processForwardConfig(HttpServletRequest request, HttpServletResponse response, ForwardConfig forward)
+        throws IOException, ServletException
+    {
+        MgnlRequestProcessorHelper.doProcessForwardConfig(request, response, forward);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doForward(String uri, HttpServletRequest request, HttpServletResponse response) throws IOException,
+        ServletException
+    {
+        // forwards are translated to include when running inside magnolia
+        doInclude(uri, request, response);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doInclude(String uri, HttpServletRequest request, HttpServletResponse response) throws IOException,
+        ServletException
+    {
+        MgnlRequestProcessorHelper.doInclude(uri, request, response);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected ActionMapping processMapping(HttpServletRequest request, HttpServletResponse response, String path)
+        throws IOException
+    {
+        return MgnlRequestProcessorHelper.doProcessMapping(request, response, path, moduleConfig);
+    }
+}


Property changes on: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessor.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessorHelper.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessorHelper.java	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessorHelper.java	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,180 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnlstruts11.process;
+
+import info.magnolia.cms.beans.config.ServerConfiguration;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.context.WebContext;
+import it.openutils.mgnlstruts11.render.StrutsRenderer;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.Globals;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.config.ActionConfig;
+import org.apache.struts.config.ForwardConfig;
+import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.upload.MultipartRequestWrapper;
+import org.apache.struts.util.RequestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author fgiust
+ * @version $Id: MgnlRequestProcessorHelper.java 86 2008-11-04 08:37:44Z fgiust
+ *          $
+ */
+public class MgnlRequestProcessorHelper {
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory
+            .getLogger(MgnlRequestProcessorHelper.class);
+
+    public static void doProcessForwardConfig(HttpServletRequest request,
+            HttpServletResponse response, ForwardConfig forward)
+            throws IOException, ServletException {
+
+        log.info("processForwardConfig " + forward);
+        if (forward == null) {
+            return;
+        }
+
+        if (log.isDebugEnabled()) {
+            log.debug("processForwardConfig(" + forward + ")");
+        }
+
+        String forwardPath = forward.getPath();
+        String uri = null;
+
+        // paths not starting with / should be passed through without any
+        // processing
+        // (ie. they're absolute)
+        if (forwardPath.startsWith("/")) {
+            uri = RequestUtils.forwardURL(request, forward); // get module
+                                                             // relative uri
+        } else {
+            uri = forwardPath;
+        }
+
+        if (forward.getRedirect() && !uri.endsWith(".jsp")) {
+            // @todo redirect in templates
+            // only prepend context path for relative uri
+            if (uri.startsWith("/")) {
+                uri = request.getContextPath() + uri;
+            }
+            response.sendRedirect(response.encodeRedirectURL(uri));
+
+        } else {
+            doInclude(uri, request, response);
+        }
+
+    }
+
+    public static void doInclude(String uri, HttpServletRequest request,
+            HttpServletResponse response) throws IOException, ServletException {
+
+        // needed for chained forwards, avoid loops!
+        request.setAttribute(StrutsRenderer.PARAGRAPH_PATH, uri);
+
+        // Unwrap the multipart request, if there is one.
+        if (request instanceof MultipartRequestWrapper) {
+            request = ((MultipartRequestWrapper) request).getRequest();
+        }
+
+        RequestDispatcher rd = getWebContext().getServletContext()
+                .getRequestDispatcher(uri);
+
+        getWebContext().include(uri, getOut());
+    }
+
+    public static ActionMapping doProcessMapping(HttpServletRequest request,
+            HttpServletResponse response, String path, ModuleConfig moduleConfig)
+            throws IOException {
+
+        log.info("Process mapping " + path);
+
+        // Is there a directly defined mapping for this path?
+        ActionMapping mapping = (ActionMapping) moduleConfig.findActionConfig(path);
+        
+        if (mapping == null) {
+            // @todo This is almost a copy-paste of the end of RequestProcessor.processPath method, it should be refactored in a "simplify path" somewhere else.
+            // This is a temporary patch to handle forwards correctly.
+            String retryPath = StringUtils.defaultString(StringUtils.substringAfterLast(StringUtils.substringBeforeLast(path, "."), "/"));
+            retryPath = retryPath.startsWith("/") ? retryPath : ("/" + retryPath);
+            mapping = (ActionMapping) moduleConfig.findActionConfig(retryPath);
+        }
+
+        if (mapping != null) {
+            request.setAttribute(Globals.MAPPING_KEY, mapping);
+            return (mapping);
+        }
+
+        // Locate the mapping for unknown paths (if any)
+        ActionConfig configs[] = moduleConfig.findActionConfigs();
+        for (int i = 0; i < configs.length; i++) {
+            if (configs[i].getUnknown()) {
+                mapping = (ActionMapping) configs[i];
+                request.setAttribute(Globals.MAPPING_KEY, mapping);
+                return (mapping);
+            }
+        }
+
+        // No mapping can be found to process this request
+        log.error("Invalid path: " + path);
+
+        // debug only on admin instances
+        if (ServerConfiguration.getInstance().isAdmin()) {
+            getOut().write("Invalid path: " + path);
+        }
+
+        return (null);
+
+    }
+
+    private static WebContext getWebContext() {
+        return ((WebContext) MgnlContext.getInstance());
+    }
+
+    /**
+     * @return
+     * @throws IOException
+     */
+    private static Writer getOut() throws IOException {
+        Writer out = null;
+
+        PageContext pageContext = getWebContext().getPageContext();
+
+        if (pageContext != null) {
+            out = pageContext.getOut();
+        } else {
+            out = getWebContext().getResponse().getWriter();
+        }
+        return out;
+    }
+
+}


Property changes on: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlRequestProcessorHelper.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlStrutsUtils.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlStrutsUtils.java	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/process/MgnlStrutsUtils.java	2008-12-11 16:15:12 UTC (rev 949)
@@ -0,0 +1,457 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnlstruts11.process;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URLEncoder;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.Globals;
+import org.apache.struts.action.ActionServlet;
+import org.apache.struts.action.RequestProcessor;
+import org.apache.struts.config.ForwardConfig;
+import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Magnolia-Struts utility methods.
+ * @author fgiust
+ * @version $Id$
+ */
+public final class MgnlStrutsUtils
+{
+
+    /**
+     * Request parameter containing the current magnolia action.
+     */
+    public static final String PARAMETER_MGNLACTION = "_mgnlaction";
+
+    /**
+     *
+     */
+    public static final String ATTRIBUTE_ORIGINALURI = "_originaluri";
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(MgnlStrutsUtils.class);
+
+    /**
+     * The message resources for this package.
+     */
+    private static MessageResources messages = MessageResources
+        .getMessageResources("org.apache.struts.util.LocalStrings");
+
+    /**
+     * Look up and return the {@link RequestProcessor} responsible for the specified module, creating a new one if
+     * necessary.
+     * @param config The module configuration for which to acquire and return a RequestProcessor.
+     * @exception ServletException if we cannot instantiate a RequestProcessor instance
+     * @since Struts 1.1
+     */
+    public static RequestProcessor getRequestProcessor(ModuleConfig config, ServletContext servletContext,
+        ActionServlet dispatcher, Class mgnlProcessorClass) throws ServletException
+    {
+
+        String key = Globals.REQUEST_PROCESSOR_KEY + config.getPrefix();
+        RequestProcessor processor = (RequestProcessor) servletContext.getAttribute(key);
+
+        if (processor == null)
+        {
+            String processorClass = config.getControllerConfig().getProcessorClass();
+            try
+            {
+                processor = (RequestProcessor) RequestUtils.applicationInstance(StringUtils.isNotBlank(processorClass)
+                    ? processorClass
+                    : mgnlProcessorClass.getName());
+
+                if (!processor.getClass().isAssignableFrom(mgnlProcessorClass))
+                {
+                    if (StringUtils.equalsIgnoreCase(
+                        org.apache.struts.action.RequestProcessor.class.getName(),
+                        processorClass))
+                    {
+                        // It's safe to replace the default processor
+                        log.warn("The default processor class ("
+                            + processorClass
+                            + ") has been specified for struts module, this will be replaced by "
+                            + mgnlProcessorClass.getName()
+                            + " to enable the magnolia integration");
+                    }
+                    else
+                    {
+                        // It's NOT safe to replace a custom class, should stop the application...
+                        log.error("A custom processor class ("
+                            + processorClass
+                            + ") has been specified for struts module, this will be replaced by "
+                            + mgnlProcessorClass.getName()
+                            + " to enable the magnolia integration");
+                    }
+                    processor = (RequestProcessor) RequestUtils.applicationInstance(mgnlProcessorClass.getName());
+                }
+            }
+            catch (Exception e)
+            {
+                throw new UnavailableException("Cannot initialize RequestProcessor of class "
+                    + config.getControllerConfig().getProcessorClass()
+                    + ": "
+                    + e);
+            }
+
+            processor.init(dispatcher, config);
+            servletContext.setAttribute(key, processor);
+
+        }
+        return (processor);
+
+    }
+
+    /**
+     * Compute a hyperlink URL based on the <code>forward</code>, <code>href</code>, <code>action</code> or
+     * <code>page</code> parameter that is not null. The returned URL will have already been passed to
+     * <code>response.encodeURL()</code> for adding a session identifier.
+     * @param pageContext PageContext for the tag making this call
+     * @param forward Logical forward name for which to look up the context-relative URI (if specified)
+     * @param href URL to be utilized unmodified (if specified)
+     * @param page Module-relative page for which a URL should be created (if specified)
+     * @param action Logical action name for which to look up the context-relative URI (if specified)
+     * @param params Map of parameters to be dynamically included (if any)
+     * @param anchor Anchor to be dynamically included (if any)
+     * @param redirect Is this URL for a <code>response.sendRedirect()</code>?
+     * @param encodeSeparator This is only checked if redirect is set to false (never encoded for a redirect). If true,
+     * query string parameter separators are encoded as &gt;amp;, else &amp; is used.
+     * @return URL with session identifier
+     * @exception MalformedURLException if a URL cannot be created for the specified parameters
+     */
+    public static String computeURL(PageContext pageContext, String forward, String href, String page, String action,
+        Map<String, String> params, String anchor, boolean redirect, boolean encodeSeparator, String destinationPage)
+        throws MalformedURLException
+    {
+
+        // TODO All the computeURL() methods need refactoring!
+
+        // Validate that exactly one specifier was included
+        int n = 0;
+        if (forward != null)
+        {
+            n++;
+        }
+        if (href != null)
+        {
+            n++;
+        }
+        if (page != null)
+        {
+            n++;
+        }
+        if (action != null)
+        {
+            n++;
+        }
+        if (n != 1)
+        {
+            throw new MalformedURLException(messages.getMessage("computeURL.specifier"));
+        }
+
+        // Look up the module configuration for this request
+        ModuleConfig config = (ModuleConfig) pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
+        if (config == null)
+        { // Backwards compatibility hack
+            config = (ModuleConfig) pageContext.getServletContext().getAttribute(Globals.MODULE_KEY);
+            pageContext.getRequest().setAttribute(Globals.MODULE_KEY, config);
+        }
+
+        // Calculate the appropriate URL
+        StringBuffer url = new StringBuffer();
+        HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+
+        String mgnlaction = null;
+
+        if (destinationPage != null && href == null)
+        {
+            url.append(destinationPage);
+        }
+
+        if (forward != null)
+        {
+            ForwardConfig fc = config.findForwardConfig(forward);
+            if (fc == null)
+            {
+                throw new MalformedURLException(messages.getMessage("computeURL.forward", forward));
+            }
+            if (fc.getRedirect())
+            {
+                redirect = true;
+            }
+
+            mgnlaction = forward;
+
+        }
+        else if (href != null)
+        {
+            url.append(href);
+        }
+        else if (action != null)
+        {
+            mgnlaction = RequestUtils.getActionMappingURL(action, pageContext);
+            // url.append(RequestUtils.getActionMappingURL(action, pageContext));
+
+        }
+        else
+        /* if (page != null) */{
+
+            mgnlaction = RequestUtils.pageURL(request, page);
+            // url.append(request.getContextPath());
+            // url.append(RequestUtils.pageURL(request, page));
+        }
+
+        if (mgnlaction != null)
+        {
+            // remove parameters (how ugly is struts 1 :( )
+            if (mgnlaction.contains("?"))
+            {
+                String actionparams = StringUtils.substringAfter(mgnlaction, "?");
+
+                String[] paramz = StringUtils.split(actionparams, "&");
+                for (String string : paramz)
+                {
+                    if (StringUtils.contains(string, "="))
+                    {
+                        params.put(StringUtils.substringBefore(string, "="), StringUtils.substringAfter(string, "="));
+                    }
+
+                }
+                mgnlaction = StringUtils.substringBefore(mgnlaction, "?");
+            }
+
+            if (mgnlaction.endsWith(".do"))
+            {
+                mgnlaction = StringUtils.substringBeforeLast(mgnlaction, ".do");
+            }
+
+            params.put(PARAMETER_MGNLACTION, mgnlaction);
+        }
+
+        // Add anchor if requested (replacing any existing anchor)
+        if (anchor != null)
+        {
+            String temp = url.toString();
+            int hash = temp.indexOf('#');
+            if (hash >= 0)
+            {
+                url.setLength(hash);
+            }
+            url.append('#');
+            url.append(encode(anchor));
+        }
+
+        // Add dynamic parameters if requested
+        if ((params != null) && (params.size() > 0))
+        {
+
+            // Save any existing anchor
+            String temp = url.toString();
+            int hash = temp.indexOf('#');
+            if (hash >= 0)
+            {
+                anchor = temp.substring(hash + 1);
+                url.setLength(hash);
+                temp = url.toString();
+            }
+            else
+            {
+                anchor = null;
+            }
+
+            // Define the parameter separator
+            String separator = null;
+            if (redirect)
+            {
+                separator = "&";
+            }
+            else if (encodeSeparator)
+            {
+                separator = "&amp;";
+            }
+            else
+            {
+                separator = "&";
+            }
+
+            // Add the required request parameters
+            boolean question = temp.indexOf('?') >= 0;
+            Iterator keys = params.keySet().iterator();
+            while (keys.hasNext())
+            {
+                String key = (String) keys.next();
+                Object value = params.get(key);
+               ...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[1598] trunk

[<fg...@us...>]

Revision: 1598
          http://openutils.svn.sourceforge.net/openutils/?rev=1598&view=rev
Author:   fgiust
Date:     2010-01-03 18:15:56 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
better configuration for source bundle

Modified Paths:
--------------
    trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml

Modified: trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlbootstrapsync/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -15,10 +15,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlcontrols/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -15,10 +15,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -16,10 +16,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlgroovy/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -15,10 +15,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -14,10 +14,18 @@
         <include>*</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>/sources/</outputDirectory>
+      <includes>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>${pom.artifactId}</outputDirectory>
+      <outputDirectory>bin</outputDirectory>
       <includes>
         <include>com.drewnoakes:metadata-extractor</include>
         <include>net.sourceforge.openutils:*</include>

Modified: trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlmessages/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -15,10 +15,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlrepoutils/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -15,10 +15,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlstripes/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -15,10 +15,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnlstruts11/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -15,10 +15,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml	2010-01-03 17:40:28 UTC (rev 1597)
+++ trunk/openutils-mgnltasks/src/main/assembly/assembly-bundle.xml	2010-01-03 18:15:56 UTC (rev 1598)
@@ -16,10 +16,11 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/java/</directory>
+      <directory>.</directory>
       <outputDirectory>/sources/</outputDirectory>
       <includes>
-        <include>**/*</include>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
       </includes>
     </fileSet>
   </fileSets>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1599] trunk

[<fg...@us...>]

Revision: 1599
          http://openutils.svn.sourceforge.net/openutils/?rev=1599&view=rev
Author:   fgiust
Date:     2010-01-04 12:09:03 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
updated for spring 3.0

Modified Paths:
--------------
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
    trunk/openutils-spring/pom.xml

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java	2010-01-03 18:15:56 UTC (rev 1598)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java	2010-01-04 12:09:03 UTC (rev 1599)
@@ -23,7 +23,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
@@ -36,6 +36,8 @@
 import org.apache.commons.fileupload.servlet.ServletRequestContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.multipart.MultipartException;
 import org.springframework.web.multipart.MultipartFile;
@@ -112,12 +114,14 @@
         MultipartForm form = (MultipartForm) request.getAttribute("multipartform");
 
         Map<String, Document> documents = form.getDocuments();
-        Map<String, MultipartFile> files = new HashMap<String, MultipartFile>();
+        MultiValueMap<String, MultipartFile> files = new LinkedMultiValueMap<String, MultipartFile>();
 
         for (String key : documents.keySet())
         {
             Document doc = documents.get(key);
-            files.put(key, new DocWrapperMultipartFile(doc));
+            ArrayList<MultipartFile> filelist = new ArrayList<MultipartFile>();
+            filelist.add(new DocWrapperMultipartFile(doc));
+            files.put(key, filelist);
         }
 
         Map<String, String[]> singleParamters = form.getParameters();

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2010-01-03 18:15:56 UTC (rev 1598)
+++ trunk/openutils-spring/pom.xml	2010-01-04 12:09:03 UTC (rev 1599)
@@ -48,6 +48,18 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>${spring.version}</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>net.sf.json-lib</groupId>
       <artifactId>json-lib</artifactId>
       <version>1.1</version>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1678] trunk

[<fg...@us...>]

Revision: 1678
          http://openutils.svn.sourceforge.net/openutils/?rev=1678&view=rev
Author:   fgiust
Date:     2010-01-18 17:59:05 +0000 (Mon, 18 Jan 2010)

Log Message:
-----------
minor checks on licenses

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlcriteria/src/main/etc/header.txt
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmedia/src/main/etc/header.txt
    trunk/openutils-mgnlutils/pom.xml
    trunk/openutils-mgnlutils/src/main/etc/header.txt
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing/src/main/etc/header.txt
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-junit/src/main/etc/header.txt
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing-testng/src/main/etc/header.txt

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-mgnlcriteria/pom.xml	2010-01-18 17:59:05 UTC (rev 1678)
@@ -50,7 +50,7 @@
             <include>src/**/*.java</include>
           </includes>
           <properties>
-            <year>${project.inceptionYear} - 2010</year>
+            <year>${project.inceptionYear}-2010</year>
             <name>${project.name}</name>
             <description>${project.description}</description>
             <url>${project.url}</url>

Modified: trunk/openutils-mgnlcriteria/src/main/etc/header.txt
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/etc/header.txt	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-mgnlcriteria/src/main/etc/header.txt	2010-01-18 17:59:05 UTC (rev 1678)
@@ -1,6 +1,6 @@
 
 ${name} (${url})
-Copyright (C)${year}, Openmind S.r.l. http://www.openmindonline.it
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-01-18 17:59:05 UTC (rev 1678)
@@ -67,7 +67,7 @@
             <include>src/**/*.java</include>
           </includes>
           <properties>
-            <year>${project.inceptionYear} - 2010</year>
+            <year>${project.inceptionYear}-2010</year>
             <name>${project.name}</name>
             <description>${project.description}</description>
             <url>${project.url}</url>

Modified: trunk/openutils-mgnlmedia/src/main/etc/header.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/main/etc/header.txt	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-mgnlmedia/src/main/etc/header.txt	2010-01-18 17:59:05 UTC (rev 1678)
@@ -1,6 +1,6 @@
 
 ${name} (${url})
-Copyright (C)${year}, Openmind S.r.l. http://www.openmindonline.it
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

Modified: trunk/openutils-mgnlutils/pom.xml
===================================================================
--- trunk/openutils-mgnlutils/pom.xml	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-mgnlutils/pom.xml	2010-01-18 17:59:05 UTC (rev 1678)
@@ -67,7 +67,7 @@
             <include>src/**/*.java</include>
           </includes>
           <properties>
-            <year>${project.inceptionYear} - 2010</year>
+            <year>${project.inceptionYear}-2010</year>
             <name>${project.name}</name>
             <description>${project.description}</description>
             <url>${project.url}</url>

Modified: trunk/openutils-mgnlutils/src/main/etc/header.txt
===================================================================
--- trunk/openutils-mgnlutils/src/main/etc/header.txt	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-mgnlutils/src/main/etc/header.txt	2010-01-18 17:59:05 UTC (rev 1678)
@@ -1,6 +1,6 @@
 
 ${name} (${url})
-Copyright (C)${year}, Openmind S.r.l. http://www.openmindonline.it
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-testing/pom.xml	2010-01-18 17:59:05 UTC (rev 1678)
@@ -36,7 +36,7 @@
             <exclude>target/**</exclude>
           </excludes>
           <properties>
-            <year>${project.inceptionYear} - 2010</year>
+            <year>${project.inceptionYear}-2010</year>
             <name>${project.name}</name>
             <description>${project.description}</description>
             <url>${project.url}</url>

Modified: trunk/openutils-testing/src/main/etc/header.txt
===================================================================
--- trunk/openutils-testing/src/main/etc/header.txt	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-testing/src/main/etc/header.txt	2010-01-18 17:59:05 UTC (rev 1678)
@@ -1,7 +1,7 @@
 
 ${name} (${url})
 
-Copyright (C)${year}, Openmind S.r.l. http://www.openmindonline.it
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
 
 
 This library is free software; you can redistribute it and/or

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-testing-junit/pom.xml	2010-01-18 17:59:05 UTC (rev 1678)
@@ -39,7 +39,7 @@
             <exclude>src/main/assembly/**</exclude>
           </excludes>
           <properties>
-            <year>${project.inceptionYear} - 2010</year>
+            <year>${project.inceptionYear}-2010</year>
             <name>${project.name}</name>
             <description>${project.description}</description>
             <url>${project.url}</url>

Modified: trunk/openutils-testing-junit/src/main/etc/header.txt
===================================================================
--- trunk/openutils-testing-junit/src/main/etc/header.txt	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-testing-junit/src/main/etc/header.txt	2010-01-18 17:59:05 UTC (rev 1678)
@@ -1,7 +1,7 @@
 
 ${name} (${url})
 
-Copyright (C)${year}, Openmind S.r.l. http://www.openmindonline.it
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
 
 
 This library is free software; you can redistribute it and/or

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-testing-testng/pom.xml	2010-01-18 17:59:05 UTC (rev 1678)
@@ -39,7 +39,7 @@
             <exclude>src/main/assembly/**</exclude>
           </excludes>
           <properties>
-            <year>${project.inceptionYear} - 2010</year>
+            <year>${project.inceptionYear}-2010</year>
             <name>${project.name}</name>
             <description>${project.description}</description>
             <url>${project.url}</url>

Modified: trunk/openutils-testing-testng/src/main/etc/header.txt
===================================================================
--- trunk/openutils-testing-testng/src/main/etc/header.txt	2010-01-18 17:36:56 UTC (rev 1677)
+++ trunk/openutils-testing-testng/src/main/etc/header.txt	2010-01-18 17:59:05 UTC (rev 1678)
@@ -1,7 +1,7 @@
 
 ${name} (${url})
 
-Copyright (C)${year}, Openmind S.r.l. http://www.openmindonline.it
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
 
 
 This library is free software; you can redistribute it and/or


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1967] trunk

[<die...@us...>]

Revision: 1967
          http://openutils.svn.sourceforge.net/openutils/?rev=1967&view=rev
Author:   diego_schivo
Date:     2010-02-16 15:14:20 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Module store: webapp renamed to magnolia-webapp-modulestore

Added Paths:
-----------
    trunk/magnolia-webapp-modulestore/

Removed Paths:
-------------
    trunk/module-store-server-webapp/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[2203] trunk

[<fg...@us...>]

Revision: 2203
          http://openutils.svn.sourceforge.net/openutils/?rev=2203&view=rev
Author:   fgiust
Date:     2010-03-21 17:37:34 +0000 (Sun, 21 Mar 2010)

Log Message:
-----------
update parent pom

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-mgnlbootstrapsync/pom.xml
    trunk/openutils-mgnlcas/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlext/pom.xml
    trunk/openutils-mgnlgroovy/pom.xml
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlrepoutils/pom.xml
    trunk/openutils-mgnlspring/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstruts11/pom.xml
    trunk/openutils-mgnltagcloud/pom.xml
    trunk/openutils-mgnltasks/pom.xml
    trunk/openutils-mgnlutils/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml

Added Paths:
-----------
    trunk/openutils-mgnlcriteria/src/main/resources/
    trunk/openutils-mgnltasks/src/main/resources/

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/magnolia-test-webapp/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>war</packaging>

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-bshd5/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-dbmigration/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils db migration</name>

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-deployment/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-deployment</artifactId>
   <name>openutils deployment tools</name>

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-elfunctions/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-log4j/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-log4j</artifactId>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcas/pom.xml
===================================================================
--- trunk/openutils-mgnlcas/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlcas/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlcontrols/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlcriteria/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
   <name>Magnolia Criteria API</name>

Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlext/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlgroovy/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlmessages/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlrepoutils/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlspring/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlstripes/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlstruts11/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-mgnlstruts11</artifactId>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnltagcloud/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnltasks/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlutils/pom.xml
===================================================================
--- trunk/openutils-mgnlutils/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-mgnlutils/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-spring/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-spring</artifactId>
   <name>openutils spring tools</name>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-testing/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-testing</artifactId>
   <name>Openutils testing library</name>

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-testing-junit/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-testing-junit</artifactId>
   <name>Openutils testing library (JUnit)</name>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-testing-testng/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-testing-testng</artifactId>
   <name>Openutils testing library (TestNG)</name>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-testing4dwr/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-testing4dwr</artifactId>
   <name>openutils dwr test utils</name>

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-testing4dwr-junit</artifactId>
   <name>openutils testing4dwr (junit)</name>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-testing4dwr-testng</artifactId>
   <name>openutils testing4dwr (testng)</name>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2010-03-21 17:35:30 UTC (rev 2202)
+++ trunk/openutils-testing4web/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-testing4web</artifactId>
   <name>Openutils testing4web</name>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[2677] trunk

[<die...@us...>]

Revision: 2677
          http://openutils.svn.sourceforge.net/openutils/?rev=2677&view=rev
Author:   diego_schivo
Date:     2010-06-18 13:14:42 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
CONTROLS-31 moved logic away from DialogGrid and its save-handler

Modified Paths:
--------------
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java	2010-06-18 12:56:14 UTC (rev 2676)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java	2010-06-18 13:14:42 UTC (rev 2677)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcontrols.configuration;
 
+import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 
 import java.util.Map;
@@ -53,4 +54,19 @@
             + "}))\n";
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnLoad(String value, Content colConfig)
+    {
+        return value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnSave(String value, Content colConfig)
+    {
+        return value;
+    }
 }

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java	2010-06-18 12:56:14 UTC (rev 2676)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java	2010-06-18 13:14:42 UTC (rev 2677)
@@ -19,8 +19,11 @@
 
 package net.sourceforge.openutils.mgnlcontrols.configuration;
 
+import info.magnolia.cms.core.Content;
+
 import java.util.Map;
 
+
 /**
  * @author dschivo
  * @version $Id$
@@ -40,4 +43,7 @@
      */
     public String getColumnModelSnippet(Map colmap);
 
+    public String processValueOnLoad(String value, Content colConfig);
+
+    public String processValueOnSave(String value, Content colConfig);
 }

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java	2010-06-18 12:56:14 UTC (rev 2676)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java	2010-06-18 13:14:42 UTC (rev 2677)
@@ -1,5 +1,6 @@
 package net.sourceforge.openutils.mgnlcontrols.configuration;
 
+import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 
 import java.util.ArrayList;
@@ -43,4 +44,19 @@
         return "editor: new Ed(new LinkField({\n" + StringUtils.join(options, ",\n") + "}))";
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnLoad(String value, Content colConfig)
+    {
+        return value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnSave(String value, Content colConfig)
+    {
+        return value;
+    }
 }

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java	2010-06-18 12:56:14 UTC (rev 2676)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java	2010-06-18 13:14:42 UTC (rev 2677)
@@ -1,5 +1,9 @@
 package net.sourceforge.openutils.mgnlcontrols.configuration;
 
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 
 import java.util.ArrayList;
@@ -43,4 +47,35 @@
         return "editor: new Ed(new UUIDLinkField({\n" + StringUtils.join(options, ",\n") + "}))";
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnLoad(String value, Content colConfig)
+    {
+        String repository = StringUtils.defaultIfEmpty(
+            NodeDataUtil.getString(colConfig, "repository"),
+            ContentRepository.WEBSITE);
+        Content node = ContentUtil.getContentByUUID(repository, value);
+        if (node != null)
+        {
+            value = node.getHandle();
+        }
+        return value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnSave(String value, Content colConfig)
+    {
+        String repository = StringUtils.defaultIfEmpty(
+            NodeDataUtil.getString(colConfig, "repository"),
+            ContentRepository.WEBSITE);
+        Content node = ContentUtil.getContent(repository, value);
+        if (node != null)
+        {
+            value = node.getUUID();
+        }
+        return value;
+    }
 }

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java	2010-06-18 12:56:14 UTC (rev 2676)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java	2010-06-18 13:14:42 UTC (rev 2677)
@@ -19,10 +19,8 @@
 
 package net.sourceforge.openutils.mgnlcontrols.dialog;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 
 import java.util.ArrayList;
@@ -33,6 +31,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sourceforge.openutils.mgnlcontrols.configuration.GridColumnType;
 import net.sourceforge.openutils.mgnlcontrols.configuration.GridColumnTypeManager;
 
 import org.apache.commons.lang.StringUtils;
@@ -82,7 +81,8 @@
     {
         super.addToParameters(parameters);
 
-        parameters.put("gridColumnTypes", GridColumnTypeManager.getInstance().getColumnTypes());
+        Map<String, GridColumnType> colTypeMap = GridColumnTypeManager.getInstance().getColumnTypes();
+        parameters.put("gridColumnTypes", colTypeMap);
 
         String value = getValue();
         if (value != null)
@@ -98,31 +98,12 @@
                     if (colIndex < colConfigs.size())
                     {
                         Content colConfig = colConfigs.get(colIndex);
-                        String colType = NodeDataUtil.getString(colConfig, "type");
-                        if ("uuidLink".equals(colType))
+                        String colTypeName = NodeDataUtil.getString(colConfig, "type");
+                        GridColumnType colType = colTypeMap.get(colTypeName);
+                        if (colType != null)
                         {
-                            String repository = StringUtils.defaultIfEmpty(NodeDataUtil.getString(
-                                colConfig,
-                                "repository"), ContentRepository.WEBSITE);
-                            Content node = ContentUtil.getContentByUUID(repository, token);
-                            if (node != null)
-                            {
-                                token = node.getHandle();
-                            }
+                            token = colType.processValueOnLoad(token, colConfig);
                         }
-                        else if ("media".equals(colType))
-                        {
-                            String valueType = StringUtils.defaultIfEmpty(NodeDataUtil
-                                .getString(colConfig, "valueType"), "uuid");
-                            if ("uuid".equals(valueType))
-                            {
-                                if (StringUtils.startsWith(token, "/"))
-                                {
-                                    Content node = ContentUtil.getContentByUUID("media", token);
-                                    token = node != null ? node.getUUID() : token;
-                                }
-                            }
-                        }
                     }
                     if (colIndex > 0)
                     {

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java	2010-06-18 12:56:14 UTC (rev 2676)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java	2010-06-18 13:14:42 UTC (rev 2677)
@@ -19,7 +19,6 @@
 
 package net.sourceforge.openutils.mgnlcontrols.dialog;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.beans.runtime.Document;
 import info.magnolia.cms.beans.runtime.MultipartForm;
 import info.magnolia.cms.core.Content;
@@ -39,9 +38,13 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.jcr.RepositoryException;
 
+import net.sourceforge.openutils.mgnlcontrols.configuration.GridColumnType;
+import net.sourceforge.openutils.mgnlcontrols.configuration.GridColumnTypeManager;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -70,6 +73,8 @@
             colConfigs.addAll(configNode.getContent("columns").getChildren(ItemType.CONTENTNODE));
         }
 
+        Map<String, GridColumnType> colTypeMap = GridColumnTypeManager.getInstance().getColumnTypes();
+
         HierarchyManager hm = parentNode.getHierarchyManager();
         Content filesNode = ContentUtil.getOrCreateContent(parentNode, name + "_files", ItemType.CONTENTNODE);
         String value = form.getParameter(name);
@@ -87,34 +92,14 @@
                 if (colIndex < colConfigs.size())
                 {
                     Content colConfig = colConfigs.get(colIndex);
-                    String colType = NodeDataUtil.getString(colConfig, "type");
-                    if ("uuidLink".equals(colType))
+                    String colTypeName = NodeDataUtil.getString(colConfig, "type");
+                    GridColumnType colType = colTypeMap.get(colTypeName);
+                    if (colType != null)
                     {
-                        String repository = StringUtils.defaultIfEmpty(
-                            NodeDataUtil.getString(colConfig, "repository"),
-                            ContentRepository.WEBSITE);
-                        Content node = ContentUtil.getContent(repository, token);
-                        if (node != null)
-                        {
-                            token = node.getUUID();
-                        }
+                        token = colType.processValueOnSave(token, colConfig);
                     }
-                    else if ("media".equals(colType))
+                    else if ("file".equals(colTypeName))
                     {
-                        String mediaValueType = StringUtils.defaultIfEmpty(NodeDataUtil.getString(
-                            colConfig,
-                            "valueType"), "uuid");
-                        if ("uuid".equals(mediaValueType))
-                        {
-                            if (StringUtils.startsWith(token, "/"))
-                            {
-                                Content node = ContentUtil.getContentByUUID("media", token);
-                                token = node != null ? node.getUUID() : token;
-                            }
-                        }
-                    }
-                    else if ("file".equals(colType))
-                    {
                         if (token.startsWith(ctx))
                         {
                             String link = StringUtils.substringAfter(token, ctx);

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java	2010-06-18 12:56:14 UTC (rev 2676)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java	2010-06-18 13:14:42 UTC (rev 2677)
@@ -19,13 +19,19 @@
 
 package net.sourceforge.openutils.mgnlmedia.grid;
 
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 
 import java.util.Map;
 
 import net.sourceforge.openutils.mgnlcontrols.configuration.GridColumnType;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 
+import org.apache.commons.lang.StringUtils;
 
+
 /**
  * @author dschivo
  * @version $Id$
@@ -64,4 +70,37 @@
             + "}";
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnLoad(String value, Content colConfig)
+    {
+        String valueType = StringUtils.defaultIfEmpty(NodeDataUtil.getString(colConfig, "valueType"), "uuid");
+        if ("uuid".equals(valueType))
+        {
+            if (StringUtils.startsWith(value, "/"))
+            {
+                Content node = ContentUtil.getContentByUUID(MediaModule.REPO, value);
+                value = node != null ? node.getUUID() : value;
+            }
+        }
+        return value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String processValueOnSave(String value, Content colConfig)
+    {
+        String mediaValueType = StringUtils.defaultIfEmpty(NodeDataUtil.getString(colConfig, "valueType"), "uuid");
+        if ("uuid".equals(mediaValueType))
+        {
+            if (StringUtils.startsWith(value, "/"))
+            {
+                Content node = ContentUtil.getContentByUUID(MediaModule.REPO, value);
+                value = node != null ? node.getUUID() : value;
+            }
+        }
+        return value;
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3012] trunk

[<fg...@us...>]

Revision: 3012
          http://openutils.svn.sourceforge.net/openutils/?rev=3012&view=rev
Author:   fgiust
Date:     2010-09-09 21:13:25 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
update dependencies

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/magnolia-test-webapp/pom.xml	2010-09-09 21:13:25 UTC (rev 3012)
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.0.6-SNAPSHOT</version>
+      <version>1.0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/pom.xml	2010-09-09 21:13:25 UTC (rev 3012)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -115,7 +116,8 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.0.6-SNAPSHOT</version>
+      <version>1.0.6</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.jcr</groupId>

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -22,7 +22,7 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -47,7 +47,7 @@
  * @author dschivo
  * @version $Id$
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.Criteria.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.Criteria.xml")
 public class BasePathTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -22,7 +22,7 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.util.Map;
 
@@ -45,7 +45,7 @@
  * @author fgiust
  * @version $Id$
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
 public class Content2BeanTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -22,7 +22,7 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -39,7 +39,7 @@
  * @author dschivo
  * @version $Id$
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.myproject.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.myproject.xml")
 public class FirstDigitEscapeTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -22,7 +22,7 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,7 +47,7 @@
  * @version $Id: JcrContainsCriteriaSearchTest.java 2914 2010-08-28 08:14:49Z
  *          fgiust $
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
 public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -23,7 +23,7 @@
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import javax.jcr.query.Query;
 
@@ -45,7 +45,7 @@
  * @version $Id: JcrContainsQuestionMarkTest.java 2933 2010-08-29 16:00:21Z
  *          fgiust $
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
 public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -22,7 +22,7 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -40,7 +40,7 @@
  * 
  * @author dschivo
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.letters.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.letters.xml")
 public class PaginationTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -23,7 +23,7 @@
 import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.util.Collection;
 import java.util.List;
@@ -40,7 +40,7 @@
  * @version $Id: ScoreAnalizerAndSortTest.java 2916 2010-08-28 09:20:10Z fgiust
  *          $
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml")
 public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -23,7 +23,7 @@
 import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.util.Collection;
 
@@ -44,7 +44,7 @@
  * @author lbrindisi
  * @version $Id$
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml")
 public class XpathEscapeTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -28,7 +28,7 @@
 import info.magnolia.cms.util.SimpleUrlPattern;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.lang.reflect.Field;
 import java.util.Calendar;
@@ -57,7 +57,7 @@
  * 
  * @author dschivo
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
 public class AccessibleResultItemResultIteratorTest extends
 		TestNgRepositoryTestcase {
 

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -26,7 +26,7 @@
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.util.Calendar;
 
@@ -42,7 +42,7 @@
  * @author dschivo
  * @version $Id$
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
 public class CriteriaTest extends TestNgRepositoryTestcase {
 
 	/**

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2010-09-09 20:50:21 UTC (rev 3011)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2010-09-09 21:13:25 UTC (rev 3012)
@@ -31,7 +31,7 @@
 import info.magnolia.context.MgnlContext;
 import info.magnolia.test.mock.MockWebContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
-import it.openutils.mgnlutils.test.testNg.TestNgRepositoryTestcase;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.lang.reflect.Field;
 import java.util.Calendar;
@@ -56,7 +56,7 @@
  * 
  * @author dschivo
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfigFileName = "/crit-repository/jackrabbit-acl-search-index-test-configuration.xml", repositoryConfigFileName = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-acl-search-index-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
 public class AclSearchIndexTest extends TestNgRepositoryTestcase {
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3170] trunk

[<fg...@us...>]

Revision: 3170
          http://openutils.svn.sourceforge.net/openutils/?rev=3170&view=rev
Author:   fgiust
Date:     2010-12-08 20:35:51 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
update parent pom

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-maven-skin/pom.xml
    trunk/openutils-mgnlbootstrapsync/pom.xml
    trunk/openutils-mgnlcache/pom.xml
    trunk/openutils-mgnlcas/pom.xml
    trunk/openutils-mgnlcontextmenu/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlext/pom.xml
    trunk/openutils-mgnlgroovy/pom.xml
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlrepoutils/pom.xml
    trunk/openutils-mgnlrules/pom.xml
    trunk/openutils-mgnlspring/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstruts11/pom.xml
    trunk/openutils-mgnltagcloud/pom.xml
    trunk/openutils-mgnltasks/pom.xml
    trunk/openutils-mgnlutils/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/magnolia-test-webapp/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>war</packaging>

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-bshd5/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-dbmigration/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils dbmigration</name>

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-deployment/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-deployment</artifactId>
   <name>openutils deployment tools</name>

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-elfunctions/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-log4j/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-log4j</artifactId>
   <packaging>jar</packaging>
@@ -56,25 +57,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.15</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.jms</groupId>
-          <artifactId>jms</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jdmk</groupId>
-          <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jmx</groupId>
-          <artifactId>jmxri</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>1.2.16</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-maven-skin/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-maven-skin</artifactId>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcache/pom.xml
===================================================================
--- trunk/openutils-mgnlcache/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlcache/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -3,7 +3,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcas/pom.xml
===================================================================
--- trunk/openutils-mgnlcas/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlcas/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlcontextmenu/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlcontrols/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -3,7 +3,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlcriteria/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
   <name>Magnolia Criteria API</name>

Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlext/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -3,7 +3,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlgroovy/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlmessages/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -3,7 +3,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlrepoutils/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlrules/pom.xml
===================================================================
--- trunk/openutils-mgnlrules/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlrules/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlspring/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlstripes/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>net.sourceforge.stripes</groupId>
       <artifactId>stripes</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.4</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlstruts11/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-mgnlstruts11</artifactId>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnltagcloud/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnltasks/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlutils/pom.xml
===================================================================
--- trunk/openutils-mgnlutils/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-mgnlutils/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-spring/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-spring</artifactId>
   <name>openutils spring tools</name>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-testing/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-testing</artifactId>
   <name>Openutils testing library</name>

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-testing-junit/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-testing-junit</artifactId>
   <name>Openutils testing library (JUnit)</name>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-testing-testng/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-testing-testng</artifactId>
   <name>Openutils testing library (TestNG)</name>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-testing4dwr/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-testing4dwr</artifactId>
   <name>openutils dwr test utils</name>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
+      <version>1.2.16</version>
     </dependency>
     <dependency>
       <groupId>httpunit</groupId>

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-testing4dwr-junit</artifactId>
   <name>openutils testing4dwr (junit)</name>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-testing4dwr-testng</artifactId>
   <name>openutils testing4dwr (testng)</name>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2010-12-08 19:34:39 UTC (rev 3169)
+++ trunk/openutils-testing4web/pom.xml	2010-12-08 20:35:51 UTC (rev 3170)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.6</version>
+    <version>1.7</version>
   </parent>
   <artifactId>openutils-testing4web</artifactId>
   <name>Openutils testing4web</name>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3663] trunk

[<die...@us...>]

Revision: 3663
          http://openutils.svn.sourceforge.net/openutils/?rev=3663&view=rev
Author:   diego_schivo
Date:     2011-08-26 09:35:03 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
mvn license:format

Modified Paths:
--------------
    trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
    trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
    trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
    trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
    trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java

Modified: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java	2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java	2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
 /**
  *
  * openutils dwr test utils (http://openutils.sourceforge.net/openutils-testing4dwr)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

Modified: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java	2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java	2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
 /**
  *
  * openutils dwr test utils (http://openutils.sourceforge.net/openutils-testing4dwr)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

Modified: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java	2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java	2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
 /**
  *
  * openutils dwr test utils (http://openutils.sourceforge.net/openutils-testing4dwr)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

Modified: trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java	2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java	2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
 /**
  *
  * openutils testing4dwr (junit) (http://openutils.sourceforge.net/openutils-testing4dwr-junit)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

Modified: trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java	2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java	2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
 /**
  *
  * openutils testing4dwr (testng) (http://openutils.sourceforge.net/openutils-testing4dwr-testng)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[4234] trunk

[<fg...@us...>]

Revision: 4234
          http://openutils.svn.sourceforge.net/openutils/?rev=4234&view=rev
Author:   fgiust
Date:     2013-05-19 08:28:09 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update parent

Modified Paths:
--------------
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-spring/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-spring</artifactId>
   <name>openutils spring tools</name>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-testing</artifactId>
   <name>Openutils testing library</name>

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing-junit/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-testing-junit</artifactId>
   <name>Openutils testing library (JUnit)</name>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing-testng/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-testing-testng</artifactId>
   <name>Openutils testing library (TestNG)</name>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4dwr/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-testing4dwr</artifactId>
   <name>openutils dwr test utils</name>

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-testing4dwr-junit</artifactId>
   <name>openutils testing4dwr (junit)</name>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-testing4dwr-testng</artifactId>
   <name>openutils testing4dwr (testng)</name>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2013-05-19 08:23:49 UTC (rev 4233)
+++ trunk/openutils-testing4web/pom.xml	2013-05-19 08:28:09 UTC (rev 4234)
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.13</version>
   </parent>
   <artifactId>openutils-testing4web</artifactId>
   <name>Openutils testing4web</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[957] trunk

[<mol...@us...>]

Revision: 957
          http://openutils.svn.sourceforge.net/openutils/?rev=957&view=rev
Author:   molaschi
Date:     2008-12-16 14:16:26 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
add openutils small notification manager lib

Added Paths:
-----------
    trunk/openutils-notifications/
    trunk/openutils-notifications/pom.xml
    trunk/openutils-notifications/src/
    trunk/openutils-notifications/src/main/
    trunk/openutils-notifications/src/main/java/
    trunk/openutils-notifications/src/main/java/net/
    trunk/openutils-notifications/src/main/java/net/sourceforge/
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/Notification.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/NotificationException.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/EmailNotification.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/FreemarkerEmailNotification.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/SmsNotification.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/EmailNotifier.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/FreemarkerEmailNotifier.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/Notifier.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/SMSNotifier.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/DefaultNotificationManagerImpl.java
    trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/NotificationManager.java
    trunk/openutils-notifications/src/main/resources/
    trunk/openutils-notifications/src/test/
    trunk/openutils-notifications/src/test/java/
    trunk/openutils-notifications/src/test/resources/

Added: trunk/openutils-notifications/pom.xml
===================================================================
--- trunk/openutils-notifications/pom.xml	                        (rev 0)
+++ trunk/openutils-notifications/pom.xml	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>10</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-notifications</artifactId>
+  <name>Openutils Notifications</name>
+  <version>1.0.0-SNAPSHOT</version>
+  <description>openutils spring notification manager (plain text mails, freemarker mails, ...)</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+      <version>2.3.13</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>2.5.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.5.0</version>
+    </dependency>
+  </dependencies>
+</project>

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/Notification.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/Notification.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/Notification.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,30 @@
+package net.sourceforge.openutils.notifications;
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public interface Notification
+{
+
+    /**
+     * Get the notifier bean
+     * 
+     * @return notifier
+     */
+    String getNotifierBeanName();
+
+    /**
+     * Get message body
+     * 
+     * @return message body
+     */
+    String getMessageBody() throws NotificationException;
+
+    /**
+     * Get message subject
+     * 
+     * @return message subject
+     */
+    String getMessageSubject();
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/NotificationException.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/NotificationException.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/NotificationException.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,32 @@
+package net.sourceforge.openutils.notifications;
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class NotificationException extends Exception
+{
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @param arg0
+     * @param arg1
+     */
+    public NotificationException(String arg0, Throwable arg1)
+    {
+        super(arg0, arg1);
+    }
+
+    /**
+     * @param arg0
+     */
+    public NotificationException(Throwable arg0)
+    {
+        super(arg0);
+    }
+
+}

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/EmailNotification.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/EmailNotification.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/EmailNotification.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,35 @@
+package net.sourceforge.openutils.notifications.messages;
+
+import java.util.List;
+
+import javax.mail.internet.MimeBodyPart;
+
+import net.sourceforge.openutils.notifications.Notification;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public abstract class EmailNotification implements Notification
+{
+
+    /**
+     * Default property name for email sender
+     */
+    public static String DEFAULT_SENDER = "mail.defaultSender";
+
+    public static String BEAN_NAME = "emailNotifier";
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final String getNotifierBeanName()
+    {
+        return BEAN_NAME;
+    }
+
+    public abstract List<MimeBodyPart> getAttachments();
+
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/FreemarkerEmailNotification.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/FreemarkerEmailNotification.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/FreemarkerEmailNotification.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,182 @@
+package net.sourceforge.openutils.notifications.messages;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.mail.internet.MimeBodyPart;
+
+import net.sourceforge.openutils.notifications.NotificationException;
+
+import org.apache.commons.lang.StringUtils;
+
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.ext.beans.BeanModel;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateMethodModelEx;
+import freemarker.template.TemplateModelException;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public abstract class FreemarkerEmailNotification extends EmailNotification
+{
+
+    private Configuration configuration;
+
+    private Map<String, Object> data;
+
+    protected String body;
+
+    public Locale getLocale()
+    {
+        return Locale.ENGLISH;
+    }
+
+    /**
+     * Sets the configuration.
+     * @param configuration the configuration to set
+     */
+    public void setConfiguration(Configuration configuration)
+    {
+        this.configuration = configuration;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getMessageBody() throws NotificationException
+    {
+        if (body == null)
+        {
+            if (data == null)
+            {
+                data = new HashMap<String, Object>();
+            }
+            for (Method m : this.getClass().getDeclaredMethods())
+            {
+                if ((m.getModifiers() & Method.PUBLIC) == Method.PUBLIC)
+                {
+                    data.put(m.getName(), new ExecuteMethod(m, this));
+                }
+            }
+            String templateName = StringUtils.replace(this.getClass().getName(), ".", "/") + ".html";
+            data.put("this", this);
+            try
+            {
+                this.configuration.setTemplateLoader(new ClassTemplateLoader(this.getClass(), "/"));
+                Template t = this.configuration.getTemplate(templateName, getLocale());
+                StringWriter out = new StringWriter();
+                t.process(data, out);
+                body = out.toString();
+            }
+            catch (TemplateException e)
+            {
+                throw new NotificationException(e);
+            }
+            catch (IOException e)
+            {
+                throw new NotificationException(e);
+            }
+
+        }
+        return body;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public abstract String getMessageSubject();
+
+    public class ExecuteMethod implements TemplateMethodModelEx
+    {
+
+        private Method method;
+
+        private Object parent;
+
+        public ExecuteMethod(Method method, Object parent)
+        {
+            this.method = method;
+            this.parent = parent;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public Object exec(List arguments) throws TemplateModelException
+        {
+            try
+            {
+                if (arguments == null || arguments.size() == 0)
+                {
+                    return method.invoke(parent);
+                }
+                else
+                {
+                    List unwrappedArgs = new ArrayList();
+                    for (Object o : arguments)
+                    {
+                        unwrappedArgs.add(((BeanModel) o).getWrappedObject());
+                    }
+
+                    if (unwrappedArgs.size() == 1)
+                    {
+                        return method.invoke(parent, unwrappedArgs.iterator().next());
+
+                    }
+                    else
+                    {
+                        return method.invoke(parent, unwrappedArgs.toArray(new Object[unwrappedArgs.size()]));
+                    }
+                }
+            }
+            catch (IllegalAccessException ex)
+            {
+                throw new TemplateModelException(ex);
+            }
+            catch (IllegalArgumentException ex)
+            {
+                throw new TemplateModelException(ex);
+            }
+            catch (InvocationTargetException ex)
+            {
+                throw new TemplateModelException(ex);
+            }
+        }
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<MimeBodyPart> getAttachments()
+    {
+        return null;
+    }
+
+    /**
+     * Sets the data.
+     * @param data the data to set
+     */
+    public void setData(Map<String, Object> data)
+    {
+        this.data = data;
+    }
+
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/SmsNotification.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/SmsNotification.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/messages/SmsNotification.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,33 @@
+package net.sourceforge.openutils.notifications.messages;
+
+import net.sourceforge.openutils.notifications.Notification;
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public abstract class SmsNotification implements Notification
+{
+
+    public static String BEAN_NAME = "smsNotifier";
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final String getNotifierBeanName()
+    {
+        return BEAN_NAME;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public final String getMessageSubject()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/EmailNotifier.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/EmailNotifier.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/EmailNotifier.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,186 @@
+package net.sourceforge.openutils.notifications.notifiers;
+
+import java.util.List;
+import java.util.Properties;
+
+import javax.mail.Address;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.Message.RecipientType;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+
+import net.sourceforge.openutils.notifications.Notification;
+import net.sourceforge.openutils.notifications.NotificationException;
+import net.sourceforge.openutils.notifications.messages.EmailNotification;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class EmailNotifier implements Notifier
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(EmailNotifier.class);
+
+    private String mailHost;
+
+    private String mailPort;
+
+    private boolean async = false;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean send(String from, List<String> toAddresses, List<String> ccAddresses, List<String> ccnAddresses,
+        Notification notification) throws NotificationException
+    {
+        if (log.isDebugEnabled() && notification != null)
+        {
+            log.debug("Subject: {}", notification.getMessageSubject());
+            log.debug("Body: {}", notification.getMessageBody());
+        }
+
+        Properties props = new Properties(); // System.getProperties(); should I try to use the system properties ?
+        props.put("mail.smtp.host", this.mailHost);
+        props.put("mail.smtp.port", this.mailPort);
+
+        Session smtpSession = Session.getInstance(props);
+        MimeMessage message = new MimeMessage(smtpSession);
+
+        List<MimeBodyPart> attachments = ((EmailNotification) notification).getAttachments();
+        try
+        {
+            message.addFrom(new Address[]{new InternetAddress(from) });
+            message.setSubject(notification.getMessageSubject());
+            if (attachments == null || attachments.size() == 0)
+            {
+                message.setContent(notification.getMessageBody(), "text/html; charset=UTF-8");
+            }
+            else
+            {
+                MimeMultipart multiPart = new MimeMultipart();
+
+                MimeBodyPart text = new MimeBodyPart();
+                text.setContent(notification.getMessageBody(), "text/html; charset=UTF-8");
+
+                multiPart.addBodyPart(text);
+
+                for (MimeBodyPart mbp : attachments)
+                {
+                    multiPart.addBodyPart(mbp);
+                }
+
+                message.setContent(multiPart);
+            }
+        }
+        catch (MessagingException ex)
+        {
+            throw new NotificationException(ex);
+        }
+
+        for (String to : toAddresses)
+        {
+            try
+            {
+                message.setRecipient(RecipientType.TO, new InternetAddress(to));
+
+                if (ccAddresses != null)
+                {
+                    for (String address : ccAddresses)
+                    {
+                        if (StringUtils.isNotEmpty(address))
+                        {
+                            message.addRecipient(RecipientType.CC, new InternetAddress(address));
+                        }
+                    }
+                }
+                if (ccnAddresses != null)
+                {
+                    for (String address : ccnAddresses)
+                    {
+                        if (StringUtils.isNotEmpty(address))
+                        {
+                            message.addRecipient(RecipientType.BCC, new InternetAddress(address));
+                        }
+                    }
+                }
+                Transport.send(message);
+            }
+            catch (MessagingException ex)
+            {
+                throw new NotificationException(ex);
+            }
+
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the mailHost.
+     * @return the mailHost
+     */
+    public String getMailHost()
+    {
+        return mailHost;
+    }
+
+    /**
+     * Sets the mailHost.
+     * @param mailHost the mailHost to set
+     */
+    public void setMailHost(String mailHost)
+    {
+        this.mailHost = mailHost;
+    }
+
+    /**
+     * Returns the mailPort.
+     * @return the mailPort
+     */
+    public String getMailPort()
+    {
+        return mailPort;
+    }
+
+    /**
+     * Sets the mailPort.
+     * @param mailPort the mailPort to set
+     */
+    public void setMailPort(String mailPort)
+    {
+        this.mailPort = mailPort;
+    }
+
+    /**
+     * Returns the async.
+     * @return the async
+     */
+    public boolean isAsync()
+    {
+        return async;
+    }
+
+    /**
+     * Sets the async.
+     * @param async the async to set
+     */
+    public void setAsync(boolean async)
+    {
+        this.async = async;
+    }
+
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/FreemarkerEmailNotifier.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/FreemarkerEmailNotifier.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/FreemarkerEmailNotifier.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,56 @@
+package net.sourceforge.openutils.notifications.notifiers;
+
+import java.util.List;
+import java.util.Map;
+
+import net.sourceforge.openutils.notifications.Notification;
+import net.sourceforge.openutils.notifications.NotificationException;
+import net.sourceforge.openutils.notifications.messages.FreemarkerEmailNotification;
+import freemarker.template.Configuration;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class FreemarkerEmailNotifier extends EmailNotifier
+{
+
+    Configuration configuration;
+
+    Map<String, Object> data;
+
+    /**
+     * Sets the data.
+     * @param data the data to set
+     */
+    public void setData(Map<String, Object> data)
+    {
+        this.data = data;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean send(String from, List<String> toAddresses, List<String> ccAddresses, List<String> ccnAddresses,
+        Notification notification) throws NotificationException
+    {
+        if (notification instanceof FreemarkerEmailNotification)
+        {
+            ((FreemarkerEmailNotification) notification).setConfiguration(configuration);
+            ((FreemarkerEmailNotification) notification).setData(data);
+        }
+        return super.send(from, toAddresses, ccAddresses, ccnAddresses, notification);
+    }
+
+    /**
+     * Sets the configuration.
+     * @param configuration the configuration to set
+     */
+    public void setConfiguration(Configuration configuration)
+    {
+        this.configuration = configuration;
+    }
+
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/Notifier.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/Notifier.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/Notifier.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,27 @@
+package net.sourceforge.openutils.notifications.notifiers;
+
+import java.util.List;
+
+import net.sourceforge.openutils.notifications.Notification;
+import net.sourceforge.openutils.notifications.NotificationException;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public interface Notifier
+{
+
+    /**
+     * Send method
+     * @param from sender
+     * @param toAddresses list of receivers
+     * @param ccAddresses list of cc addresses
+     * @param ccnAddresses list of ccn addresses
+     * @param notification notification class
+     * @return true if send succeed
+     */
+    boolean send(String from, List<String> toAddresses, List<String> ccAddresses, List<String> ccnAddresses,
+        Notification notification) throws NotificationException;
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/SMSNotifier.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/SMSNotifier.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/notifiers/SMSNotifier.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,194 @@
+package net.sourceforge.openutils.notifications.notifiers;
+
+import java.util.List;
+
+import net.sourceforge.openutils.notifications.Notification;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class SMSNotifier implements Notifier
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(SMSNotifier.class);
+
+    private String smsGateway;
+
+    private String userId;
+
+    private String password;
+
+    private String passwordProperty;
+
+    private String userIdProperty;
+
+    private String cellNumProperty;
+
+    private String textProperty;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean send(String from, List<String> toAddresses, List<String> ccAddress, List<String> ccnAddresses,
+        Notification notification)
+    {
+        String url = smsGateway;
+        if (url.indexOf("?") < 0)
+        {
+            url += "?";
+        }
+        else
+        {
+            url += "&";
+        }
+
+        for (String to : toAddresses)
+        {
+            /*
+             * GetMethod request = new GetMethod(smsGateway); request.setQueryString(new NameValuePair[]{ new
+             * NameValuePair(userIdProperty, userId), new NameValuePair(passwordProperty, password), new
+             * NameValuePair(cellNumProperty, to), new NameValuePair(textProperty, notification.getMessageBody()) });
+             * HttpClient client = new HttpClient(); try { client.executeMethod(request); } catch (HttpException ex) {
+             * log.error("Exception sending sms", ex); } catch (IOException ex) { log.error("Exception sending sms",
+             * ex); }
+             */
+        }
+        return true;
+    }
+
+    /**
+     * Returns the smsGateway.
+     * @return the smsGateway
+     */
+    public String getSmsGateway()
+    {
+        return smsGateway;
+    }
+
+    /**
+     * Sets the smsGateway.
+     * @param smsGateway the smsGateway to set
+     */
+    public void setSmsGateway(String smsGateway)
+    {
+        this.smsGateway = smsGateway;
+    }
+
+    /**
+     * Returns the userId.
+     * @return the userId
+     */
+    public String getUserId()
+    {
+        return userId;
+    }
+
+    /**
+     * Sets the userId.
+     * @param userId the userId to set
+     */
+    public void setUserId(String userId)
+    {
+        this.userId = userId;
+    }
+
+    /**
+     * Returns the password.
+     * @return the password
+     */
+    public String getPassword()
+    {
+        return password;
+    }
+
+    /**
+     * Sets the password.
+     * @param password the password to set
+     */
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    /**
+     * Returns the passwordProperty.
+     * @return the passwordProperty
+     */
+    public String getPasswordProperty()
+    {
+        return passwordProperty;
+    }
+
+    /**
+     * Sets the passwordProperty.
+     * @param passwordProperty the passwordProperty to set
+     */
+    public void setPasswordProperty(String passwordProperty)
+    {
+        this.passwordProperty = passwordProperty;
+    }
+
+    /**
+     * Returns the userIdProperty.
+     * @return the userIdProperty
+     */
+    public String getUserIdProperty()
+    {
+        return userIdProperty;
+    }
+
+    /**
+     * Sets the userIdProperty.
+     * @param userIdProperty the userIdProperty to set
+     */
+    public void setUserIdProperty(String userIdProperty)
+    {
+        this.userIdProperty = userIdProperty;
+    }
+
+    /**
+     * Returns the cellNumProperty.
+     * @return the cellNumProperty
+     */
+    public String getCellNumProperty()
+    {
+        return cellNumProperty;
+    }
+
+    /**
+     * Sets the cellNumProperty.
+     * @param cellNumProperty the cellNumProperty to set
+     */
+    public void setCellNumProperty(String cellNumProperty)
+    {
+        this.cellNumProperty = cellNumProperty;
+    }
+
+    /**
+     * Returns the textProperty.
+     * @return the textProperty
+     */
+    public String getTextProperty()
+    {
+        return textProperty;
+    }
+
+    /**
+     * Sets the textProperty.
+     * @param textProperty the textProperty to set
+     */
+    public void setTextProperty(String textProperty)
+    {
+        this.textProperty = textProperty;
+    }
+
+}
\ No newline at end of file

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/DefaultNotificationManagerImpl.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/DefaultNotificationManagerImpl.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/DefaultNotificationManagerImpl.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,90 @@
+package net.sourceforge.openutils.notifications.services;
+
+import java.util.Arrays;
+import java.util.List;
+
+import net.sourceforge.openutils.notifications.Notification;
+import net.sourceforge.openutils.notifications.NotificationException;
+import net.sourceforge.openutils.notifications.notifiers.Notifier;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class DefaultNotificationManagerImpl implements ApplicationContextAware, NotificationManager
+{
+
+    private ApplicationContext context;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.context = applicationContext;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean send(String from, List<String> toAddresses, List<String> ccAddresses, Notification notification)
+        throws NotificationException
+    {
+        Notifier notifier = (Notifier) context.getBean(notification.getNotifierBeanName());
+        return notifier.send(from, toAddresses, ccAddresses, null, notification);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean send(String from, List<String> toAddresses, List<String> ccAddresses, List<String> ccnAddresses,
+        Notification notification) throws NotificationException
+    {
+        Notifier notifier = (Notifier) context.getBean(notification.getNotifierBeanName());
+        return notifier.send(from, toAddresses, ccAddresses, ccnAddresses, notification);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean send(String from, String toAddress, List<String> ccAddresses, Notification notification)
+        throws NotificationException
+    {
+        Notifier notifier = (Notifier) context.getBean(notification.getNotifierBeanName());
+        return notifier.send(from, Arrays.asList(toAddress), ccAddresses, null, notification);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean send(String from, String toAddress, List<String> ccAddresses, List<String> ccnAddresses,
+        Notification notification) throws NotificationException
+    {
+        Notifier notifier = (Notifier) context.getBean(notification.getNotifierBeanName());
+        return notifier.send(from, Arrays.asList(toAddress), ccAddresses, ccnAddresses, notification);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean send(String from, String toAddress, Notification notification) throws NotificationException
+    {
+        Notifier notifier = (Notifier) context.getBean(notification.getNotifierBeanName());
+        return notifier.send(from, Arrays.asList(toAddress), null, null, notification);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean send(String from, List<String> toAddresses, Notification notification) throws NotificationException
+    {
+        Notifier notifier = (Notifier) context.getBean(notification.getNotifierBeanName());
+        return notifier.send(from, toAddresses, null, null, notification);
+    }
+}

Added: trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/NotificationManager.java
===================================================================
--- trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/NotificationManager.java	                        (rev 0)
+++ trunk/openutils-notifications/src/main/java/net/sourceforge/openutils/notifications/services/NotificationManager.java	2008-12-16 14:16:26 UTC (rev 957)
@@ -0,0 +1,86 @@
+package net.sourceforge.openutils.notifications.services;
+
+import java.util.List;
+
+import net.sourceforge.openutils.notifications.Notification;
+import net.sourceforge.openutils.notifications.NotificationException;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public interface NotificationManager
+{
+
+    /**
+     * Send notification
+     * @param from sender
+     * @param toAddresses list of receivers
+     * @param ccAddresses list of cc
+     * @param notification notification
+     * @param <T> Class that extends Notification interface
+     * @return true if mail is sent
+     */
+    boolean send(String from, List<String> toAddresses, List<String> ccAddresses, Notification notification)
+        throws NotificationException;
+
+    /**
+     * Send notification
+     * @param from sender
+     * @param toAddresses list of receivers
+     * @param ccAddresses list of cc
+     * @param ccnAddresses list of ccn
+     * @param notification notification
+     * @param <T> Class that extends Notification interface
+     * @return true if mail is sent
+     */
+    boolean send(String from, List<String> toAddresses, List<String> ccAddresses, List<String> ccnAddresses,
+        Notification notification) throws NotificationException;
+
+    /**
+     * Send notification
+     * @param from sender
+     * @param toAddress receiver
+     * @param ccAddresses list of cc
+     * @param notification notification
+     * @param <T> Class that extends Notification interface
+     * @return true if mail is sent
+     */
+    boolean send(String from, String toAddress, List<String> ccAddresses, Notification notification)
+        throws NotificationException;
+
+    /**
+     * Send notification
+     * @param from sender
+     * @param toAddress receiver
+     * @param ccAddresses list of cc
+     * @param ccnAddresses list of ccn
+     * @param notification notification
+     * @param <T> Class that extends Notification interface
+     * @return true if mail is sent
+     */
+    boolean send(String from, String toAddress, List<String> ccAddresses, List<String> ccnAddresses,
+        Notification notification) throws NotificationException;
+
+    /**
+     * Send notification
+     * @param from sender
+     * @param toAddress receiver
+     * @param notification notification
+     * @param <T> Class that extends Notification interface
+     * @return true if mail is sent
+     */
+    boolean send(String from, String toAddress, Notification notification) throws NotificationException;
+
+    /**
+     * Send notification
+     * @param from sender
+     * @param toAddresses list of receivers
+     * @param notification notification
+     * @param <T> Class that extends Notification interface
+     * @return true if mail is sent
+     */
+    boolean send(String from, List<String> toAddresses, Notification notification) throws NotificationException;
+
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[963] trunk

[<fg...@us...>]

Revision: 963
          http://openutils.svn.sourceforge.net/openutils/?rev=963&view=rev
Author:   fgiust
Date:     2009-01-30 16:16:01 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
ignores

Modified Paths:
--------------
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java
    trunk/pom.xml

Added Paths:
-----------
    trunk/openutils-mgnlstruts11/src/site/
    trunk/openutils-mgnlstruts11/src/site/apt/
    trunk/openutils-mgnlstruts11/src/site/apt/index.apt
    trunk/openutils-mgnlstruts11/src/site/changes/
    trunk/openutils-mgnlstruts11/src/site/changes/changes.xml
    trunk/openutils-mgnlstruts11/src/site/site.xml

Property Changed:
----------------
    trunk/openutils-deployment/
    trunk/openutils-mgnlcas/
    trunk/openutils-mgnlcontrols/
    trunk/openutils-mgnlgroovy/
    trunk/openutils-mgnlmessages/


Property changes on: trunk/openutils-deployment
___________________________________________________________________
Modified: svn:ignore
   - .wtpmodules
target
.classpath
.project
.settings
.checkstyle

   + .wtpmodules
target
.classpath
.project
.settings
.checkstyle

pom.xml.releaseBackup

release.properties



Property changes on: trunk/openutils-mgnlcas
___________________________________________________________________
Added: svn:ignore
   + 
.settings

.checkstyle

.classpath

.project

target



Property changes on: trunk/openutils-mgnlcontrols
___________________________________________________________________
Modified: svn:ignore
   - target
.settings
.checkstyle
.classpath
.project

   + target
.settings
.checkstyle
.classpath
.project

pom.xml.releaseBackup

release.properties



Property changes on: trunk/openutils-mgnlgroovy
___________________________________________________________________
Added: svn:ignore
   + target

.settings

.checkstyle

.classpath

.project



Property changes on: trunk/openutils-mgnlmessages
___________________________________________________________________
Added: svn:ignore
   + target

.settings

.checkstyle

.classpath

.project


Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java	2009-01-30 15:41:52 UTC (rev 962)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java	2009-01-30 16:16:01 UTC (rev 963)
@@ -144,7 +144,7 @@
                     }
                 }
             }
-            MgnlRequestProcessor rp = (MgnlRequestProcessor) getRequestProcessor(mc, servletContext, dispatcher);
+            RequestProcessor rp = getRequestProcessor(mc, servletContext, dispatcher);
             rp.process(request, response);
         }
         catch (ServletException e)
@@ -180,7 +180,6 @@
     protected synchronized RequestProcessor getRequestProcessor(ModuleConfig config, ServletContext servletContext,
         ActionServlet dispatcher) throws ServletException
     {
-        String key = Globals.REQUEST_PROCESSOR_KEY + config.getPrefix();
-        return (RequestProcessor) servletContext.getAttribute(key);
+        return ((MgnlStrutsServlet) dispatcher).getRequestProcessor(config);
     }
 }

Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java	2009-01-30 15:41:52 UTC (rev 962)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java	2009-01-30 16:16:01 UTC (rev 963)
@@ -83,6 +83,13 @@
         if (pageUri != null)
         {
             results.append(pageUri);
+
+            String anchor = actionUrl;
+            if (StringUtils.contains(anchor, "/"))
+            {
+                anchor = StringUtils.substringAfterLast(anchor, "/");
+            }
+            results.append("#" + anchor);
         }
         results.append("\"");
 

Added: trunk/openutils-mgnlstruts11/src/site/apt/index.apt
===================================================================
--- trunk/openutils-mgnlstruts11/src/site/apt/index.apt	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/site/apt/index.apt	2009-01-30 16:16:01 UTC (rev 963)
@@ -0,0 +1,28 @@
+                                 --------------------------
+                                   openutils-mgnlmedia
+                                 --------------------------
+                                     Fabrizio Giustina
+                                 --------------------------
+
+About openutils-mgnlmedia
+
+ openutils-mgnlmedia is a custom {{{http://www.magnolia.info}magnolia}} module for the management of multimedia assets
+ like images and videos.
+
+ <<This module requires magnolia 3.6.x, and will not work on any earlier version!>>
+
+
+
+Configuration
+
+ First of all drop the openutils-mgnlstripes jar and the stripes jar into WEB-INF/lib, or (better) if you are using maven
+ just declare the following dependency:
+
++----------------------------------------------+
+    <dependency>
+        <groupId>net.sourceforge.openutils</groupId>
+        <artifactId>openutils-mgnlmedia</artifactId>
+        <version>0.1</version>
+    </dependency>
++----------------------------------------------+
+


Property changes on: trunk/openutils-mgnlstruts11/src/site/apt/index.apt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlstruts11/src/site/changes/changes.xml	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/site/changes/changes.xml	2009-01-30 16:16:01 UTC (rev 963)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+  <!--
+  "type" attribute can be: add, remove, update or fix.
+-->
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
+  </properties>
+  <body>
+    <release version="0.1" date="2008-12-04" description="">
+      <action type="add" dev="fgiust">first alpha release</action>
+    </release>
+  </body>
+</document>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlstruts11/src/site/changes/changes.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlstruts11/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlstruts11/src/site/site.xml	                        (rev 0)
+++ trunk/openutils-mgnlstruts11/src/site/site.xml	2009-01-30 16:16:01 UTC (rev 963)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Openutils mgnlmedia">
+  <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
+  <version position="navigation-bottom" />
+  <bannerRight>
+    <name>Openutils</name>
+    <src>http://openutils.sourceforge.net/images/openutils-logo.png
+    </src>
+    <href>http://openutils.sourceforge.net</href>
+  </bannerRight>
+  <bannerLeft>
+    <name>Sourceforge</name>
+    <src>http://sourceforge.net/sflogo.php?group_id=150467&amp;amp;type=2</src>
+    <href>http://www.sourceforge.net/projects/openutils</href>
+  </bannerLeft>
+  <body>
+    <head>
+      <link rel="icon" href="images/favicon.ico" />
+    </head>
+    <breadcrumbs>
+      <item name="openutils" href="http://openutils.sourceforge.net/" />
+      <item name="openutils-mgnlstruts11" href="http://openutils.sourceforge.net/openutils-mgnlstruts11" />
+    </breadcrumbs>
+    <menu name="openutils mgnlmedia">
+      <item name="About" href="index.html"></item>
+    </menu>
+    <menu ref="modules" inherit="bottom" />
+    <menu ref="reports" inherit="bottom" />
+  </body>
+  <skin>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils-maven-skin</artifactId>
+    <version>1.1</version>
+  </skin>
+</project>


Property changes on: trunk/openutils-mgnlstruts11/src/site/site.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-01-30 15:41:52 UTC (rev 962)
+++ trunk/pom.xml	2009-01-30 16:16:01 UTC (rev 963)
@@ -244,13 +244,11 @@
     <module>openutils-mgnlmessages</module>
     <module>openutils-mgnlcas</module>
     <module>openutils-mgnlgroovy</module>
-    <!--
+    <module>openutils-mgnlstruts11</module>
+    <module>openutils-mgnlmedia</module>
     <module>openutils-elfunctions</module>
-    <module>openutils-mgnlmessages</module>
+    <!--
     <module>openutils-mgnlrating</module>
-    <module>openutils-mgnlcas</module>
-    <module>openutils-mgnlgroovy</module>
-    <module>openutils-mgnlmedia</module>
      -->
     <!-- <module>openutils-spring-remote-callback</module>-->
   </modules>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1017] trunk

[<fg...@us...>]

Revision: 1017
          http://openutils.svn.sourceforge.net/openutils/?rev=1017&view=rev
Author:   fgiust
Date:     2009-02-17 09:32:24 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
update poms for new releases

Modified Paths:
--------------
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2009-02-17 09:13:31 UTC (rev 1016)
+++ trunk/openutils-testing-junit/pom.xml	2009-02-17 09:32:24 UTC (rev 1017)
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.1.1-SNAPSHOT</version>
+      <version>2.1.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -23,22 +23,6 @@
       <version>4.4</version>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.1.ga</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
       <version>10.2.2.0</version>
@@ -47,7 +31,7 @@
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -67,7 +51,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>${spring.version}</version>
+      <version>2.5.3</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -77,7 +61,4 @@
       </exclusions>
     </dependency>
   </dependencies>
-  <properties>
-    <spring.version>2.5.3</spring.version>
-  </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2009-02-17 09:13:31 UTC (rev 1016)
+++ trunk/openutils-testing-testng/pom.xml	2009-02-17 09:32:24 UTC (rev 1017)
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.1.1-SNAPSHOT</version>
+      <version>2.1.1</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>${spring.version}</version>
+      <version>2.5.3</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -68,7 +68,4 @@
       </exclusions>
     </dependency>
   </dependencies>
-  <properties>
-    <spring.version>2.5.3</spring.version>
-  </properties>
 </project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1081] trunk

[<fg...@us...>]

Revision: 1081
          http://openutils.svn.sourceforge.net/openutils/?rev=1081&view=rev
Author:   fgiust
Date:     2009-03-12 11:12:04 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
massive update of dependencies: magnolia, slf4j, spring, hibernate

Modified Paths:
--------------
    trunk/openutils-backup/pom.xml
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-configuration-dataobjects/pom.xml
    trunk/openutils-configuration-services/pom.xml
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-hibernate-security/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-maven-skin/pom.xml
    trunk/openutils-mgnlbootstrapsync/pom.xml
    trunk/openutils-mgnlcas/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlext/pom.xml
    trunk/openutils-mgnlgroovy/pom.xml
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlspring/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstruts11/pom.xml
    trunk/openutils-mgnltasks/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-spring-remote-callback/pom.xml
    trunk/openutils-spring-rmibernate/pom.xml
    trunk/openutils-tags-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml
    trunk/openutils-usermanagement/pom.xml
    trunk/openutils-usermanagement-dataobjects/pom.xml
    trunk/openutils-web/pom.xml
    trunk/pom.xml

Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-backup/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-backup</artifactId>
@@ -15,20 +15,14 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.2</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.0</version>

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-bshd5/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-bshd5</artifactId>
@@ -14,12 +15,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.5.0</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -67,16 +68,20 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.1.ga</version>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</version>
       <exclusions>
         <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -103,6 +108,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.3</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-configuration-dataobjects/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>
@@ -16,19 +17,19 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
+      <version>3.4.0.GA</version>
       <exclusions>
         <exclusion>
           <!-- not needed here, just load annotations -->
           <groupId>org.hibernate</groupId>
-          <artifactId>hibernate</artifactId>
+          <artifactId>hibernate-core</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-configuration-services/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>
@@ -29,6 +29,12 @@
       <artifactId>openutils-spring</artifactId>
       <version>2.0</version>
       <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -38,43 +44,40 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-bshd5</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing-testng</artifactId>
       <version>2.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
+      <version>3.4.0.GA</version>
       <exclusions>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
+          <!-- not needed here, just load annotations -->
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-core</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -96,7 +99,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-dbmigration/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
@@ -14,7 +15,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -57,12 +58,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.1</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
@@ -74,6 +75,10 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -91,6 +96,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.1</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-deployment/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-deployment</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -43,12 +43,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -65,6 +65,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.1</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-elfunctions/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-hibernate-security/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,8 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>openutils</artifactId>
     <groupId>net.sourceforge.openutils</groupId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -11,10 +12,6 @@
   <name>openutils hibernate security</name>
   <version>0.0.8-SNAPSHOT</version>
   <description>Hibernate Security classes</description>
-  <properties>
-    <spring.version>2.5.1</spring.version>
-    <aspectj.version>1.5.3</aspectj.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -99,6 +96,12 @@
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-usermanagement</artifactId>
       <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -108,53 +111,54 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-bshd5</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing-junit</artifactId>
       <version>2.0.2</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-testing</artifactId>
-      <version>2.0.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.5.ga</version>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</version>
       <exclusions>
         <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
+      <version>3.4.0.GA</version>
       <exclusions>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
+          <!-- not needed here, just load annotations -->
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-core</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -176,28 +180,28 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.2</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
-      <version>1.0.6</version>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>2.0.3</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>spring-remoting</artifactId>
           <groupId>org.springframework</groupId>
+          <artifactId>spring-context</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>spring-jdbc</artifactId>
           <groupId>org.springframework</groupId>
+          <artifactId>spring-aop</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.springframework</groupId>
           <artifactId>spring-support</artifactId>
-          <groupId>org.springframework</groupId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -220,4 +224,8 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <properties>
+    <spring.version>2.5.6</spring.version>
+    <aspectj.version>1.5.3</aspectj.version>
+  </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-log4j/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-log4j</artifactId>

Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-maven-skin/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-maven-skin</artifactId>

Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.5-rc2</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>3.5.2</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>

Modified: trunk/openutils-mgnlcas/pom.xml
===================================================================
--- trunk/openutils-mgnlcas/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcas/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,13 +2,13 @@
    <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  <artifactId>openutils-cas</artifactId>
-  <name>openutils-cas</name>
+  <artifactId>openutils-mgnlcas</artifactId>
+  <name>openutils-mgnlcas</name>
   <version>1.1-SNAPSHOT</version>
   <licenses>
     <license>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-jaas</artifactId>
-      <version>3.6.3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>org.jasig.cas</groupId>

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcontrols/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.5.8</version>
+      <version>4.0</version>
       <exclusions>
         <exclusion>
           <groupId>servlets.com</groupId>
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>3.5.8</version>
+      <version>4.0</version>
       <exclusions>
         <exclusion>
           <groupId>servlets.com</groupId>

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlcriteria/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
@@ -14,17 +14,17 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.6.3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.5.0</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlext/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlgroovy/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
    <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.6.3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>3.6.3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlmedia/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>4.0-rc3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>4.0-rc3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlmessages/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>4.0-rc3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>4.0-rc3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlspring/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -21,12 +21,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.5.0</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.5.4</version>
+      <version>4.0</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-jaas</artifactId>
-      <version>3.5.4</version>
+      <version>4.0</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -146,6 +146,6 @@
     </repository>
   </repositories>
   <properties>
-    <spring.version>2.5.3</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlstripes/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>4.0-rc1</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>4.0-rc1</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnlstruts11/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-mgnlstruts11</artifactId>
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>4.0-rc3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>4.0-rc3</version>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-mgnltasks/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.5.8</version>
+      <version>4.0</version>
       <exclusions>
         <exclusion>
           <groupId>servlets.com</groupId>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>3.5.8</version>
+      <version>4.0</version>
       <exclusions>
         <exclusion>
           <groupId>servlets.com</groupId>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-spring</artifactId>
@@ -63,7 +64,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
@@ -79,27 +80,24 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
+      <version>3.4.0.GA</version>
       <optional>true</optional>
       <exclusions>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
+          <!-- not needed here, just load annotations -->
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-core</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -131,12 +129,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
@@ -144,6 +136,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.1</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-spring-remote-callback/pom.xml
===================================================================
--- trunk/openutils-spring-remote-callback/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring-remote-callback/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>openutils</artifactId>
     <groupId>net.sourceforge.openutils</groupId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -13,18 +13,12 @@
   <version>0.0.1-SNAPSHOT</version>
   <description>Openutils Spring Remote Callback classes</description>
   <properties>
-    <spring.version>2.5.1</spring.version>
+    <spring.version>2.5.6</spring.version>
     <aspectj.version>1.5.3</aspectj.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-      <version>${spring.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>${spring.version}</version>
       <exclusions>
@@ -60,10 +54,29 @@
       <groupId>org.logicblaze.lingo</groupId>
       <artifactId>lingo</artifactId>
       <version>1.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>incubator-activemq</groupId>
+          <artifactId>activeio-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>incubator-activemq</groupId>
+          <artifactId>activemq-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
+      <version>5.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
       <version>4.1.1</version>
     </dependency>
     <dependency>
@@ -105,24 +118,24 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing-junit</artifactId>
       <version>2.0.2</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-testing</artifactId>
-      <version>2.0.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.2</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -135,16 +148,12 @@
       <artifactId>xbean-spring-v2c</artifactId>
       <version>2.8</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>http://repository.codehaus.org</id>
-      <name>codehaus repository</name>
-      <url>http://repository.codehaus.org</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
 </project>
\ No newline at end of file

Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-spring-rmibernate/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-spring-rmibernate</artifactId>
@@ -15,13 +15,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <!--  replaces commons-logging -->
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.1</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -47,24 +47,20 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.5.ga</version>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</version>
       <exclusions>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>cglib</groupId>
           <artifactId>cglib</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>asm</groupId>
-          <artifactId>asm</artifactId>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>asm</groupId>
-          <artifactId>asm-attrs</artifactId>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -82,7 +78,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
@@ -103,22 +99,19 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-bshd5</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
+      <version>3.4.0.GA</version>
       <exclusions>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
+          <!-- not needed here, just load annotations -->
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-core</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
       </exclusions>
       <scope>test</scope>
     </dependency>
@@ -133,14 +126,14 @@
       <artifactId>openutils-testing-junit</artifactId>
       <version>2.0.2</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-testing</artifactId>
-      <version>2.0.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.4</version>
@@ -170,6 +163,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.1</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-tags-spring/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-tags-spring</artifactId>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.2</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -77,20 +77,14 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.0</version>
@@ -98,6 +92,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.1</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.5.0</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -112,6 +112,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.3</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing-junit/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing-junit</artifactId>
@@ -14,7 +15,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.1.1</version>
+      <version>2.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -50,7 +51,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>2.5.3</version>
+      <version>2.5.6</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing-testng/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing-testng</artifactId>
@@ -14,7 +15,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.1.1</version>
+      <version>2.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -57,7 +58,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>2.5.3</version>
+      <version>2.5.6</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr</artifactId>
@@ -30,12 +30,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -77,26 +77,56 @@
       <groupId>tomcat</groupId>
       <artifactId>jasper-compiler-jdt</artifactId>
       <version>5.5.12</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>naming-resources</artifactId>
       <version>5.5.15</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>jasper-runtime</artifactId>
       <version>5.5.12</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>jasper-compiler</artifactId>
       <version>5.5.12</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>naming-factory</artifactId>
       <version>5.5.15</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -127,6 +157,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <spring.version>2.5.3</spring.version>
+    <spring.version>2.5.6</spring.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr-junit</artifactId>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4dwr-testng</artifactId>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-testing4web/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing4web</artifactId>
@@ -47,6 +47,12 @@
       <groupId>tomcat</groupId>
       <artifactId>jasper-compiler-jdt</artifactId>
       <version>5.5.12</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
@@ -63,16 +69,34 @@
       <groupId>tomcat</groupId>
       <artifactId>jasper-runtime</artifactId>
       <version>5.5.12</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>jasper-compiler</artifactId>
       <version>5.5.12</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
       <artifactId>naming-factory</artifactId>
       <version>5.5.15</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2009-03-06 21:56:58 UTC (rev 1080)
+++ trunk/openutils-usermanagement/pom.xml	2009-03-12 11:12:04 UTC (rev 1081)
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>10</version>
+    <version>11</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>
@@ -12,9 +13,6 @@
   <name>openutils-usermanagement</name>
   <version>2.0.2-SNAPSHOT</version>
   <description>Usermanagement classes</description>
-  <properties>
-    <spring.version>2.5.1</spring.version>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -39,12 +37,18 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-bshd5</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing-junit</artifactId>
       <version>2.0.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -72,16 +76,13 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
+      <version>3.4.0.GA</version>
       <exclusions>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
+          <!-- not needed here, just load annotations -->
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-core</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -108,22 +109,22 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.6</version>
     </dependency>
     <dependency>
-      <groupId>org.acegisecurity</groupId>
-...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[1094] trunk

[<fg...@us...>]

Revision: 1094
          http://openutils.svn.sourceforge.net/openutils/?rev=1094&view=rev
Author:   fgiust
Date:     2009-03-15 15:30:30 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
junit version aligned to 4.4

Modified Paths:
--------------
    trunk/openutils-backup/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-tags-spring/pom.xml
    trunk/openutils-web/pom.xml

Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml	2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-backup/pom.xml	2009-03-15 15:30:30 UTC (rev 1094)
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-deployment/pom.xml	2009-03-15 15:30:30 UTC (rev 1094)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -58,9 +59,25 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.testng</groupId>
+          <artifactId>testng</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-log4j/pom.xml	2009-03-15 15:30:30 UTC (rev 1094)
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <version>4.4<version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-spring/pom.xml	2009-03-15 15:30:30 UTC (rev 1094)
@@ -131,7 +131,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml	2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-tags-spring/pom.xml	2009-03-15 15:30:30 UTC (rev 1094)
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml	2009-03-14 17:58:38 UTC (rev 1093)
+++ trunk/openutils-web/pom.xml	2009-03-15 15:30:30 UTC (rev 1094)
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1102] trunk

[<luc...@us...>]

Revision: 1102
          http://openutils.svn.sourceforge.net/openutils/?rev=1102&view=rev
Author:   lucaboati
Date:     2009-03-16 16:15:54 +0000 (Mon, 16 Mar 2009)

Log Message:
-----------
dependency version changed into 4.0/* (was 4)

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
    trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2009-03-15 15:39:07 UTC (rev 1101)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2009-03-16 16:15:54 UTC (rev 1102)
@@ -10,11 +10,11 @@
   <dependencies>
     <dependency>
       <name>adminInterface</name>
-      <version>4</version>
+      <version>4.0/*</version>
     </dependency>
     <dependency>
       <name>cache</name>
-      <version>4</version>
+      <version>4.0/*</version>
     </dependency>
   </dependencies>
   <repositories>

Modified: trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2009-03-15 15:39:07 UTC (rev 1101)
+++ trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2009-03-16 16:15:54 UTC (rev 1102)
@@ -16,7 +16,7 @@
   <dependencies>
     <dependency>
       <name>adminInterface</name>
-      <version>4</version>
+      <version>4.0/*</version>
     </dependency>
   </dependencies>
   <repositories>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1111] trunk

[<fg...@us...>]

Revision: 1111
          http://openutils.svn.sourceforge.net/openutils/?rev=1111&view=rev
Author:   fgiust
Date:     2009-03-28 18:37:21 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
use openutils-testng 2.2

Modified Paths:
--------------
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2009-03-28 18:36:58 UTC (rev 1110)
+++ trunk/openutils-testing-junit/pom.xml	2009-03-28 18:37:21 UTC (rev 1111)
@@ -9,13 +9,13 @@
   </parent>
   <artifactId>openutils-testing-junit</artifactId>
   <name>openutils test utils (junit)</name>
-  <version>2.1.2-SNAPSHOT</version>
+  <version>2.2-SNAPSHOT</version>
   <description>openutils test utils</description>
   <dependencies>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.1.2-SNAPSHOT</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2009-03-28 18:36:58 UTC (rev 1110)
+++ trunk/openutils-testing-testng/pom.xml	2009-03-28 18:37:21 UTC (rev 1111)
@@ -9,13 +9,13 @@
   </parent>
   <artifactId>openutils-testing-testng</artifactId>
   <name>openutils test utils (testng)</name>
-  <version>2.1.2-SNAPSHOT</version>
+  <version>2.2-SNAPSHOT</version>
   <description>openutils test utils</description>
   <dependencies>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.1.2-SNAPSHOT</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1123] trunk

[<fg...@us...>]

Revision: 1123
          http://openutils.svn.sourceforge.net/openutils/?rev=1123&view=rev
Author:   fgiust
Date:     2009-03-29 09:50:25 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
use openutils-testing 2.1.1

Modified Paths:
--------------
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2009-03-29 09:49:38 UTC (rev 1122)
+++ trunk/openutils-testing-junit/pom.xml	2009-03-29 09:50:25 UTC (rev 1123)
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.2</version>
+      <version>2.2.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2009-03-29 09:49:38 UTC (rev 1122)
+++ trunk/openutils-testing-testng/pom.xml	2009-03-29 09:50:25 UTC (rev 1123)
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing</artifactId>
-      <version>2.2</version>
+      <version>2.2.1</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1147] trunk

[<fg...@us...>]

Revision: 1147
          http://openutils.svn.sourceforge.net/openutils/?rev=1147&view=rev
Author:   fgiust
Date:     2009-04-16 15:37:05 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
changelog

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/site/changes/changes.xml
    trunk/openutils-mgnlmessages/src/site/changes/changes.xml

Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml	2009-04-09 17:07:39 UTC (rev 1146)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml	2009-04-16 15:37:05 UTC (rev 1147)
@@ -8,12 +8,15 @@
     <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
   </properties>
   <body>
-    <release version="0.1" date="2008-12-04" description="">
-      <action type="add" dev="fgiust">first alpha release</action>
+    <release version="4.0-b3" date="2009-04-16" description="">
+      <action type="update" dev="fgiust">Stable release for Magnolia 4.x</action>
     </release>
     <release version="3.6" date="2009-02-15" description="">
       <action type="add" dev="fgiust">Added support for reading CMYK/YCCK jpegs</action>
       <action type="update" dev="fgiust">Stable release for Magnolia 3.6.x</action>
     </release>
+    <release version="0.1" date="2008-12-04" description="">
+      <action type="add" dev="fgiust">first alpha release</action>
+    </release>
   </body>
 </document>
\ No newline at end of file

Modified: trunk/openutils-mgnlmessages/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmessages/src/site/changes/changes.xml	2009-04-09 17:07:39 UTC (rev 1146)
+++ trunk/openutils-mgnlmessages/src/site/changes/changes.xml	2009-04-16 15:37:05 UTC (rev 1147)
@@ -9,8 +9,8 @@
     <author email="molaschi(at)users.sourceforge.net">Manuel Molaschi</author>
   </properties>
   <body>
-    <release version="4.0" date="2009-02-13" description="">
-      <action type="update" dev="molaschi">Updated to magnolia 4.0.x.</action>
+    <release version="4.0-b3" date="2009-04-16" description="">
+      <action type="update" dev="fgiust">Stable release for Magnolia 4.x</action>
     </release>
     <release version="1.1" date="2009-01-31" description="">
       <action type="fix" dev="fgiust">minor bugfixes and basic documentation added</action>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.