openutils-svn — developer list with svn commits

[Openutils-svn] SF.net SVN: openutils: [164] trunk/openutils-dbmigration/pom.xml

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

Revision: 164
          http://svn.sourceforge.net/openutils/?rev=164&view=rev
Author:   fgiust
Date:     2007-02-01 03:21:27 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
fix classpath

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

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2007-02-01 10:57:14 UTC (rev 163)
+++ trunk/openutils-dbmigration/pom.xml	2007-02-01 11:21:27 UTC (rev 164)
@@ -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>
@@ -17,17 +18,31 @@
       <version>2.2</version>
     </dependency>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.0.1</version>
+      <version>1.2</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>3.8.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: [163] trunk/openutils-dbmigration/src/main/java

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

Revision: 163
          http://svn.sourceforge.net/openutils/?rev=163&view=rev
Author:   fgiust
Date:     2007-02-01 02:57:14 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
initial import

Added Paths:
-----------
    trunk/openutils-dbmigration/src/main/java/it/
    trunk/openutils-dbmigration/src/main/java/it/openutils/
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration;
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public interface DbSetupManager
+{
+
+    /**
+     * Updates the DDL
+     */
+    void updateDDL();
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration;
+
+import it.openutils.migration.task.setup.DbTask;
+import it.openutils.migration.task.update.DbUpdate;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+
+/**
+ * DB setup manager: handles db setup and upgrade.
+ * @author fgiust
+ * @version $Id$
+ */
+public class DbSetupManagerImpl implements DbSetupManager
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(DbSetupManagerImpl.class);
+
+    private List<DbTask> setupTasks;
+
+    private List<DbUpdate> updateTasks;
+
+    private DataSource dataSource;
+
+    private DbVersionManager versionManager;
+
+    private TransactionTemplate transactionTemplate;
+
+    /**
+     * Sets the versionManager.
+     * @param versionManager the versionManager to set
+     */
+    public void setVersionManager(DbVersionManager versionManager)
+    {
+        this.versionManager = versionManager;
+    }
+
+    /**
+     * Sets the transactionTemplate.
+     * @param transactionTemplate the transactionTemplate to set
+     */
+    public void setTransactionTemplate(TransactionTemplate transactionTemplate)
+    {
+        this.transactionTemplate = transactionTemplate;
+    }
+
+    /**
+     * Setter for <code>dataSource</code>.
+     * @param dataSource The dataSource to set.
+     */
+    public void setDataSource(DataSource dataSource)
+    {
+        this.dataSource = dataSource;
+    }
+
+    /**
+     * Sets the tasks.
+     * @param setupTasks the tasks to set
+     */
+    public void setSetupTasks(List<DbTask> setupTasks)
+    {
+        this.setupTasks = setupTasks;
+    }
+
+    /**
+     * Sets the updateTasks.
+     * @param updateTasks the updateTasks to set
+     */
+    public void setUpdateTasks(List<DbUpdate> updateTasks)
+    {
+        this.updateTasks = updateTasks;
+    }
+
+    /**
+     * @see it.openutils.dbupdate.DbSetupManager#updateDDL()
+     */
+    public void updateDDL()
+    {
+
+        transactionTemplate.execute(new TransactionCallbackWithoutResult()
+        {
+
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status)
+            {
+                if (setupTasks != null)
+                {
+                    executeSetupTasks();
+                }
+                if (updateTasks != null)
+                {
+                    executeUpdateTasks();
+                }
+            }
+        });
+
+    }
+
+    /**
+     *
+     */
+    private void executeSetupTasks()
+    {
+        log.info("Preparing db, checking {} setup tasks.", setupTasks.size());
+        for (DbTask task : setupTasks)
+        {
+            log.info(task.getDescription());
+            task.execute(dataSource);
+        }
+
+    }
+
+    /**
+     *
+     */
+    private void executeUpdateTasks()
+    {
+
+        int initialVersion = versionManager.getCurrentVersion();
+        int currentVersion = initialVersion;
+
+        Set<DbUpdate> sortedMigrations = new TreeSet<DbUpdate>(new Comparator<DbUpdate>()
+        {
+
+            public int compare(DbUpdate o1, DbUpdate o2)
+            {
+                return o1.getVersion() - o2.getVersion();
+            }
+
+        });
+        sortedMigrations.addAll(updateTasks);
+
+        log.info("Found {} migrations, looking for updates to run...", updateTasks.size());
+        for (DbUpdate update : sortedMigrations)
+        {
+            if (update.getVersion() > currentVersion)
+            {
+                currentVersion = update.getVersion();
+
+                log.info("Preparing migration to version {}. {}", update.getVersion(), update.getDescription());
+                try
+                {
+                    update.execute(dataSource);
+                }
+                catch (DataAccessException e)
+                {
+                    log.error("\n***********\n\n\nDatabase upgrade from version "
+                        + initialVersion
+                        + " to version "
+                        + currentVersion
+                        + " FAILED!\n\n\n***********\n", e);
+                }
+                versionManager.setNewVersion(currentVersion);
+            }
+        }
+        if (currentVersion != initialVersion)
+        {
+            log.info("Database upgraded from version {} to version {}", initialVersion, currentVersion);
+        }
+        else
+        {
+            log.info("No Database upgrade is needed. Current version is {} ", initialVersion);
+        }
+        // org.springframework.jdbc.BadSqlGrammarException:
+        // java.sql.SQLException: ORA-00959: tablespace 'XDM_DATA' inesistente
+
+    }
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration;
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public interface DbVersionManager
+{
+
+    /**
+     * Returns the current version for the db, usually reading from a configuration table. This should also handle table
+     * initialization.
+     * @return current db version
+     */
+    int getCurrentVersion();
+
+    /**
+     * Saves a new version for the db.
+     * @param version new version
+     */
+    void setNewVersion(int version);
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration;
+
+import javax.sql.DataSource;
+
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * <pre>
+ * &lt;bean class="it.openutils.migration.DefaultDbVersionManagerImpl">
+ *   &lt;property name="dataSource" ref="dataSource" />
+ *   &lt;property name="versionQuery">
+ *     &lt;value>SELECT DBVERSION FROM DBVERSION&lt;/value>
+ *   &lt;/property>
+ *   &lt;property name="versionUpdate">
+ *     &lt;value>UPDATE DBVERSION SET DBVERSION = ?&lt;/value>
+ *   &lt;/property>
+ *   &lt;property name="versionCreate">
+ *     &lt;value>INSERT INTO DBVERSION(DBVERSION) VALUES (0)&lt;/value>
+ *   &lt;/property>
+ * &lt;/bean>
+ * </pre>
+ * 
+ * @author fgiust
+ * @version $Id$
+ */
+public class DefaultDbVersionManagerImpl implements DbVersionManager
+{
+
+    private String versionQuery;
+
+    private String versionUpdate;
+
+    private String versionCreate;
+
+    private DataSource dataSource;
+
+    /**
+     * Sets the versionCreate.
+     * @param versionCreate the versionCreate to set
+     */
+    public void setVersionCreate(String versionCreate)
+    {
+        this.versionCreate = versionCreate;
+    }
+
+    /**
+     * Sets the versionQuery.
+     * @param versionQuery the versionQuery to set
+     */
+    public void setVersionQuery(String versionQuery)
+    {
+        this.versionQuery = versionQuery;
+    }
+
+    /**
+     * Sets the versionUpdate.
+     * @param versionUpdate the versionUpdate to set
+     */
+    public void setVersionUpdate(String versionUpdate)
+    {
+        this.versionUpdate = versionUpdate;
+    }
+
+    /**
+     * Sets the dataSource.
+     * @param dataSource the dataSource to set
+     */
+    public void setDataSource(DataSource dataSource)
+    {
+        this.dataSource = dataSource;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getCurrentVersion()
+    {
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+        int initialVersion = 0;
+        try
+        {
+            initialVersion = jdbcTemplate.queryForInt(versionQuery);
+        }
+        catch (EmptyResultDataAccessException e)
+        {
+            jdbcTemplate.update(versionCreate);
+        }
+        return initialVersion;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setNewVersion(int version)
+    {
+        new SimpleJdbcTemplate(dataSource).update(versionUpdate, version);
+    }
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public abstract class BaseDbTask implements DbTask
+{
+
+    private String description;
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+
+    }
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import javax.sql.DataSource;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public interface DbTask
+{
+
+    /**
+     * Returns a description for this task
+     * @return task description
+     */
+    String getDescription();
+
+    /**
+     * Execute this db task.
+     * @param dataSource javax.sql.datasource
+     */
+    void execute(DataSource dataSource);
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class GenericConditionalTask extends BaseDbTask implements DbTask
+{
+
+    private String check;
+
+    private String ddl;
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setDdl(String ddls)
+    {
+        this.ddl = ddls;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setCheck(String name)
+    {
+        this.check = name;
+    }
+
+    /**
+     * Returns the check.
+     * @return the check
+     */
+    public String getCheck()
+    {
+        return check;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(DataSource dataSource)
+    {
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+        int result = jdbcTemplate.queryForInt(getCheck());
+        if (result == 0)
+        {
+            String[] ddls = StringUtils.split(ddl, ';');
+            for (String statement : ddls)
+            {
+                if (StringUtils.isNotBlank(statement))
+                {
+                    jdbcTemplate.update(statement);
+                }
+            }
+        }
+    }
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class GenericScriptBasedConditionalTask implements DbTask
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
+
+    protected List<Resource> scripts;
+
+    private String check;
+
+    /**
+     * Sets the scripts.
+     * @param scripts the scripts to set
+     */
+    public void setScripts(List<Resource> scripts)
+    {
+        this.scripts = scripts;
+    }
+
+    /**
+     * Sets the check.
+     * @param check the check to set
+     */
+    public void setCheck(String check)
+    {
+        this.check = check;
+    }
+
+    protected String objectNameFromFileName(Resource script)
+    {
+        return StringUtils.substringBeforeLast(script.getFilename(), ".");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getDescription()
+    {
+        // @todo add better description and avoid NPEs
+        return "Checking " + objectNameFromFileName(scripts.get(0));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(DataSource dataSource)
+    {
+
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+        for (Resource script : scripts)
+        {
+            int result = jdbcTemplate.queryForInt(check, this.objectNameFromFileName(script));
+            if (result == 0)
+            {
+                if (script == null || !script.exists())
+                {
+                    log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+                    return;
+                }
+
+                String scriptContent;
+                InputStream is = null;
+
+                try
+                {
+                    is = script.getInputStream();
+                    scriptContent = IOUtils.toString(is, "UTF8");
+                }
+                catch (IOException e)
+                {
+                    log.error(
+                        "Unable to execute db task \"{}\", script \"{}\" can't be read.",
+                        getDescription(),
+                        script);
+                    return;
+                }
+                finally
+                {
+                    IOUtils.closeQuietly(is);
+                }
+
+                String[] ddls = StringUtils.split(scriptContent, ";");
+
+                for (String ddl : ddls)
+                {
+                    if (StringUtils.isNotBlank(ddl))
+                    {
+                        log.debug("Executing:\n{}", ddl);
+                        jdbcTemplate.update(ddl);
+                    }
+                }
+            }
+        }
+
+    }
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class ScriptBasedUnconditionalTask extends BaseDbTask implements DbTask
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
+
+    private List<Resource> scripts;
+
+    /**
+     * Sets the scripts.
+     * @param scripts the scripts to set
+     */
+    public void setScripts(List<Resource> scripts)
+    {
+        this.scripts = scripts;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(DataSource dataSource)
+    {
+
+        for (Resource script : scripts)
+        {
+            if (script == null || !script.exists())
+            {
+                log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+                return;
+            }
+
+            String scriptContent;
+
+            try
+            {
+                // @todo we should read line by line, avoiding to cache all the script in memory
+                scriptContent = IOUtils.toString(script.getInputStream(), "UTF8");
+            }
+            catch (IOException e)
+            {
+                log.error("Unable to execute db task \"{}\", script \"{}\" can't be read.", getDescription(), script);
+                return;
+            }
+
+            String[] ddls = StringUtils.split(scriptContent, ";");
+            SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+            for (String ddl : ddls)
+            {
+                if (StringUtils.isNotBlank(ddl))
+                {
+                    log.debug("Executing:\n{}", ddl);
+                    jdbcTemplate.update(ddl);
+                }
+            }
+
+        }
+
+    }
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.update;
+
+import it.openutils.migration.task.setup.DbTask;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public interface DbUpdate extends DbTask
+{
+
+    /**
+     * Returns the version for this update. THe task will be executed only if the current db version is lower than this.
+     * @return target version for this upgrade.
+     */
+    int getVersion();
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java	2007-02-01 10:57:14 UTC (rev 163)
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.update;
+
+import it.openutils.migration.task.setup.ScriptBasedUnconditionalTask;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class ScriptBasedDbUpdate implements DbUpdate
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
+
+    private Resource script;
+
+    private int version;
+
+    private String description;
+
+    /**
+     * Sets the script.
+     * @param script the script to set
+     */
+    public void setScript(Resource script)
+    {
+        this.script = script;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getVersion()
+    {
+        return version;
+    }
+
+    /**
+     * Sets the version.
+     * @param version the version to set
+     */
+    public void setVersion(int version)
+    {
+        this.version = version;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * Sets the description.
+     * @param description the description to set
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(DataSource dataSource)
+    {
+        if (script == null || !script.exists())
+        {
+            log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+            return;
+        }
+
+        String scriptContent;
+        InputStream is = null;
+
+        try
+        {
+            is = script.getInputStream();
+            scriptContent = IOUtils.toString(is, "UTF8");
+        }
+        catch (IOException e)
+        {
+            log.error("Unable to execute db task \"{}\", script \"{}\" can't be read.", getDescription(), script);
+            return;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(is);
+        }
+
+        String[] ddls = StringUtils.split(scriptContent, ";");
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+        for (String ddl : ddls)
+        {
+            if (StringUtils.isNotBlank(ddl))
+            {
+                log.debug("Executing:\n{}", ddl);
+                jdbcTemplate.update(ddl);
+            }
+        }
+
+    }
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


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

[Openutils-svn] SF.net SVN: openutils: [162] trunk/openutils-bshd5/pom.xml

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

Revision: 162
          http://svn.sourceforge.net/openutils/?rev=162&view=rev
Author:   fgiust
Date:     2007-01-30 09:23:18 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

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

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2007-01-30 17:23:10 UTC (rev 161)
+++ trunk/openutils-bshd5/pom.xml	2007-01-30 17:23:18 UTC (rev 162)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>
-  <version>1.0.4</version>
+  <version>1.0.5-SNAPSHOT</version>
   <description>openutils base Spring-Hibernate DAO for java 5.0</description>
   <dependencies>
     <dependency>
@@ -43,10 +43,4 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.4</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.4</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.0.4</url>
-  </scm>
 </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: [161] tags

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

Revision: 161
          http://svn.sourceforge.net/openutils/?rev=161&view=rev
Author:   fgiust
Date:     2007-01-30 09:23:10 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
[maven-scm] copy for tag openutils-bshd5-1.0.4

Added Paths:
-----------
    tags/openutils-bshd5-1.0.4/
    tags/openutils-bshd5-1.0.4/pom.xml
    tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
    tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java
    tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/hibernate/example/EnhancedExample.java

Removed Paths:
-------------
    tags/openutils-bshd5-1.0.4/pom.xml
    tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
    tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java
    tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/hibernate/example/EnhancedExample.java

Copied: tags/openutils-bshd5-1.0.4 (from rev 146, trunk/openutils-bshd5)

Deleted: tags/openutils-bshd5-1.0.4/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2007-01-04 15:46:29 UTC (rev 146)
+++ tags/openutils-bshd5-1.0.4/pom.xml	2007-01-30 17:23:10 UTC (rev 161)
@@ -1,46 +0,0 @@
-<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>3</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>openutils-bshd5</artifactId>
-  <name>openutils base Spring-Hibernate DAO for java 5.0</name>
-  <version>1.0.4-SNAPSHOT</version>
-  <description>openutils base Spring-Hibernate DAO for java 5.0</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-hibernate3</artifactId>
-      <version>2.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.1.ga</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: tags/openutils-bshd5-1.0.4/pom.xml (from rev 160, trunk/openutils-bshd5/pom.xml)
===================================================================
--- tags/openutils-bshd5-1.0.4/pom.xml	                        (rev 0)
+++ tags/openutils-bshd5-1.0.4/pom.xml	2007-01-30 17:23:10 UTC (rev 161)
@@ -0,0 +1,52 @@
+<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>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-bshd5</artifactId>
+  <name>openutils base Spring-Hibernate DAO for java 5.0</name>
+  <version>1.0.4</version>
+  <description>openutils base Spring-Hibernate DAO for java 5.0</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-hibernate3</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate</artifactId>
+      <version>3.2.1.ga</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.4</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.4</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.0.4</url>
+  </scm>
+</project>
\ No newline at end of file

Deleted: tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2007-01-04 15:46:29 UTC (rev 146)
+++ tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2007-01-30 17:23:10 UTC (rev 161)
@@ -1,428 +0,0 @@
-package it.openutils.dao.hibernate;
-
-import it.openutils.hibernate.example.EnhancedExample;
-import it.openutils.hibernate.example.FilterMetadata;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.hibernate.Criteria;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.ObjectNotFoundException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.Order;
-import org.hibernate.type.Type;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.orm.hibernate3.HibernateCallback;
-import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-
-/**
- * Base Hibernate DAO.
- * @author Fabrizio Giustina
- * @version $Id$
- */
-public abstract class HibernateDAOImpl<T extends Object, K extends Serializable> extends HibernateDaoSupport
-    implements
-    HibernateDAO<T, K>
-{
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(HibernateDAOImpl.class);
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#find(java.lang.String)
-     */
-    @SuppressWarnings("unchecked")
-    public List<T> find(String query)
-    {
-        return getHibernateTemplate().find(query);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findAll()
-     */
-    public List<T> findAll()
-    {
-        return findAll(getDefaultOrder());
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findAll(org.hibernate.criterion.Order[])
-     */
-    @SuppressWarnings("unchecked")
-    public List<T> findAll(final Order[] orderProperties)
-    {
-
-        return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                Criteria crit = ses.createCriteria(getReferenceClass());
-                if (null != orderProperties)
-                {
-                    for (int j = 0; j < orderProperties.length; j++)
-                    {
-                        crit.addOrder(orderProperties[j]);
-                    }
-
-                }
-                return crit.list();
-            }
-        });
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#find(java.lang.String, java.lang.Object, org.hibernate.type.Type)
-     */
-    public List<T> find(String query, Object obj, Type type)
-    {
-        return find(query, new Object[]{obj}, new Type[]{type});
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#find(String, Object[], Type[])
-     */
-    @SuppressWarnings("unchecked")
-    public List<T> find(final String query, final Object[] obj, final Type[] type)
-    {
-        return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                // hibernate 3
-                return ses.createQuery(query).setParameters(obj, type).list();
-            }
-        });
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#load(java.io.Serializable)
-     */
-    @SuppressWarnings("unchecked")
-    public T load(K key)
-    {
-        T result = (T) getHibernateTemplate().load(getReferenceClass(), key);
-        Hibernate.initialize(result);
-        return result;
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#load(java.io.Serializable)
-     */
-    @SuppressWarnings("unchecked")
-    public T loadIfAvailable(K key)
-    {
-        T result;
-        try
-        {
-            result = (T) getHibernateTemplate().load(getReferenceClass(), key);
-            Hibernate.initialize(result);
-        }
-        catch (ObjectNotFoundException e)
-        {
-            // during lazy initialization
-            return null;
-        }
-        catch (HibernateObjectRetrievalFailureException e)
-        {
-            // during load
-            if (e.getCause() instanceof ObjectNotFoundException)
-            {
-                return null;
-            }
-            throw e;
-        }
-        return result;
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#saveOrUpdate(null)
-     */
-    public void saveOrUpdate(final T obj)
-    {
-        getHibernateTemplate().saveOrUpdate(obj);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#update(null)
-     */
-    public void update(T obj)
-    {
-        getHibernateTemplate().update(obj);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#delete(null)
-     */
-    public boolean delete(final K key)
-    {
-
-        return (Boolean) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                ses.delete(ses.load(getReferenceClass(), key));
-                return true;
-            }
-        });
-
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#refresh(null)
-     */
-    public void refresh(T obj)
-    {
-        getHibernateTemplate().refresh(obj);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#merge(T)
-     */
-    @SuppressWarnings("unchecked")
-    public T merge(final T obj)
-    {
-        return (T) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                return ses.merge(obj);
-            }
-        });
-
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#save(java.lang.Object)
-     */
-    @SuppressWarnings("unchecked")
-    public K save(T obj)
-    {
-        return (K) getHibernateTemplate().save(obj);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFilteredFirst(T)
-     */
-    public T findFilteredFirst(final T filter)
-    {
-        return getFirstInCollection(findFiltered(filter, 1, 0));
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(T)
-     */
-    public List<T> findFiltered(final T filter)
-    {
-        return findFiltered(filter, new HashMap<String, FilterMetadata>(0));
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(java.lang.Object, org.hibernate.criterion.Order[])
-     */
-    public List<T> findFiltered(T filter, Order[] orderProperties)
-    {
-        return findFiltered(filter, orderProperties, new HashMap<String, FilterMetadata>(0), Integer.MAX_VALUE, 0);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(T)
-     */
-    public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata)
-    {
-        return findFiltered(filter, metadata, Integer.MAX_VALUE, 0);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(null, int, int)
-     */
-    public List<T> findFiltered(final T filter, final int maxResults, final int page)
-    {
-        return findFiltered(filter, new HashMap<String, FilterMetadata>(0), maxResults, page);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(null, int, int)
-     */
-    public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata, final int maxResults,
-        final int page)
-    {
-        return findFiltered(filter, null, metadata, maxResults, page);
-    }
-
-    /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(null, int, int)
-     */
-    @SuppressWarnings("unchecked")
-    public List<T> findFiltered(final T filter, final Order[] customOrder, final Map<String, FilterMetadata> metadata,
-        final int maxResults, final int page)
-    {
-        final Order[] orderProperties = customOrder != null && customOrder.length > 0 ? customOrder : this
-            .getDefaultOrder();
-
-        return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                Criteria crit = ses.createCriteria(filter.getClass());
-                crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
-                crit.setMaxResults(maxResults);
-                crit.setFirstResult(maxResults * page);
-
-                if (null != orderProperties && orderProperties.length > 0)
-                {
-                    for (Order order : orderProperties)
-                    {
-                        if (order != null)
-                        {
-                            crit.addOrder(order);
-                        }
-                    }
-                }
-
-                EnhancedExample.create(crit, filter, metadata);
-
-                return crit.list();
-            }
-        });
-    }
-
-    /**
-     * Return the specific Object class that will be used for class-specific implementation of this DAO.
-     * @return the reference Class
-     */
-    protected abstract Class<T> getReferenceClass();
-
-    /**
-     * Return a list of <code>Order</code> object to be used for the default ordering of the collection.
-     * @return the property name
-     */
-    protected Order[] getDefaultOrder()
-    {
-        return new Order[0];
-    }
-
-    /**
-     * Obtain an instance of Query for a named query string defined in the mapping file.
-     * @param name the name of a query defined externally
-     * @return Query
-     */
-    protected List< ? > getNamedQuery(final String name, final int marResults)
-    {
-        return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                Query q = ses.getNamedQuery(name);
-                q.setMaxResults(marResults);
-                return q.list();
-            }
-        });
-    }
-
-    /**
-     * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
-     * @param name the name of a query defined externally
-     * @param params the parameter array
-     * @return Query
-     */
-    protected List< ? > getNamedQuery(final String name, final Serializable[] params, final int marResults)
-    {
-
-        return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                Query q = ses.getNamedQuery(name);
-                q.setMaxResults(marResults);
-                if (null != params)
-                {
-                    for (int i = 0; i < params.length; i++)
-                    {
-                        q.setParameter(i, params[i]);
-                    }
-                }
-                return q.list();
-            }
-        });
-    }
-
-    /**
-     * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
-     * @param name the name of a query defined externally
-     * @param params the parameter Map
-     * @return Query
-     */
-    protected List< ? > getNamedQuery(final String name, final Map<String, Object> params, final int marResults)
-    {
-        return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
-        {
-
-            public Object doInHibernate(Session ses) throws HibernateException
-            {
-                Query q = ses.getNamedQuery(name);
-                q.setMaxResults(marResults);
-                if (params != null)
-                {
-                    for (Map.Entry<String, Object> entry : params.entrySet())
-                    {
-                        setParameterValue(q, entry.getKey(), entry.getValue());
-                    }
-                }
-                return q.list();
-            }
-        });
-    }
-
-    /**
-     * Convenience method to set paramers in the query given based on the actual object type in passed in as the value.
-     * You may need to add more functionaly to this as desired (or not use this at all).
-     * @param query the Query to set
-     * @param key the key name
-     * @param value the object to set as the parameter
-     */
-    protected void setParameterValue(Query query, String key, Object value)
-    {
-        if (null == key || null == value)
-        {
-            return;
-        }
-        query.setParameter(key, value);
-    }
-
-    /**
-     * Returns the first object in the collection or null if the collection is null or empty.
-     * @param list collection
-     * @return first element in the list
-     */
-    @SuppressWarnings("unchecked")
-    private T getFirstInCollection(Collection<T> list)
-    {
-        if (list != null && !list.isEmpty())
-        {
-            Object result = list.iterator().next();
-            Hibernate.initialize(result);
-            return (T) result;
-        }
-        return null;
-    }
-
-}
\ No newline at end of file

Copied: tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java (from rev 158, trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java)
===================================================================
--- tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	                        (rev 0)
+++ tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2007-01-30 17:23:10 UTC (rev 161)
@@ -0,0 +1,441 @@
+package it.openutils.dao.hibernate;
+
+import it.openutils.hibernate.example.EnhancedExample;
+import it.openutils.hibernate.example.FilterMetadata;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.Criteria;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.ObjectNotFoundException;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.criterion.CriteriaSpecification;
+import org.hibernate.criterion.Order;
+import org.hibernate.type.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+
+/**
+ * Base Hibernate DAO.
+ * @author Fabrizio Giustina
+ * @version $Id: $
+ * @param <T> Persistence class
+ * @param <K> Object Key
+ */
+public abstract class HibernateDAOImpl<T extends Object, K extends Serializable> extends HibernateDaoSupport
+    implements
+    HibernateDAO<T, K>
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(HibernateDAOImpl.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public List<T> find(String query)
+    {
+        return getHibernateTemplate().find(query);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<T> findAll()
+    {
+        return findAll(getDefaultOrder());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public List<T> findAll(final Order[] orderProperties)
+    {
+
+        return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                Criteria crit = ses.createCriteria(getReferenceClass());
+                if (null != orderProperties)
+                {
+                    for (int j = 0; j < orderProperties.length; j++)
+                    {
+                        crit.addOrder(orderProperties[j]);
+                    }
+
+                }
+                return crit.list();
+            }
+        });
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<T> find(String query, Object obj, Type type)
+    {
+        return find(query, new Object[]{obj }, new Type[]{type });
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public List<T> find(final String query, final Object[] obj, final Type[] type)
+    {
+        return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                // hibernate 3
+                return ses.createQuery(query).setParameters(obj, type).list();
+            }
+        });
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public T load(K key)
+    {
+        T result = (T) getHibernateTemplate().load(getReferenceClass(), key);
+        Hibernate.initialize(result);
+        return result;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public T loadIfAvailable(K key)
+    {
+        T result;
+        try
+        {
+            result = (T) getHibernateTemplate().load(getReferenceClass(), key);
+            Hibernate.initialize(result);
+        }
+        catch (ObjectNotFoundException e)
+        {
+            // during lazy initialization
+            return null;
+        }
+        catch (HibernateObjectRetrievalFailureException e)
+        {
+            // during load
+            if (e.getCause() instanceof ObjectNotFoundException)
+            {
+                return null;
+            }
+            throw e;
+        }
+        return result;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void saveOrUpdate(final T obj)
+    {
+        getHibernateTemplate().saveOrUpdate(obj);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void update(T obj)
+    {
+        getHibernateTemplate().update(obj);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean delete(final K key)
+    {
+
+        return (Boolean) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                ses.delete(ses.load(getReferenceClass(), key));
+                return true;
+            }
+        });
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void refresh(T obj)
+    {
+        getHibernateTemplate().refresh(obj);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public T merge(final T obj)
+    {
+        return (T) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                return ses.merge(obj);
+            }
+        });
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public K save(T obj)
+    {
+        return (K) getHibernateTemplate().save(obj);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public T findFilteredFirst(final T filter)
+    {
+        return getFirstInCollection(findFiltered(filter, 1, 0));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<T> findFiltered(final T filter)
+    {
+        return findFiltered(filter, getDefaultFilterMetadata());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<T> findFiltered(T filter, Order[] orderProperties)
+    {
+        return findFiltered(filter, orderProperties, getDefaultFilterMetadata(), Integer.MAX_VALUE, 0);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata)
+    {
+        return findFiltered(filter, metadata, Integer.MAX_VALUE, 0);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<T> findFiltered(final T filter, final int maxResults, final int page)
+    {
+        return findFiltered(filter, getDefaultFilterMetadata(), maxResults, page);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata, final int maxResults,
+        final int page)
+    {
+        return findFiltered(filter, null, metadata, maxResults, page);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public List<T> findFiltered(final T filter, final Order[] customOrder, final Map<String, FilterMetadata> metadata,
+        final int maxResults, final int page)
+    {
+        final Order[] orderProperties = customOrder != null && customOrder.length > 0 ? customOrder : this
+            .getDefaultOrder();
+
+        return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                Criteria crit = ses.createCriteria(filter.getClass());
+                crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
+                crit.setMaxResults(maxResults);
+                crit.setFirstResult(maxResults * page);
+
+                if (orderProperties != null && orderProperties.length > 0)
+                {
+                    for (Order order : orderProperties)
+                    {
+                        if (order != null)
+                        {
+                            crit.addOrder(order);
+                        }
+                    }
+                }
+                EnhancedExample.create(crit, filter, metadata);
+                return crit.list();
+            }
+        });
+    }
+
+    /**
+     * Return the specific Object class that will be used for class-specific implementation of this DAO.
+     * @return the reference Class
+     */
+    protected abstract Class<T> getReferenceClass();
+
+    /**
+     * Return a list of <code>Order</code> object to be used for the default ordering of the collection.
+     * @return the property name
+     */
+    protected Order[] getDefaultOrder()
+    {
+        return new Order[0];
+    }
+
+    /**
+     * Obtain an instance of Query for a named query string defined in the mapping file.
+     * @param name the name of a query defined externally
+     * @param maxResults max number of results
+     * @return Query
+     */
+    protected List< ? > getNamedQuery(final String name, final int maxResults)
+    {
+        return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                Query q = ses.getNamedQuery(name);
+                q.setMaxResults(maxResults);
+                return q.list();
+            }
+        });
+    }
+
+    /**
+     * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
+     * @param name the name of a query defined externally
+     * @param params the parameter array
+     * @param maxResults max number of results
+     * @return Query
+     */
+    protected List< ? > getNamedQuery(final String name, final Serializable[] params, final int maxResults)
+    {
+
+        return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                Query q = ses.getNamedQuery(name);
+                q.setMaxResults(maxResults);
+                if (null != params)
+                {
+                    for (int i = 0; i < params.length; i++)
+                    {
+                        q.setParameter(i, params[i]);
+                    }
+                }
+                return q.list();
+            }
+        });
+    }
+
+    /**
+     * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
+     * @param name the name of a query defined externally
+     * @param params the parameter Map
+     * @param maxResults max number of results
+     * @return Query
+     */
+    protected List< ? > getNamedQuery(final String name, final Map<String, Object> params, final int maxResults)
+    {
+        return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
+        {
+
+            public Object doInHibernate(Session ses) throws HibernateException
+            {
+                Query q = ses.getNamedQuery(name);
+                q.setMaxResults(maxResults);
+                if (params != null)
+                {
+                    for (Map.Entry<String, Object> entry : params.entrySet())
+                    {
+                        setParameterValue(q, entry.getKey(), entry.getValue());
+                    }
+                }
+                return q.list();
+            }
+        });
+    }
+
+    /**
+     * Convenience method to set paramers in the query given based on the actual object type in passed in as the value.
+     * You may need to add more functionaly to this as desired (or not use this at all).
+     * @param query the Query to set
+     * @param key the key name
+     * @param value the object to set as the parameter
+     */
+    protected void setParameterValue(Query query, String key, Object value)
+    {
+        if (null == key || null == value)
+        {
+            return;
+        }
+        query.setParameter(key, value);
+    }
+
+    /**
+     * Returns the default set of FilterMetadata that will be applied to any query. The default implementation doesn't
+     * set any default filter, subclasses may override this.
+     * @return map of property name - filter metadata
+     */
+    protected Map<String, FilterMetadata> getDefaultFilterMetadata()
+    {
+        return new HashMap<String, FilterMetadata>(0);
+    }
+
+    /**
+     * Returns the first object in the collection or null if the collection is null or empty.
+     * @param list collection
+     * @return first element in the list
+     */
+    @SuppressWarnings("unchecked")
+    private T getFirstInCollection(Collection<T> list)
+    {
+        if (list != null && !list.isEmpty())
+        {
+            Object result = list.iterator().next();
+            Hibernate.initialize(result);
+            return (T) result;
+        }
+        return null;
+    }
+
+}
\ No newline at end of file

Deleted: tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java	2007-01-04 15:46:29 UTC (rev 146)
+++ tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java	2007-01-30 17:23:10 UTC (rev 161)
@@ -1,74 +0,0 @@
-package it.openutils.dao.hibernate;
-
-import java.util.Date;
-
-
-/**
- * @author fgiust
- * @version $Id: $
- * @deprecated use FilterMetadata
- */
-public class MutableDateRange extends Date
-{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * range start.
-     */
-    private Date from;
-
-    /**
-     * range end.
-     */
-    private Date to;
-
-    /**
-     * Getter for <code>from</code>.
-     * @return Returns the from.
-     */
-    public Date getFrom()
-    {
-        return this.from;
-    }
-
-    /**
-     * Setter for <code>from</code>.
-     * @param from The from to set.
-     */
-    public void setFrom(Date from)
-    {
-        this.from = from;
-    }
-
-    /**
-     * Getter for <code>to</code>.
-     * @return Returns the to.
-     */
-    public Date getTo()
-    {
-        return this.to;
-    }
-
-    /**
-     * Setter for <code>to</code>.
-     * @param to The to to set.
-     */
-    public void setTo(Date to)
-    {
-        this.to = to;
-    }
-
-    /**
-     * Returns <code>true</code> if at least one date is set.
-     * @return <code>true</code> if at least one date is set
-     */
-    public boolean isSet()
-    {
-        return this.to != null || this.from != null;
-    }
-
-}

Copied: tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java (from rev 157, trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java)
===================================================================
--- tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java	                        (rev 0)
+++ tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java	2007-01-30 17:23:10 UTC (rev 161)
@@ -0,0 +1,75 @@
+package it.openutils.dao.hibernate;
+
+import java.util.Date;
+
+
+/**
+ * @author Fabrizio Giustina
+ * @version $Id: $
+ * @deprecated use FilterMetadata
+ */
+@Deprecated
+public class MutableDateRange extends Date
+{
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * range start.
+     */
+    private Date from;
+
+    /**
+     * range end.
+     */
+    private Date to;
+
+    /**
+     * Getter for <code>from</code>.
+     * @return Returns the from.
+     */
+    public Date getFrom()
+    {
+        return this.from;
+    }
+
+    /**
+     * Setter for <code>from</code>.
+     * @param from The from to set.
+     */
+    public void setFrom(Date from)
+    {
+        this.from = from;
+    }
+
+    /**
+     * Getter for <code>to</code>.
+     * @return Returns the to.
+     */
+    public Date getTo()
+    {
+        return this.to;
+    }
+
+    /**
+     * Setter for <code>to</code>.
+     * @param to The to to set.
+     */
+    public void setTo(Date to)
+    {
+        this.to = to;
+    }
+
+    /**
+     * Returns <code>true</code> if at least one date is set.
+     * @return <code>true</code> if at least one date is set
+     */
+    public boolean isSet()
+    {
+        return this.to != null || this.from != null;
+    }
+
+}

Deleted: tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/hibernate/example/EnhancedExample.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java	2007-01-04 15:46:29 UTC (rev 146)
+++ tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/hibernate/example/EnhancedExample.java	2007-01-30 17:23:10 UTC (rev 161)
@@ -1,319 +0,0 @@
-package it.openutils.hibernate.example;
-
-import it.openutils.dao.hibernate.MutableDateRange;
-
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.StringUtils;
-import org.hibernate.Criteria;
-import org.hibernate.HibernateException;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataRetrievalFailureException;
-
-
-/**
- * @author Fabrizio Giustina
- * @version $Id: $
- */
-public class EnhancedExample
-{
-
-    private Map<String, FilterMetadata> metadata;
-
-    private EnhancedExample(Criteria crit, Object filter, Map<String, FilterMetadata> metadata)
-    {
-        this.metadata = metadata == null ? new HashMap<String, FilterMetadata>(0) : metadata;
-        fillCriteria(null, crit, filter);
-    }
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(EnhancedExample.class);
-
-    /**
-     * Fills a criteria object calling addCondition() for any non-null property or for any component in collections.
-     * @param crit Criteria
-     * @param filter javabean which will be analyzed for non-null properties
-     * @throws HibernateException exception while building the criteria
-     */
-    public static void create(Criteria crit, Object filter, Map<String, FilterMetadata> metadata)
-        throws HibernateException
-    {
-        new EnhancedExample(crit, filter, metadata);
-    }
-
-    /**
-     * Adds contitions to an existing criteria or create sub-criteria for associations.
-     * @param crit Criteria
-     * @param propertyName property name in parent bean
-     * @param value property value
-     * @throws HibernateException exception while building the criteria
-     */
-    private void addCondition(Criteria crit, String propertyName, Object value, Object parentObject)
-        throws HibernateException
-    {
-        if (isSimpleType(value))
-        {
-
-            // don't filter on empty strings!
-            if (value instanceof String && StringUtils.isBlank((String) value))
-            {
-                return;
-            }
-
-            FilterMetadata fmd = metadata.get(propertyName);
-
-            if (fmd == null)
-            {
-                fmd = FilterMetadata.EQUAL;
-            }
-
-            String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils.substringAfterLast(
-                propertyName,
-                ".") : propertyName;
-
-            fmd.createFilter(crit, simplePropertyName, value);
-
-        }
-        else if (value instanceof MutableDateRange) // @todo MutableDateRange should be removed, use a FilterMetadata
-        // for this scope
-        {
-            Date from = ((MutableDateRange) value).getFrom();
-            Date to = ((MutableDateRange) value).getTo();
-            if (from != null && to != null)
-            {
-                log.debug("crit.add(Restrictions.between({},{}, {})", new Object[]{propertyName, from, to});
-                crit.add(Restrictions.between(propertyName, from, to));
-            }
-            else if (from != null)
-            {
-
-                log.debug("crit.add(Restrictions.ge({}, {})", propertyName, to);
-
-                crit.add(Restrictions.ge(propertyName, from));
-            }
-            else if (to != null)
-            {
-                log.debug("crit.add(Restrictions.le({}, {})", propertyName, to);
-                crit.add(Restrictions.le(propertyName, to));
-            }
-        }
-        else
-        {
-            if (containsSomething(value))
-            {
-
-                // @todo handle multiple associations in lists?
-                // see http://opensource2.atlassian.com/projects/hibernate/browse/HHH-879
-                if ((value instanceof Set || value instanceof List) && !((Collection) value).isEmpty())
-                {
-                    // collection: the new criteria has already been created, now we only nee to analize content
-
-                    for (Object element : ((Collection) value))
-                    {
-                        String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils
-                            .substringAfterLast(propertyName, ".") : propertyName;
-                        log.debug("crit.createCriteria({})", simplePropertyName);
-                        Criteria childrenCriteria = crit.createCriteria(simplePropertyName);
-                        fillCriteria(propertyName, childrenCriteria, element);
-                    }
-                }
-                else
-                {
-                    String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils
-                        .substringAfterLast(propertyName, ".") : propertyName;
-                    log.debug("crit.createCriteria({})", simplePropertyName);
-                    Criteria childrenCriteria = crit.createCriteria(simplePropertyName);
-                    fillCriteria(propertyName, childrenCriteria, value);
-                }
-            }
-        }
-    }
-
-    /**
-     * Check if the bean contains at least a valid property.
-     * @param bean javabean
-     * @return <code>true</code> if the bean contains at least a valid property
-     */
-    private boolean containsSomething(Object bean)
-    {
-
-        if (bean == null)
-        {
-            return false;
-        }
-        if (isSimpleType(bean))
-        {
-            return true;
-        }
-        else if (bean instanceof MutableDateRange)
-        {
-            return ((MutableDateRange) bean).isSet();
-        }
-
-        if (bean instanceof Collection)
-        {
-
-            Collection coll = ((Collection) bean);
-            if (coll.isEmpty())
-            {
-                return false;
-            }
-
-            if (containsSomething(coll.iterator().next()))
-            {
-                return true;
-            }
-        }
-        else if (bean instanceof Map)
-        {
-            Map coll = ((Map) bean);
-            if (coll.isEmpty())
-            {
-                return false;
-            }
-
-            if (containsSomething(coll.values().iterator().next()))
-            {
-                return true;
-            }
-        }
-
-        Map<String, Object> properties;
-        try
-        {
-            properties = PropertyUtils.describe(bean);
-        }
-        catch (Throwable e)
-        {
-            if (e instanceof InvocationTargetException)
-            {
-                e = ((InvocationTargetException) e).getTargetException();
-            }
-
-            log.error("Unable to build filter, PropertyUtils.describe throws an exception while analizing class "
-                + ClassUtils.getShortClassName(bean, "NULL"), e);
-            return false;
-        }
-
-        for (Map.Entry<String, Object> property : properties.entrySet())
-        {
-
-            if (!PropertyUtils.isWriteable(bean, property.getKey()))
-            {
-                // skip readonly properties
-                continue;
-            }
-
-            Object propertyValue = property.getValue();
-            if (propertyValue == null)
-            {
-                continue;
-            }
-
-            if (isSimpleType(propertyValue) || containsSomething(propertyValue))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Fills a criteria object calling addCondition() for any non-null property or for any component in collections.
-     * @param crit Criteria
-     * @param filter javabean which will be analyzed for non-null properties
-     * @throws HibernateException exception while building the criteria
-     */
-    private void fillCriteria(String parentPropertyName, Criteria crit, Object filter) throws HibernateException
-    {
-        if ((filter instanceof Set || filter instanceof List) && !((Collection) filter).isEmpty())
-        {
-            // collection: the new criteria has already been created, now we only need to analize content
-            for (Object element : ((Collection) filter))
-            {
-                fillCriteria(parentPropertyName, crit, element);
-            }
-        }
-
-        Map<String, Object> properties;
-        try
-        {
-            properties = PropertyUtils.describe(filter);
-        }
-        catch (Throwable e)
-        {
-            if (e instanceof InvocationTargetException)
-            {
-                e = ((InvocationTargetException) e).getTargetException();
-            }
-
-            throw new DataRetrievalFailureException(
-                "Unable to build filter, PropertyUtils.describe throws an exception while analizing class "
-                    + ClassUtils.getShortClassName(filter, "NULL")
-                    + ":"
-                    + e.getClass(),
-                e);
-        }
-
-        Iterator<String> iterator = properties.keySet().iterator();
-        while (iterator.hasNext())
-        {
-            String propertyName = iterator.next();
-
-            Object value = properties.get(propertyName);
-
-            // add only non-null values, ignore read-only properties
-            if (value != null && PropertyUtils.isWriteable(filter, propertyName))
-            {
-                String composedPropertyName = (parentPropertyName == null) ? propertyName : parentPropertyName
-                    + "."
-                    + propertyName;
-                addCondition(crit, composedPropertyName, value, filter);
-            }
-        }
-    }
-
-    /**
-     * Check if the given object is a simple java type
-     * @param object object to check
-     * @return <code>true</code>if the given object is a simple type
-     */
-    private boolean isSimpleType(Object object)
-    {
-
-        Class< ? extends Object> objClass = object.getClass();
-
-        return objClass.isPrimitive()
-            || objClass.equals(Integer.class)
-            || objClass.equals(Long.class)
-            || objClass.equals(Short.class)
-            || objClass.equals(Boolean.class)
-            || objClass.equals(String.class)
-            || objClass.equals(Double.class)
-            || objClass.equals(Float.class)
-            || objClass.equals(Date.class)
-            || objClass.equals(Byte.class)
-            || objClass.equals(BigDecimal.class)
-            || objClass.equals(Timestamp.class)
-            || objClass.equals(Character.class)
-            || Calendar.class.isAssignableFrom(objClass);
-    }
-
-}

Copied: tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/hibernate/example/EnhancedExample.java (from rev 159, trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java)
===================================================================
--- tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/hibernate/example/EnhancedExample.java	                        (rev 0)
+++ tags/openutils-bshd5-1.0.4/src/main/java/it/openutils/hibernate/example/EnhancedExample.java	2007-01-30 17:23:10 UTC (rev 161)
@@ -0,0 +1,332 @@
+package it.openutils.hibernate.example;
+
+import it.openutils.dao.hibernate.MutableDateRange;
+
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
+import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataRetrievalFailureException;
+
+
+/**
+ * @author Fabrizio Giustina
+ * @version $Id: $
+ */
+public class EnhancedExample
+{
+
+    private Map<String, FilterMetadata> metadata;
+
+    private EnhancedExample(Criteria crit, Object filter, Map<String, FilterMetadata> metadata)
+    {
+        this.metadata = metadata == null ? new HashMap<String, FilterMetadata>(0) : metadata;
+        fillCriteria(null, crit, filter);
+    }
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(EnhancedExample.class);
+
+    /**
+     * Fills a criteria object calling addCondition() for any non-null property or for any component in collections.
+     * @param crit Criteria
+     * @param filter javabean which will be analyzed for non-null properties
+     * @throws HibernateException exception while building the criteria
+     */
+    public static void create(Criteria crit, Object filter, Map<String, FilterMetadata> metadata)
+        throws HibernateException
+    {
+        new EnhancedExample(crit, filter, metadata);
+    }
+
+    /**
+     * Adds contitions to an existing criteria or create sub-criteria for associations.
+     * @param crit Criteria
+     * @param propertyName property name in parent bean
+     * @param value property value
+     * @throws HibernateException exception while building the criteria
+     */
+    private void addCondition(Criteria crit, String propertyName, Object value, Object parentObject)
+        throws HibernateException
+    {
+
+        String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils.substringAfterLast(
+            propertyName,
+            ".") : propertyName;
+
+        if (isSimpleType(value))
+        {
+
+            // don't filter on empty strings!
+            if (value instanceof String && StringUtils.isBlank((String) value))
+            {
+                return;
+            }
+
+            FilterMetadata fmd = metadata.get(propertyName);
+
+            if (fmd == null)
+            {
+                fmd = FilterMetadata.EQUAL;
+            }
+
+            fmd.createFilter(crit, simplePropertyName, value);
+
+        }
+        else if (value instanceof MutableDateRange) // @todo MutableDateRange should be removed, use a FilterMetadata
+        // for this scope
+        {
+            Date from = ((MutableDateRange) value).getFrom();
+            Date to = ((MutableDateRange) value).getTo();
+            if (from != null && to != null)
+            {
+                log.debug("crit.add(Restrictions.between({},{}, {})", new Object[]{propertyName, from, to });
+                crit.add(Restrictions.between(propertyName, from, to));
+            }
+            else if (from != null)
+            {
+
+                log.debug("crit.add(Restrictions.ge({}, {})", propertyName, to);
+
+                crit.add(Restrictions.ge(propertyName, from));
+            }
+            else if (to != null)
+            {
+                log.debug("crit.add(Restrictions.le({}, {})", propertyName, to);
+                crit.add(Restrictions.le(propertyName, to));
+            }
+        }
+        else
+        {
+            if (containsSomething(value))
+            {
+                // @todo handle multiple associations in lists?
+                // see http://opensource2.atlassian.com/projects/hibernate/browse/HHH-879
+                if ((value instanceof Set || value instanceof List) && !((Collection) value).isEmpty())
+                {
+                    // collection: the new criteria has already been created, now we only nee to analize content
+
+                    for (Object element : ((Collection< ? extends Object>) value))
+                    {
+
+                        log.debug("crit.createCriteria({})", simplePropertyName);
+                        Criteria childrenCriteria = crit.createCriteria(simplePropertyName);
+                        fillCriteria(propertyName, childrenCriteria, element);
+                    }
+                }
+                else if ((value instanceof Map) && !((Map) value).isEmpty())
+                {
+                    FilterMetadata fmd = metadata.get(propertyName);
+
+                    if (fmd != null)
+                    {
+                        fmd.createFilter(crit, simplePropertyName, value);
+                    }
+                    else
+                    {
+                        log.warn(
+                            "Maps are not handled without a FilterMetadata. Property is {} and value is {}.",
+                            propertyName,
+                            value);
+                    }
+                }
+                else
+                {
+                    log.debug("crit.createCriteria({})", simplePropertyName);
+                    Criteria childrenCriteria = crit.createCriteria(simplePropertyName);
+                    fillCriteria(propertyName, childrenCriteria, value);
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if the bean contains at least a valid property.
+     * @param bean javabean
+     * @return <code>true</code> if the bean contains at least a valid property
+     */
+    private boolean containsSomething(Object bean)
+    {
+
+        if (bean == null)
+        {
+            return false;
+        }
+        if (isSimpleType(bean))
+        {
+            return true;
+        }
+        else if (bean instanceof MutableDateRange)
+        {
+            return ((MutableDateRange) bean).isSet();
+        }
+
+        if (bean instanceof Collection)
+        {
+
+            Collection coll = ((Collection) bean);
+            if (coll.isEmpty())
+            {
+                return false;
+            }
+
+            if (containsSomething(coll.iterator().next()))
+            {
+                return true;
+            }
+        }
+        else if (bean instanceof Map)
+        {
+            Map coll = ((Map) bean);
+            if (coll.isEmpty())
+            {
+                return false;
+            }
+
+            if (containsSomething(coll.values().iterator().next()))
+            {
+                return true;
+            }
+        }
+
+        Map<String, Object> properties;
+        try
+        {
+            properties = PropertyUtils.describe(bean);
+        }
+        catch (Throwable e)
+        {
+            if (e instanceof InvocationTargetException)
+            {
+                e = ((InvocationTargetException) e).getTargetException();
+            }
+
+            log.error("Unable to build filter, PropertyUtils.describe throws an exception while analizing class "
+                + ClassUtils.getShortClassName(bean, "NULL"), e);
+            return false;
+        }
+
+        for (Map.Entry<String, Object> property : properties.entrySet())
+        {
+
+            if (!PropertyUtils.isWriteable(bean, property.getKey()))
+            {
+                // skip readonly properties
+                continue;
+            }
+
+            Object propertyValue = property.getValue();
+            if (propertyValue == null)
+            {
+                continue;
+            }
+
+            if (isSimpleType(propertyValue) || containsSomething(propertyValue))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Fills a criteria object calling addCondition() for any non-null property or for any component in collections.
+     * @param crit Criteria
+     * @param filter javabean which will be analyzed for non-null properties
+     * @throws HibernateException exception while building the criteria
+     */
+    private void fillCriteria(String parentPropertyName, Criteria crit, Object filter) throws HibernateException
+    {
+        if ((filter instanceof Set || filter instanceof List) && !((Collection) filter).isEmpty())
+        {
+            // collection: the new criteria has already been created, now we only need to analize content
+            for (Object element : ((Collection) filter))
+            {
+                fillCriteria(parentPropertyName, crit, element);
+            }
+        }
+
+        Map<String, Object> properties;
+        try
+        {
+            properties = PropertyUtils.describe(filter);
+        }
+        catch (Throwable e)
+        {
+            if (e instanceof InvocationTargetException)
+            {
+                e = ((InvocationTargetException) e).getTargetException();
+            }
+
+            throw new DataRetrievalFailureException(
+                "Unable to build filter, PropertyUtils.describe throws an exception while analizing class "
+                    + ClassUtils.getShortClassName(filter, "NULL")
+                    + ":"
+                    + e.getClass(),
+                e);
+        }
+
+        Iterator<String> iterator = properties.keySet().iterator();
+        while (iterator.hasNext())
+        {
+            String propertyName = iterator.next();
+
+            Object value = properties.get(propertyName);
+
+            // add only non-null values, ignore read-only properties
+            if (value != null && PropertyUtils.isWriteable(filter, propertyName))
+            {
+                String composedPropertyName = (parentPropertyName == null) ? propertyName : parentPropertyName
+                    + "."
+                    + propertyName;
+                addCondition(crit, composedPropertyName, value, filter);
+            }
+        }
+    }
+
+    /**
+     * Check if the given object is a simple java type
+     * @param object object to check
+     * @return <code>true</code>if the given object is a simple type
+     */
+    private boolean isSimpleType(Object object)
+    {
+
+        Class< ? extends Object> objClass = object.getClass();
+
+        return objClass.isPrimitive()
+            || objClass.equals(Integer.class)
+            || objClass.equals(Long.class)
+            || objClass.equals(Short.class)
+            || objClass.equals(Boolean.class)
+            || objClass.equals(String.class)
+            || objClass.equals(Double.class)
+            || objClass.equals(Float.class)
+            || objClass.equals(Date.class)
+            || objClass.equals(Byte.class)
+            || objClass.equals(BigDecimal.class)
+            || objClass.equals(Timestamp.class)
+            || objClass.equals(Character.class)
+            || Calendar.class.isAssignableFrom(objClass);
+    }
+
+}


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

[Openutils-svn] SF.net SVN: openutils: [160] trunk/openutils-bshd5/pom.xml

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

Revision: 160
          http://svn.sourceforge.net/openutils/?rev=160&view=rev
Author:   fgiust
Date:     2007-01-30 09:22:45 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-1.0.4

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

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2007-01-30 17:09:39 UTC (rev 159)
+++ trunk/openutils-bshd5/pom.xml	2007-01-30 17:22:45 UTC (rev 160)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.4</version>
   <description>openutils base Spring-Hibernate DAO for java 5.0</description>
   <dependencies>
     <dependency>
@@ -43,4 +43,10 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.4</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.4</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.0.4</url>
+  </scm>
 </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: [159] trunk/openutils-bshd5/src/main/java/it/ openutils/hibernate/example/EnhancedExample.java

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

Revision: 159
          http://svn.sourceforge.net/openutils/?rev=159&view=rev
Author:   fgiust
Date:     2007-01-30 09:09:39 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
handle Maps using filter metadata

Modified Paths:
--------------
    trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java	2007-01-30 15:35:37 UTC (rev 158)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java	2007-01-30 17:09:39 UTC (rev 159)
@@ -67,6 +67,11 @@
     private void addCondition(Criteria crit, String propertyName, Object value, Object parentObject)
         throws HibernateException
     {
+
+        String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils.substringAfterLast(
+            propertyName,
+            ".") : propertyName;
+
         if (isSimpleType(value))
         {
 
@@ -83,10 +88,6 @@
                 fmd = FilterMetadata.EQUAL;
             }
 
-            String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils.substringAfterLast(
-                propertyName,
-                ".") : propertyName;
-
             fmd.createFilter(crit, simplePropertyName, value);
 
         }
@@ -97,7 +98,7 @@
             Date to = ((MutableDateRange) value).getTo();
             if (from != null && to != null)
             {
-                log.debug("crit.add(Restrictions.between({},{}, {})", new Object[]{propertyName, from, to});
+                log.debug("crit.add(Restrictions.between({},{}, {})", new Object[]{propertyName, from, to });
                 crit.add(Restrictions.between(propertyName, from, to));
             }
             else if (from != null)
@@ -117,26 +118,38 @@
         {
             if (containsSomething(value))
             {
-
                 // @todo handle multiple associations in lists?
                 // see http://opensource2.atlassian.com/projects/hibernate/browse/HHH-879
                 if ((value instanceof Set || value instanceof List) && !((Collection) value).isEmpty())
                 {
                     // collection: the new criteria has already been created, now we only nee to analize content
 
-                    for (Object element : ((Collection) value))
+                    for (Object element : ((Collection< ? extends Object>) value))
                     {
-                        String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils
-                            .substringAfterLast(propertyName, ".") : propertyName;
+
                         log.debug("crit.createCriteria({})", simplePropertyName);
                         Criteria childrenCriteria = crit.createCriteria(simplePropertyName);
                         fillCriteria(propertyName, childrenCriteria, element);
                     }
                 }
+                else if ((value instanceof Map) && !((Map) value).isEmpty())
+                {
+                    FilterMetadata fmd = metadata.get(propertyName);
+
+                    if (fmd != null)
+                    {
+                        fmd.createFilter(crit, simplePropertyName, value);
+                    }
+                    else
+                    {
+                        log.warn(
+                            "Maps are not handled without a FilterMetadata. Property is {} and value is {}.",
+                            propertyName,
+                            value);
+                    }
+                }
                 else
                 {
-                    String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils
-                        .substringAfterLast(propertyName, ".") : propertyName;
                     log.debug("crit.createCriteria({})", simplePropertyName);
                     Criteria childrenCriteria = crit.createCriteria(simplePropertyName);
                     fillCriteria(propertyName, childrenCriteria, 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: [158] trunk/openutils-bshd5/src/main/java/it/ openutils/dao/hibernate/HibernateDAOImpl.java

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

Revision: 158
          http://svn.sourceforge.net/openutils/?rev=158&view=rev
Author:   fgiust
Date:     2007-01-30 07:35:37 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
add the ability to define custom default filters

Modified Paths:
--------------
    trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2007-01-30 14:53:48 UTC (rev 157)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2007-01-30 15:35:37 UTC (rev 158)
@@ -231,7 +231,7 @@
      */
     public List<T> findFiltered(final T filter)
     {
-        return findFiltered(filter, new HashMap<String, FilterMetadata>(0));
+        return findFiltered(filter, getDefaultFilterMetadata());
     }
 
     /**
@@ -239,7 +239,7 @@
      */
     public List<T> findFiltered(T filter, Order[] orderProperties)
     {
-        return findFiltered(filter, orderProperties, new HashMap<String, FilterMetadata>(0), Integer.MAX_VALUE, 0);
+        return findFiltered(filter, orderProperties, getDefaultFilterMetadata(), Integer.MAX_VALUE, 0);
     }
 
     /**
@@ -255,7 +255,7 @@
      */
     public List<T> findFiltered(final T filter, final int maxResults, final int page)
     {
-        return findFiltered(filter, new HashMap<String, FilterMetadata>(0), maxResults, page);
+        return findFiltered(filter, getDefaultFilterMetadata(), maxResults, page);
     }
 
     /**
@@ -412,6 +412,16 @@
     }
 
     /**
+     * Returns the default set of FilterMetadata that will be applied to any query. The default implementation doesn't
+     * set any default filter, subclasses may override this.
+     * @return map of property name - filter metadata
+     */
+    protected Map<String, FilterMetadata> getDefaultFilterMetadata()
+    {
+        return new HashMap<String, FilterMetadata>(0);
+    }
+
+    /**
      * Returns the first object in the collection or null if the collection is null or empty.
      * @param list collection
      * @return first element in the list


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

[Openutils-svn] SF.net SVN: openutils: [157] trunk/openutils-bshd5/src/main/java/it/ openutils/dao/hibernate

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

Revision: 157
          http://svn.sourceforge.net/openutils/?rev=157&view=rev
Author:   fgiust
Date:     2007-01-30 06:53:48 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
javadocs only

Modified Paths:
--------------
    trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
    trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2007-01-27 20:19:06 UTC (rev 156)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2007-01-30 14:53:48 UTC (rev 157)
@@ -28,7 +28,9 @@
 /**
  * Base Hibernate DAO.
  * @author Fabrizio Giustina
- * @version $Id$
+ * @version $Id: $
+ * @param <T> Persistence class
+ * @param <K> Object Key
  */
 public abstract class HibernateDAOImpl<T extends Object, K extends Serializable> extends HibernateDaoSupport
     implements
@@ -41,7 +43,7 @@
     private static Logger log = LoggerFactory.getLogger(HibernateDAOImpl.class);
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#find(java.lang.String)
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public List<T> find(String query)
@@ -50,7 +52,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findAll()
+     * {@inheritDoc}
      */
     public List<T> findAll()
     {
@@ -58,7 +60,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findAll(org.hibernate.criterion.Order[])
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public List<T> findAll(final Order[] orderProperties)
@@ -84,15 +86,15 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#find(java.lang.String, java.lang.Object, org.hibernate.type.Type)
+     * {@inheritDoc}
      */
     public List<T> find(String query, Object obj, Type type)
     {
-        return find(query, new Object[]{obj}, new Type[]{type});
+        return find(query, new Object[]{obj }, new Type[]{type });
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#find(String, Object[], Type[])
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public List<T> find(final String query, final Object[] obj, final Type[] type)
@@ -109,7 +111,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#load(java.io.Serializable)
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public T load(K key)
@@ -120,7 +122,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#load(java.io.Serializable)
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public T loadIfAvailable(K key)
@@ -149,7 +151,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#saveOrUpdate(null)
+     * {@inheritDoc}
      */
     public void saveOrUpdate(final T obj)
     {
@@ -157,7 +159,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#update(null)
+     * {@inheritDoc}
      */
     public void update(T obj)
     {
@@ -165,7 +167,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#delete(null)
+     * {@inheritDoc}
      */
     public boolean delete(final K key)
     {
@@ -183,7 +185,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#refresh(null)
+     * {@inheritDoc}
      */
     public void refresh(T obj)
     {
@@ -191,7 +193,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#merge(T)
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public T merge(final T obj)
@@ -208,7 +210,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#save(java.lang.Object)
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public K save(T obj)
@@ -217,7 +219,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFilteredFirst(T)
+     * {@inheritDoc}
      */
     public T findFilteredFirst(final T filter)
     {
@@ -225,7 +227,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(T)
+     * {@inheritDoc}
      */
     public List<T> findFiltered(final T filter)
     {
@@ -233,7 +235,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(java.lang.Object, org.hibernate.criterion.Order[])
+     * {@inheritDoc}
      */
     public List<T> findFiltered(T filter, Order[] orderProperties)
     {
@@ -241,7 +243,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(T)
+     * {@inheritDoc}
      */
     public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata)
     {
@@ -249,7 +251,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(null, int, int)
+     * {@inheritDoc}
      */
     public List<T> findFiltered(final T filter, final int maxResults, final int page)
     {
@@ -257,7 +259,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(null, int, int)
+     * {@inheritDoc}
      */
     public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata, final int maxResults,
         final int page)
@@ -266,7 +268,7 @@
     }
 
     /**
-     * @see it.openutils.dao.hibernate.HibernateDAO#findFiltered(null, int, int)
+     * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
     public List<T> findFiltered(final T filter, final Order[] customOrder, final Map<String, FilterMetadata> metadata,
@@ -285,7 +287,7 @@
                 crit.setMaxResults(maxResults);
                 crit.setFirstResult(maxResults * page);
 
-                if (null != orderProperties && orderProperties.length > 0)
+                if (orderProperties != null && orderProperties.length > 0)
                 {
                     for (Order order : orderProperties)
                     {
@@ -295,9 +297,7 @@
                         }
                     }
                 }
-
                 EnhancedExample.create(crit, filter, metadata);
-
                 return crit.list();
             }
         });
@@ -321,9 +321,10 @@
     /**
      * Obtain an instance of Query for a named query string defined in the mapping file.
      * @param name the name of a query defined externally
+     * @param maxResults max number of results
      * @return Query
      */
-    protected List< ? > getNamedQuery(final String name, final int marResults)
+    protected List< ? > getNamedQuery(final String name, final int maxResults)
     {
         return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
         {
@@ -331,7 +332,7 @@
             public Object doInHibernate(Session ses) throws HibernateException
             {
                 Query q = ses.getNamedQuery(name);
-                q.setMaxResults(marResults);
+                q.setMaxResults(maxResults);
                 return q.list();
             }
         });
@@ -341,9 +342,10 @@
      * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
      * @param name the name of a query defined externally
      * @param params the parameter array
+     * @param maxResults max number of results
      * @return Query
      */
-    protected List< ? > getNamedQuery(final String name, final Serializable[] params, final int marResults)
+    protected List< ? > getNamedQuery(final String name, final Serializable[] params, final int maxResults)
     {
 
         return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
@@ -352,7 +354,7 @@
             public Object doInHibernate(Session ses) throws HibernateException
             {
                 Query q = ses.getNamedQuery(name);
-                q.setMaxResults(marResults);
+                q.setMaxResults(maxResults);
                 if (null != params)
                 {
                     for (int i = 0; i < params.length; i++)
@@ -369,9 +371,10 @@
      * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
      * @param name the name of a query defined externally
      * @param params the parameter Map
+     * @param maxResults max number of results
      * @return Query
      */
-    protected List< ? > getNamedQuery(final String name, final Map<String, Object> params, final int marResults)
+    protected List< ? > getNamedQuery(final String name, final Map<String, Object> params, final int maxResults)
     {
         return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
         {
@@ -379,7 +382,7 @@
             public Object doInHibernate(Session ses) throws HibernateException
             {
                 Query q = ses.getNamedQuery(name);
-                q.setMaxResults(marResults);
+                q.setMaxResults(maxResults);
                 if (params != null)
                 {
                     for (Map.Entry<String, Object> entry : params.entrySet())

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java	2007-01-27 20:19:06 UTC (rev 156)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/MutableDateRange.java	2007-01-30 14:53:48 UTC (rev 157)
@@ -4,10 +4,11 @@
 
 
 /**
- * @author fgiust
+ * @author Fabrizio Giustina
  * @version $Id: $
  * @deprecated use FilterMetadata
  */
+@Deprecated
 public class MutableDateRange extends Date
 {
 


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

[Openutils-svn] SF.net SVN: openutils: [156] tags/openutils-deployment-1.0.4/src/main/java/ it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

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

Revision: 156
          http://svn.sourceforge.net/openutils/?rev=156&view=rev
Author:   fgiust
Date:     2007-01-27 12:19:06 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
fix for unqualified hostname

Modified Paths:
--------------
    tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

Modified: tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 20:18:08 UTC (rev 155)
+++ tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 20:19:06 UTC (rev 156)
@@ -93,7 +93,9 @@
             String hostname = null;
             try
             {
-                hostname = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
+                hostname = StringUtils.substringBefore(
+                    StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()),
+                    ".");
             }
             catch (UnknownHostException e)
             {


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

[Openutils-svn] SF.net SVN: openutils: [155] trunk/openutils-deployment/src/main/java/it/ openutils/deployment/spring/EnvironmentPropertyConfigurer.java

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

Revision: 155
          http://svn.sourceforge.net/openutils/?rev=155&view=rev
Author:   fgiust
Date:     2007-01-27 12:18:08 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
use unqualified hostname

Modified Paths:
--------------
    trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 19:56:26 UTC (rev 154)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 20:18:08 UTC (rev 155)
@@ -93,7 +93,9 @@
             String hostname = null;
             try
             {
-                hostname = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
+                hostname = StringUtils.substringBefore(
+                    StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()),
+                    ".");
             }
             catch (UnknownHostException e)
             {


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

[Openutils-svn] SF.net SVN: openutils: [154] trunk/openutils-deployment/pom.xml

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

Revision: 154
          http://svn.sourceforge.net/openutils/?rev=154&view=rev
Author:   fgiust
Date:     2007-01-27 11:56:26 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

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

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2007-01-27 19:56:19 UTC (rev 153)
+++ trunk/openutils-deployment/pom.xml	2007-01-27 19:56:26 UTC (rev 154)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-deployment</artifactId>
   <name>openutils deployment tools</name>
-  <version>1.0.4</version>
+  <version>1.0.5-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
@@ -55,10 +55,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.4</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.4</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.4</url>
-  </scm>
 </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: [153] tags

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

Revision: 153
          http://svn.sourceforge.net/openutils/?rev=153&view=rev
Author:   fgiust
Date:     2007-01-27 11:56:19 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
[maven-scm] copy for tag openutils-deployment-1.0.4

Added Paths:
-----------
    tags/openutils-deployment-1.0.4/
    tags/openutils-deployment-1.0.4/pom.xml
    tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

Removed Paths:
-------------
    tags/openutils-deployment-1.0.4/pom.xml
    tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

Copied: tags/openutils-deployment-1.0.4 (from rev 146, trunk/openutils-deployment)

Deleted: tags/openutils-deployment-1.0.4/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2007-01-04 15:46:29 UTC (rev 146)
+++ tags/openutils-deployment-1.0.4/pom.xml	2007-01-27 19:56:19 UTC (rev 153)
@@ -1,70 +0,0 @@
-<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>3</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>openutils-deployment</artifactId>
-  <name>openutils deployment tools</name>
-  <version>1.0.4-SNAPSHOT</version>
-  <description />
-  <dependencies>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.0.1</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: tags/openutils-deployment-1.0.4/pom.xml (from rev 152, trunk/openutils-deployment/pom.xml)
===================================================================
--- tags/openutils-deployment-1.0.4/pom.xml	                        (rev 0)
+++ tags/openutils-deployment-1.0.4/pom.xml	2007-01-27 19:56:19 UTC (rev 153)
@@ -0,0 +1,64 @@
+<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>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-deployment</artifactId>
+  <name>openutils deployment tools</name>
+  <version>1.0.4</version>
+  <description />
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>2.0.1</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.4</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.4</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.4</url>
+  </scm>
+</project>
\ No newline at end of file

Deleted: tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-04 15:46:29 UTC (rev 146)
+++ tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 19:56:19 UTC (rev 153)
@@ -1,170 +0,0 @@
-package it.openutils.deployment.spring;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-import org.springframework.web.context.ServletContextAware;
-
-
-/**
- * @author fgiust
- * @version $Id: $
- */
-public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware
-{
-
-    private String fileLocation;
-
-    private String defaultEnvironment;
-
-    private ServletContext servletContext;
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class);
-
-    /**
-     * {@inheritDoc}
-     */
-    public void setServletContext(ServletContext servletContext)
-    {
-        this.servletContext = servletContext;
-    }
-
-    /**
-     * Setter for <code>fileLocation</code>.
-     * @param fileLocation The fileLocation to set.
-     */
-    public void setFileLocation(String fileLocation)
-    {
-        this.fileLocation = fileLocation;
-    }
-
-    /**
-     * Setter for <code>defaultEnvironment</code>.
-     * @param defaultEnvironment The defaultEnvironment to set.
-     */
-    public void setDefaultEnvironment(String defaultEnvironment)
-    {
-        this.defaultEnvironment = defaultEnvironment;
-    }
-
-    private String getRootPath()
-    {
-        if (servletContext != null)
-        {
-            return servletContext.getRealPath("/");
-        }
-        return "src/main/webapp/";
-    }
-
-    private URL getResource(String resource)
-    {
-        URL url = null;
-
-        if (servletContext != null)
-        {
-            try
-            {
-                url = servletContext.getResource(resource);
-
-                if (url != null)
-                {
-                    // check needed for servletUnit
-                    // we need to check for a connection because getResource always returns a URL, also if the resource
-                    // doesn't exists
-                    url.openConnection().connect();
-                }
-
-            }
-            catch (MalformedURLException e)
-            {
-                log.error(e.getMessage(), e);
-            }
-            catch (IOException e)
-            {
-                // ignore, URL is not a valid resource
-                url = null;
-            }
-        }
-        else
-        {
-            try
-            {
-                return new File(getRootPath(), resource).toURL();
-            }
-            catch (MalformedURLException e)
-            {
-                log.error(e.getMessage(), e);
-            }
-            // test
-        }
-        return url;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
-    {
-        if (fileLocation != null)
-        {
-
-            String hostname = null;
-
-            try
-            {
-                hostname = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
-            }
-            catch (UnknownHostException e)
-            {
-                log.error(e.getMessage());
-            }
-
-            System.setProperty("env", hostname);
-
-            String resolvedLocation = StringUtils.replace(fileLocation, "${env}", hostname);
-            URL propertyUrl = null;
-
-            propertyUrl = getResource(resolvedLocation);
-
-            if (propertyUrl == null)
-            {
-                log.info("No environment specific properties found at {}, using default", resolvedLocation);
-                resolvedLocation = StringUtils.replace(fileLocation, "${env}", this.defaultEnvironment);
-
-                propertyUrl = getResource(resolvedLocation);
-
-            }
-
-            if (propertyUrl == null)
-            {
-                log.error("No default properties found at {}", resolvedLocation);
-            }
-            else
-            {
-                Resource resource = new UrlResource(propertyUrl);
-                super.setLocation(resource);
-            }
-        }
-
-        super.postProcessBeanFactory(beanFactory);
-    }
-
-}

Copied: tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (from rev 151, trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java)
===================================================================
--- tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	                        (rev 0)
+++ tags/openutils-deployment-1.0.4/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 19:56:19 UTC (rev 153)
@@ -0,0 +1,212 @@
+package it.openutils.deployment.spring;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.context.ServletContextAware;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware
+{
+
+    /**
+     * Application name (webapp name) variable.
+     */
+    private static final String PROPERTY_APPL = "${appl}";
+
+    /**
+     * Environment (server name) variable.
+     */
+    private static final String PROPERTY_ENV = "${env}";
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class);
+
+    /**
+     * @deprecated use defaultLocation
+     */
+    @Deprecated
+    private String defaultEnvironment;
+
+    private ServletContext servletContext;
+
+    private String fileLocation;
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setServletContext(ServletContext servletContext)
+    {
+        this.servletContext = servletContext;
+    }
+
+    /**
+     * Setter for <code>fileLocation</code>.
+     * @param fileLocation The fileLocation to set.
+     */
+    public void setFileLocation(String fileLocation)
+    {
+        this.fileLocation = fileLocation;
+    }
+
+    /**
+     * Setter for <code>defaultEnvironment</code>.
+     * @param defaultEnvironment The defaultEnvironment to set.
+     * @deprecated use defaultLocation
+     */
+    @Deprecated
+    public void setDefaultEnvironment(String defaultEnvironment)
+    {
+        this.defaultEnvironment = defaultEnvironment;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+    {
+        if (fileLocation != null)
+        {
+
+            String hostname = null;
+            try
+            {
+                hostname = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
+            }
+            catch (UnknownHostException e)
+            {
+                log.error(e.getMessage()); // should not happen
+            }
+
+            if (hostname != null)
+            {
+                System.setProperty("env", hostname);
+            }
+
+            String applName = getApplicationName();
+            if (applName != null)
+            {
+                System.setProperty("appl", applName);
+            }
+
+            URL propertyUrl = null;
+
+            String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname);
+            replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName);
+
+            String[] locations = StringUtils.split(replacedLocations, ",");
+
+            for (String loc : locations)
+            {
+                propertyUrl = getResource(StringUtils.strip(loc));
+                if (propertyUrl != null)
+                {
+                    break;
+                }
+                log.debug("Property file not found at {}", loc);
+            }
+
+            if (propertyUrl == null && defaultEnvironment != null)
+            {
+                log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location "
+                    + "as the last comma separated value in \"fileLocation\"");
+                propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment));
+
+            }
+
+            if (propertyUrl == null)
+            {
+                log.error("No properties found at {}", replacedLocations);
+            }
+            else
+            {
+                Resource resource = new UrlResource(propertyUrl);
+                super.setLocation(resource);
+            }
+        }
+
+        super.postProcessBeanFactory(beanFactory);
+    }
+
+    private URL getResource(String resource)
+    {
+        URL url = null;
+
+        if (servletContext != null)
+        {
+            try
+            {
+                url = servletContext.getResource(resource);
+
+                if (url != null)
+                {
+                    // check needed for servletUnit
+                    // we need to check for a connection because getResource always returns a URL, also if the resource
+                    // doesn't exists
+                    url.openConnection().connect();
+                }
+
+            }
+            catch (MalformedURLException e)
+            {
+                log.error(e.getMessage(), e);
+            }
+            catch (IOException e)
+            {
+                // ignore, URL is not a valid resource
+                url = null;
+            }
+        }
+        else
+        {
+            try
+            {
+                url = ResourceUtils.getURL(resource);
+            }
+            catch (FileNotFoundException e)
+            {
+                // ignore, can be normal
+            }
+        }
+        return url;
+    }
+
+    private String getApplicationName()
+    {
+        if (servletContext != null)
+        {
+            String url = servletContext.getRealPath("/");
+            url = StringUtils.replace(url, "\\", "/");
+            if (url.endsWith("/"))
+            {
+                url = StringUtils.substringBeforeLast(url, "/");
+            }
+
+            return StringUtils.substringAfterLast(url, "/");
+        }
+        return null;
+    }
+
+}


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

[Openutils-svn] SF.net SVN: openutils: [152] trunk/openutils-deployment/pom.xml

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

Revision: 152
          http://svn.sourceforge.net/openutils/?rev=152&view=rev
Author:   fgiust
Date:     2007-01-27 11:56:09 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-deployment-1.0.4

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

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2007-01-27 19:55:11 UTC (rev 151)
+++ trunk/openutils-deployment/pom.xml	2007-01-27 19:56:09 UTC (rev 152)
@@ -1,5 +1,4 @@
-<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>
@@ -9,7 +8,7 @@
   </parent>
   <artifactId>openutils-deployment</artifactId>
   <name>openutils deployment tools</name>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.4</version>
   <description />
   <dependencies>
     <dependency>
@@ -56,4 +55,10 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.4</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.4</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.4</url>
+  </scm>
 </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: [151] trunk/openutils-deployment/src/main/java/it/ openutils/deployment/spring/EnvironmentPropertyConfigurer.java

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

Revision: 151
          http://svn.sourceforge.net/openutils/?rev=151&view=rev
Author:   fgiust
Date:     2007-01-27 11:55:11 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
check for null properties

Modified Paths:
--------------
    trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 19:44:34 UTC (rev 150)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 19:55:11 UTC (rev 151)
@@ -100,10 +100,16 @@
                 log.error(e.getMessage()); // should not happen
             }
 
-            System.setProperty("env", hostname);
+            if (hostname != null)
+            {
+                System.setProperty("env", hostname);
+            }
 
             String applName = getApplicationName();
-            System.setProperty("appl", applName);
+            if (applName != null)
+            {
+                System.setProperty("appl", applName);
+            }
 
             URL propertyUrl = null;
 


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

[Openutils-svn] SF.net SVN: openutils: [150] trunk/openutils-deployment

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

Revision: 150
          http://svn.sourceforge.net/openutils/?rev=150&view=rev
Author:   fgiust
Date:     2007-01-27 11:44:34 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
make propertyConfigurer more configurable

Modified Paths:
--------------
    trunk/openutils-deployment/pom.xml
    trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2007-01-05 16:55:48 UTC (rev 149)
+++ trunk/openutils-deployment/pom.xml	2007-01-27 19:44:34 UTC (rev 150)
@@ -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>
@@ -17,17 +18,6 @@
       <version>2.2</version>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
       <version>2.0.1</version>
@@ -48,6 +38,11 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
@@ -60,11 +55,5 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-05 16:55:48 UTC (rev 149)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-01-27 19:44:34 UTC (rev 150)
@@ -1,6 +1,6 @@
 package it.openutils.deployment.spring;
 
-import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.MalformedURLException;
@@ -17,6 +17,7 @@
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.util.ResourceUtils;
 import org.springframework.web.context.ServletContextAware;
 
 
@@ -27,18 +28,32 @@
 public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware
 {
 
-    private String fileLocation;
+    /**
+     * Application name (webapp name) variable.
+     */
+    private static final String PROPERTY_APPL = "${appl}";
 
-    private String defaultEnvironment;
+    /**
+     * Environment (server name) variable.
+     */
+    private static final String PROPERTY_ENV = "${env}";
 
-    private ServletContext servletContext;
-
     /**
      * Logger.
      */
     private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class);
 
     /**
+     * @deprecated use defaultLocation
+     */
+    @Deprecated
+    private String defaultEnvironment;
+
+    private ServletContext servletContext;
+
+    private String fileLocation;
+
+    /**
      * {@inheritDoc}
      */
     public void setServletContext(ServletContext servletContext)
@@ -58,19 +73,75 @@
     /**
      * Setter for <code>defaultEnvironment</code>.
      * @param defaultEnvironment The defaultEnvironment to set.
+     * @deprecated use defaultLocation
      */
+    @Deprecated
     public void setDefaultEnvironment(String defaultEnvironment)
     {
         this.defaultEnvironment = defaultEnvironment;
     }
 
-    private String getRootPath()
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
     {
-        if (servletContext != null)
+        if (fileLocation != null)
         {
-            return servletContext.getRealPath("/");
+
+            String hostname = null;
+            try
+            {
+                hostname = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
+            }
+            catch (UnknownHostException e)
+            {
+                log.error(e.getMessage()); // should not happen
+            }
+
+            System.setProperty("env", hostname);
+
+            String applName = getApplicationName();
+            System.setProperty("appl", applName);
+
+            URL propertyUrl = null;
+
+            String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname);
+            replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName);
+
+            String[] locations = StringUtils.split(replacedLocations, ",");
+
+            for (String loc : locations)
+            {
+                propertyUrl = getResource(StringUtils.strip(loc));
+                if (propertyUrl != null)
+                {
+                    break;
+                }
+                log.debug("Property file not found at {}", loc);
+            }
+
+            if (propertyUrl == null && defaultEnvironment != null)
+            {
+                log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location "
+                    + "as the last comma separated value in \"fileLocation\"");
+                propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment));
+
+            }
+
+            if (propertyUrl == null)
+            {
+                log.error("No properties found at {}", replacedLocations);
+            }
+            else
+            {
+                Resource resource = new UrlResource(propertyUrl);
+                super.setLocation(resource);
+            }
         }
-        return "src/main/webapp/";
+
+        super.postProcessBeanFactory(beanFactory);
     }
 
     private URL getResource(String resource)
@@ -106,65 +177,30 @@
         {
             try
             {
-                return new File(getRootPath(), resource).toURL();
+                url = ResourceUtils.getURL(resource);
             }
-            catch (MalformedURLException e)
+            catch (FileNotFoundException e)
             {
-                log.error(e.getMessage(), e);
+                // ignore, can be normal
             }
-            // test
         }
         return url;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+    private String getApplicationName()
     {
-        if (fileLocation != null)
+        if (servletContext != null)
         {
-
-            String hostname = null;
-
-            try
+            String url = servletContext.getRealPath("/");
+            url = StringUtils.replace(url, "\\", "/");
+            if (url.endsWith("/"))
             {
-                hostname = StringUtils.lowerCase(InetAddress.getLocalHost().getHostName());
+                url = StringUtils.substringBeforeLast(url, "/");
             }
-            catch (UnknownHostException e)
-            {
-                log.error(e.getMessage());
-            }
 
-            System.setProperty("env", hostname);
-
-            String resolvedLocation = StringUtils.replace(fileLocation, "${env}", hostname);
-            URL propertyUrl = null;
-
-            propertyUrl = getResource(resolvedLocation);
-
-            if (propertyUrl == null)
-            {
-                log.info("No environment specific properties found at {}, using default", resolvedLocation);
-                resolvedLocation = StringUtils.replace(fileLocation, "${env}", this.defaultEnvironment);
-
-                propertyUrl = getResource(resolvedLocation);
-
-            }
-
-            if (propertyUrl == null)
-            {
-                log.error("No default properties found at {}", resolvedLocation);
-            }
-            else
-            {
-                Resource resource = new UrlResource(propertyUrl);
-                super.setLocation(resource);
-            }
+            return StringUtils.substringAfterLast(url, "/");
         }
-
-        super.postProcessBeanFactory(beanFactory);
+        return null;
     }
 
 }


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

[Openutils-svn] SF.net SVN: openutils: [149] trunk/openutils-tags-spring/src/main

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

Revision: 149
          http://svn.sourceforge.net/openutils/?rev=149&view=rev
Author:   fgiust
Date:     2007-01-05 08:55:48 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
new taglib URIs plus minor fixes

Modified Paths:
--------------
    trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag

Added Paths:
-----------
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld

Removed Paths:
-------------
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld

Modified: trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java	2007-01-05 16:55:48 UTC (rev 149)
@@ -6,7 +6,8 @@
 
 import javax.servlet.jsp.PageContext;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -22,7 +23,7 @@
     /**
      * Logger.
      */
-    private static Logger log = Logger.getLogger(DaoFunctions.class);
+    private static Logger log = LoggerFactory.getLogger(DaoFunctions.class);
 
     /**
      * Call findAll on a given DAO and retuns the result. The findAll method is caled using reflection, so the DAO

Copied: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld (from rev 148, trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld)
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld	2007-01-05 16:55:48 UTC (rev 149)
@@ -0,0 +1,54 @@
+<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>jakarta commons-lang EL functions</description>
+  <display-name>Commons lang EL library</display-name>
+  <tlib-version>1.2</tlib-version>
+  <short-name>commonslang</short-name>
+  <uri>http://openutils.sourceforge.net/openutils-tags-commonslang</uri>
+  <function>
+    <name>substringAfter</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>substringBefore</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String substringBefore(java.lang.String, 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>indexOf</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>split</name>
+    <function-class>org.apache.commons.lang.StringUtils</function-class>
+    <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>contains</name>
+    <function-class>org.apache.commons.lang.ArrayUtils</function-class>
+    <function-signature>boolean contains(java.lang.Object[], java.lang.Object)</function-signature>
+  </function>
+  <function>
+    <name>getFullStackTrace</name>
+    <function-class>org.apache.commons.lang.exception.ExceptionUtils</function-class>
+    <function-signature>java.lang.String getFullStackTrace(java.lang.Throwable)</function-signature>
+  </function>
+  <function>
+    <name>escapeXml</name>
+    <function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
+    <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
+  </function>
+</taglib>
\ No newline at end of file

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,13 +1,14 @@
 <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>DAO Tag Library</description>
-    <display-name>DAO extension</display-name>
-    <tlib-version>1.1</tlib-version>
-    <short-name>dao</short-name>
-    <uri>dao</uri>
-    <function>
-        <name>findAll</name>
-        <function-class>it.openutils.web.jstl.DaoFunctions</function-class>
-        <function-signature>java.util.List findAll(javax.servlet.jsp.PageContext, java.lang.String)</function-signature>
-    </function>
+  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>DAO Tag Library</description>
+  <display-name>DAO extension</display-name>
+  <tlib-version>1.0</tlib-version>
+  <short-name>dao</short-name>
+  <uri>http://openutils.sourceforge.net/openutils-tags-dao</uri>
+  <function>
+    <name>findAll</name>
+    <function-class>it.openutils.web.jstl.DaoFunctions</function-class>
+    <function-signature>java.util.List findAll(javax.servlet.jsp.PageContext, java.lang.String)</function-signature>
+  </function>
 </taglib>
\ No newline at end of file

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,87 +1,87 @@
 <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>EL extension Tag Library</description>
-    <display-name>EL extension</display-name>
-    <tlib-version>1.1</tlib-version>
-    <short-name>elx</short-name>
-    <uri>elx</uri>
-    <tag>
-        <description>Converts text in the body of the tag to options tags.</description>
-        <name>stringToOptions</name>
-        <tag-class>it.openutils.web.jstl.StringToOptionsTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <description>Separator, defaults to |.</description>
-            <name>separator</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>summary</name>
-        <tag-class>it.openutils.web.tag.SummaryTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>lines</name>
-            <required>true</required>
-        </attribute>
-        <attribute>
-            <name>charsPerLine</name>
-            <required>true</required>
-        </attribute>
-        <attribute>
-            <name>ellipses</name>
-            <required>false</required>
-        </attribute>
-    </tag>
-    <function>
-        <name>lang</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>Object chooseLanguage(java.lang.Object)</function-signature>
-    </function>
-    <function>
-        <name>isempty</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>boolean isCollectionEmpty(java.lang.Object)</function-signature>
-    </function>
-    <function>
-        <name>size</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>int getCollectionSize(java.lang.Object)</function-signature>
-    </function>
-    <function>
-        <name>fmt</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>
-            java.lang.String formatMessage(javax.servlet.jsp.PageContext, java.lang.String)
-        </function-signature>
-    </function>
-    <function>
-        <name>containsString</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>boolean containsString(java.lang.String[], java.lang.Object)</function-signature>
-    </function>
-    <function>
-        <name>equalsString</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>boolean equalsString(java.lang.Object, java.lang.Object)</function-signature>
-    </function>
-    <function>
-        <name>getProperty</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>java.lang.Object getProperty(java.lang.Object, java.lang.String)</function-signature>
-    </function>
-    <function>
-        <name>space</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>java.lang.String space()</function-signature>
-    </function>
-    <function>
-        <name>dateRange</name>
-        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
-        <function-signature>
-            boolean dateRange(java.util.Date, java.util.Date, java.util.Date, java.util.Date)
-        </function-signature>
-    </function>
+  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>EL extension Tag Library</description>
+  <display-name>EL extension</display-name>
+  <tlib-version>1.0</tlib-version>
+  <short-name>elx</short-name>
+  <uri>http://openutils.sourceforge.net/openutils-tags-elx</uri>
+  <tag>
+    <description>Converts text in the body of the tag to options tags.</description>
+    <name>stringToOptions</name>
+    <tag-class>it.openutils.web.jstl.StringToOptionsTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>Separator, defaults to |.</description>
+      <name>separator</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>summary</name>
+    <tag-class>it.openutils.web.tag.SummaryTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <name>lines</name>
+      <required>true</required>
+    </attribute>
+    <attribute>
+      <name>charsPerLine</name>
+      <required>true</required>
+    </attribute>
+    <attribute>
+      <name>ellipses</name>
+      <required>false</required>
+    </attribute>
+  </tag>
+  <function>
+    <name>lang</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>Object chooseLanguage(java.lang.Object)</function-signature>
+  </function>
+  <function>
+    <name>isempty</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>boolean isCollectionEmpty(java.lang.Object)</function-signature>
+  </function>
+  <function>
+    <name>size</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>int getCollectionSize(java.lang.Object)</function-signature>
+  </function>
+  <function>
+    <name>fmt</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>
+      java.lang.String formatMessage(javax.servlet.jsp.PageContext, java.lang.String)
+    </function-signature>
+  </function>
+  <function>
+    <name>containsString</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>boolean containsString(java.lang.String[], java.lang.Object)</function-signature>
+  </function>
+  <function>
+    <name>equalsString</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>boolean equalsString(java.lang.Object, java.lang.Object)</function-signature>
+  </function>
+  <function>
+    <name>getProperty</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>java.lang.Object getProperty(java.lang.Object, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <name>space</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>java.lang.String space()</function-signature>
+  </function>
+  <function>
+    <name>dateRange</name>
+    <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+    <function-signature>
+      boolean dateRange(java.util.Date, java.util.Date, java.util.Date, java.util.Date)
+    </function-signature>
+  </function>
 </taglib>
\ No newline at end of file

Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,53 +0,0 @@
-<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>jakarta commons-lang EL functions</description>
-    <display-name>Commons lang EL library</display-name>
-    <tlib-version>1.2</tlib-version>
-    <short-name>cl</short-name>
-    <uri>stringutils</uri>
-    <function>
-        <name>substringAfter</name>
-        <function-class>org.apache.commons.lang.StringUtils</function-class>
-        <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
-    </function>
-    <function>
-        <name>substringBefore</name>
-        <function-class>org.apache.commons.lang.StringUtils</function-class>
-        <function-signature>java.lang.String substringBefore(java.lang.String, 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>indexOf</name>
-        <function-class>org.apache.commons.lang.StringUtils</function-class>
-        <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
-    </function>
-    <function>
-        <name>split</name>
-        <function-class>org.apache.commons.lang.StringUtils</function-class>
-        <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
-    </function>
-    <function>
-        <name>contains</name>
-        <function-class>org.apache.commons.lang.ArrayUtils</function-class>
-        <function-signature>boolean contains(java.lang.Object[], java.lang.Object)</function-signature>
-    </function>
-    <function>
-        <name>getFullStackTrace</name>
-        <function-class>org.apache.commons.lang.exception.ExceptionUtils</function-class>
-        <function-signature>java.lang.String getFullStackTrace(java.lang.Throwable)</function-signature>
-    </function>
-    <function>
-        <name>escapeXml</name>
-        <function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
-        <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
-    </function>
-</taglib>
\ No newline at end of file

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,43 +1,35 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
-
-    <jsp:directive.attribute name="type" required="true" />
-    <jsp:directive.attribute name="href" required="true" />
-    <jsp:directive.attribute name="text" />
-
-
-    <c:if test="${empty(text)}">
-        <c:set var="text">action.${type}</c:set>
-    </c:if>
-
-    <c:set var="message" value="${elx:fmt(pageContext,text)}" />
-
-
-    <c:choose>
-      <c:when test="${type == 'delete'}">
-		<c:set var="image" value="ico_delete.png" />
-      </c:when>
-      <c:when test="${type == 'edit'}">
-		<c:set var="image" value="ico_arrow.png" />
-      </c:when>
-      <c:when test="${type == 'mail'}">
-		<c:set var="image" value="ico_mail.png" />
-      </c:when>
-      <c:when test="${type == 'duplica'}">
-		<c:set var="image" value="ico_saveas.png" />
-      </c:when>
-      <c:when test="${type == 'view'}">
-		<c:set var="image" value="icon_doc_sml.png" />
-      </c:when>
-      <c:otherwise>
-		<c:set var="image" value="ico_arrow.png" />
-      </c:otherwise>
-    </c:choose>
-
-	<a href="${href}" title="${message}">
-        <img src="${pageContext.request.contextPath}/docroot/img/${image}" alt="${message}"/>
-    </a>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+  xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+  xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+  xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+  <jsp:directive.attribute name="type" required="true" />
+  <jsp:directive.attribute name="href" required="true" />
+  <jsp:directive.attribute name="text" />
+  <c:if test="${empty(text)}">
+    <c:set var="text">action.${type}</c:set>
+  </c:if>
+  <c:set var="message" value="${elx:fmt(pageContext,text)}" />
+  <c:choose>
+    <c:when test="${type == 'delete'}">
+      <c:set var="image" value="ico_delete.png" />
+    </c:when>
+    <c:when test="${type == 'edit'}">
+      <c:set var="image" value="ico_arrow.png" />
+    </c:when>
+    <c:when test="${type == 'mail'}">
+      <c:set var="image" value="ico_mail.png" />
+    </c:when>
+    <c:when test="${type == 'duplica'}">
+      <c:set var="image" value="ico_saveas.png" />
+    </c:when>
+    <c:when test="${type == 'view'}">
+      <c:set var="image" value="icon_doc_sml.png" />
+    </c:when>
+    <c:otherwise>
+      <c:set var="image" value="ico_arrow.png" />
+    </c:otherwise>
+  </c:choose>
+  <a href="${href}" title="${message}">
+    <img src="${pageContext.request.contextPath}/docroot/img/${image}" alt="${message}" />
+  </a>
 </jsp:root>

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,15 +1,12 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
-
-    <jsp:directive.attribute name="reset" required="false" type="java.lang.Boolean" />
-
-	<div class="buttons">
-		<c:if test="${reset}">
-			<input type="reset" name="reset" id="reset"  />
-	    </c:if>
-		<input type="submit" name="save" value="save" id="save" />
-    </div>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+  xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+  xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+  xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+  <jsp:directive.attribute name="reset" required="false" type="java.lang.Boolean" />
+  <div class="buttons">
+    <c:if test="${reset}">
+      <input type="reset" name="reset" id="reset" />
+    </c:if>
+    <input type="submit" name="save" value="save" id="save" />
+  </div>
 </jsp:root>

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,7 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
 
     <jsp:directive.attribute name="path" required="true" />
     <jsp:directive.attribute name="name" required="false" />
@@ -9,19 +10,19 @@
     <jsp:directive.attribute name="style" required="false" />
 
     <spring:bind path="${path}">
-	    <c:if test="${empty(name)}">
-	      <c:set var="name">${su:substringAfter(path, ".")}</c:set>
-	    </c:if>
+        <c:if test="${empty(name)}">
+          <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+        </c:if>
 
 
            <c:choose>
               <c:when test="${bare}">
                     <c:choose>
                       <c:when test="${status.value}">
-    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+                         <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
                       </c:when>
                       <c:otherwise>
-    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+                         <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
                       </c:otherwise>
                     </c:choose>
                     <input type="hidden" name="_${name}" />
@@ -29,35 +30,35 @@
               <c:when test="${multiline}">
                 <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
 
-    		    <div class="${divclass}" style="${style}">
+                <div class="${divclass}" style="${style}">
                     <label for="${name}"><fmt:message key="${path}" />:</label>
                     <c:choose>
                       <c:when test="${status.value}">
-    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+                         <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
                       </c:when>
                       <c:otherwise>
-    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+                         <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
                       </c:otherwise>
                     </c:choose>
                     <input type="hidden" name="_${name}" />
-    	            <div class="clear"><!--  --></div>
-    		    </div>
+                    <div class="clear"><!--  --></div>
+                </div>
               </c:when>
               <c:otherwise>
-                <c:set var="divclass">formelementch <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
-    		    <span class="${divclass}" style="${style}">
+                <c:set var="divclass">formelementch<c:if test="${!empty(status.errorMessage)}"><![CDATA[ ]]>formelementerror</c:if></c:set>
+                <span class="${divclass}" style="${style}">
                     <c:choose>
                       <c:when test="${status.value}">
-    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+                         <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
                       </c:when>
                       <c:otherwise>
-    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+                         <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
                       </c:otherwise>
                     </c:choose>
                     <input type="hidden" name="_${name}" />
-                    <jsp:text><![CDATA[   ]]></jsp:text>
+                    <jsp:text><![CDATA[ ]]></jsp:text>
                     <span class="chlabel"><fmt:message key="${path}" /></span>
-    		    </span>
+                </span>
               </c:otherwise>
             </c:choose>
 

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,7 +1,7 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
-    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
     <jsp:directive.attribute name="bean" required="true" type="java.lang.Object" />
     <jsp:directive.attribute name="property" required="false" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
 
     <jsp:directive.attribute name="path" required="true" />
     <jsp:directive.attribute name="name" required="false" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,5 +1,5 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
-	xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+	xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 	<jsp:directive.attribute name="from" required="true" type="java.util.Date" />
 	<jsp:directive.attribute name="to" required="true" type="java.util.Date" />
 	<!--  elimina date anteriori al 1970 -->

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,5 +1,5 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:debug="urn:jsptld:debug" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+    xmlns:debug="urn:jsptld:debug" xmlns:c="http://java.sun.com/jsp/jstl/core">
 
     <script type="text/javascript">
     <![CDATA[

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
 
     <jsp:directive.attribute name="type" required="true" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,23 +1,19 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
-    <jsp:directive.attribute name="width" required="false" />
-    <jsp:directive.attribute name="height" required="false" />
-    <jsp:directive.attribute name="doc" required="true" />
-	<jsp:directive.attribute name="id" required="false" />
-
-    <c:choose>
-      <c:when test="${!empty(doc)}">
-	    <iframe src="${jspContext.request.contextPath}/docs/pdf/${doc}" width="${width}" height="${height}" id="${id}">
-		   <!-- a -->
-		</iframe>
-      </c:when>
-      <c:otherwise>
-
-          <![CDATA[ <!-- doc is empty --> ]]>
-      </c:otherwise>
-    </c:choose>
-
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+  xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+  xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+  xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+  <jsp:directive.attribute name="width" required="false" />
+  <jsp:directive.attribute name="height" required="false" />
+  <jsp:directive.attribute name="doc" required="true" />
+  <jsp:directive.attribute name="id" required="false" />
+  <c:choose>
+    <c:when test="${!empty(doc)}">
+      <iframe src="${jspContext.request.contextPath}/docs/pdf/${doc}" width="${width}" height="${height}" id="${id}">
+        <!-- a -->
+      </iframe>
+    </c:when>
+    <c:otherwise>
+      <![CDATA[ <!-- doc is empty --> ]]>
+    </c:otherwise>
+  </c:choose>
 </jsp:root>

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
 
     <jsp:directive.attribute name="href" required="true" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
     <jsp:directive.attribute name="modello" required="true" />
 

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,5 +1,5 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core">
     <!--
 
 	 errorbox

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
 
     <jsp:directive.attribute name="path" required="true" />
     <jsp:directive.attribute name="name" required="false" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,7 +1,7 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
-    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
     <jsp:directive.attribute name="selected" required="false" />
     <jsp:directive.attribute name="href" required="true" />
     <jsp:directive.attribute name="text" required="true" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,16 +1,16 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags"
-    xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-      xmlns:su="urn:jsptld:stringutils"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt">
+    xmlns:spring="http://www.springframework.org/tags"
+    xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt">
 
     <c:if test="${not empty errors}">
         <div class="error">
-	        <ul>
-	            <c:forEach var="msg" items="${errors}">
-	                <li><c:out value="${msg}" escapeXml="false" /></li>
-	            </c:forEach>
-	        </ul>
+            <ul>
+                <c:forEach var="msg" items="${errors}">
+                    <li><c:out value="${msg}" escapeXml="false" /></li>
+                </c:forEach>
+            </ul>
         </div>
         <c:remove var="errors" />
     </c:if>

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,15 +1,12 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
-    <c:set var="body"><jsp:doBody /></c:set>
-    <c:choose>
-      <c:when test="${!empty(body)}">
-	    ${body}
-      </c:when>
-      <c:otherwise>
-		N/A
-      </c:otherwise>
-    </c:choose>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+  xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+  xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+  xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+  <c:set var="body">
+    <jsp:doBody />
+  </c:set>
+  <c:choose>
+    <c:when test="${!empty(body)}">${body}</c:when>
+    <c:otherwise>N/A</c:otherwise>
+  </c:choose>
 </jsp:root>

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx"
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx"
     xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:dao="urn:jsptld:dao">
 
     <jsp:directive.attribute name="path" required="true" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,7 +1,7 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
-    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
     <jsp:directive.attribute name="path" required="true" />
     <jsp:directive.attribute name="maxlength" required="false" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
 
     <jsp:directive.attribute name="path" required="true" />
     <jsp:directive.attribute name="name" required="false" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
 
     <jsp:directive.attribute name="name" required="true" />
@@ -14,25 +14,25 @@
     <jsp:directive.attribute name="onkeypress" required="false" />
     <jsp:directive.attribute name="onkeydown" required="false" />
     <jsp:directive.attribute name="onkeyup" required="false" />
-     <jsp:directive.attribute name="onchange" required="false" />
-      <jsp:directive.attribute name="onblur" required="false" />
+    <jsp:directive.attribute name="onchange" required="false" />
+    <jsp:directive.attribute name="onblur" required="false" />
 
     <c:if test="${empty(type)}">
       <c:set var="type" value="text" />
     </c:if>
 
-	<![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" value="]]>${value}<![CDATA[" type="]]>${type}<![CDATA["]]>
-	<c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
-	<c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if>
-	<c:if test="${!empty(onkeypress)}"><![CDATA[ onkeypress="]]>${onkeypress}<![CDATA[" ]]></c:if>
-	<c:if test="${!empty(onkeydown)}"><![CDATA[ onkeydown="]]>${onkeydown}<![CDATA[" ]]></c:if>
-	<c:if test="${!empty(onkeyup)}"><![CDATA[ onkeydown="]]>${onkeyup}<![CDATA[" ]]></c:if>
-	<c:if test="${!empty(onchange)}"><![CDATA[ onchange="]]>${onchange}<![CDATA[" ]]></c:if>
-	<c:if test="${!empty(onblur)}"><![CDATA[ onblur="]]>${onblur}<![CDATA[" ]]></c:if>
-	<c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
-	<c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
-	<c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
-	<c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}"><![CDATA[ autocomplete="off" ]]></c:if>
+    <![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" value="]]>${value}<![CDATA[" type="]]>${type}<![CDATA["]]>
+    <c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
+    <c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if>
+    <c:if test="${!empty(onkeypress)}"><![CDATA[ onkeypress="]]>${onkeypress}<![CDATA[" ]]></c:if>
+    <c:if test="${!empty(onkeydown)}"><![CDATA[ onkeydown="]]>${onkeydown}<![CDATA[" ]]></c:if>
+    <c:if test="${!empty(onkeyup)}"><![CDATA[ onkeydown="]]>${onkeyup}<![CDATA[" ]]></c:if>
+    <c:if test="${!empty(onchange)}"><![CDATA[ onchange="]]>${onchange}<![CDATA[" ]]></c:if>
+    <c:if test="${!empty(onblur)}"><![CDATA[ onblur="]]>${onblur}<![CDATA[" ]]></c:if>
+    <c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
+    <c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
+    <c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
+    <c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}"><![CDATA[ autocomplete="off" ]]></c:if>
     <![CDATA[ />]]>
 
 

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
 
     <jsp:directive.attribute name="value" required="true" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
 
     <jsp:directive.attribute name="name" required="true" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+    xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
 
 
     <jsp:directive.attribute name="name" required="true" />

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,17 +1,17 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
-    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
-
-    <jsp:directive.attribute name="collection" required="true" type="java.lang.Object" />
-    <jsp:directive.attribute name="property" required="false" />
-
-    <c:if test="${!empty(collection)}">
-        <ul>
-            <c:forEach items="${collection}" var="item">
-                <li><ou:compositeproperty bean="${item}" property="${property}" /></li>
-            </c:forEach>
-        </ul>
-    </c:if>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+  xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+  xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+  xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"
+  xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+  <jsp:directive.attribute name="collection" required="true" type="java.lang.Object" />
+  <jsp:directive.attribute name="property" required="false" />
+  <c:if test="${!empty(collection)}">
+    <ul>
+      <c:forEach items="${collection}" var="item">
+        <li>
+          <ou:compositeproperty bean="${item}" property="${property}" />
+        </li>
+      </c:forEach>
+    </ul>
+  </c:if>
 </jsp:root>

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag	2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag	2007-01-05 16:55:48 UTC (rev 149)
@@ -1,20 +1,21 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
-	xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-	<jsp:directive.attribute name="var" required="false" />
-	<jsp:directive.attribute name="value" required="true" />
-	<c:url var="tmpVar" value="${currentpage}">
-		<c:param name="springaction" value="${value}" />
-		<jsp:doBody />
-	</c:url>
-	<c:choose>
-		<c:when test="${!empty(var)}">
-		    <jsp:scriptlet>
-			    String varName = (String)jspContext.getAttribute("var");
-			    String varContent = (String)jspContext.getAttribute("tmpVar");
-			    jspContext.setAttribute(varName, varContent);
-		    </jsp:scriptlet>
-			<!-- <c:set var="${var}" value="tmpVar" /> -->
-		</c:when>
-		<c:otherwise>${tmpVar}</c:otherwise>
-	</c:choose>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+  xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+  xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+  xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+  <jsp:directive.attribute name="var" required="false" />
+  <jsp:directive.attribute name="value" required="true" />
+  <c:url var="tmpVar" value="${currentpage}">
+    <c:param name="springaction" value="${value}" />
+    <jsp:doBody />
+  </c:url>
+  <c:choose>
+    <c:when test="${!empty(var)}">
+      <jsp:scriptlet>
+        String varName = (String)jspContext.getAttribute("var");
+        String varContent = (String)jspContext.getAttribute("tmpVar");
+        jspContext.setAttribute(varName, varContent);
+      </jsp:scriptlet>
+    </c:when>
+    <c:otherwise>${tmpVar}</c:otherwise>
+  </c:choose>
 </jsp:root>


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

[Openutils-svn] SF.net SVN: openutils: [148] trunk/openutils-tags-spring

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

Revision: 148
          http://svn.sourceforge.net/openutils/?rev=148&view=rev
Author:   fgiust
Date:     2007-01-04 09:32:56 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
adding elx, su and DAO tlds

Modified Paths:
--------------
    trunk/openutils-tags-spring/pom.xml

Added Paths:
-----------
    trunk/openutils-tags-spring/src/main/java/it/
    trunk/openutils-tags-spring/src/main/java/it/openutils/
    trunk/openutils-tags-spring/src/main/java/it/openutils/web/
    trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/
    trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java
    trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/ElxFunctions.java
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld

Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml	2007-01-04 16:52:28 UTC (rev 147)
+++ trunk/openutils-tags-spring/pom.xml	2007-01-04 17:32:56 UTC (rev 148)
@@ -13,6 +13,64 @@
   <description />
   <dependencies>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>2.0.1</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>taglibs</groupId>
+          <artifactId>standard</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+      </exclusions>
+    </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>

Added: trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java	2007-01-04 17:32:56 UTC (rev 148)
@@ -0,0 +1,71 @@
+package it.openutils.web.jstl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import javax.servlet.jsp.PageContext;
+
+import org.apache.log4j.Logger;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+
+/**
+ * EL functions fo simple data access operations.
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class DaoFunctions
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = Logger.getLogger(DaoFunctions.class);
+
+    /**
+     * Call findAll on a given DAO and retuns the result. The findAll method is caled using reflection, so the DAO
+     * doesn't need to implement any specific interface.
+     * @param pageContext jsp page context
+     * @param daoName dao name, without the "DAO" postfix, automatically added (e.g. "user" for "userDAO"). The full
+     * name of the dao should be the name of a bean available in spring application context.
+     * @return List returned by DAO.findAll().
+     */
+    public static List findAll(PageContext pageContext, String daoName) throws Throwable
+    {
+
+        String fullDaoName = daoName + "DAO";
+        if (log.isDebugEnabled())
+        {
+            log.debug("calling dao:findall for [" + daoName + "]");
+        }
+
+        WebApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(pageContext
+            .getServletContext());
+
+        Object dao = context.getBean(fullDaoName);
+
+        Method m = dao.getClass().getMethod("findAll", null);
+
+        List results = null;
+
+        try
+        {
+            results = (List) m.invoke(dao, null);
+        }
+        catch (InvocationTargetException ex)
+        {
+            throw ex.getTargetException();
+        }
+
+        if (log.isDebugEnabled())
+        {
+            log.debug("Returning " + results);
+        }
+
+        return results;
+
+    }
+
+}


Property changes on: trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/ElxFunctions.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/ElxFunctions.java	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/ElxFunctions.java	2007-01-04 17:32:56 UTC (rev 148)
@@ -0,0 +1,299 @@
+package it.openutils.web.jstl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.jstl.core.Config;
+import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class ElxFunctions
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(ElxFunctions.class);
+
+    /**
+     * check is a collection is empty.
+     * @param collection
+     * @return boolean
+     */
+    public static boolean isCollectionEmpty(Object collection)
+    {
+
+        if (collection == null)
+        {
+            return true;
+        }
+
+        try
+        {
+            if (collection instanceof Collection)
+            {
+                return ((Collection) collection).isEmpty();
+            }
+            else if (collection instanceof Map)
+            {
+                return ((Map) collection).isEmpty();
+            }
+        }
+        catch (Throwable e)
+        {
+            // catch hibernate lazy initialization errors
+            log.error("An error occurred while evaluating the elx:isempty function: " + e.getMessage(), e);
+            return true;
+        }
+
+        // the "new Throwable()" is used to add a stacktrace
+        log
+            .error(
+                "elx:isempty can be used only with an object of type java.util.Collection or java.util.Map, you are trying to use it with an instance of "
+                    + collection.getClass(),
+                new Throwable());
+
+        return true;
+
+    }
+
+    /**
+     * return the size of the collection.
+     * @param collection
+     * @return int
+     */
+    public static int getCollectionSize(Object collection)
+    {
+
+        if (collection == null)
+        {
+            return 0;
+        }
+
+        try
+        {
+            if (collection instanceof Collection)
+            {
+                return ((Collection) collection).size();
+            }
+            else if (collection instanceof Map)
+            {
+                return ((Map) collection).size();
+            }
+        }
+        catch (Throwable e)
+        {
+            // catch hibernate lazy initialization errors
+            log.error("An error occurred while evaluating the elx:size function: " + e.getMessage(), e);
+            return 0;
+        }
+
+        // the "new Throwable()" is used to add a stacktrace
+        log
+            .error(
+                "elx:size can be used only with an object of type java.util.Collection or java.util.Map, you are trying to use it with an instance of "
+                    + collection.getClass(),
+                new Throwable());
+        return 0;
+    }
+
+    public static String formatMessage(PageContext pageContext, String key)
+    {
+        String title = null;
+        ResourceBundle bundle = null;
+
+        // standard jstl localizationContest
+        // check for the localizationContext in applicationScope, set in web.xml
+        LocalizationContext localization = getLocalizationContext(pageContext);
+
+        if (localization != null)
+        {
+            bundle = localization.getResourceBundle();
+        }
+
+        if (bundle != null)
+        {
+            try
+            {
+                title = bundle.getString(key);
+            }
+            catch (MissingResourceException e)
+            {
+                // ignore
+            }
+        }
+
+        return title;
+    }
+
+    /**
+     * Check if a given array of Strings contains <em>the String representation</em> of an object.
+     * @param array String array
+     * @param value object to search for
+     * @return <code>true</code> if a array contains a value equals to the String representation of object
+     */
+    public static boolean containsString(String[] array, Object value)
+    {
+        if (log.isDebugEnabled())
+        {
+            // log.debug("containsString [" + value + "] in [" + ArrayUtils.toString(array) + "]");
+        }
+
+        if (array == null || value == null)
+        {
+            return false;
+        }
+
+        String valueString = value.toString();
+
+        for (String element : array)
+        {
+            if (valueString.equals(element))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Compares the String representation of two objects.
+     * @param one first object to be compared
+     * @param two second object to be compared
+     * @return <code>true</code> only if both objects are not null and their String representaion is equals()
+     */
+    public static boolean equalsString(Object one, Object two)
+    {
+        if (one == null || two == null)
+        {
+            return false;
+        }
+
+        if (log.isDebugEnabled())
+        {
+            log.debug("Comparing [" + one + "] and [" + two + "]");
+        }
+
+        return one.toString().equals(two.toString());
+    }
+
+    /**
+     * Returns a bean property (optionally nested= handling nulls both in bean and property name)
+     * @param bean bean
+     * @param property property name, optionally nested
+     * @return property value, null if bean is null, bean if property is null
+     * @throws IllegalAccessException
+     * @throws InvocationTargetException
+     * @throws NoSuchMethodException
+     */
+    public static Object getProperty(Object bean, String property)
+    {
+        if (bean == null)
+        {
+            return null;
+        }
+        if (StringUtils.isEmpty(property))
+        {
+            return bean;
+        }
+
+        try
+        {
+            if (property.startsWith("(string)"))
+            {
+                return StringUtils.substringAfter(property, "(string)");
+            }
+            else
+            {
+                return PropertyUtils.getProperty(bean, property);
+            }
+
+        }
+        catch (Exception e)
+        {
+            log.error("Error while evaluating property \"" + property + "\" in bean " + bean.getClass().getName(), e);
+        }
+
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * Check if ricambio is into the inverval of tavola verifying dates
+     * @param tavolaDa start date for tavola
+     * @param tavolaA end date for tavola
+     * @param ricambioDa start date for ricambio
+     * @param ricambioA end date for ricambio
+     * @return
+     */
+    public static boolean dateRange(java.util.Date tavolaDa, java.util.Date tavolaA, java.util.Date ricambioDa,
+        java.util.Date ricambioA)
+    {
+        long tavDa = (tavolaDa == null) ? 0 : tavolaDa.getTime();
+        long tavA = (tavolaA == null) ? Long.MAX_VALUE : tavolaA.getTime();
+
+        long ricDa = (ricambioDa == null) ? 0 : ricambioDa.getTime();
+        long ricA = (ricambioA == null) ? Long.MAX_VALUE : ricambioA.getTime();
+
+        return (ricDa <= tavA && ricA >= tavDa);
+    }
+
+    public static String space()
+    {
+        return " ";
+    }
+
+    /**
+     * Gets the default I18N localization context.
+     * @param pc Page in which to look up the default I18N localization context
+     */
+    private static LocalizationContext getLocalizationContext(PageContext pc)
+    {
+        LocalizationContext locCtxt = null;
+
+        Object obj = Config.find(pc, Config.FMT_LOCALIZATION_CONTEXT);
+        if (obj == null)
+        {
+            return null;
+        }
+
+        if (obj instanceof LocalizationContext)
+        {
+            locCtxt = (LocalizationContext) obj;
+        }
+        else
+        {
+            // localization context is a bundle basename
+            locCtxt = getLocalizationContext(pc, (String) obj);
+        }
+
+        return locCtxt;
+    }
+
+    private static LocalizationContext getLocalizationContext(PageContext pc, String basename)
+    {
+        LocalizationContext locCtxt = null;
+        ResourceBundle bundle = null;
+
+        if ((basename == null) || basename.equals(""))
+        {
+            return new LocalizationContext();
+        }
+
+        return locCtxt;
+    }
+
+}


Property changes on: trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/ElxFunctions.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld	2007-01-04 17:32:56 UTC (rev 148)
@@ -0,0 +1,13 @@
+<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>DAO Tag Library</description>
+    <display-name>DAO extension</display-name>
+    <tlib-version>1.1</tlib-version>
+    <short-name>dao</short-name>
+    <uri>dao</uri>
+    <function>
+        <name>findAll</name>
+        <function-class>it.openutils.web.jstl.DaoFunctions</function-class>
+        <function-signature>java.util.List findAll(javax.servlet.jsp.PageContext, java.lang.String)</function-signature>
+    </function>
+</taglib>
\ No newline at end of file


Property changes on: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld	2007-01-04 17:32:56 UTC (rev 148)
@@ -0,0 +1,87 @@
+<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>EL extension Tag Library</description>
+    <display-name>EL extension</display-name>
+    <tlib-version>1.1</tlib-version>
+    <short-name>elx</short-name>
+    <uri>elx</uri>
+    <tag>
+        <description>Converts text in the body of the tag to options tags.</description>
+        <name>stringToOptions</name>
+        <tag-class>it.openutils.web.jstl.StringToOptionsTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>Separator, defaults to |.</description>
+            <name>separator</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>summary</name>
+        <tag-class>it.openutils.web.tag.SummaryTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>lines</name>
+            <required>true</required>
+        </attribute>
+        <attribute>
+            <name>charsPerLine</name>
+            <required>true</required>
+        </attribute>
+        <attribute>
+            <name>ellipses</name>
+            <required>false</required>
+        </attribute>
+    </tag>
+    <function>
+        <name>lang</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>Object chooseLanguage(java.lang.Object)</function-signature>
+    </function>
+    <function>
+        <name>isempty</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>boolean isCollectionEmpty(java.lang.Object)</function-signature>
+    </function>
+    <function>
+        <name>size</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>int getCollectionSize(java.lang.Object)</function-signature>
+    </function>
+    <function>
+        <name>fmt</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>
+            java.lang.String formatMessage(javax.servlet.jsp.PageContext, java.lang.String)
+        </function-signature>
+    </function>
+    <function>
+        <name>containsString</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>boolean containsString(java.lang.String[], java.lang.Object)</function-signature>
+    </function>
+    <function>
+        <name>equalsString</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>boolean equalsString(java.lang.Object, java.lang.Object)</function-signature>
+    </function>
+    <function>
+        <name>getProperty</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>java.lang.Object getProperty(java.lang.Object, java.lang.String)</function-signature>
+    </function>
+    <function>
+        <name>space</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>java.lang.String space()</function-signature>
+    </function>
+    <function>
+        <name>dateRange</name>
+        <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+        <function-signature>
+            boolean dateRange(java.util.Date, java.util.Date, java.util.Date, java.util.Date)
+        </function-signature>
+    </function>
+</taglib>
\ No newline at end of file


Property changes on: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld	2007-01-04 17:32:56 UTC (rev 148)
@@ -0,0 +1,53 @@
+<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>jakarta commons-lang EL functions</description>
+    <display-name>Commons lang EL library</display-name>
+    <tlib-version>1.2</tlib-version>
+    <short-name>cl</short-name>
+    <uri>stringutils</uri>
+    <function>
+        <name>substringAfter</name>
+        <function-class>org.apache.commons.lang.StringUtils</function-class>
+        <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
+    </function>
+    <function>
+        <name>substringBefore</name>
+        <function-class>org.apache.commons.lang.StringUtils</function-class>
+        <function-signature>java.lang.String substringBefore(java.lang.String, 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>indexOf</name>
+        <function-class>org.apache.commons.lang.StringUtils</function-class>
+        <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
+    </function>
+    <function>
+        <name>split</name>
+        <function-class>org.apache.commons.lang.StringUtils</function-class>
+        <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
+    </function>
+    <function>
+        <name>contains</name>
+        <function-class>org.apache.commons.lang.ArrayUtils</function-class>
+        <function-signature>boolean contains(java.lang.Object[], java.lang.Object)</function-signature>
+    </function>
+    <function>
+        <name>getFullStackTrace</name>
+        <function-class>org.apache.commons.lang.exception.ExceptionUtils</function-class>
+        <function-signature>java.lang.String getFullStackTrace(java.lang.Throwable)</function-signature>
+    </function>
+    <function>
+        <name>escapeXml</name>
+        <function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
+        <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
+    </function>
+</taglib>
\ No newline at end of file


Property changes on: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


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

[Openutils-svn] SF.net SVN: openutils: [147] trunk/openutils-tags-spring/src/main/resources

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

Revision: 147
          http://svn.sourceforge.net/openutils/?rev=147&view=rev
Author:   fgiust
Date:     2007-01-04 08:52:28 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
importing tag files

Added Paths:
-----------
    trunk/openutils-tags-spring/src/main/resources/META-INF/
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
+  <description>Tag library for tag file directory /META-INF/tags/ou/</description>
+  <tlib-version>1.0</tlib-version>
+  <short-name>openutils-tags-spring</short-name>
+  <uri>http://openutils.sourceforge.net/openutils-tags-spring</uri>
+  <!-- generated using mvn net.sourceforge.maven-taglib:maven-taglib-plugin:tldgenerate -->
+  <tag-file>
+    <name>button</name>
+    <path>/META-INF/tags/ou/button.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>buttons</name>
+    <path>/META-INF/tags/ou/buttons.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>checkbox</name>
+    <path>/META-INF/tags/ou/checkbox.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>compositeproperty</name>
+    <path>/META-INF/tags/ou/compositeproperty.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>date</name>
+    <path>/META-INF/tags/ou/date.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>daterange</name>
+    <path>/META-INF/tags/ou/daterange.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>debug</name>
+    <path>/META-INF/tags/ou/debug.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>docbutton</name>
+    <path>/META-INF/tags/ou/docbutton.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>docframe</name>
+    <path>/META-INF/tags/ou/docframe.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>docprintbutton</name>
+    <path>/META-INF/tags/ou/docprintbutton.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>docsvg</name>
+    <path>/META-INF/tags/ou/docsvg.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>errorbox</name>
+    <path>/META-INF/tags/ou/errorbox.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>input</name>
+    <path>/META-INF/tags/ou/input.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>li</name>
+    <path>/META-INF/tags/ou/li.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>messages</name>
+    <path>/META-INF/tags/ou/messages.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>na</name>
+    <path>/META-INF/tags/ou/na.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>select</name>
+    <path>/META-INF/tags/ou/select.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>tablelang</name>
+    <path>/META-INF/tags/ou/tablelang.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>text</name>
+    <path>/META-INF/tags/ou/text.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>txtinput</name>
+    <path>/META-INF/tags/ou/txtinput.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>txtoption</name>
+    <path>/META-INF/tags/ou/txtoption.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>txtselect</name>
+    <path>/META-INF/tags/ou/txtselect.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>txttextarea</name>
+    <path>/META-INF/tags/ou/txttextarea.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>ul</name>
+    <path>/META-INF/tags/ou/ul.tag</path>
+  </tag-file>
+  <tag-file>
+    <name>url</name>
+    <path>/META-INF/tags/ou/url.tag</path>
+  </tag-file>
+</taglib>


Property changes on: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,43 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="type" required="true" />
+    <jsp:directive.attribute name="href" required="true" />
+    <jsp:directive.attribute name="text" />
+
+
+    <c:if test="${empty(text)}">
+        <c:set var="text">action.${type}</c:set>
+    </c:if>
+
+    <c:set var="message" value="${elx:fmt(pageContext,text)}" />
+
+
+    <c:choose>
+      <c:when test="${type == 'delete'}">
+		<c:set var="image" value="ico_delete.png" />
+      </c:when>
+      <c:when test="${type == 'edit'}">
+		<c:set var="image" value="ico_arrow.png" />
+      </c:when>
+      <c:when test="${type == 'mail'}">
+		<c:set var="image" value="ico_mail.png" />
+      </c:when>
+      <c:when test="${type == 'duplica'}">
+		<c:set var="image" value="ico_saveas.png" />
+      </c:when>
+      <c:when test="${type == 'view'}">
+		<c:set var="image" value="icon_doc_sml.png" />
+      </c:when>
+      <c:otherwise>
+		<c:set var="image" value="ico_arrow.png" />
+      </c:otherwise>
+    </c:choose>
+
+	<a href="${href}" title="${message}">
+        <img src="${pageContext.request.contextPath}/docroot/img/${image}" alt="${message}"/>
+    </a>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,15 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="reset" required="false" type="java.lang.Boolean" />
+
+	<div class="buttons">
+		<c:if test="${reset}">
+			<input type="reset" name="reset" id="reset"  />
+	    </c:if>
+		<input type="submit" name="save" value="save" id="save" />
+    </div>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,67 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+
+    <jsp:directive.attribute name="path" required="true" />
+    <jsp:directive.attribute name="name" required="false" />
+    <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="multiline" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="style" required="false" />
+
+    <spring:bind path="${path}">
+	    <c:if test="${empty(name)}">
+	      <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+	    </c:if>
+
+
+           <c:choose>
+              <c:when test="${bare}">
+                    <c:choose>
+                      <c:when test="${status.value}">
+    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+                      </c:when>
+                      <c:otherwise>
+    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+                      </c:otherwise>
+                    </c:choose>
+                    <input type="hidden" name="_${name}" />
+              </c:when>
+              <c:when test="${multiline}">
+                <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+
+    		    <div class="${divclass}" style="${style}">
+                    <label for="${name}"><fmt:message key="${path}" />:</label>
+                    <c:choose>
+                      <c:when test="${status.value}">
+    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+                      </c:when>
+                      <c:otherwise>
+    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+                      </c:otherwise>
+                    </c:choose>
+                    <input type="hidden" name="_${name}" />
+    	            <div class="clear"><!--  --></div>
+    		    </div>
+              </c:when>
+              <c:otherwise>
+                <c:set var="divclass">formelementch <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+    		    <span class="${divclass}" style="${style}">
+                    <c:choose>
+                      <c:when test="${status.value}">
+    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+                      </c:when>
+                      <c:otherwise>
+    	                 <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+                      </c:otherwise>
+                    </c:choose>
+                    <input type="hidden" name="_${name}" />
+                    <jsp:text><![CDATA[   ]]></jsp:text>
+                    <span class="chlabel"><fmt:message key="${path}" /></span>
+    		    </span>
+              </c:otherwise>
+            </c:choose>
+
+
+    </spring:bind>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,21 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+
+    <jsp:directive.attribute name="bean" required="true" type="java.lang.Object" />
+    <jsp:directive.attribute name="property" required="false" />
+
+
+    <c:choose>
+        <c:when test="${empty(property)}">
+		  <c:out value="${bean}" escapeXml="true" />
+		</c:when>
+        <c:otherwise>
+            <c:forTokens items="${property}" delims=" " var="textToken">
+                <c:out value="${elx:getProperty(bean,textToken)} " escapeXml="true" />
+            </c:forTokens>
+        </c:otherwise>
+    </c:choose>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,100 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+
+    <jsp:directive.attribute name="path" required="true" />
+    <jsp:directive.attribute name="name" required="false" />
+    <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="type" required="false" />
+    <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="style" required="false" />
+    <jsp:directive.attribute name="onkeypress" required="false" />
+    <jsp:directive.attribute name="onkeydown" required="false" />
+    <jsp:directive.attribute name="onkeyup" required="false" />
+    <jsp:directive.attribute name="onchange" required="false" />
+    <jsp:directive.attribute name="cssclass" required="false" />
+    <jsp:directive.attribute name="key" required="false" />
+	<jsp:directive.attribute name="onblur" required="false" />
+    <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
+
+
+    <c:if test="${empty(key)}">
+        <c:set var="key">${path}</c:set>
+    </c:if>
+    <c:if test="${empty(name)}">
+      <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+    </c:if>
+    <c:if test="${empty(maxlength)}">
+      <c:set var="maxlength">30</c:set>
+    </c:if>
+    <c:if test="${empty(style)}">
+      <c:set var="style">width: 75px</c:set>
+    </c:if>
+    <c:if test="${type == 'key' and !empty(status.value)}">
+      <c:set var="type">hidden</c:set>
+    </c:if>
+    <c:if test="${type == 'keyshow' and !empty(status.value)}">
+      <c:set var="readonly" value="${true}" />
+    </c:if>
+    <c:set var="divclass">formelement</c:set>
+
+
+	 <c:choose>
+		 <c:when test="${empty(label)}">
+		  <c:set var="labelmsg"><fmt:message key="${key}" /></c:set>
+		 </c:when>
+		 <c:otherwise>
+		  <c:set var="labelmsg">${label}</c:set>
+		 </c:otherwise>
+	 </c:choose>
+
+    <c:choose>
+      <c:when test="${!nobind}">
+            <spring:bind path="${path}">
+    	    <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+
+
+		    <div class="${divclass}">
+		        <label for="${name}">${labelmsg}:</label>
+
+	            <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+
+                <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn"><span>C</span></a>
+
+                <div class="calendar" id="divdata${name}" style="display:none"><!--  --></div>
+
+&lt;!--[if gte IE 5.5]>
+<iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' scrolling='no' style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe>
+&lt;![endif]-->
+                <div class="clear"><!--  --></div>
+		    </div>
+            <script type="text/javascript">
+                createCalendar('${status.value}', 'divdata${name}', '${name}')
+            </script>
+
+
+        </spring:bind>
+      </c:when>
+      <c:otherwise>
+
+
+		    <div class="${divclass}">
+		        <label for="${name}">${labelmsg}:</label>
+
+	             <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="10" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+
+
+            </div>
+
+
+
+	            <div class="clear"><!--  --></div>
+
+
+      </c:otherwise>
+   </c:choose>
+
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,30 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+	xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+	<jsp:directive.attribute name="from" required="true" type="java.util.Date" />
+	<jsp:directive.attribute name="to" required="true" type="java.util.Date" />
+	<!--  elimina date anteriori al 1970 -->
+	<c:if test="${from.time le 0}">
+		<c:remove var="from" />
+	</c:if>
+	<c:if test="${to.time le 0}">
+		<c:remove var="to" />
+	</c:if>
+	<c:if test="${(from != null) or (to != null)}">
+		<jsp:text> (</jsp:text>
+		<c:if test="${from != null}">
+			<fmt:message key="daterange.from" />
+			<jsp:text>&#160;</jsp:text>
+			<fmt:formatDate value="${from}" type="date" pattern="dd/MM/yyyy" />
+			<c:if test="${to != null}">
+				<jsp:text>&#160;</jsp:text>
+			</c:if>
+		</c:if>
+
+		<c:if test="${to != null}">
+			<fmt:message key="daterange.to" />
+			<jsp:text>&#160;</jsp:text>
+			<fmt:formatDate value="${to}" type="date" pattern="dd/MM/yyyy" />
+		</c:if>
+		<jsp:text>) </jsp:text>
+	</c:if>
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,47 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:debug="urn:jsptld:debug" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+
+    <script type="text/javascript">
+    <![CDATA[
+      function showDebug(pId) {
+        lDebugDiv = document.getElementById(pId);
+        if (lDebugDiv.style.display == "block") {
+          lDebugDiv.style.display="none";
+        }
+        else
+        {
+          lDebugDiv.style.display="block";
+        }
+    }
+    ]]>
+    </script>
+    <div class="debugtabs"><a href="javascript:showDebug('debug')">&amp;raquo; debug</a></div>
+    <div id="debug" class="debug" style="display:none">
+    <table>
+        <tr>
+            <th onclick="showDebug('parameters')">Parameters</th>
+            <td id="parameters" style="display:none"><debug:parameters /></td>
+        </tr>
+        <tr>
+            <th onclick="showDebug('request')">Request</th>
+            <td id="request" style="display:none"><debug:attributes scope="request" /></td>
+        </tr>
+        <tr>
+            <th onclick="showDebug('session')">Session</th>
+            <td id="session" style="display:none"><debug:attributes scope="session" /></td>
+        </tr>
+        <tr>
+            <th onclick="showDebug('page')">Page</th>
+            <td id="page" style="display:none"><debug:attributes scope="page" /></td>
+        </tr>
+        <tr>
+            <th onclick="showDebug('application')">Application</th>
+            <td id="application" style="display:none"><debug:attributes scope="application" /></td>
+        </tr>
+        <tr>
+            <th onclick="showDebug('headers')">Request headers</th>
+            <td id="headers" style="display:none"><debug:headers /></td>
+        </tr>
+    </table>
+    </div>
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,24 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="type" required="true" />
+    <jsp:directive.attribute name="href" required="true" />
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+
+
+	<c:set var="message"><fmt:message key="btn.${type}" /></c:set>
+
+    <c:choose>
+      <c:when test="${disabled}">
+	       <img src="${pageContext.request.contextPath}/docroot/img/btn-${type}_false.gif" alt="${message}" title="${message}"/>
+      </c:when>
+      <c:otherwise>
+		<a href="${href}&amp;amp;page=full" title="${message}" target="_blank">
+	        <img src="${pageContext.request.contextPath}/docroot/img/btn-${type}.gif" alt="${message}" />
+	    </a>
+      </c:otherwise>
+    </c:choose>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,23 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+    <jsp:directive.attribute name="width" required="false" />
+    <jsp:directive.attribute name="height" required="false" />
+    <jsp:directive.attribute name="doc" required="true" />
+	<jsp:directive.attribute name="id" required="false" />
+
+    <c:choose>
+      <c:when test="${!empty(doc)}">
+	    <iframe src="${jspContext.request.contextPath}/docs/pdf/${doc}" width="${width}" height="${height}" id="${id}">
+		   <!-- a -->
+		</iframe>
+      </c:when>
+      <c:otherwise>
+
+          <![CDATA[ <!-- doc is empty --> ]]>
+      </c:otherwise>
+    </c:choose>
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,13 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="href" required="true" />
+
+	<c:set var="message"><fmt:message key="btn.stampa" /></c:set>
+
+	<a href="${href}&amp;amp;page=full&amp;amp;print=print" title="${message}" target="_blank">
+        <img src="${pageContext.request.contextPath}/docroot/img/btn-stampa.gif" alt="${message}" />
+    </a>
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,13 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+    <jsp:directive.attribute name="modello" required="true" />
+
+  <object class="svg" data="${jspContext.request.contextPath}/docs/svg/ES_${prodotto.seriemodello.id}.svg" type="image/svg+xml">
+  	<!-- <embed src="${jspContext.request.contextPath}/docs/svg/ES_${prodotto.seriemodello.id}.svg" type="image/svg+xml" pluginspage="http://www.adobe.com/svg/viewer/install/" /> -->
+  </object>
+
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,38 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+    <!--
+
+	 errorbox
+
+	 Iterate over the list of errors for the command or bean specified in the
+	 'path' attribute. If errors are found, display a box with css class "error"
+	 and print out any error.
+
+	 @param path the name of the field to bind to (required)
+
+	-->
+    <jsp:directive.attribute name="path" required="true" />
+
+    <spring:bind path="${path}">
+        <c:if test="${not empty status.errorMessages}">
+            <div class="error">
+            <ul>
+                <c:forEach var="error" items="${status.errorMessages}">
+                    <li><c:out value="${error}" escapeXml="false" /></li>
+                </c:forEach>
+            </ul>
+            </div>
+        </c:if>
+    </spring:bind>
+    <spring:bind path="${path}.*">
+        <c:if test="${not empty status.errorMessages}">
+            <div class="error">
+            <ul>
+                <c:forEach var="error" items="${status.errorMessages}">
+                    <li><c:out value="${error}" escapeXml="false" /></li>
+                </c:forEach>
+            </ul>
+            </div>
+        </c:if>
+    </spring:bind>
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,136 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+
+    <jsp:directive.attribute name="path" required="true" />
+    <jsp:directive.attribute name="name" required="false" />
+    <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" />
+    <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="type" required="false" />
+    <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="style" required="false" />
+    <jsp:directive.attribute name="onkeypress" required="false" />
+    <jsp:directive.attribute name="onkeydown" required="false" />
+    <jsp:directive.attribute name="onkeyup" required="false" />
+    <jsp:directive.attribute name="onchange" required="false" />
+    <jsp:directive.attribute name="cssclass" required="false" />
+    <jsp:directive.attribute name="key" required="false" />
+	<jsp:directive.attribute name="onblur" required="false" />
+    <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
+
+
+    <c:if test="${empty(key)}">
+        <c:set var="key">${path}</c:set>
+    </c:if>
+    <c:if test="${empty(name)}">
+      <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+    </c:if>
+    <c:if test="${empty(maxlength)}">
+      <c:set var="maxlength">30</c:set>
+    </c:if>
+    <c:if test="${type == 'key' and !empty(status.value)}">
+      <c:set var="type">hidden</c:set>
+    </c:if>
+    <c:if test="${type == 'keyshow' and !empty(status.value)}">
+      <c:set var="readonly" value="${true}" />
+    </c:if>
+    <c:set var="divclass">formelement</c:set>
+
+
+	 <c:choose>
+		 <c:when test="${empty(label)}">
+		  <c:set var="labelmsg"><fmt:message key="${key}" /></c:set>
+		 </c:when>
+		 <c:otherwise>
+		  <c:set var="labelmsg">${label}</c:set>
+		 </c:otherwise>
+	 </c:choose>
+
+    <c:choose>
+      <c:when test="${!nobind}">
+            <spring:bind path="${path}">
+    	    <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+
+    	    <c:choose>
+    	      <c:when test="${type == 'hidden'}">
+    	      	<input type="hidden" name="${name}" id="${name}" value="${status.value}" />
+    	      </c:when>
+    	      <c:when test="${bare}">
+
+    	        <c:choose>
+    	              <c:when test="${maxlength le 256}">
+    	                 <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+    	               </c:when>
+    	              <c:otherwise>
+    	                <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" />
+    	              </c:otherwise>
+    	            </c:choose>
+    	      	</c:when>
+    	      	<c:when test="${type == 'password'}">
+    	      		 <div class="${divclass}">
+    		        <label for="${name}">${labelmsg}:</label>
+
+
+    	                 <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+
+
+
+
+    	            <div class="clear"><!--  --></div>
+    		    </div>
+    	      	</c:when>
+    	      <c:otherwise>
+    		    <div class="${divclass}">
+    		        <label for="${name}">${labelmsg}:</label>
+
+                     <c:choose>
+    	              <c:when test="${maxlength le 256}">
+    	                 <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+    	              </c:when>
+    	              <c:otherwise>
+    	                <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" />
+    	              </c:otherwise>
+    	            </c:choose>
+
+
+    	            <div class="clear"><!--  --></div>
+    		    </div>
+    	      </c:otherwise>
+    	    </c:choose>
+        </spring:bind>
+      </c:when>
+      <c:otherwise>
+
+    	    <c:choose>
+    	      <c:when test="${type == 'hidden'}">
+    	      	<input type="hidden" name="${name}" id="${name}" value="${status.value}" />
+    	      </c:when>
+    	      <c:when test="${bare}">
+    	      	<ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+    	      </c:when>
+    	      <c:otherwise>
+    		    <div class="${divclass}">
+    		        <label for="${name}">${labelmsg}:</label>
+
+                     <c:choose>
+    	              <c:when test="${maxlength le 256}">
+    	                 <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+    	              </c:when>
+    	              <c:otherwise>
+    	                <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" />
+    	              </c:otherwise>
+    	            </c:choose>
+
+
+    	            <div class="clear"><!--  --></div>
+    		    </div>
+    	      </c:otherwise>
+    	    </c:choose>
+      </c:otherwise>
+   </c:choose>
+
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,23 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+    <jsp:directive.attribute name="selected" required="false" />
+    <jsp:directive.attribute name="href" required="true" />
+    <jsp:directive.attribute name="text" required="true" />
+    <jsp:directive.attribute name="title" required="false" />
+    <c:choose>
+        <c:when test="${href eq selected}">
+            <li id="current">
+                <strong>
+                    <a href="${href}" title="${title}">${text}</a>
+                </strong>
+            </li>
+        </c:when>
+        <c:otherwise>
+            <li>
+                <a href="${href}" title="${title}">${text}</a>
+            </li>
+        </c:otherwise>
+    </c:choose>
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,30 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags"
+    xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+      xmlns:su="urn:jsptld:stringutils"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt">
+
+    <c:if test="${not empty errors}">
+        <div class="error">
+	        <ul>
+	            <c:forEach var="msg" items="${errors}">
+	                <li><c:out value="${msg}" escapeXml="false" /></li>
+	            </c:forEach>
+	        </ul>
+        </div>
+        <c:remove var="errors" />
+    </c:if>
+
+
+    <c:if test="${not empty messages}">
+        <div class="message">
+        <ul>
+            <c:forEach var="msg" items="${messages}">
+                <li><c:out value="${msg}" escapeXml="false" /></li>
+            </c:forEach>
+        </ul>
+        </div>
+        <c:remove var="messages" />
+    </c:if>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,15 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+    <c:set var="body"><jsp:doBody /></c:set>
+    <c:choose>
+      <c:when test="${!empty(body)}">
+	    ${body}
+      </c:when>
+      <c:otherwise>
+		N/A
+      </c:otherwise>
+    </c:choose>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,117 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:dao="urn:jsptld:dao">
+
+    <jsp:directive.attribute name="path" required="true" />
+    <jsp:directive.attribute name="name" required="false" />
+    <jsp:directive.attribute name="collection" required="false" />
+    <jsp:directive.attribute name="property" required="false" />
+    <jsp:directive.attribute name="text" required="false" />
+    <jsp:directive.attribute name="multiple" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="style" required="false" />
+    <jsp:directive.attribute name="findall" required="false" />
+    <jsp:directive.attribute name="addempty" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="onchange" required="false" />
+    <jsp:directive.attribute name="key" required="false" />
+    <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
+
+
+    <c:if test="${empty(key)}">
+        <c:set var="key">${path}</c:set>
+    </c:if>
+
+    <c:choose>
+        <c:when test="${!empty(collection)}">
+            <c:set var="backingList" value="${requestScope[collection]}" />
+        </c:when>
+        <c:when test="${!empty(findall)}">
+            <c:set var="backingList" value="${dao:findAll(pageContext, findall)}" />
+        </c:when>
+    </c:choose>
+
+
+     <c:choose>
+         <c:when test="${empty(label)}">
+          <c:set var="labelmsg"><fmt:message key="${key}" /></c:set>
+         </c:when>
+         <c:otherwise>
+          <c:set var="labelmsg">${label}</c:set>
+         </c:otherwise>
+     </c:choose>
+
+
+    <spring:bind path="${path}">
+        <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if>
+        </c:set>
+        <c:if test="${empty(name)}">
+            <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+        </c:if>
+
+        <c:if test="${!bare}">
+            <![CDATA[<div class="]]>${divclass}<![CDATA[">]]>
+            <label for="${name}">${labelmsg} </label>
+        </c:if>
+
+            <c:choose>
+              <c:when test="${multiple}">
+                    <ou:txtselect name="${name}"  multiple="${multiple}" style="${style}" readonly="${readonly}" disabled="${disabled}" onchange="${onchange}">
+
+                        <c:set var="statusArray" value="${su:split(status.value,',')}" />
+                        <c:forEach items="${backingList}" var="option">
+
+                            <c:choose>
+                                <c:when test="${empty(property)}">
+                                    <c:set var="optionvalue" value="${option}" />
+                                </c:when>
+                                <c:otherwise>
+                                    <c:set var="optionvalue" value="${option[property]}" />
+                                </c:otherwise>
+                            </c:choose>
+
+                            <ou:txtoption selected="${elx:containsString(statusArray, optionvalue)}" value="${optionvalue}">
+
+                             <ou:compositeproperty bean="${option}" property="${text}" />
+
+                            </ou:txtoption>
+                        </c:forEach>
+                    </ou:txtselect>
+                    <!-- needed for empty submissions -->
+                    <input type="hidden" name="_${name}" value="" />
+              </c:when>
+              <c:otherwise>
+                    <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}" disabled="${disabled}" onchange="${onchange}" >
+                        <c:if test="${addempty}">
+                            <option value="">---</option>
+                        </c:if>
+                        <c:forEach items="${backingList}" var="option">
+
+                            <c:choose>
+                                <c:when test="${empty(property)}">
+                                    <c:set var="optionvalue" value="${option}" />
+                                </c:when>
+                                <c:otherwise>
+                                    <c:set var="optionvalue" value="${option[property]}" />
+                                </c:otherwise>
+                            </c:choose>
+
+                            <ou:txtoption selected="${elx:equalsString(status.value, optionvalue)}" value="${optionvalue}">
+
+                            <ou:compositeproperty bean="${option}" property="${text}" />
+
+                            </ou:txtoption>
+                        </c:forEach>
+                    </ou:txtselect>
+              </c:otherwise>
+            </c:choose>
+
+
+        <c:if test="${!bare}">
+            <![CDATA[<div class="clear"><!--  --></div> </div>]]>
+        </c:if>
+    </spring:bind>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,77 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
+    xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+
+    <jsp:directive.attribute name="path" required="true" />
+    <jsp:directive.attribute name="maxlength" required="false" />
+
+    <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+    <c:set var="bean">${su:substringBefore(path, ".")}</c:set>
+    <c:if test="${empty(maxlength)}">
+      <c:set var="maxlength">30</c:set>
+    </c:if>
+    <c:set var="value" value="${elx:getProperty(requestScope[bean],name)}" />
+    <c:if test="${elx:isempty(value)}">
+      <jsp:scriptlet>java.util.Map map = new java.util.HashMap(1);map.put("","");jspContext.setAttribute("value", map);</jsp:scriptlet>
+    </c:if>
+    <c:set var="languages" value="${su:split('IT EN FR DE ES',' ')}" />
+
+    <script type="text/javascript">
+<![CDATA[
+function tblangAdd(lid)
+{
+ element = lid.parentNode;
+ row = element.childNodes[0];
+ cloned = row.cloneNode(true);
+ for (j=0;cloned.childNodes[j];j++) { if (cloned.childNodes[j].nodeType == 1) { cloned.childNodes[j].value=""; } }
+ element.appendChild(cloned);
+ element.appendChild(lid);
+ return false;
+}
+function tblangDel(lid)
+{
+ element = lid.parentNode;
+ if (element.parentNode.childNodes.length > 2) {
+   element.parentNode.removeChild(element);
+ }else{
+   for (j=0;element.childNodes[j];j++) { if (element.childNodes[j].nodeType == 1) { element.childNodes[j].value=""; } }
+ }
+ return false;
+}
+]]>
+	</script>
+
+    <spring:bind path="${path}">
+        <c:set var="divclass">formelement tblang <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if>
+        </c:set>
+
+        <div class="${divclass}">
+            <label for="${name}"><fmt:message key="${path}" />:</label>
+
+            <div class="tblangentry">
+	            <c:forEach items="${value}" var="item" varStatus="idx">
+	                <div id="${name}${idx.index}">
+			            <ou:txtselect name="${name}">
+			                <c:forEach items="${languages}" var="language">
+			                   <ou:txtoption selected="${item.key == language}" value="¶${language}">${language}</ou:txtoption>
+			                </c:forEach>
+			            </ou:txtselect>
+
+			            <c:choose>
+			              <c:when test="${maxlength le 256}">
+			                <input type="text" name="${name}" value="${item.value}" maxlength="${maxlength}" class="tblanginput"/>
+			              </c:when>
+			              <c:otherwise>
+			                <ou:txttextarea name="${name}" value="${item.value}" cssclass="tblangtextarea"/>
+			              </c:otherwise>
+			            </c:choose>
+
+			            <a href="#" class="tblangDel" onclick="return tblangDel(this)">-</a>
+		            </div>
+	            </c:forEach>
+	            <a href="#" class="tblangAdd" onclick="return tblangAdd(this)">+</a>
+            </div>
+        </div>
+    </spring:bind>
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,54 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+
+    <jsp:directive.attribute name="path" required="true" />
+    <jsp:directive.attribute name="name" required="false" />
+    <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" />
+    <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="type" required="false" />
+    <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
+
+    <spring:bind path="${path}">
+	    <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+	    <c:if test="${empty(name)}">
+	      <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+	    </c:if>
+	    <c:if test="${empty(maxlength)}">
+	      <c:set var="maxlength">30</c:set>
+	    </c:if>
+	    <c:if test="${type == 'key' and !empty(status.value)}">
+	      <c:set var="type">hidden</c:set>
+	    </c:if>
+	    <c:if test="${type == 'keyshow' and !empty(status.value)}">
+	      <c:set var="readonly" value="${true}" />
+	    </c:if>
+
+		 <c:choose>
+			 <c:when test="${empty(label)}">
+			  <c:set var="labelmsg"><fmt:message key="${path}" /></c:set>
+			 </c:when>
+			 <c:otherwise>
+			  <c:set var="labelmsg">${label}</c:set>
+			 </c:otherwise>
+		 </c:choose>
+
+
+	    <c:choose>
+	      <c:when test="${type == 'hidden'}">
+	      	<input type="hidden" name="${name}" id="${name}" value="${status.value}" />
+	      </c:when>
+	      <c:otherwise>
+		    <div class="${divclass}">
+		        <label for="${name}">${labelmsg}:</label>
+
+	            <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" readonly="${readonly}" disabled="${disabled}"/>
+
+	            <div class="clear"><!--  --></div>
+		    </div>
+	      </c:otherwise>
+	    </c:choose>
+    </spring:bind>
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,39 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="name" required="true" />
+    <jsp:directive.attribute name="value" required="true" />
+    <jsp:directive.attribute name="type" required="false" />
+    <jsp:directive.attribute name="cssclass" required="false" />
+    <jsp:directive.attribute name="style" required="false" />
+    <jsp:directive.attribute name="maxlength" required="false" />
+    <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean"/>
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean"/>
+    <jsp:directive.attribute name="onkeypress" required="false" />
+    <jsp:directive.attribute name="onkeydown" required="false" />
+    <jsp:directive.attribute name="onkeyup" required="false" />
+     <jsp:directive.attribute name="onchange" required="false" />
+      <jsp:directive.attribute name="onblur" required="false" />
+
+    <c:if test="${empty(type)}">
+      <c:set var="type" value="text" />
+    </c:if>
+
+	<![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" value="]]>${value}<![CDATA[" type="]]>${type}<![CDATA["]]>
+	<c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(onkeypress)}"><![CDATA[ onkeypress="]]>${onkeypress}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(onkeydown)}"><![CDATA[ onkeydown="]]>${onkeydown}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(onkeyup)}"><![CDATA[ onkeydown="]]>${onkeyup}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(onchange)}"><![CDATA[ onchange="]]>${onchange}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(onblur)}"><![CDATA[ onblur="]]>${onblur}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
+	<c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
+	<c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
+	<c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}"><![CDATA[ autocomplete="off" ]]></c:if>
+    <![CDATA[ />]]>
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,19 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="value" required="true" />
+    <jsp:directive.attribute name="selected" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="style" required="false" />
+    <jsp:directive.attribute name="multiple" required="false" type="java.lang.Boolean" />
+
+
+	<![CDATA[<option value="]]>${value}<![CDATA["]]>
+	<c:if test="${selected}"><![CDATA[ selected="selected" ]]></c:if>
+	<![CDATA[>]]>
+		<jsp:doBody />
+    <![CDATA[</option>]]>
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,36 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="name" required="true" />
+    <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="style" required="false" />
+    <jsp:directive.attribute name="cssclass" required="false" />
+    <jsp:directive.attribute name="multiple" required="false" type="java.lang.Boolean" />
+    <jsp:directive.attribute name="value" required="false" />
+    <jsp:directive.attribute name="onchange" required="false" />
+
+    <c:if test="${multiple}">
+		<c:set var="cssclass">multiple ${cssclass}</c:set>
+	</c:if>
+
+
+    <!-- readonly selects are emulated using a disabled select + hidden field -->
+	<c:if test="${readonly}"><input type="hidden" name="${name}" value="${value}"/></c:if>
+
+	<![CDATA[<select name="]]>${name}<![CDATA["]]>
+	<![CDATA[ id="]]>${name}<![CDATA["]]>
+	<c:if test="${readonly}"><![CDATA[ disabled="disabled" ]]></c:if>
+	<c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
+	<c:if test="${multiple}"><![CDATA[ multiple="multiple" ]]></c:if>
+	<c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(onchange)}"><![CDATA[ onChange="]]>${onchange}<![CDATA[" ]]></c:if>
+	<![CDATA[>]]>
+		<jsp:doBody />
+    <![CDATA[</select>]]>
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag	                        (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag	2007-01-04 16:52:28 UTC (rev 147)
@@ -0,0 +1,23 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+    xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+
+
+    <jsp:directive.attribute name="name" required="true" />
+    <jsp:directive.attribute name="value" required="true" />
+    <jsp:directive.attribute name="type" required="false" />
+    <jsp:directive.attribute name="cssclass" required="false" />
+    <jsp:directive.attribute name="style" required="false" />
+    <jsp:directive.attribute name="maxlength" required="false" />
+    <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean"/>
+    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean"/>
+
+	<![CDATA[<textarea name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA["]]>
+	<c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
+	<c:if test="${!empty(styled)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
+	<c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
+	<c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
+    <![CDATA[>]]>${value}<![CDATA[</textarea>]]>
+
+
+</jsp:root>

Added: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag	                        (rev 0)
+++ trunk/openutils-tags-...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils: [146] trunk/openutils-spring/src/main/java/it/ openutils/spring

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

Revision: 146
          http://svn.sourceforge.net/openutils/?rev=146&view=rev
Author:   fgiust
Date:     2007-01-04 07:46:29 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Annotation validator for hibernate

Added Paths:
-----------
    trunk/openutils-spring/src/main/java/it/openutils/spring/validation/
    trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/
    trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java

Added: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java	                        (rev 0)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java	2007-01-04 15:46:29 UTC (rev 146)
@@ -0,0 +1,42 @@
+package it.openutils.spring.validation.hibernate;
+
+import org.hibernate.validator.ClassValidator;
+import org.hibernate.validator.InvalidValue;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class AnnotationValidator implements Validator
+{
+
+    /**
+     * @see org.springframework.validation.Validator#supports(java.lang.Class)
+     */
+    @SuppressWarnings("unchecked")
+    public boolean supports(Class clazz)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public void validate(Object obj, Errors errors)
+    {
+        ClassValidator classValidator = new ClassValidator(obj.getClass());
+        InvalidValue[] validationMessages = classValidator.getInvalidValues(obj);
+        for (InvalidValue value : validationMessages)
+        {
+            String propertyName = value.getPropertyName();
+
+            String message = value.getMessage();
+
+            errors.rejectValue(propertyName, null, message);
+        }
+    }
+}


Property changes on: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java	                        (rev 0)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java	2007-01-04 15:46:29 UTC (rev 146)
@@ -0,0 +1,30 @@
+package it.openutils.spring.validation.hibernate;
+
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class NullValidator implements Validator
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public boolean supports(final Class command)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void validate(final Object command, final Errors errors)
+    {
+        return;
+    }
+}


Property changes on: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


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

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

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

Revision: 145
          http://svn.sourceforge.net/openutils/?rev=145&view=rev
Author:   fgiust
Date:     2007-01-04 07:45:45 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
new utility filter

Modified Paths:
--------------
    trunk/openutils-spring/pom.xml
    trunk/openutils-tags-spring/pom.xml
    trunk/openutils-testing/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java
    trunk/pom.xml

Added Paths:
-----------
    trunk/openutils-web/src/main/java/it/
    trunk/openutils-web/src/main/java/it/openutils/
    trunk/openutils-web/src/main/java/it/openutils/web/
    trunk/openutils-web/src/main/java/it/openutils/web/filters/
    trunk/openutils-web/src/main/java/it/openutils/web/filters/NoCachingFilter.java

Property Changed:
----------------
    trunk/openutils-backup/
    trunk/openutils-bshd5/
    trunk/openutils-dbmigration/
    trunk/openutils-deployment/
    trunk/openutils-log4j/
    trunk/openutils-spring/
    trunk/openutils-tags-spring/
    trunk/openutils-testing/
    trunk/openutils-usermanagement/
    trunk/openutils-usermanagement-dataobjects/
    trunk/openutils-web/


Property changes on: trunk/openutils-backup
___________________________________________________________________
Name: svn:ignore
   + .checkstyle
target



Property changes on: trunk/openutils-bshd5
___________________________________________________________________
Name: svn:ignore
   - .wtpmodules
target
.classpath
.project
.settings
   + .wtpmodules
target
.classpath
.project
.settings
.checkstyle



Property changes on: trunk/openutils-dbmigration
___________________________________________________________________
Name: svn:ignore
   - target

   + target
.checkstyle



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



Property changes on: trunk/openutils-log4j
___________________________________________________________________
Name: svn:ignore
   - .wtpmodules
.project
.classpath
target
.settings
   + .wtpmodules
.project
.classpath
target
.settings
.checkstyle



Property changes on: trunk/openutils-spring
___________________________________________________________________
Name: svn:ignore
   - .wtpmodules
.settings
target
.classpath
.project

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


Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
+++ trunk/openutils-spring/pom.xml	2007-01-04 15:45:45 UTC (rev 145)
@@ -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>
@@ -59,6 +60,12 @@
       <version>1.0.1</version>
     </dependency>
     <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-annotations</artifactId>
+      <version>3.2.1.ga</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>


Property changes on: trunk/openutils-tags-spring
___________________________________________________________________
Name: svn:ignore
   - target

   + target
.checkstyle


Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
+++ trunk/openutils-tags-spring/pom.xml	2007-01-04 15:45:45 UTC (rev 145)
@@ -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>
@@ -10,4 +11,12 @@
   <name>openutils tags for spring MVC</name>
   <version>1.0-SNAPSHOT</version>
   <description />
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
\ No newline at end of file


Property changes on: trunk/openutils-testing
___________________________________________________________________
Name: svn:ignore
   - .classpath
.project
.settings
target

   + .classpath
.project
.settings
target
.checkstyle


Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java	2007-01-04 14:15:02 UTC (rev 144)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java	2007-01-04 15:45:45 UTC (rev 145)
@@ -187,6 +187,7 @@
      * Returns the full test name.
      * @see junit.framework.TestCase#getName()
      */
+    @Override
     public String getName()
     {
         return ClassUtils.getShortClassName(this.getClass()) + "::" + super.getName();


Property changes on: trunk/openutils-usermanagement
___________________________________________________________________
Name: svn:ignore
   - target
.classpath
.project
.settings
db
*.log

   + target
.classpath
.project
.settings
db
*.log
.checkstyle



Property changes on: trunk/openutils-usermanagement-dataobjects
___________________________________________________________________
Name: svn:ignore
   - .classpath
.project
.settings
target

   + .classpath
.project
.settings
target
.checkstyle



Property changes on: trunk/openutils-web
___________________________________________________________________
Name: svn:ignore
   - target

   + target
.checkstyle


Added: trunk/openutils-web/src/main/java/it/openutils/web/filters/NoCachingFilter.java
===================================================================
--- trunk/openutils-web/src/main/java/it/openutils/web/filters/NoCachingFilter.java	                        (rev 0)
+++ trunk/openutils-web/src/main/java/it/openutils/web/filters/NoCachingFilter.java	2007-01-04 15:45:45 UTC (rev 145)
@@ -0,0 +1,51 @@
+package it.openutils.web.filters;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * Simple webapp filter that disables caching by setting the appropriate headers on the response.
+ * @author fgiust
+ * @version $Id$
+ */
+public class NoCachingFilter implements Filter
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    public void init(FilterConfig filterConfig)
+    {
+        // unused
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void destroy()
+    {
+        // unused
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+        ServletException
+    {
+        HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+        httpResponse.setHeader("Cache-Control", "no-cache");
+        httpResponse.setDateHeader("Expires", 0);
+        httpResponse.setHeader("Pragma", "No-cache");
+        chain.doFilter(request, response);
+    }
+}
\ No newline at end of file


Property changes on: trunk/openutils-web/src/main/java/it/openutils/web/filters/NoCachingFilter.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
+++ trunk/pom.xml	2007-01-04 15:45:45 UTC (rev 145)
@@ -15,9 +15,7 @@
   </issueManagement>
   <scm>
     <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk</connection>
-    <developerConnection>
-      scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk
-    </developerConnection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk</developerConnection>
     <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk</url>
   </scm>
   <organization>
@@ -82,6 +80,32 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <wtpversion>1.5</wtpversion>
+          <additionalBuildcommands>
+            <additionalBuildcommand>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</additionalBuildcommand>
+          </additionalBuildcommands>
+          <additionalProjectnatures>
+            <additionalProjectnature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</additionalProjectnature>
+          </additionalProjectnatures>
+          <additionalConfig>
+            <file>
+              <name>.checkstyle</name>
+              <content>
+                <![CDATA[<fileset-config file-format-version="1.2.0" simple-config="true">
+  <fileset name="all" enabled="true" check-config-name="project" local="false">
+    <file-match-pattern match-pattern="." include-pattern="true" />
+  </fileset>
+  <filter name="NonSrcDirs" enabled="true" />
+</fileset-config>]]>
+              </content>
+            </file>
+          </additionalConfig>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <reporting>


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

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

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

Revision: 144
          http://svn.sourceforge.net/openutils/?rev=144&view=rev
Author:   fgiust
Date:     2007-01-04 06:15:02 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
move parent and make room for new modules

Modified Paths:
--------------
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-usermanagement/pom.xml
    trunk/openutils-usermanagement-dataobjects/pom.xml

Added Paths:
-----------
    trunk/LICENSE.txt
    trunk/openutils-backup/
    trunk/openutils-backup/pom.xml
    trunk/openutils-backup/src/
    trunk/openutils-backup/src/main/
    trunk/openutils-backup/src/main/java/
    trunk/openutils-backup/src/main/resources/
    trunk/openutils-backup/src/test/
    trunk/openutils-backup/src/test/java/
    trunk/openutils-backup/src/test/resources/
    trunk/openutils-dbmigration/
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-dbmigration/src/
    trunk/openutils-dbmigration/src/main/
    trunk/openutils-dbmigration/src/main/java/
    trunk/openutils-dbmigration/src/main/resources/
    trunk/openutils-dbmigration/src/test/
    trunk/openutils-dbmigration/src/test/java/
    trunk/openutils-dbmigration/src/test/resources/
    trunk/openutils-tags-spring/
    trunk/openutils-tags-spring/pom.xml
    trunk/openutils-tags-spring/src/
    trunk/openutils-tags-spring/src/main/
    trunk/openutils-tags-spring/src/main/java/
    trunk/openutils-tags-spring/src/main/resources/
    trunk/openutils-tags-spring/src/test/
    trunk/openutils-tags-spring/src/test/java/
    trunk/openutils-tags-spring/src/test/resources/
    trunk/openutils-web/
    trunk/openutils-web/pom.xml
    trunk/openutils-web/src/
    trunk/openutils-web/src/main/
    trunk/openutils-web/src/main/java/
    trunk/openutils-web/src/main/resources/
    trunk/openutils-web/src/test/
    trunk/openutils-web/src/test/java/
    trunk/openutils-web/src/test/resources/
    trunk/pom.xml
    trunk/src/

Removed Paths:
-------------
    trunk/openutils-parent/LICENSE.txt
    trunk/openutils-parent/pom.xml
    trunk/openutils-parent/src/

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - openutils-springjsp

   + openutils-springjsp
target


Copied: trunk/LICENSE.txt (from rev 109, trunk/openutils-parent/LICENSE.txt)
===================================================================
--- trunk/LICENSE.txt	                        (rev 0)
+++ trunk/LICENSE.txt	2007-01-04 14:15:02 UTC (rev 144)
@@ -0,0 +1,3 @@
+
+   Opentils modules are released under different licenses.
+   Please see license information for each module.

Added: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml	                        (rev 0)
+++ trunk/openutils-backup/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -0,0 +1,37 @@
+<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>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-backup</artifactId>
+  <name>openutils data backup</name>
+  <version>1.0-SNAPSHOT</version>
+  <description />
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.0.1</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>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-backup/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-bshd5/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -3,8 +3,8 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>2</version>
-    <relativePath>../openutils-parent</relativePath>
+    <version>3</version>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>


Property changes on: trunk/openutils-dbmigration
___________________________________________________________________
Name: svn:ignore
   + target


Added: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	                        (rev 0)
+++ trunk/openutils-dbmigration/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -0,0 +1,37 @@
+<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>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-dbmigration</artifactId>
+  <name>openutils db migration framework</name>
+  <version>1.0-SNAPSHOT</version>
+  <description />
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.0.1</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>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-dbmigration/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-deployment/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -3,8 +3,8 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>2</version>
-    <relativePath>../openutils-parent</relativePath>
+    <version>3</version>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-deployment</artifactId>
   <name>openutils deployment tools</name>

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-log4j/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -4,8 +4,8 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>2</version>
-    <relativePath>../openutils-parent</relativePath>
+    <version>3</version>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-log4j</artifactId>
   <packaging>jar</packaging>

Deleted: trunk/openutils-parent/LICENSE.txt
===================================================================
--- trunk/openutils-parent/LICENSE.txt	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-parent/LICENSE.txt	2007-01-04 14:15:02 UTC (rev 144)
@@ -1,3 +0,0 @@
-
-   Opentils modules are released under different licenses.
-   Please see license information for each module.

Deleted: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-parent/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -1,131 +0,0 @@
-<?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 ">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>net.sourceforge.openutils</groupId>
-  <artifactId>openutils</artifactId>
-  <packaging>pom</packaging>
-  <version>2</version>
-  <name>openutils</name>
-  <description>openutils parent POM</description>
-  <url>http://openutils.sourceforge.net</url>
-  <issueManagement>
-    <system>sourceforge</system>
-    <url>http://sourceforge.net/tracker/?group_id=150467&amp;atid=784057</url>
-  </issueManagement>
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-site</connection>
-    <developerConnection>
-      scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-site
-    </developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-site</url>
-  </scm>
-  <organization>
-    <name>Openmind</name>
-    <url>http://www.openmindonline.it</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>fgiust</id>
-      <name>Fabrizio Giustina</name>
-      <email>fg...@ap...</email>
-      <organization>openmind</organization>
-      <roles>
-        <role>Project admin and developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>ronya_z</id>
-      <name>Daniela Fuscio</name>
-      <email>dan...@op...</email>
-      <organization>openmind</organization>
-      <roles>
-        <role>developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>fberar</id>
-      <name>Fabrizio Berardi</name>
-      <email>fab...@op...</email>
-      <organization>openmind</organization>
-      <roles>
-        <role>developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changes-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changelog-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-  <distributionManagement>
-    <site>
-      <id>sourceforge</id>
-      <name>sourceforge</name>
-      <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://shell.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>
-    </snapshotRepository>
-  </distributionManagement>
-  <modules>
-    <module>../openutils-bshd5</module>
-    <module>../openutils-deployment</module>
-    <module>../openutils-log4j</module>
-    <module>../openutils-spring</module>
-    <module>../openutils-usermanagement-dataobjects</module>
-    <module>../openutils-usermanagement</module>
-    <module>../openutils-testing</module>
-  </modules>
-</project>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-spring/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -3,8 +3,8 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>2</version>
-    <relativePath>../openutils-parent</relativePath>
+    <version>3</version>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-spring</artifactId>
   <name>openutils spring tools</name>


Property changes on: trunk/openutils-tags-spring
___________________________________________________________________
Name: svn:ignore
   + target


Added: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml	                        (rev 0)
+++ trunk/openutils-tags-spring/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -0,0 +1,13 @@
+<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>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-tags-spring</artifactId>
+  <name>openutils tags for spring MVC</name>
+  <version>1.0-SNAPSHOT</version>
+  <description />
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-tags-spring/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-testing/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -3,8 +3,8 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>2</version>
-    <relativePath>../openutils-parent</relativePath>
+    <version>3</version>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>openutils-testing</artifactId>
   <name>openutils test utils</name>

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-usermanagement/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -4,8 +4,8 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>2</version>
-    <relativePath>../openutils-parent</relativePath>
+    <version>3</version>
+    <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>
   <artifactId>openutils-usermanagement</artifactId>

Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -3,8 +3,8 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
-    <version>2</version>
-    <relativePath>../openutils-parent</relativePath>
+    <version>3</version>
+    <relativePath>..</relativePath>
   </parent>
   <groupId>net.sourceforge.openutils</groupId>
   <artifactId>openutils-usermanagement-dataobjects</artifactId>


Property changes on: trunk/openutils-web
___________________________________________________________________
Name: svn:ignore
   + target


Added: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml	                        (rev 0)
+++ trunk/openutils-web/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -0,0 +1,43 @@
+<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>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-web</artifactId>
+  <name>openutils generic web utilities</name>
+  <version>1.0-SNAPSHOT</version>
+  <description />
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <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>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-web/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Copied: trunk/pom.xml (from rev 141, trunk/openutils-parent/pom.xml)
===================================================================
--- trunk/pom.xml	                        (rev 0)
+++ trunk/pom.xml	2007-01-04 14:15:02 UTC (rev 144)
@@ -0,0 +1,135 @@
+<?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 ">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sourceforge.openutils</groupId>
+  <artifactId>openutils</artifactId>
+  <packaging>pom</packaging>
+  <version>3</version>
+  <name>openutils</name>
+  <description>openutils parent POM</description>
+  <url>http://openutils.sourceforge.net</url>
+  <issueManagement>
+    <system>sourceforge</system>
+    <url>http://sourceforge.net/tracker/?group_id=150467&amp;atid=784057</url>
+  </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk</connection>
+    <developerConnection>
+      scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk
+    </developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk</url>
+  </scm>
+  <organization>
+    <name>Openmind</name>
+    <url>http://www.openmindonline.it</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>fgiust</id>
+      <name>Fabrizio Giustina</name>
+      <email>fg...@ap...</email>
+      <organization>openmind</organization>
+      <roles>
+        <role>Project admin and developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>ronya_z</id>
+      <name>Daniela Fuscio</name>
+      <email>dan...@op...</email>
+      <organization>openmind</organization>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>fberar</id>
+      <name>Fabrizio Berardi</name>
+      <email>fab...@op...</email>
+      <organization>openmind</organization>
+      <roles>
+        <role>developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+  </developers>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-changes-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-changelog-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+  <distributionManagement>
+    <site>
+      <id>sourceforge</id>
+      <name>sourceforge</name>
+      <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://shell.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>
+    </snapshotRepository>
+  </distributionManagement>
+  <modules>
+    <module>openutils-bshd5</module>
+    <module>openutils-deployment</module>
+    <module>openutils-log4j</module>
+    <module>openutils-spring</module>
+    <module>openutils-usermanagement-dataobjects</module>
+    <module>openutils-usermanagement</module>
+    <module>openutils-testing</module>
+    <module>openutils-web</module>
+    <module>openutils-tags-spring</module>
+    <module>openutils-dbmigration</module>
+    <module>openutils-backup</module>
+  </modules>
+</project>

Copied: trunk/src (from rev 109, trunk/openutils-parent/src)


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

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

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

Revision: 143
          http://svn.sourceforge.net/openutils/?rev=143&view=rev
Author:   fgiust
Date:     2006-12-10 09:38:08 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
upgrade libs

Modified Paths:
--------------
    trunk/openutils-deployment/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing/pom.xml

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2006-12-10 17:37:01 UTC (rev 142)
+++ trunk/openutils-deployment/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>2.0</version>
+      <version>2.0.1</version>
       <optional>true</optional>
       <exclusions>
         <exclusion>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2006-12-10 17:37:01 UTC (rev 142)
+++ trunk/openutils-spring/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>2.0</version>
+      <version>2.0.1</version>
       <optional>true</optional>
       <exclusions>
         <exclusion>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2006-12-10 17:37:01 UTC (rev 142)
+++ trunk/openutils-testing/pom.xml	2006-12-10 17:38:08 UTC (rev 143)
@@ -19,23 +19,23 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>2.0</version>
+      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>2.0</version>
+      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-hibernate3</artifactId>
-      <version>2.0</version>
+      <version>2.0.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>dbunit</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: [142] trunk/openutils-bshd5/pom.xml

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

Revision: 142
          http://svn.sourceforge.net/openutils/?rev=142&view=rev
Author:   fgiust
Date:     2006-12-10 09:37:01 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
upgrade libs

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

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2006-12-10 17:36:38 UTC (rev 141)
+++ trunk/openutils-bshd5/pom.xml	2006-12-10 17:37:01 UTC (rev 142)
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-hibernate3</artifactId>
-      <version>2.0</version>
+      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate</artifactId>
-      <version>3.2.0.cr5</version>
+      <version>3.2.1.ga</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</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: [141] trunk

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

Revision: 141
          http://svn.sourceforge.net/openutils/?rev=141&view=rev
Author:   fgiust
Date:     2006-12-10 09:36:38 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
upgrade to acegi 1.0.3

Modified Paths:
--------------
    trunk/openutils-parent/pom.xml
    trunk/openutils-usermanagement/pom.xml
    trunk/openutils-usermanagement-dataobjects/pom.xml

Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml	2006-12-09 20:18:26 UTC (rev 140)
+++ trunk/openutils-parent/pom.xml	2006-12-10 17:36:38 UTC (rev 141)
@@ -14,11 +14,11 @@
     <url>http://sourceforge.net/tracker/?group_id=150467&amp;atid=784057</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://svn.sourceforge.net/svnroot/openutils/trunk/openutils-site</connection>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-site</connection>
     <developerConnection>
-      scm:svn:https://svn.sourceforge.net/svnroot/openutils/trunk/openutils-site
+      scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-site
     </developerConnection>
-    <url>http://svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-site</url>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-site</url>
   </scm>
   <organization>
     <name>Openmind</name>

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2006-12-09 20:18:26 UTC (rev 140)
+++ trunk/openutils-usermanagement/pom.xml	2006-12-10 17:36:38 UTC (rev 141)
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3</version>
       <exclusions>
         <exclusion>
           <groupId>org.springframework</groupId>

Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml	2006-12-09 20:18:26 UTC (rev 140)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml	2006-12-10 17:36:38 UTC (rev 141)
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3</version>
       <exclusions>
         <exclusion>
           <groupId>org.springframework</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: [140] trunk/openutils-bshd5/pom.xml

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

Revision: 140
          http://svn.sourceforge.net/openutils/?rev=140&view=rev
Author:   fgiust
Date:     2006-12-09 12:18:26 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

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

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2006-12-09 20:18:16 UTC (rev 139)
+++ trunk/openutils-bshd5/pom.xml	2006-12-09 20:18:26 UTC (rev 140)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>
-  <version>1.0.3</version>
+  <version>1.0.4-SNAPSHOT</version>
   <description>openutils base Spring-Hibernate DAO for java 5.0</description>
   <dependencies>
     <dependency>
@@ -43,10 +43,4 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.3</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.3</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.0.3</url>
-  </scm>
 </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.