openutils-svn — developer list with svn commits

[Openutils-svn] SF.net SVN: openutils: [645] trunk/openutils-hibernate-security/src/test/ java/it/openutils/hibernate/security/services/impl/

[<fc...@us...>]

Revision: 645
          http://openutils.svn.sourceforge.net/openutils/?rev=645&view=rev
Author:   fcarone
Date:     2008-02-19 10:28:34 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
Remove empty test

Removed Paths:
-------------
    trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/services/impl/


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

[Openutils-svn] SF.net SVN: openutils: [644] trunk/openutils-hibernate-security/src/main/ java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter .java

[<fc...@us...>]

Revision: 644
          http://openutils.svn.sourceforge.net/openutils/?rev=644&view=rev
Author:   fcarone
Date:     2008-02-19 09:44:08 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
more logging and some minor refactorings

Modified Paths:
--------------
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java	2008-02-19 17:43:17 UTC (rev 643)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java	2008-02-19 17:44:08 UTC (rev 644)
@@ -22,6 +22,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
@@ -56,16 +57,20 @@
      */
     public boolean supports(ConfigAttribute attribute)
     {
+        log.debug("Evaluating attribute {}", attribute.getAttribute());
+
         if (attribute.getAttribute() != null)
         {
             for (PermissionEnum permission : PermissionEnum.values())
             {
                 if (StringUtils.equals(permission.getValue(), attribute.getAttribute()))
                 {
+                    log.debug("Support ok.");
                     return true;
                 }
             }
         }
+        log.debug("Not supporting attribute.");
         return false;
     }
 
@@ -84,15 +89,14 @@
     public int vote(Authentication authentication, Object object, ConfigAttributeDefinition config)
     {
         List<String> roles = new ArrayList<String>();
-        for (GrantedAuthority authority : authentication.getAuthorities())
-        {
-            roles.add(authority.getAuthority());
-        }
+        roles.addAll(getRolesFromAuthentication(authentication));
+
         if (object instanceof ReflectiveMethodInvocation)
         {
             ReflectiveMethodInvocation methodInvocation = ((ReflectiveMethodInvocation) object);
             for (Object argument : methodInvocation.getArguments())
             {
+                log.debug("Evaluating argument {}", argument);
                 List<SecurityRule> rules = securityRuleManager.getRulesForRoles(argument.getClass().getName(), roles);
                 boolean permissionMatches = checkPermissions(rules, config);
                 if (!permissionMatches)
@@ -112,12 +116,28 @@
     }
 
     /**
+     * @param authentication
+     * @return
+     */
+    private Collection< ? extends String> getRolesFromAuthentication(Authentication authentication)
+    {
+        List<String> roles = new ArrayList<String>();
+        for (GrantedAuthority authority : authentication.getAuthorities())
+        {
+            log.debug("Granted authority for user {}: {}", authentication.getName(), authority.getAuthority());
+            roles.add(authority.getAuthority());
+        }
+        return roles;
+    }
+
+    /**
      * @param rules
      * @param argument
      * @return
      */
     private boolean checkRules(List<SecurityRule> rules, Object argument)
     {
+        log.debug("Evaluating rules.");
         try
         {
             for (SecurityRule rule : rules)
@@ -127,13 +147,15 @@
                 {
                     if (StringUtils.equals(objProperty, rule.getValue()))
                     {
+                        log.debug("Matching rule found: {}", rule);
                         return true;
                     }
                 }
                 else if (rule.getModifier() == ModifierEnum.NOT)
                 {
-                    if (StringUtils.equals(objProperty, rule.getValue()))
+                    if (!StringUtils.equals(objProperty, rule.getValue()))
                     {
+                        log.debug("Matching rule found: {}", rule);
                         return true;
                     }
                 }
@@ -155,6 +177,7 @@
         {
             log.error("{}", e);
         }
+        log.debug("No matching rules found.");
         return false;
     }
 
@@ -166,6 +189,7 @@
     @SuppressWarnings("unchecked")
     private boolean checkPermissions(List<SecurityRule> rules, ConfigAttributeDefinition config)
     {
+        log.debug("Evaluation permissions");
         Iterator iterator = config.getConfigAttributes();
         while (iterator.hasNext())
         {
@@ -176,11 +200,13 @@
                 {
                     if (StringUtils.equals(permission.getValue(), attribute))
                     {
+                        log.debug("Matching permission: {}", permission.getValue());
                         return true;
                     }
                 }
             }
         }
+        log.debug("No matching permissions found.");
         return false;
     }
 


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

[Openutils-svn] SF.net SVN: openutils: [643] trunk/openutils-hibernate-security/src/main/ java/it/openutils/hibernate/security/filter/JavaBeanFilter.java

[<fc...@us...>]

Revision: 643
          http://openutils.svn.sourceforge.net/openutils/?rev=643&view=rev
Author:   fcarone
Date:     2008-02-19 09:43:17 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
Use a stringbuffer during filter construction

Modified Paths:
--------------
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java	2008-02-19 17:42:20 UTC (rev 642)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java	2008-02-19 17:43:17 UTC (rev 643)
@@ -65,17 +65,17 @@
 
         if (!beanClass.isAnnotationPresent(Entity.class))
         {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("Class " + bean + " must contain the @Entity annotation.");
         }
         if (!(beanClass.isAnnotationPresent(Table.class) || beanClass
             .isAnnotationPresent(org.hibernate.annotations.Table.class)))
         {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("Class " + bean + " must contain the @Table annotation.");
         }
 
         Map<String, String> propertyColumnMap = new HashMap<String, String>();
 
-        String filterDefCondition = StringUtils.EMPTY;
+        StringBuffer filterDefCondition = new StringBuffer();
         String filterName = StringUtils.EMPTY;
 
         Map<String, List<SecurityRule>> roleRuleMap = new LinkedHashMap<String, List<SecurityRule>>();
@@ -93,12 +93,12 @@
             filterName += entry.getKey();
 
             List<SecurityRule> rules = entry.getValue();
-            if (!StringUtils.isEmpty(filterDefCondition))
+            if (!StringUtils.isEmpty(filterDefCondition.toString()))
             {
-                filterDefCondition += " OR ";
+                filterDefCondition.append(" OR ");
             }
-            filterDefCondition += "(";
-            String subFilterCond = StringUtils.EMPTY;
+            filterDefCondition.append("(");
+            StringBuffer subFilterCond = new StringBuffer();
             for (SecurityRule securityRule : rules)
             {
                 String property = securityRule.getProperty();
@@ -108,47 +108,59 @@
 
                 // @todo: annotations may also be defined on getters/setters...
                 propertyColumnMap.put(property, field.getAnnotation(Column.class).name());
-                if (!StringUtils.isEmpty(subFilterCond))
+                if (!StringUtils.isEmpty(subFilterCond.toString()))
                 {
-                    subFilterCond += " AND ";
+                    subFilterCond.append(" AND ");
                 }
                 String modifier = null;
                 String startQuote = null;
                 String endQuote = null;
+
+                if (field.getType().isAssignableFrom(String.class))
+                {
+                    startQuote = "\'";
+                    endQuote = startQuote;
+                }
+                else if (field.getType().getSuperclass().isAssignableFrom(Number.class))
+                {
+                    startQuote = StringUtils.EMPTY;
+                    endQuote = StringUtils.EMPTY;
+                }
+
                 switch (securityRule.getModifier())
                 {
                     case EQUALS :
                         modifier = " = ";
-                        startQuote = "\'";
-                        endQuote = startQuote;
                         break;
 
                     case NOT :
                         modifier = " != ";
-                        startQuote = "\'";
-                        endQuote = startQuote;
                         break;
 
                     default :
-                        throw new IllegalArgumentException("Modifier " + securityRule.getModifier() + "not recognized");
+                        throw new IllegalArgumentException("Modifier " + securityRule.getModifier() + "not recognized.");
                 }
-                subFilterCond += field.getAnnotation(Column.class).name()
-                    + modifier
-                    + startQuote
-                    + securityRule.getValue()
-                    + endQuote;
+                subFilterCond.append(field.getAnnotation(Column.class).name());
+                subFilterCond.append(modifier);
+                if (StringUtils.isNotEmpty(startQuote))
+                {
+                    subFilterCond.append(startQuote);
+                }
+                subFilterCond.append(securityRule.getValue());
+                if (StringUtils.isNotEmpty(endQuote))
+                {
+                    subFilterCond.append(endQuote);
+                }
 
                 filterName += securityRule.getValue();
             }
-            filterDefCondition += subFilterCond;
-            filterDefCondition += ")";
+            filterDefCondition.append(subFilterCond);
+            filterDefCondition.append(")");
         }
 
         // filtername is unique, but untraceable
-        this.filterDefinition = new FilterDefinition(
-            Integer.toString(filterName.hashCode()),
-            filterDefCondition,
-            new HashMap());
+        this.filterDefinition = new FilterDefinition(Integer.toString(filterName.hashCode()), filterDefCondition
+            .toString(), new HashMap());
     }
 
     /**


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

[Openutils-svn] SF.net SVN: openutils: [642] trunk/openutils-hibernate-security/src/main/ java/it/openutils/hibernate/security/aop/AOPSecurity.java

[<fc...@us...>]

Revision: 642
          http://openutils.svn.sourceforge.net/openutils/?rev=642&view=rev
Author:   fcarone
Date:     2008-02-19 09:42:20 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
conservative logging

Modified Paths:
--------------
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java	2008-02-19 16:01:18 UTC (rev 641)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java	2008-02-19 17:42:20 UTC (rev 642)
@@ -97,17 +97,19 @@
 
         if (rules.isEmpty())
         {
-            String grantedRoles = StringUtils.EMPTY;
-            for (int i = 0; i < authorities.length; i++)
+            if (log.isWarnEnabled())
             {
-                grantedRoles += authorities[i].getAuthority() + " ";
+                String grantedRoles = StringUtils.EMPTY;
+                for (int i = 0; i < authorities.length; i++)
+                {
+                    grantedRoles += authorities[i].getAuthority() + " ";
+                }
+                log.warn("Access is denied on " + entity + ", for user {} with roles {}", SecurityContextHolder
+                    .getContext()
+                    .getAuthentication()
+                    .getPrincipal()
+                    .toString(), grantedRoles);
             }
-            log.warn("Access is denied on " + entity + ", for user {} with roles {}", SecurityContextHolder
-                .getContext()
-                .getAuthentication()
-                .getPrincipal()
-                .toString(), grantedRoles);
-
             throw new SecurityException("Access denied");
         }
 
@@ -142,7 +144,6 @@
         this.securedDAOs = securedDAOs;
     }
 
-
     /**
      * Sets the enabled.
      * @param enabled the enabled to set


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

[Openutils-svn] SF.net SVN: openutils: [641] trunk/openutils-hibernate-security/

[<fc...@us...>]

Revision: 641
          http://openutils.svn.sourceforge.net/openutils/?rev=641&view=rev
Author:   fcarone
Date:     2008-02-19 08:01:18 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
ignore tests generated files

Property Changed:
----------------
    trunk/openutils-hibernate-security/


Property changes on: trunk/openutils-hibernate-security
___________________________________________________________________
Name: svn:ignore
   - target
.settings
.checkstyle
.classpath
.project
derby.log
test-output

   + target
.settings
.checkstyle
.classpath
.project
derby.log
test-output
temp-testng-customsuite.xml



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

[Openutils-svn] SF.net SVN: openutils: [640] trunk/openutils-hibernate-security

[<fc...@us...>]

Revision: 640
          http://openutils.svn.sourceforge.net/openutils/?rev=640&view=rev
Author:   fcarone
Date:     2008-02-19 07:36:46 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
SecurityIntegrationTest updated

Modified Paths:
--------------
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java
    trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java
    trunk/openutils-hibernate-security/src/test/resources/SecurityIntegrationTest-load.xml
    trunk/openutils-hibernate-security/src/test/resources/log4j.xml
    trunk/openutils-hibernate-security/src/test/resources/spring-dao.xml
    trunk/openutils-hibernate-security/src/test/resources/spring-database.xml
    trunk/openutils-hibernate-security/src/test/resources/spring-hibernate.xml
    trunk/openutils-hibernate-security/src/test/resources/spring-managers.xml
    trunk/openutils-hibernate-security/src/test/resources/spring-security.xml
    trunk/openutils-hibernate-security/src/test/resources/spring-tests.xml

Property Changed:
----------------
    trunk/openutils-hibernate-security/


Property changes on: trunk/openutils-hibernate-security
___________________________________________________________________
Name: svn:ignore
   - target
.settings
.checkstyle
.classpath
.project
derby.log

   + target
.settings
.checkstyle
.classpath
.project
derby.log
test-output


Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/aop/AOPSecurity.java	2008-02-19 15:36:46 UTC (rev 640)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package it.openutils.hibernate.security.aop;
 

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java	2008-02-19 15:36:46 UTC (rev 640)
@@ -32,7 +32,6 @@
 import org.acegisecurity.vote.AccessDecisionVoter;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.enums.EnumUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.ReflectiveMethodInvocation;

Modified: trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java
===================================================================
--- trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java	2008-02-19 15:36:46 UTC (rev 640)
@@ -3,24 +3,31 @@
 import it.openutils.hibernate.example.FilterMetadata;
 import it.openutils.hibernate.security.apptest.DummyDAO;
 import it.openutils.hibernate.security.apptest.DummyDataobject;
-import it.openutils.testing.junit.DbUnitTestCase;
+import it.openutils.hibernate.security.apptest.DummyObjectManager;
+import it.openutils.testing.DbUnitExecution;
+import it.openutils.testing.junit.AbstractDbUnitJunitSpringContextTests;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import org.acegisecurity.AccessDeniedException;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContextHolder;
 import org.acegisecurity.context.SecurityContextImpl;
 import org.acegisecurity.providers.AuthenticationProvider;
 import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.dbunit.database.DatabaseConfig;
-import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.operation.InsertOperation;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.junit.Assert;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /*
@@ -31,28 +38,27 @@
  * @author fcarone
  * @version $Id: $
  */
-public class SecurityIntegrationTest extends DbUnitTestCase
+@ContextConfiguration(locations = {"/spring-tests.xml" })
+@DbUnitExecution(datasets = {"/SecurityIntegrationTest-load.xml" }, dataSource = "dataSource", //
+    dataTypeFactory = HsqlDatatypeFactory.class,
+    insertOperation = InsertOperation.class)
+@TestExecutionListeners({TransactionalTestExecutionListener.class })
+@Transactional
+@TransactionConfiguration(transactionManager = "transactionManager")
+public class SecurityIntegrationTest extends AbstractDbUnitJunitSpringContextTests
 {
 
+    @Autowired
     private DummyDAO securedObject;
 
+    @Autowired
+    private AuthenticationProvider authenticationProvider;
 
+    @Autowired
+    private DummyObjectManager dummyObjectManager;
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected IDatabaseConnection createConnection() throws SQLException
-    {
-        IDatabaseConnection connection = super.createConnection();
-        DatabaseConfig config = connection.getConfig();
-        config.setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new HsqlDatatypeFactory());
-        return connection;
-    }
-
     private void authenticate(String username, String password)
     {
-        AuthenticationProvider authenticationProvider = (AuthenticationProvider) ctx.getBean("authenticationProvider");
         Authentication authentication = new UsernamePasswordAuthenticationToken(username, password);
         authentication = authenticationProvider.authenticate(authentication);
         SecurityContextImpl sci = new SecurityContextImpl();
@@ -70,7 +76,6 @@
         authenticate("UserUno", "password");
 
         // test
-        securedObject = (DummyDAO) ctx.getBean("dummyDAO");
         DummyDataobject filter = new DummyDataobject();
         List<DummyDataobject> dummyObjects = securedObject.findFiltered(
             filter,
@@ -80,11 +85,134 @@
             0,
             new ArrayList<Criterion>());
         Assert.assertNotNull(dummyObjects);
+        Assert.assertEquals(1, dummyObjects.size());
 
         dummyObjects = securedObject.findFiltered(filter);
         Assert.assertNotNull(dummyObjects);
         Assert.assertEquals(1, dummyObjects.size());
+    }
 
+    /**
+     * @throws Exception Any exception
+     */
+    @Test
+    public void testUpdateOK() throws Exception
+    {
+        authenticate("UserUno", "password");
+        DummyDataobject filter = new DummyDataobject();
+        List<DummyDataobject> dummyObjects = securedObject.findFiltered(filter);
+        Assert.assertNotNull(dummyObjects);
+        DummyDataobject ddo = dummyObjects.get(0);
+
+        ddo.setStringValue("ModifiedValue");
+
+        dummyObjectManager.update(ddo);
     }
 
+    /**
+     * @throws Exception Any exception
+     */
+    @Test(expected = AccessDeniedException.class)
+    public void testUpdateNoGo() throws Exception
+    {
+        authenticate("UserDue", "password");
+        DummyDataobject filter = new DummyDataobject();
+        List<DummyDataobject> dummyObjects = securedObject.findFiltered(filter);
+        Assert.assertNotNull(dummyObjects);
+        DummyDataobject ddo = dummyObjects.get(0);
+
+        ddo.setStringValue("ModifiedValue");
+
+        dummyObjectManager.update(ddo);
+    }
+
+    /**
+     * @throws Exception Any exception
+     */
+    @Test
+    public void testDeleteOk() throws Exception
+    {
+        authenticate("UserUno", "password");
+        DummyDataobject filter = new DummyDataobject();
+        List<DummyDataobject> dummyObjects = securedObject.findFiltered(filter);
+        Assert.assertNotNull(dummyObjects);
+        DummyDataobject ddo = dummyObjects.get(0);
+
+        dummyObjectManager.delete(ddo);
+    }
+
+    /**
+     * @throws Exception Any exception
+     */
+    @Test(expected = AccessDeniedException.class)
+    public void testDeleteNoGo() throws Exception
+    {
+        authenticate("UserDue", "password");
+        DummyDataobject filter = new DummyDataobject();
+        List<DummyDataobject> dummyObjects = securedObject.findFiltered(filter);
+        Assert.assertNotNull(dummyObjects);
+        DummyDataobject ddo = dummyObjects.get(0);
+
+        dummyObjectManager.delete(ddo);
+    }
+
+    /**
+     * @throws Exception Any exception
+     */
+    @Test(expected = AccessDeniedException.class)
+    public void testCreateNoGo() throws Exception
+    {
+        authenticate("UserUno", "password");
+        DummyDataobject filter = new DummyDataobject();
+        List<DummyDataobject> dummyObjects = securedObject.findFiltered(filter);
+        Assert.assertNotNull(dummyObjects);
+        DummyDataobject ddo = dummyObjects.get(0);
+
+        dummyObjectManager.create(ddo);
+    }
+
+    /**
+     * @throws Exception Any exception
+     */
+    @Test
+    public void testCreateOk() throws Exception
+    {
+        authenticate("UserDue", "password");
+        DummyDataobject filter = new DummyDataobject();
+        List<DummyDataobject> dummyObjects = securedObject.findFiltered(filter);
+        Assert.assertNotNull(dummyObjects);
+        DummyDataobject ddo = dummyObjects.get(0);
+
+        dummyObjectManager.create(ddo);
+    }
+
+    /**
+     * Sets the securedObject.
+     * @param securedObject the securedObject to set
+     */
+    public void setSecuredObject(DummyDAO securedObject)
+    {
+        this.securedObject = securedObject;
+    }
+
+
+    /**
+     * Sets the authenticationProvider.
+     * @param authenticationProvider the authenticationProvider to set
+     */
+    public void setAuthenticationProvider(AuthenticationProvider authenticationProvider)
+    {
+        this.authenticationProvider = authenticationProvider;
+    }
+
+
+    /**
+     * Sets the dummyObjectManager.
+     * @param dummyObjectManager the dummyObjectManager to set
+     */
+    public void setDummyObjectManager(DummyObjectManager dummyObjectManager)
+    {
+        this.dummyObjectManager = dummyObjectManager;
+    }
+
 }

Modified: trunk/openutils-hibernate-security/src/test/resources/SecurityIntegrationTest-load.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/SecurityIntegrationTest-load.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/SecurityIntegrationTest-load.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -65,7 +65,7 @@
             <value>GRUPPOUNO</value>
         </row>
         <row>
-            <value>UserUno</value>
+            <value>UserDue</value>
             <value>GRUPPODUE</value>
         </row>
     </table>
@@ -101,6 +101,22 @@
             <value>1</value>
             <value>EQUALS</value>
         </row>
+        <row>
+            <value>2</value>
+            <value>RoleDue</value>
+            <value>it.openutils.hibernate.security.apptest.DummyDataobject</value>
+            <value>intValue</value>
+            <value>1</value>
+            <value>EQUALS</value>
+        </row>
+        <row>
+            <value>3</value>
+            <value>RoleTre</value>
+            <value>it.openutils.hibernate.security.apptest.DummyDataobject</value>
+            <value>intValue</value>
+            <value>1</value>
+            <value>EQUALS</value>
+        </row>
     </table>
     <table name="SECRULE_PERMISSION">
         <column>ID_SECURITY_RULE</column>
@@ -109,6 +125,22 @@
             <value>1</value>
             <value>LOAD</value>
         </row>
+        <row>
+            <value>1</value>
+            <value>MODIFY</value>
+        </row>
+        <row>
+            <value>2</value>
+            <value>DELETE</value>
+        </row>
+        <row>
+            <value>3</value>
+            <value>LOAD</value>
+        </row>
+        <row>
+            <value>3</value>
+            <value>CREATE</value>
+        </row>
     </table>
     <table name="DUMMYDATAOBJECT">
         <column>ID</column>

Modified: trunk/openutils-hibernate-security/src/test/resources/log4j.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/log4j.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/log4j.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -38,9 +38,12 @@
     <category name="it.openutils.dbupdate.DbSetupManagerImpl">
         <priority value="INFO" />
     </category>
-    <category name="it.openutils.hibernate.security.aop">
+    <category name="it.openutils.hibernate.security">
         <priority value="DEBUG" />
     </category>
+    <category name="org.acegisecurity">
+        <priority value="DEBUG" />
+    </category>
     <root>
         <priority value="debug" />
         <appender-ref ref="test-appender" />

Modified: trunk/openutils-hibernate-security/src/test/resources/spring-dao.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/spring-dao.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/spring-dao.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
   <bean id="userDAO" parent="txProxyTemplate">
     <property name="target">
       <bean class="it.openutils.usermanagement.dao.UserDAOImpl">
@@ -9,18 +9,19 @@
       </bean>
     </property>
   </bean>
-  <bean id="securityRuleDAO" parent="txProxyTemplate">
-    <property name="target">
-      <bean class="it.openutils.hibernate.security.dao.impl.SecurityRuleDAOImpl">
-        <property name="sessionFactory" ref="sessionFactory" />
-      </bean>
-    </property>
+  <bean id="securityRuleDAO" parent="txProxyTemplate">
+    <property name="target">
+      <bean class="it.openutils.hibernate.security.dao.impl.SecurityRuleDAOImpl">
+        <property name="sessionFactory" ref="sessionFactory" />
+      </bean>
+    </property>
   </bean>
   <bean id="dummyDAO" parent="txProxyTemplate">
     <property name="target">
       <bean class="it.openutils.hibernate.security.apptest.DummyDaoImpl">
         <property name="sessionFactory" ref="sessionFactory" />
+        <property name="aopenabled" value="true" />
       </bean>
     </property>
-  </bean>
+  </bean>
 </beans>
\ No newline at end of file

Modified: trunk/openutils-hibernate-security/src/test/resources/spring-database.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/spring-database.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/spring-database.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
     <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="location">
             <value>classpath:database.properties</value>

Modified: trunk/openutils-hibernate-security/src/test/resources/spring-hibernate.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/spring-hibernate.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/spring-hibernate.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
     <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
         <property name="dataSource">

Modified: trunk/openutils-hibernate-security/src/test/resources/spring-managers.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/spring-managers.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/spring-managers.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -1,17 +1,49 @@
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-  <bean id="securityRuleManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
-    autowire="byType">
-    <property name="transactionManager">
-      <ref bean="transactionManager" />
-    </property>
-    <property name="transactionAttributes">
-      <props>
-        <prop key="*">PROPAGATION_REQUIRED</prop>
-      </props>
-    </property>
-    <property name="target">
-      <bean class="it.openutils.hibernate.security.services.impl.SecurityRuleManagerImpl" autowire="byType"></bean>
-    </property>
-  </bean>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+  <bean id="securityRuleManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+    <property name="transactionManager">
+      <ref bean="transactionManager" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="*">PROPAGATION_REQUIRED</prop>
+      </props>
+    </property>
+    <property name="target">
+      <bean class="it.openutils.hibernate.security.services.impl.SecurityRuleManagerImpl" autowire="byType"></bean>
+    </property>
+  </bean>
+  <bean id="dummyObjectManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+    <property name="transactionManager">
+      <ref bean="transactionManager" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="*">PROPAGATION_REQUIRED</prop>
+      </props>
+    </property>
+    <property name="target">
+      <bean class="it.openutils.hibernate.security.apptest.DummyObjectManagerImpl">
+        <property name="dummyDAO" ref="dummyDAO" />
+      </bean>
+    </property>
+  </bean>
+  <bean id="userManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+    <property name="transactionManager">
+      <ref bean="transactionManager" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="*">PROPAGATION_REQUIRED</prop>
+      </props>
+    </property>
+    <property name="target">
+      <bean class="it.openutils.usermanagement.manager.UserManagerImpl">
+        <property name="passwordEncoder" ref="passwordEncoder" />
+        <property name="userDAO" ref="userDAO" />
+      </bean>
+    </property>
+  </bean>
 </beans>
\ No newline at end of file

Modified: trunk/openutils-hibernate-security/src/test/resources/spring-security.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/spring-security.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/spring-security.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+  xmlns:util="http://www.springframework.org/schema/util" xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+     http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
   <aop:aspectj-autoproxy />
+
   <bean id="securityAspect" class="it.openutils.hibernate.security.aop.AOPSecurity">
     <property name="securityRuleManager" ref="securityRuleManager" />
     <property name="enabled" value="true" />
@@ -12,26 +15,60 @@
       </list>
     </property>
   </bean>
+
   <bean id="passwordEncoder" class="org.acegisecurity.providers.encoding.ShaPasswordEncoder" />
+
   <bean id="userDetailsService" class="it.openutils.usermanagement.acegi.HibernateUserDetailsServiceImpl"
     autowire="byType">
     <property name="userDao" ref="userDAO" />
   </bean>
-  <bean id="authenticationProvider" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
-    <property name="targetName" value="authenticationProviderDB" />
+
+  <bean id="authenticationProviderDB" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"
+    lazy-init="true">
+    <property name="userDetailsService" ref="userDetailsService" />
+    <property name="passwordEncoder" ref="passwordEncoder" />
   </bean>
+
+  <bean id="authenticationManager" class="org.acegisecurity.MockAuthenticationManager" />
+
   <bean id="roleVoter" class="org.acegisecurity.vote.RoleVoter" />
-  <bean id="accessDecisionManager" class="org.acegisecurity.vote.AffirmativeBased">
+
+  <bean id="securityRuleVoter" class="it.openutils.hibernate.security.filter.SecurityRuleAccessDecisionVoter">
+    <property name="securityRuleManager" ref="securityRuleManager" />
+  </bean>
+
+  <bean id="accessDecisionManager" class="org.acegisecurity.vote.UnanimousBased">
     <property name="allowIfAllAbstainDecisions" value="false" />
     <property name="decisionVoters">
       <list>
         <ref bean="roleVoter" />
+        <ref bean="securityRuleVoter" />
       </list>
     </property>
   </bean>
-  <bean id="authenticationProviderDB" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"
-    lazy-init="true">
-    <property name="userDetailsService" ref="userDetailsService" />
-    <property name="passwordEncoder" ref="passwordEncoder" />
+
+  <bean id="securityInterceptor" class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+    <property name="authenticationManager" ref="authenticationManager" />
+    <property name="accessDecisionManager" ref="accessDecisionManager" />
+    <property name="objectDefinitionSource">
+      <value>
+        it.openutils.hibernate.security.apptest.DummyObjectManager.update=MODIFY
+        it.openutils.hibernate.security.apptest.DummyObjectManager.create=CREATE
+        it.openutils.hibernate.security.apptest.DummyObjectManager.delete=DELETE
+      </value>
+    </property>
   </bean>
+
+  <bean class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
+    <property name="beanNames">
+      <list>
+        <idref bean="dummyObjectManager" />
+      </list>
+    </property>
+    <property name="interceptorNames">
+      <list>
+        <value>securityInterceptor</value>
+      </list>
+    </property>
+  </bean>
 </beans>

Modified: trunk/openutils-hibernate-security/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-hibernate-security/src/test/resources/spring-tests.xml	2008-02-19 15:34:28 UTC (rev 639)
+++ trunk/openutils-hibernate-security/src/test/resources/spring-tests.xml	2008-02-19 15:36:46 UTC (rev 640)
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
     <import resource="classpath:spring-database.xml" />
     <import resource="classpath:spring-hibernate.xml" />
     <import resource="classpath:spring-dao.xml" />


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

[Openutils-svn] SF.net SVN: openutils: [639] trunk/openutils-hibernate-security/src/main/ java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter .java

[<fc...@us...>]

Revision: 639
          http://openutils.svn.sourceforge.net/openutils/?rev=639&view=rev
Author:   fcarone
Date:     2008-02-19 07:34:28 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
SecurityRule based acegi voter added

Added Paths:
-----------
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java

Added: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java	                        (rev 0)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAccessDecisionVoter.java	2008-02-19 15:34:28 UTC (rev 639)
@@ -0,0 +1,197 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.openutils.hibernate.security.filter;
+
+import it.openutils.hibernate.security.dataobject.ModifierEnum;
+import it.openutils.hibernate.security.dataobject.PermissionEnum;
+import it.openutils.hibernate.security.dataobject.SecurityRule;
+import it.openutils.hibernate.security.services.SecurityRuleManager;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.acegisecurity.Authentication;
+import org.acegisecurity.ConfigAttribute;
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.GrantedAuthority;
+import org.acegisecurity.vote.AccessDecisionVoter;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.enums.EnumUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.aop.framework.ReflectiveMethodInvocation;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class SecurityRuleAccessDecisionVoter implements AccessDecisionVoter
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(SecurityRuleAccessDecisionVoter.class);
+
+    private SecurityRuleManager securityRuleManager;
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean supports(ConfigAttribute attribute)
+    {
+        if (attribute.getAttribute() != null)
+        {
+            for (PermissionEnum permission : PermissionEnum.values())
+            {
+                if (StringUtils.equals(permission.getValue(), attribute.getAttribute()))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    public boolean supports(Class clazz)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int vote(Authentication authentication, Object object, ConfigAttributeDefinition config)
+    {
+        List<String> roles = new ArrayList<String>();
+        for (GrantedAuthority authority : authentication.getAuthorities())
+        {
+            roles.add(authority.getAuthority());
+        }
+        if (object instanceof ReflectiveMethodInvocation)
+        {
+            ReflectiveMethodInvocation methodInvocation = ((ReflectiveMethodInvocation) object);
+            for (Object argument : methodInvocation.getArguments())
+            {
+                List<SecurityRule> rules = securityRuleManager.getRulesForRoles(argument.getClass().getName(), roles);
+                boolean permissionMatches = checkPermissions(rules, config);
+                if (!permissionMatches)
+                {
+                    return ACCESS_DENIED;
+                }
+
+                boolean areRulesMatching = checkRules(rules, argument);
+                if (!areRulesMatching)
+                {
+                    return ACCESS_DENIED;
+                }
+            }
+        }
+
+        return ACCESS_GRANTED;
+    }
+
+    /**
+     * @param rules
+     * @param argument
+     * @return
+     */
+    private boolean checkRules(List<SecurityRule> rules, Object argument)
+    {
+        try
+        {
+            for (SecurityRule rule : rules)
+            {
+                String objProperty = BeanUtils.getSimpleProperty(argument, rule.getProperty());
+                if (rule.getModifier() == ModifierEnum.EQUALS)
+                {
+                    if (StringUtils.equals(objProperty, rule.getValue()))
+                    {
+                        return true;
+                    }
+                }
+                else if (rule.getModifier() == ModifierEnum.NOT)
+                {
+                    if (StringUtils.equals(objProperty, rule.getValue()))
+                    {
+                        return true;
+                    }
+                }
+                else
+                {
+                    throw new RuntimeException("Modifier " + rule.getModifier() + " is not recognized");
+                }
+            }
+        }
+        catch (NoSuchMethodException e)
+        {
+            log.error("{}", e);
+        }
+        catch (IllegalAccessException e)
+        {
+            log.error("{}", e);
+        }
+        catch (InvocationTargetException e)
+        {
+            log.error("{}", e);
+        }
+        return false;
+    }
+
+    /**
+     * @param rules
+     * @param config
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    private boolean checkPermissions(List<SecurityRule> rules, ConfigAttributeDefinition config)
+    {
+        Iterator iterator = config.getConfigAttributes();
+        while (iterator.hasNext())
+        {
+            String attribute = ((ConfigAttribute) iterator.next()).getAttribute();
+            for (SecurityRule rule : rules)
+            {
+                for (PermissionEnum permission : rule.getPermissions())
+                {
+                    if (StringUtils.equals(permission.getValue(), attribute))
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Sets the securityRuleManager.
+     * @param securityRuleManager the securityRuleManager to set
+     */
+    public void setSecurityRuleManager(SecurityRuleManager securityRuleManager)
+    {
+        this.securityRuleManager = securityRuleManager;
+    }
+
+}


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

[Openutils-svn] SF.net SVN: openutils: [638] trunk/openutils-hibernate-security/src/main/ java/it/openutils/hibernate/security/filter/JavaBeanFilter.java

[<fc...@us...>]

Revision: 638
          http://openutils.svn.sourceforge.net/openutils/?rev=638&view=rev
Author:   fcarone
Date:     2008-02-19 07:33:39 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
Copyright updated

Modified Paths:
--------------
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java	2008-02-19 15:32:28 UTC (rev 637)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/JavaBeanFilter.java	2008-02-19 15:33:39 UTC (rev 638)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package it.openutils.hibernate.security.filter;
 


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

[Openutils-svn] SF.net SVN: openutils: [637] trunk/openutils-hibernate-security/pom.xml

[<fc...@us...>]

Revision: 637
          http://openutils.svn.sourceforge.net/openutils/?rev=637&view=rev
Author:   fcarone
Date:     2008-02-19 07:32:28 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
Dependencies updated

Modified Paths:
--------------
    trunk/openutils-hibernate-security/pom.xml

Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml	2008-02-19 15:31:39 UTC (rev 636)
+++ trunk/openutils-hibernate-security/pom.xml	2008-02-19 15:32:28 UTC (rev 637)
@@ -13,6 +13,10 @@
   <name>openutils hibernate security</name>
   <version>0.0.3-SNAPSHOT</version>
   <description>Hibernate Security classes</description>
+  <properties>
+    <spring.version>2.5.1</spring.version>
+    <aspectj.version>1.5.3</aspectj.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -96,23 +100,29 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-usermanagement</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-usermanagement-dataobjects</artifactId>
-      <version>2.0.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-bshd5</artifactId>
-      <version>2.0.2-SNAPSHOT</version>
+      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing-junit</artifactId>
-      <version>2.0.3-SNAPSHOT</version>
+      <version>2.0.2</version>
       <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-testing</artifactId>
+      <version>2.0.3</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -137,7 +147,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
-      <version>3.3.0.ga</version>
+      <version>3.2.1.ga</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -202,7 +212,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -212,8 +222,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <properties>
-    <spring.version>2.5.1</spring.version>
-    <aspectj.version>1.5.3</aspectj.version>
-  </properties>
 </project>


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

[Openutils-svn] SF.net SVN: openutils: [636] trunk/openutils-hibernate-security/src/test/ java/it/openutils/hibernate/security/apptest

[<fc...@us...>]

Revision: 636
          http://openutils.svn.sourceforge.net/openutils/?rev=636&view=rev
Author:   fcarone
Date:     2008-02-19 07:31:39 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
DummyObjectManager added for tests

Added Paths:
-----------
    trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManager.java
    trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManagerImpl.java

Added: trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManager.java
===================================================================
--- trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManager.java	                        (rev 0)
+++ trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManager.java	2008-02-19 15:31:39 UTC (rev 636)
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.hibernate.security.apptest;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public interface DummyObjectManager
+{
+    public void update(DummyDataobject ddo);
+
+    public void create(DummyDataobject ddo);
+
+    public void delete(DummyDataobject ddo);
+
+}

Added: trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManagerImpl.java
===================================================================
--- trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManagerImpl.java	                        (rev 0)
+++ trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/apptest/DummyObjectManagerImpl.java	2008-02-19 15:31:39 UTC (rev 636)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.hibernate.security.apptest;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class DummyObjectManagerImpl implements DummyObjectManager
+{
+
+    private DummyDAO dummyDAO;
+
+    /**
+     * {@inheritDoc}
+     */
+    public void create(DummyDataobject ddo)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void delete(DummyDataobject ddo)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void update(DummyDataobject ddo)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+
+    /**
+     * Sets the dummyDAO.
+     * @param dummyDAO the dummyDAO to set
+     */
+    public void setDummyDAO(DummyDAO dummyDAO)
+    {
+        this.dummyDAO = dummyDAO;
+    }
+
+}


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

[Openutils-svn] SF.net SVN: openutils: [635] trunk/openutils-testing/pom.xml

[<fc...@us...>]

Revision: 635
          http://openutils.svn.sourceforge.net/openutils/?rev=635&view=rev
Author:   fcarone
Date:     2008-02-19 07:23:59 -0800 (Tue, 19 Feb 2008)

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

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

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2008-02-19 15:22:42 UTC (rev 634)
+++ trunk/openutils-testing/pom.xml	2008-02-19 15:23:59 UTC (rev 635)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-testing</artifactId>
   <name>openutils test utils</name>
-  <version>2.0.3</version>
+  <version>2.0.4-SNAPSHOT</version>
   <description>openutils test utils</description>
   <dependencies>
     <dependency>
@@ -61,10 +61,4 @@
   <properties>
     <spring.version>2.5.1</spring.version>
   </properties>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.0.3</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.0.3</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.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.

[Openutils-svn] SF.net SVN: openutils: [634] tags

[<fc...@us...>]

Revision: 634
          http://openutils.svn.sourceforge.net/openutils/?rev=634&view=rev
Author:   fcarone
Date:     2008-02-19 07:22:42 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-testing-2.0.3

Added Paths:
-----------
    tags/openutils-testing-2.0.3/
    tags/openutils-testing-2.0.3/pom.xml
    tags/openutils-testing-2.0.3/src/site/changes/changes.xml

Removed Paths:
-------------
    tags/openutils-testing-2.0.3/pom.xml
    tags/openutils-testing-2.0.3/src/site/changes/changes.xml

Copied: tags/openutils-testing-2.0.3 (from rev 630, trunk/openutils-testing)

Deleted: tags/openutils-testing-2.0.3/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2008-02-19 13:41:04 UTC (rev 630)
+++ tags/openutils-testing-2.0.3/pom.xml	2008-02-19 15:22:42 UTC (rev 634)
@@ -1,64 +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>7</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>openutils-testing</artifactId>
-  <name>openutils test utils</name>
-  <version>2.0.3-SNAPSHOT</version>
-  <description>openutils test utils</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.dbunit</groupId>
-      <artifactId>dbunit</artifactId>
-      <version>2.2</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit-addons</groupId>
-          <artifactId>junit-addons</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-  <properties>
-    <spring.version>2.5.1</spring.version>
-  </properties>
-</project>

Copied: tags/openutils-testing-2.0.3/pom.xml (from rev 633, trunk/openutils-testing/pom.xml)
===================================================================
--- tags/openutils-testing-2.0.3/pom.xml	                        (rev 0)
+++ tags/openutils-testing-2.0.3/pom.xml	2008-02-19 15:22:42 UTC (rev 634)
@@ -0,0 +1,70 @@
+<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>7</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-testing</artifactId>
+  <name>openutils test utils</name>
+  <version>2.0.3</version>
+  <description>openutils test utils</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.dbunit</groupId>
+      <artifactId>dbunit</artifactId>
+      <version>2.2</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit-addons</groupId>
+          <artifactId>junit-addons</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <properties>
+    <spring.version>2.5.1</spring.version>
+  </properties>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.0.3</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.0.3</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.0.3</url>
+  </scm>
+</project>
\ No newline at end of file

Deleted: tags/openutils-testing-2.0.3/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-testing/src/site/changes/changes.xml	2008-02-19 13:41:04 UTC (rev 630)
+++ tags/openutils-testing-2.0.3/src/site/changes/changes.xml	2008-02-19 15:22:42 UTC (rev 634)
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  "type" attribute can be: add, remove, update or fix.
--->
-<document>
-  <properties>
-    <title>Changes</title>
-    <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
-  </properties>
-  <body>
-    <release version="2.0.3" date="in svn" description="2.0.2">
-      <action type="update" dev="fgiust">
-        it.openutils.testing.DateAssert is now thread safe. Failure messages have been improved.
-      </action>
-    </release>
-    <release version="2.0.2" date="2008-01-31" description="2.0.2">
-      <action type="add" dev="fgiust">
-        New dbunit operation classes for mssql and mysql (extension of standard dbunit operation, but refactored so that
-        they can be used in annotations). See the javadocs in the it.openutils.testing.dbunit package
-      </action>
-      <action type="update" dev="fgiust">
-        truncate operation now defaults to DbUnitOperation.DELETE_ALL instead of DbUnitOperation.TRUNCATE.
-      </action>
-      <action type="fix" dev="fgiust">DbUnitUtils.exportDataset() doesn't close anymore the provided connection</action>
-      <action type="add" dev="fgiust">new DbUnitUtils.exportTablesToDir() utility method</action>
-    </release>
-    <release version="2.0.1" date="2008-01-30" description="2.0.1">
-      <action type="fix" dev="fgiust">
-        (junit version only). it.openutils.testing.junit.AbstractDbUnitJunitSpringContextTests was totally broken due to
-        the setup method being protected. Fixed + added tests
-      </action>
-    </release>
-    <release version="2.0" date="2008-01-20" description="2.0 release">
-      <action type="update" dev="fgiust">Totally reworked dbunit test framework.</action>
-    </release>
-  </body>
-</document>
\ No newline at end of file

Copied: tags/openutils-testing-2.0.3/src/site/changes/changes.xml (from rev 632, trunk/openutils-testing/src/site/changes/changes.xml)
===================================================================
--- tags/openutils-testing-2.0.3/src/site/changes/changes.xml	                        (rev 0)
+++ tags/openutils-testing-2.0.3/src/site/changes/changes.xml	2008-02-19 15:22:42 UTC (rev 634)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+  "type" attribute can be: add, remove, update or fix.
+-->
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
+  </properties>
+  <body>
+    <release version="2.0.3" date="2008-02-19" description="2.0.3">
+      <action type="update" dev="fgiust">
+        it.openutils.testing.DateAssert is now thread safe. Failure messages have been improved.
+      </action>
+      <action type="add" dev="fcarone">
+        New option for DbUnitExection to specify the DatabaseConfig.PROPERTY_DATATYPE_FACTORY added.
+      </action>
+    </release>
+    <release version="2.0.2" date="2008-01-31" description="2.0.2">
+      <action type="add" dev="fgiust">
+        New dbunit operation classes for mssql and mysql (extension of standard dbunit operation, but refactored so that
+        they can be used in annotations). See the javadocs in the it.openutils.testing.dbunit package
+      </action>
+      <action type="update" dev="fgiust">
+        truncate operation now defaults to DbUnitOperation.DELETE_ALL instead of DbUnitOperation.TRUNCATE.
+      </action>
+      <action type="fix" dev="fgiust">DbUnitUtils.exportDataset() doesn't close anymore the provided connection</action>
+      <action type="add" dev="fgiust">new DbUnitUtils.exportTablesToDir() utility method</action>
+    </release>
+    <release version="2.0.1" date="2008-01-30" description="2.0.1">
+      <action type="fix" dev="fgiust">
+        (junit version only). it.openutils.testing.junit.AbstractDbUnitJunitSpringContextTests was totally broken due to
+        the setup method being protected. Fixed + added tests
+      </action>
+    </release>
+    <release version="2.0" date="2008-01-20" description="2.0 release">
+      <action type="update" dev="fgiust">Totally reworked dbunit test framework.</action>
+    </release>
+  </body>
+</document>
\ 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: [633] trunk/openutils-testing/pom.xml

[<fc...@us...>]

Revision: 633
          http://openutils.svn.sourceforge.net/openutils/?rev=633&view=rev
Author:   fcarone
Date:     2008-02-19 07:21:08 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-2.0.3

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

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2008-02-19 15:17:04 UTC (rev 632)
+++ trunk/openutils-testing/pom.xml	2008-02-19 15:21:08 UTC (rev 633)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-testing</artifactId>
   <name>openutils test utils</name>
-  <version>2.0.3-SNAPSHOT</version>
+  <version>2.0.3</version>
   <description>openutils test utils</description>
   <dependencies>
     <dependency>
@@ -61,4 +61,10 @@
   <properties>
     <spring.version>2.5.1</spring.version>
   </properties>
-</project>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.0.3</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.0.3</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.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.

[Openutils-svn] SF.net SVN: openutils: [632] trunk/openutils-testing/src/site/changes/ changes.xml

[<fc...@us...>]

Revision: 632
          http://openutils.svn.sourceforge.net/openutils/?rev=632&view=rev
Author:   fcarone
Date:     2008-02-19 07:17:04 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
changes.xml updated (releasing today)

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

Modified: trunk/openutils-testing/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-testing/src/site/changes/changes.xml	2008-02-19 13:44:42 UTC (rev 631)
+++ trunk/openutils-testing/src/site/changes/changes.xml	2008-02-19 15:17:04 UTC (rev 632)
@@ -8,7 +8,7 @@
     <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
   </properties>
   <body>
-    <release version="2.0.3" date="in svn" description="2.0.3">
+    <release version="2.0.3" date="2008-02-19" description="2.0.3">
       <action type="update" dev="fgiust">
         it.openutils.testing.DateAssert is now thread safe. Failure messages have been improved.
       </action>


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

[Openutils-svn] SF.net SVN: openutils: [631] trunk/openutils-testing/src/site/changes/ changes.xml

[<fc...@us...>]

Revision: 631
          http://openutils.svn.sourceforge.net/openutils/?rev=631&view=rev
Author:   fcarone
Date:     2008-02-19 05:44:42 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
Track changes on changes.xml

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

Modified: trunk/openutils-testing/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-testing/src/site/changes/changes.xml	2008-02-19 13:41:04 UTC (rev 630)
+++ trunk/openutils-testing/src/site/changes/changes.xml	2008-02-19 13:44:42 UTC (rev 631)
@@ -8,10 +8,13 @@
     <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
   </properties>
   <body>
-    <release version="2.0.3" date="in svn" description="2.0.2">
+    <release version="2.0.3" date="in svn" description="2.0.3">
       <action type="update" dev="fgiust">
         it.openutils.testing.DateAssert is now thread safe. Failure messages have been improved.
       </action>
+      <action type="add" dev="fcarone">
+        New option for DbUnitExection to specify the DatabaseConfig.PROPERTY_DATATYPE_FACTORY added.
+      </action>
     </release>
     <release version="2.0.2" date="2008-01-31" description="2.0.2">
       <action type="add" dev="fgiust">


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

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

[<fc...@us...>]

Revision: 630
          http://openutils.svn.sourceforge.net/openutils/?rev=630&view=rev
Author:   fcarone
Date:     2008-02-19 05:41:04 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
DatatypeFactory annotation configuration added

Modified Paths:
--------------
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java	2008-02-19 10:36:14 UTC (rev 629)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java	2008-02-19 13:41:04 UTC (rev 630)
@@ -22,12 +22,14 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.dbunit.database.DatabaseConfig;
+import org.dbunit.dataset.datatype.IDataTypeFactory;
 import org.dbunit.operation.DatabaseOperation;
 
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
@@ -54,6 +56,11 @@
     String schema() default "";
 
     /**
+     * The datatype factory (DatabaseConfig.PROPERTY_DATATYPE_FACTORY) to use. Can be left unset if not needed.
+     */
+    Class< ? extends IDataTypeFactory> dataTypeFactory();
+
+    /**
      * A regexp that can match table names. Any table matching this regular expression will not be considered by DbUnit.
      * By default tables starting with $ are ignored (oracle recycle bin).
      */

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	2008-02-19 10:36:14 UTC (rev 629)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	2008-02-19 13:41:04 UTC (rev 630)
@@ -26,12 +26,14 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.dbunit.DatabaseUnitException;
+import org.dbunit.database.DatabaseConfig;
 import org.dbunit.database.DatabaseConnection;
 import org.dbunit.database.DatabaseSequenceFilter;
 import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.dataset.DataSetException;
 import org.dbunit.dataset.FilteredDataSet;
 import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.datatype.IDataTypeFactory;
 import org.dbunit.dataset.filter.ITableFilter;
 import org.dbunit.dataset.filter.SequenceTableFilter;
 import org.dbunit.operation.DatabaseOperation;
@@ -48,7 +50,7 @@
 
 /**
  * @author fgiust
- * @version $Id: $
+ * @version $Id$
  */
 public class DbUnitTestContext
 {
@@ -128,6 +130,12 @@
                     getDatasource(dataSourceName).getConnection(),
                     schema);
 
+                if (dbUnitExecution.dataTypeFactory() != null)
+                {
+                    IDataTypeFactory dataTypeFactory = dbUnitExecution.dataTypeFactory().newInstance();
+                    connection.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, dataTypeFactory);
+                }
+
                 try
                 {
                     ITableFilter tableFilter = new RegExpTableFilter(dbUnitExecution.excludedTables());


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

[Openutils-svn] SF.net SVN: openutils: [629] trunk/openutils-usermanagement/pom.xml

[<fc...@us...>]

Revision: 629
          http://openutils.svn.sourceforge.net/openutils/?rev=629&view=rev
Author:   fcarone
Date:     2008-02-19 02:36:14 -0800 (Tue, 19 Feb 2008)

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

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

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-02-19 10:35:55 UTC (rev 628)
+++ trunk/openutils-usermanagement/pom.xml	2008-02-19 10:36:14 UTC (rev 629)
@@ -10,7 +10,7 @@
   <artifactId>openutils-usermanagement</artifactId>
   <packaging>jar</packaging>
   <name>openutils-usermanagement</name>
-  <version>2.0</version>
+  <version>2.0.1-SNAPSHOT</version>
   <description>Usermanagement classes</description>
   <properties>
     <spring.version>2.5.1</spring.version>
@@ -170,10 +170,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-2.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-2.0</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-usermanagement-2.0</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: [628] tags

[<fc...@us...>]

Revision: 628
          http://openutils.svn.sourceforge.net/openutils/?rev=628&view=rev
Author:   fcarone
Date:     2008-02-19 02:35:55 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-usermanagement-2.0

Added Paths:
-----------
    tags/openutils-usermanagement-2.0/
    tags/openutils-usermanagement-2.0/pom.xml
    tags/openutils-usermanagement-2.0/src/
    tags/openutils-usermanagement-2.0/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java
    tags/openutils-usermanagement-2.0/src/test/resources/spring-dao.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-database.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-hibernate.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-managers.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-tests.xml

Removed Paths:
-------------
    tags/openutils-usermanagement-2.0/pom.xml
    tags/openutils-usermanagement-2.0/src/
    tags/openutils-usermanagement-2.0/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java
    tags/openutils-usermanagement-2.0/src/test/resources/spring-dao.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-database.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-hibernate.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-managers.xml
    tags/openutils-usermanagement-2.0/src/test/resources/spring-tests.xml

Copied: tags/openutils-usermanagement-2.0 (from rev 620, trunk/openutils-usermanagement)

Deleted: tags/openutils-usermanagement-2.0/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-02-19 10:22:39 UTC (rev 620)
+++ tags/openutils-usermanagement-2.0/pom.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -1,140 +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>7</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <groupId>net.sourceforge.openutils</groupId>
-  <artifactId>openutils-usermanagement</artifactId>
-  <packaging>jar</packaging>
-  <name>openutils-usermanagement</name>
-  <version>2.0-SNAPSHOT</version>
-  <description>Usermanagement classes</description>
-  <dependencies>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-spring</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-usermanagement-dataobjects</artifactId>
-      <version>2.0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-bshd5</artifactId>
-      <version>2.0.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-testing-junit</artifactId>
-      <version>2.0.3-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>xerces</artifactId>
-          <groupId>xerces</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>xml-apis</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
-      <version>1.0.3</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-remoting</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-jdbc</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-support</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.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.2.2.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>dbunit</groupId>
-      <artifactId>dbunit</artifactId>
-      <version>2.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: tags/openutils-usermanagement-2.0/pom.xml (from rev 627, trunk/openutils-usermanagement/pom.xml)
===================================================================
--- tags/openutils-usermanagement-2.0/pom.xml	                        (rev 0)
+++ tags/openutils-usermanagement-2.0/pom.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -0,0 +1,179 @@
+<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>7</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>net.sourceforge.openutils</groupId>
+  <artifactId>openutils-usermanagement</artifactId>
+  <packaging>jar</packaging>
+  <name>openutils-usermanagement</name>
+  <version>2.0</version>
+  <description>Usermanagement classes</description>
+  <properties>
+    <spring.version>2.5.1</spring.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.testng</groupId>
+          <artifactId>testng</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-usermanagement-dataobjects</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-bshd5</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-testing-junit</artifactId>
+      <version>2.0.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-annotations</artifactId>
+      <version>3.2.1.ga</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.1_3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>xerces</artifactId>
+          <groupId>xerces</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>xml-apis</artifactId>
+          <groupId>xml-apis</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+      <version>1.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.acegisecurity</groupId>
+      <artifactId>acegi-security</artifactId>
+      <version>1.0.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-remoting</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jdbc</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-support</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.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.2.2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>dbunit</groupId>
+      <artifactId>dbunit</artifactId>
+      <version>2.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-2.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-2.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-usermanagement-2.0</url>
+  </scm>
+</project>
\ No newline at end of file

Copied: tags/openutils-usermanagement-2.0/src (from rev 619, trunk/openutils-usermanagement/src)

Deleted: tags/openutils-usermanagement-2.0/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java
===================================================================
--- trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java	2008-02-17 09:11:48 UTC (rev 619)
+++ tags/openutils-usermanagement-2.0/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java	2008-02-19 10:35:55 UTC (rev 628)
@@ -1,32 +0,0 @@
-package it.openutils.usermanagement.manager;
-
-import it.openutils.testing.junit.GenericsDbUnitTestCase;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class UserManagerTest extends GenericsDbUnitTestCase<UserManager>
-{
-
-    /**
-     * test for changePassword()
-     */
-    public void testChangePassword()
-    {
-        String newPwd = "2345";
-
-        Boolean result = instance.changePassword("UserUno", "password", newPwd);
-        assertTrue(result);
-
-    }
-
-    public void testResetPassword()
-    {
-
-        String newPwd = instance.resetPassword("UserUno");
-        assertNotNull("nothing returned by resetPassword ", newPwd);
-    }
-
-}

Copied: tags/openutils-usermanagement-2.0/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java (from rev 620, trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java)
===================================================================
--- tags/openutils-usermanagement-2.0/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java	                        (rev 0)
+++ tags/openutils-usermanagement-2.0/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java	2008-02-19 10:35:55 UTC (rev 628)
@@ -0,0 +1,62 @@
+package it.openutils.usermanagement.manager;
+
+import it.openutils.testing.DbUnitExecution;
+import it.openutils.testing.junit.AbstractDbUnitJunitSpringContextTests;
+
+import org.dbunit.operation.InsertOperation;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+@ContextConfiguration(locations = {"/spring-tests.xml" })
+@DbUnitExecution(datasets = {"/UserManagerTest-load.xml" }, dataSource = "dataSource", //
+    insertOperation = InsertOperation.class)
+@TestExecutionListeners({TransactionalTestExecutionListener.class })
+@Transactional
+@TransactionConfiguration(transactionManager = "transactionManager")
+public class UserManagerTest extends AbstractDbUnitJunitSpringContextTests
+{
+
+    @Autowired
+    private UserManager instance;
+
+    /**
+     * test for changePassword()
+     */
+    @Test
+    public void testChangePassword()
+    {
+        String newPwd = "2345";
+
+        Boolean result = instance.changePassword("UserUno", "password", newPwd);
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void testResetPassword()
+    {
+        String newPwd = instance.resetPassword("UserUno");
+        Assert.assertNotNull("nothing returned by resetPassword ", newPwd);
+    }
+
+
+    /**
+     * Sets the instance.
+     * @param instance the instance to set
+     */
+    public void setInstance(UserManager instance)
+    {
+        this.instance = instance;
+    }
+
+}

Deleted: tags/openutils-usermanagement-2.0/src/test/resources/spring-dao.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-dao.xml	2008-02-17 09:11:48 UTC (rev 619)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-dao.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
-    <bean id="userDAO" parent="txProxyTemplate">
-        <property name="target">
-            <bean class="it.openutils.usermanagement.dao.UserDAOImpl">
-                <property name="sessionFactory" ref="sessionFactory" />
-            </bean>
-        </property>
-    </bean>
-    <bean id="groupDAO" parent="txProxyTemplate">
-        <property name="target">
-            <bean class="it.openutils.usermanagement.dao.GroupDAOImpl">
-                <property name="sessionFactory" ref="sessionFactory" />
-            </bean>
-        </property>
-    </bean>
-    <bean id="roleDAO" parent="txProxyTemplate">
-        <property name="target">
-            <bean class="it.openutils.usermanagement.dao.RoleDAOImpl">
-                <property name="sessionFactory" ref="sessionFactory" />
-            </bean>
-        </property>
-    </bean>
-
-</beans>
\ No newline at end of file

Copied: tags/openutils-usermanagement-2.0/src/test/resources/spring-dao.xml (from rev 620, trunk/openutils-usermanagement/src/test/resources/spring-dao.xml)
===================================================================
--- tags/openutils-usermanagement-2.0/src/test/resources/spring-dao.xml	                        (rev 0)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-dao.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -0,0 +1,26 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+  <bean id="userDAO" parent="txProxyTemplate">
+    <property name="target">
+      <bean class="it.openutils.usermanagement.dao.UserDAOImpl">
+        <property name="sessionFactory" ref="sessionFactory" />
+      </bean>
+    </property>
+  </bean>
+  <bean id="groupDAO" parent="txProxyTemplate">
+    <property name="target">
+      <bean class="it.openutils.usermanagement.dao.GroupDAOImpl">
+        <property name="sessionFactory" ref="sessionFactory" />
+      </bean>
+    </property>
+  </bean>
+  <bean id="roleDAO" parent="txProxyTemplate">
+    <property name="target">
+      <bean class="it.openutils.usermanagement.dao.RoleDAOImpl">
+        <property name="sessionFactory" ref="sessionFactory" />
+      </bean>
+    </property>
+  </bean>
+</beans>
\ No newline at end of file

Deleted: tags/openutils-usermanagement-2.0/src/test/resources/spring-database.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-database.xml	2008-02-17 09:11:48 UTC (rev 619)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-database.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests
-    # i file per la configurazione del db utilizzati dall'applicazione web sono in
-    # src/main/web-app/WEB-INF
--->
-<beans>
-    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="location">
-            <value>classpath:database.properties</value>
-        </property>
-    </bean>
-    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-        <property name="driverClassName">
-            <value>${hibernate.connection.driver}</value>
-        </property>
-        <property name="url">
-            <value>${hibernate.connection.url}</value>
-        </property>
-        <property name="username">
-            <value>${hibernate.connection.username}</value>
-        </property>
-        <property name="password">
-            <value>${hibernate.connection.password}</value>
-        </property>
-    </bean>
-</beans>

Copied: tags/openutils-usermanagement-2.0/src/test/resources/spring-database.xml (from rev 620, trunk/openutils-usermanagement/src/test/resources/spring-database.xml)
===================================================================
--- tags/openutils-usermanagement-2.0/src/test/resources/spring-database.xml	                        (rev 0)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-database.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -0,0 +1,29 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+  <!--
+    # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests
+    # i file per la configurazione del db utilizzati dall'applicazione web sono in
+    # src/main/web-app/WEB-INF
+  -->
+  <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+    <property name="location">
+      <value>classpath:database.properties</value>
+    </property>
+  </bean>
+  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <property name="driverClassName">
+      <value>${hibernate.connection.driver}</value>
+    </property>
+    <property name="url">
+      <value>${hibernate.connection.url}</value>
+    </property>
+    <property name="username">
+      <value>${hibernate.connection.username}</value>
+    </property>
+    <property name="password">
+      <value>${hibernate.connection.password}</value>
+    </property>
+  </bean>
+</beans>

Deleted: tags/openutils-usermanagement-2.0/src/test/resources/spring-hibernate.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-hibernate.xml	2008-02-17 09:11:48 UTC (rev 619)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-hibernate.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
-    <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-        <property name="dataSource">
-            <ref bean="dataSource" />
-        </property>
-        <property name="configLocation">
-            <value>classpath:hibernate.cfg.xml</value>
-        </property>
-        <property name="configurationClass">
-            <value>org.hibernate.cfg.AnnotationConfiguration</value>
-        </property>
-        <property name="hibernateProperties">
-            <props>
-                <prop key="hibernate.dialect">${hibernate.dialect}</prop>
-                <prop key="hibernate.generate_statistics">false</prop>
-                <prop key="hibernate.bytecode.use_reflection_optimizer">true</prop>
-                <prop key="hibernate.show_sql">false</prop>
-                <prop key="hibernate.use_sql_comments">false</prop>
-                <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
-            </props>
-        </property>
-    </bean>
-    <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-        <property name="sessionFactory">
-            <ref local="sessionFactory" />
-        </property>
-    </bean>
-    <bean id="txProxyTemplate" abstract="true"
-        class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-        <property name="transactionManager">
-            <ref bean="transactionManager" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="save*">PROPAGATION_REQUIRED</prop>
-                <prop key="delete*">PROPAGATION_REQUIRED</prop>
-                <prop key="update*">PROPAGATION_REQUIRED</prop>
-                <prop key="clean*">PROPAGATION_REQUIRED</prop>
-                <prop key="*">PROPAGATION_REQUIRED,readOnly</prop>
-            </props>
-        </property>
-    </bean>
-</beans>
\ No newline at end of file

Copied: tags/openutils-usermanagement-2.0/src/test/resources/spring-hibernate.xml (from rev 620, trunk/openutils-usermanagement/src/test/resources/spring-hibernate.xml)
===================================================================
--- tags/openutils-usermanagement-2.0/src/test/resources/spring-hibernate.xml	                        (rev 0)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-hibernate.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -0,0 +1,46 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+  <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+    <property name="dataSource">
+      <ref bean="dataSource" />
+    </property>
+    <property name="configLocation">
+      <value>classpath:hibernate.cfg.xml</value>
+    </property>
+    <property name="configurationClass">
+      <value>org.hibernate.cfg.AnnotationConfiguration</value>
+    </property>
+    <property name="hibernateProperties">
+      <props>
+        <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+        <prop key="hibernate.generate_statistics">false</prop>
+        <prop key="hibernate.bytecode.use_reflection_optimizer">true</prop>
+        <prop key="hibernate.show_sql">false</prop>
+        <prop key="hibernate.use_sql_comments">false</prop>
+        <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+      </props>
+    </property>
+  </bean>
+  <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+    <property name="sessionFactory">
+      <ref local="sessionFactory" />
+    </property>
+  </bean>
+  <bean id="txProxyTemplate" abstract="true"
+    class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+    <property name="transactionManager">
+      <ref bean="transactionManager" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="save*">PROPAGATION_REQUIRED</prop>
+        <prop key="delete*">PROPAGATION_REQUIRED</prop>
+        <prop key="update*">PROPAGATION_REQUIRED</prop>
+        <prop key="clean*">PROPAGATION_REQUIRED</prop>
+        <prop key="*">PROPAGATION_REQUIRED,readOnly</prop>
+      </props>
+    </property>
+  </bean>
+</beans>
\ No newline at end of file

Deleted: tags/openutils-usermanagement-2.0/src/test/resources/spring-managers.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-managers.xml	2008-02-17 09:11:48 UTC (rev 619)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-managers.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -1,21 +0,0 @@
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-	<bean id="userManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
-		autowire="byType">
-		<property name="transactionManager">
-			<ref bean="transactionManager" />
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-		<property name="target">
-			<bean class="it.openutils.usermanagement.manager.UserManagerImpl" autowire="byType"></bean>
-		</property>
-	</bean>
-	<bean id="passwordEncoder" class="org.acegisecurity.providers.encoding.ShaPasswordEncoder" />
-	 <bean id="userDetailsService" class="it.openutils.usermanagement.acegi.HibernateUserDetailsServiceImpl"
-        autowire="byType">
-    </bean>
-</beans>
\ No newline at end of file

Copied: tags/openutils-usermanagement-2.0/src/test/resources/spring-managers.xml (from rev 620, trunk/openutils-usermanagement/src/test/resources/spring-managers.xml)
===================================================================
--- tags/openutils-usermanagement-2.0/src/test/resources/spring-managers.xml	                        (rev 0)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-managers.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -0,0 +1,27 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+  <bean id="userManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+    <property name="transactionManager">
+      <ref bean="transactionManager" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="*">PROPAGATION_REQUIRED</prop>
+      </props>
+    </property>
+    <property name="target">
+      <bean class="it.openutils.usermanagement.manager.UserManagerImpl">
+        <property name="passwordEncoder" ref="passwordEncoder" />
+        <property name="userDAO" ref="userDAO" />
+      </bean>
+    </property>
+  </bean>
+  <bean id="passwordEncoder" class="org.acegisecurity.providers.encoding.ShaPasswordEncoder" />
+  <bean id="userDetailsService" class="it.openutils.usermanagement.acegi.HibernateUserDetailsServiceImpl"
+    autowire="byType">
+    <property name="userDao" ref="userDAO" />
+    <property name="groupDAO" ref="groupDAO" />
+  </bean>
+</beans>
\ No newline at end of file

Deleted: tags/openutils-usermanagement-2.0/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-tests.xml	2008-02-17 09:11:48 UTC (rev 619)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-tests.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-    <import resource="classpath:spring-database.xml" />
-    <import resource="classpath:spring-hibernate.xml" />
-    <import resource="classpath:spring-dao.xml" />
-    <import resource="classpath:spring-managers.xml" />
-</beans>
\ No newline at end of file

Copied: tags/openutils-usermanagement-2.0/src/test/resources/spring-tests.xml (from rev 620, trunk/openutils-usermanagement/src/test/resources/spring-tests.xml)
===================================================================
--- tags/openutils-usermanagement-2.0/src/test/resources/spring-tests.xml	                        (rev 0)
+++ tags/openutils-usermanagement-2.0/src/test/resources/spring-tests.xml	2008-02-19 10:35:55 UTC (rev 628)
@@ -0,0 +1,9 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+  <import resource="classpath:spring-database.xml" />
+  <import resource="classpath:spring-hibernate.xml" />
+  <import resource="classpath:spring-dao.xml" />
+  <import resource="classpath:spring-managers.xml" />
+</beans>


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

[Openutils-svn] SF.net SVN: openutils: [627] trunk/openutils-usermanagement/pom.xml

[<fc...@us...>]

Revision: 627
          http://openutils.svn.sourceforge.net/openutils/?rev=627&view=rev
Author:   fcarone
Date:     2008-02-19 02:35:19 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-usermanagement-2.0

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

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-02-19 10:29:16 UTC (rev 626)
+++ trunk/openutils-usermanagement/pom.xml	2008-02-19 10:35:19 UTC (rev 627)
@@ -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>
@@ -11,7 +10,7 @@
   <artifactId>openutils-usermanagement</artifactId>
   <packaging>jar</packaging>
   <name>openutils-usermanagement</name>
-  <version>2.0-SNAPSHOT</version>
+  <version>2.0</version>
   <description>Usermanagement classes</description>
   <properties>
     <spring.version>2.5.1</spring.version>
@@ -171,4 +170,10 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-2.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-usermanagement-2.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-usermanagement-2.0</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: [626] trunk/openutils-usermanagement/pom.xml

[<fc...@us...>]

Revision: 626
          http://openutils.svn.sourceforge.net/openutils/?rev=626&view=rev
Author:   fcarone
Date:     2008-02-19 02:29:16 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
openutils spring was not needed after all.

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

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-02-19 10:28:04 UTC (rev 625)
+++ trunk/openutils-usermanagement/pom.xml	2008-02-19 10:29:16 UTC (rev 626)
@@ -34,12 +34,6 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-spring</artifactId>
-      <version>1.0.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-usermanagement-dataobjects</artifactId>
       <version>2.0</version>
     </dependency>


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

[Openutils-svn] SF.net SVN: openutils: [625] trunk/openutils-spring/pom.xml

[<fc...@us...>]

Revision: 625
          http://openutils.svn.sourceforge.net/openutils/?rev=625&view=rev
Author:   fcarone
Date:     2008-02-19 02:28:04 -0800 (Tue, 19 Feb 2008)

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

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

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2008-02-19 10:27:54 UTC (rev 624)
+++ trunk/openutils-spring/pom.xml	2008-02-19 10:28:04 UTC (rev 625)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-spring</artifactId>
   <name>openutils spring tools</name>
-  <version>2.0</version>
+  <version>2.0.1-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
@@ -146,10 +146,4 @@
   <properties>
     <spring.version>2.5.1</spring.version>
   </properties>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-2.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-2.0</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-2.0</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: [624] tags

[<fc...@us...>]

Revision: 624
          http://openutils.svn.sourceforge.net/openutils/?rev=624&view=rev
Author:   fcarone
Date:     2008-02-19 02:27:54 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-spring-2.0

Added Paths:
-----------
    tags/openutils-spring-2.0/
    tags/openutils-spring-2.0/pom.xml

Removed Paths:
-------------
    tags/openutils-spring-2.0/pom.xml

Copied: tags/openutils-spring-2.0 (from rev 614, trunk/openutils-spring)

Deleted: tags/openutils-spring-2.0/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2008-02-11 20:51:03 UTC (rev 614)
+++ tags/openutils-spring-2.0/pom.xml	2008-02-19 10:27:54 UTC (rev 624)
@@ -1,150 +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>7</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>openutils-spring</artifactId>
-  <name>openutils spring tools</name>
-  <version>2.0-SNAPSHOT</version>
-  <description />
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${spring.version}</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>jstl:jar</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
-        </exclusion>
-        <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>
-        <exclusion>
-          <groupId>struts</groupId>
-          <artifactId>struts</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.json-lib</groupId>
-      <artifactId>json-lib</artifactId>
-      <version>1.1</version>
-      <classifier>jdk15</classifier>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-      <version>2.3.11</version>
-      <optional>true</optional>
-    </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>
-  <properties>
-    <spring.version>2.5.1</spring.version>
-  </properties>
-</project>
\ No newline at end of file

Copied: tags/openutils-spring-2.0/pom.xml (from rev 623, trunk/openutils-spring/pom.xml)
===================================================================
--- tags/openutils-spring-2.0/pom.xml	                        (rev 0)
+++ tags/openutils-spring-2.0/pom.xml	2008-02-19 10:27:54 UTC (rev 624)
@@ -0,0 +1,155 @@
+<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>7</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-spring</artifactId>
+  <name>openutils spring tools</name>
+  <version>2.0</version>
+  <description />
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring.version}</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl:jar</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>taglibs</groupId>
+          <artifactId>standard</artifactId>
+        </exclusion>
+        <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>
+        <exclusion>
+          <groupId>struts</groupId>
+          <artifactId>struts</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.json-lib</groupId>
+      <artifactId>json-lib</artifactId>
+      <version>1.1</version>
+      <classifier>jdk15</classifier>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.7.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+      <version>1.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-annotations</artifactId>
+      <version>3.2.1.ga</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.1_3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+      <version>2.3.11</version>
+      <optional>true</optional>
+    </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>
+  <properties>
+    <spring.version>2.5.1</spring.version>
+  </properties>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-2.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-2.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-2.0</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: [623] trunk/openutils-spring/pom.xml

[<fc...@us...>]

Revision: 623
          http://openutils.svn.sourceforge.net/openutils/?rev=623&view=rev
Author:   fcarone
Date:     2008-02-19 02:27:44 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-spring-2.0

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

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2008-02-19 10:26:13 UTC (rev 622)
+++ trunk/openutils-spring/pom.xml	2008-02-19 10:27:44 UTC (rev 623)
@@ -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-spring</artifactId>
   <name>openutils spring tools</name>
-  <version>2.0-SNAPSHOT</version>
+  <version>2.0</version>
   <description />
   <dependencies>
     <dependency>
@@ -147,4 +146,10 @@
   <properties>
     <spring.version>2.5.1</spring.version>
   </properties>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-2.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-2.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-2.0</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: [622] trunk/openutils-usermanagement/pom.xml

[<fc...@us...>]

Revision: 622
          http://openutils.svn.sourceforge.net/openutils/?rev=622&view=rev
Author:   fcarone
Date:     2008-02-19 02:26:13 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
openutils spring dependency verison fixed

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

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-02-19 10:24:17 UTC (rev 621)
+++ trunk/openutils-usermanagement/pom.xml	2008-02-19 10:26:13 UTC (rev 622)
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-spring</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.4</version>
       <optional>true</optional>
     </dependency>
     <dependency>


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

[Openutils-svn] SF.net SVN: openutils: [621] trunk/openutils-usermanagement/pom.xml

[<fc...@us...>]

Revision: 621
          http://openutils.svn.sourceforge.net/openutils/?rev=621&view=rev
Author:   fcarone
Date:     2008-02-19 02:24:17 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
Do not depend on snapshots

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

Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml	2008-02-19 10:22:39 UTC (rev 620)
+++ trunk/openutils-usermanagement/pom.xml	2008-02-19 10:24:17 UTC (rev 621)
@@ -1,140 +1,180 @@
-<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>7</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <groupId>net.sourceforge.openutils</groupId>
-  <artifactId>openutils-usermanagement</artifactId>
-  <packaging>jar</packaging>
-  <name>openutils-usermanagement</name>
-  <version>2.0-SNAPSHOT</version>
-  <description>Usermanagement classes</description>
-  <dependencies>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-spring</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-usermanagement-dataobjects</artifactId>
-      <version>2.0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-bshd5</artifactId>
-      <version>2.0.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-testing-junit</artifactId>
-      <version>2.0.3-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>3.2.1.ga</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>xerces</artifactId>
-          <groupId>xerces</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>xml-apis</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
-      <version>1.0.3</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-remoting</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-jdbc</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-support</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.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.2.2.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>dbunit</groupId>
-      <artifactId>dbunit</artifactId>
-      <version>2.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+<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>7</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>net.sourceforge.openutils</groupId>
+  <artifactId>openutils-usermanagement</artifactId>
+  <packaging>jar</packaging>
+  <name>openutils-usermanagement</name>
+  <version>2.0-SNAPSHOT</version>
+  <description>Usermanagement classes</description>
+  <properties>
+    <spring.version>2.5.1</spring.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.testng</groupId>
+          <artifactId>testng</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-spring</artifactId>
+      <version>1.0.5</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-usermanagement-dataobjects</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-bshd5</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-testing-junit</artifactId>
+      <version>2.0.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-annotations</artifactId>
+      <version>3.2.1.ga</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.1_3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>xerces</artifactId>
+          <groupId>xerces</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>xml-apis</artifactId>
+          <groupId>xml-apis</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+      <version>1.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.acegisecurity</groupId>
+      <artifactId>acegi-security</artifactId>
+      <version>1.0.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-remoting</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jdbc</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-support</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.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.2.2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>dbunit</groupId>
+      <artifactId>dbunit</artifactId>
+      <version>2.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </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.