openutils-svn — developer list with svn commits

[Openutils-svn] SF.net SVN: openutils:[4590] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4590
          http://openutils.svn.sourceforge.net/openutils/?rev=4590&view=rev
Author:   gcatania
Date:     2014-08-01 17:23:04 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
Merged revisions 4588 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4588 | gcatania | 2014-08-01 19:14:45 +0200 (ven, 01 ago 2014) | 1 line
  
  BSHD-26 fix license header
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4588&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-08-01 17:21:35 UTC (rev 4589)
+++ branches/openutils-bshd5-backport	2014-08-01 17:23:04 UTC (rev 4590)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585,4587
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585,4587-4588
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:21:35 UTC (rev 4589)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:23:04 UTC (rev 4590)
@@ -1,5 +1,26 @@
 /**
- * Copyright (c) Energeya LLC.  All rights reserved. http://www.energeya.com
+ *
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
+ *
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package it.openutils.hibernate.example;
 

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

[Openutils-svn] SF.net SVN: openutils:[4589] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4589
          http://openutils.svn.sourceforge.net/openutils/?rev=4589&view=rev
Author:   gcatania
Date:     2014-08-01 17:21:35 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
Merged revisions 4587 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4587 | gcatania | 2014-08-01 19:09:42 +0200 (ven, 01 ago 2014) | 1 line
  
  BSHD-26 improve test coverage
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4587&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java

Added Paths:
-----------
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-08-01 17:14:45 UTC (rev 4588)
+++ branches/openutils-bshd5-backport	2014-08-01 17:21:35 UTC (rev 4589)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585,4587
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-08-01 17:14:45 UTC (rev 4588)
+++ branches/openutils-bshd5-backport/pom.xml	2014-08-01 17:21:35 UTC (rev 4589)
@@ -190,6 +190,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
     <slf4j.version>1.6.5</slf4j.version>

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:09:42 UTC (rev 4587)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:21:35 UTC (rev 4589)
@@ -20,10 +20,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.Matcher;
 import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
-import org.hibernate.event.spi.EventSource;
 import org.hibernate.metadata.ClassMetadata;
 import org.mockito.ArgumentMatcher;
 import org.testng.Assert;
@@ -135,16 +136,20 @@
         Assert.assertEquals(getPath(new String[]{"a", "b", "c" }), "a.b.c");
     }
 
+    /**
+     * TODO also test HibernateProxy case
+     */
     @Test
     public void testAddIdentifierRestrictionWhenAdded()
     {
         Criteria crit = mock(Criteria.class);
         Object entity = new Object();
         // mock EventSource because it needs to implement both Session and SessionImplementor
-        EventSource sess = mock(EventSource.class);
+        Session sess = mock(Session.class);
         ClassMetadata clm = mock(ClassMetadata.class);
+        when(sess.getEntityMode()).thenReturn(EntityMode.POJO);
         when(clm.getIdentifierPropertyName()).thenReturn("id");
-        when(clm.getIdentifier(entity, sess)).thenReturn(1);
+        when(clm.getIdentifier(entity, EntityMode.POJO)).thenReturn(1);
 
         boolean added = addIdentifierRestriction(crit, entity, clm, sess);
         Assert.assertTrue(added, "identifier restriction not added");
@@ -168,8 +173,7 @@
     {
         Criteria crit = mock(Criteria.class);
         Object entity = new Object();
-        // mock EventSource because it needs to implement both Session and SessionImplementor
-        EventSource sess = mock(EventSource.class);
+        Session sess = mock(Session.class);
         ClassMetadata clm = mock(ClassMetadata.class);
         when(clm.getIdentifierPropertyName()).thenReturn(null);
 
@@ -182,11 +186,11 @@
     {
         Criteria crit = mock(Criteria.class);
         Object entity = new Object();
-        // mock EventSource because it needs to implement both Session and SessionImplementor
-        EventSource sess = mock(EventSource.class);
+        Session sess = mock(Session.class);
         ClassMetadata clm = mock(ClassMetadata.class);
+        when(sess.getEntityMode()).thenReturn(EntityMode.POJO);
         when(clm.getIdentifierPropertyName()).thenReturn("id");
-        when(clm.getIdentifier(entity, sess)).thenReturn(null);
+        when(clm.getIdentifier(entity, EntityMode.POJO)).thenReturn(null);
 
         boolean added = addIdentifierRestriction(crit, entity, clm, sess);
         Assert.assertFalse(added, "identifier restriction added");

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

[Openutils-svn] SF.net SVN: openutils:[4588] trunk/openutils-bshd5/src/test/java/it/ openutils/hibernate/example/ExampleTreeUtilsTest.java

[<gca...@us...>]

Revision: 4588
          http://openutils.svn.sourceforge.net/openutils/?rev=4588&view=rev
Author:   gcatania
Date:     2014-08-01 17:14:45 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
BSHD-26 fix license header

Modified Paths:
--------------
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:09:42 UTC (rev 4587)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:14:45 UTC (rev 4588)
@@ -1,5 +1,26 @@
 /**
- * Copyright (c) Energeya LLC.  All rights reserved. http://www.energeya.com
+ *
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
+ *
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 package it.openutils.hibernate.example;
 

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

[Openutils-svn] SF.net SVN: openutils:[4587] trunk/openutils-bshd5

[<gca...@us...>]

Revision: 4587
          http://openutils.svn.sourceforge.net/openutils/?rev=4587&view=rev
Author:   gcatania
Date:     2014-08-01 17:09:42 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
BSHD-26 improve test coverage

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

Added Paths:
-----------
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2014-08-01 17:03:08 UTC (rev 4586)
+++ trunk/openutils-bshd5/pom.xml	2014-08-01 17:09:42 UTC (rev 4587)
@@ -179,6 +179,12 @@
       <version>6.8.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
     <slf4j.version>1.7.7</slf4j.version>

Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	                        (rev 0)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java	2014-08-01 17:09:42 UTC (rev 4587)
@@ -0,0 +1,195 @@
+/**
+ * Copyright (c) Energeya LLC.  All rights reserved. http://www.energeya.com
+ */
+package it.openutils.hibernate.example;
+
+import static it.openutils.hibernate.example.ExampleTreeUtils.addIdentifierRestriction;
+import static it.openutils.hibernate.example.ExampleTreeUtils.alreadyWalked;
+import static it.openutils.hibernate.example.ExampleTreeUtils.append;
+import static it.openutils.hibernate.example.ExampleTreeUtils.getClassMetadata;
+import static it.openutils.hibernate.example.ExampleTreeUtils.getPath;
+import static it.openutils.hibernate.example.ExampleTreeUtils.getValueFromCollection;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hamcrest.Matcher;
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.event.spi.EventSource;
+import org.hibernate.metadata.ClassMetadata;
+import org.mockito.ArgumentMatcher;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author gcatania
+ * @version $Id$
+ */
+public class ExampleTreeUtilsTest
+{
+
+    @Test
+    public void testAlreadyWalked()
+    {
+        Assert.assertFalse(alreadyWalked(new String[0], "prop"));
+        Assert.assertFalse(alreadyWalked(new String[]{"prop" }, "prop"));
+        Assert.assertFalse(alreadyWalked(new String[]{"prop", "childProp" }, "childProp"));
+        Assert.assertFalse(alreadyWalked(new String[]{"prop", "childProp", "grandchildProp" }, "childProp"));
+        Assert.assertFalse(alreadyWalked(new String[]{"prop", "childProp", "grandchildProp" }, "grandchildProp"));
+        Assert.assertFalse(alreadyWalked(new String[]{"prop", "childProp", "parentProp" }, "childProp"));
+        Assert.assertFalse(alreadyWalked(new String[]{"prop", "childProp", "parentProp", "childProp" }, "childProp"));
+        Assert.assertFalse(alreadyWalked(new String[]{"a", "b", "c", "b" }, "b"));
+        Assert.assertTrue(alreadyWalked(new String[]{"a", "b", "a", "b" }, "a"));
+    }
+
+    @Test
+    public void testGetValueFromColl()
+    {
+        Assert.assertNull(getValueFromCollection("prop", null));
+        Assert.assertNull(getValueFromCollection("prop", Collections.emptySet()));
+        Assert.assertNull(getValueFromCollection("prop", Collections.emptyList()));
+        Assert.assertNull(getValueFromCollection("prop", new Object[0]));
+        Assert.assertNull(getValueFromCollection("prop", new double[0]));
+
+        Object singleResult = new Object();
+        Assert.assertEquals(getValueFromCollection("prop", Collections.singleton(singleResult)), singleResult);
+        Assert.assertEquals(getValueFromCollection("prop", Collections.singletonList(singleResult)), singleResult);
+        Assert.assertEquals(getValueFromCollection("prop", new Object[]{singleResult }), singleResult);
+        Assert.assertEquals(getValueFromCollection("prop", new double[]{3d }), 3d);
+
+        try
+        {
+            getValueFromCollection("wasabi", Arrays.asList("a", "b"));
+            Assert.fail("Should have thrown exception");
+        }
+        catch (IllegalArgumentException e)
+        {
+            Assert.assertTrue(e.getMessage().contains("wasabi"), "exception message did not report property name.\n"
+                + e.getMessage());
+        }
+        try
+        {
+            getValueFromCollection("wasabi", new String[]{"a", "b" });
+            Assert.fail("Should have thrown exception");
+        }
+        catch (IllegalArgumentException e)
+        {
+            Assert.assertTrue(e.getMessage().contains("wasabi"), "exception message did not report property name.\n"
+                + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testGetClassMetadata()
+    {
+        SessionFactory sess = mock(SessionFactory.class);
+        ClassMetadata clm = mock(ClassMetadata.class);
+        when(sess.getClassMetadata(String.class)).thenReturn(clm);
+
+        ClassMetadata returned = getClassMetadata("pippo", sess);
+        Assert.assertEquals(returned, clm);
+    }
+
+    @Test
+    public void testGetClassMetadataNotFound()
+    {
+        SessionFactory sess = mock(SessionFactory.class);
+        when(sess.getClassMetadata(String.class)).thenReturn(null);
+
+        try
+        {
+            getClassMetadata("pippo", sess);
+            Assert.fail("Should have thrown exception");
+        }
+        catch (IllegalStateException e)
+        {
+            Assert.assertTrue(
+                e.getMessage().contains(String.class.toString()),
+                "exception message did not report entity type.\n" + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testAppend()
+    {
+        Assert.assertEquals(append(new String[0], "a"), new String[]{"a" });
+        Assert.assertEquals(append(new String[]{"a" }, "b"), new String[]{"a", "b" });
+        Assert.assertEquals(append(new String[]{null }, null), new String[]{null, null });
+    }
+
+    @Test
+    public void testGetPath()
+    {
+        Assert.assertEquals(getPath(new String[0]), StringUtils.EMPTY);
+        Assert.assertEquals(getPath(new String[]{"pippo" }), "pippo");
+        Assert.assertEquals(getPath(new String[]{"a", "b" }), "a.b");
+        Assert.assertEquals(getPath(new String[]{"a", "b", "c" }), "a.b.c");
+    }
+
+    @Test
+    public void testAddIdentifierRestrictionWhenAdded()
+    {
+        Criteria crit = mock(Criteria.class);
+        Object entity = new Object();
+        // mock EventSource because it needs to implement both Session and SessionImplementor
+        EventSource sess = mock(EventSource.class);
+        ClassMetadata clm = mock(ClassMetadata.class);
+        when(clm.getIdentifierPropertyName()).thenReturn("id");
+        when(clm.getIdentifier(entity, sess)).thenReturn(1);
+
+        boolean added = addIdentifierRestriction(crit, entity, clm, sess);
+        Assert.assertTrue(added, "identifier restriction not added");
+
+        Matcher<Criterion> hasSameToStringAsIdEqualsOneRestriction = new ArgumentMatcher<Criterion>()
+        {
+
+            @Override
+            public boolean matches(Object argument)
+            {
+                // all this mess because Restriction does not support equals
+                return argument != null && Restrictions.idEq(1).toString().equals(argument.toString());
+            }
+
+        };
+        verify(crit).add(argThat(hasSameToStringAsIdEqualsOneRestriction));
+    }
+
+    @Test
+    public void testAddIdentifierRestrictionWhenNotAdded1()
+    {
+        Criteria crit = mock(Criteria.class);
+        Object entity = new Object();
+        // mock EventSource because it needs to implement both Session and SessionImplementor
+        EventSource sess = mock(EventSource.class);
+        ClassMetadata clm = mock(ClassMetadata.class);
+        when(clm.getIdentifierPropertyName()).thenReturn(null);
+
+        boolean added = addIdentifierRestriction(crit, entity, clm, sess);
+        Assert.assertFalse(added, "identifier restriction added");
+    }
+
+    @Test
+    public void testAddIdentifierRestrictionWhenNotAdded2()
+    {
+        Criteria crit = mock(Criteria.class);
+        Object entity = new Object();
+        // mock EventSource because it needs to implement both Session and SessionImplementor
+        EventSource sess = mock(EventSource.class);
+        ClassMetadata clm = mock(ClassMetadata.class);
+        when(clm.getIdentifierPropertyName()).thenReturn("id");
+        when(clm.getIdentifier(entity, sess)).thenReturn(null);
+
+        boolean added = addIdentifierRestriction(crit, entity, clm, sess);
+        Assert.assertFalse(added, "identifier restriction added");
+    }
+
+}


Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/example/ExampleTreeUtilsTest.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[4586] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4586
          http://openutils.svn.sourceforge.net/openutils/?rev=4586&view=rev
Author:   gcatania
Date:     2014-08-01 17:03:08 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
Merged revisions 4585 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4585 | gcatania | 2014-08-01 19:01:13 +0200 (ven, 01 ago 2014) | 1 line
  
  BSHD-25 improve error reporting in getValueFromCollection()
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4585&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-08-01 17:01:13 UTC (rev 4585)
+++ branches/openutils-bshd5-backport	2014-08-01 17:03:08 UTC (rev 4586)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2014-08-01 17:01:13 UTC (rev 4585)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2014-08-01 17:03:08 UTC (rev 4586)
@@ -310,7 +310,7 @@
                 Object propertyValue = classMetadata.getPropertyValue(entity, propertyName, entityMode);
                 if (propertyType.isCollectionType())
                 {
-                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyValue);
+                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyName, propertyValue);
                 }
                 if (propertyValue == null)
                 {
@@ -369,7 +369,7 @@
  * workaround to {@link Example} not exposing internal property selectors
  * @author gcatania
  */
-@SuppressWarnings({"serial", "static-method"})
+@SuppressWarnings({"serial", "static-method" })
 class ExampleTreePropertySelectorSupport
 {
 
@@ -382,6 +382,7 @@
     static final class AllPropertySelector implements PropertySelector
     {
 
+        @Override
         public boolean include(Object object, String propertyName, Type type)
         {
             return true;
@@ -396,6 +397,7 @@
     static final class NotNullPropertySelector implements PropertySelector
     {
 
+        @Override
         public boolean include(Object object, String propertyName, Type type)
         {
             return object != null;
@@ -410,6 +412,7 @@
     static final class NotNullOrZeroPropertySelector implements PropertySelector
     {
 
+        @Override
         public boolean include(Object object, String propertyName, Type type)
         {
             return object != null && (!(object instanceof Number) || ((Number) object).longValue() != 0);

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2014-08-01 17:01:13 UTC (rev 4585)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2014-08-01 17:03:08 UTC (rev 4586)
@@ -25,6 +25,7 @@
 package it.openutils.hibernate.example;
 
 import java.lang.reflect.Array;
+import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -88,13 +89,15 @@
     }
 
     /**
-     * retrieves a value from a collection
+     * retrieves a value from a collection property
+     * @param propertyName the property name (will be reported in the exception)
      * @param collectionValue the collection
      * @return a value
      * @see http://opensource2.atlassian.com/projects/hibernate/browse/HHH-879
      * @throws IllegalArgumentException if the input collection contains more than one value
      */
-    public static Object getValueFromCollection(Object collectionValue) throws IllegalArgumentException
+    public static Object getValueFromCollection(String propertyName, Object collectionValue)
+        throws IllegalArgumentException
     {
         if (collectionValue != null)
         {
@@ -108,8 +111,10 @@
                 }
                 if (size > 1)
                 {
-                    throw new IllegalArgumentException("More than one element in filter collection is unsupported.\n"
-                        + coll);
+                    throw new IllegalArgumentException(MessageFormat.format(
+                        "More than one element in filter collection is unsupported.\nproperty: {0}, value: {1}",
+                        propertyName,
+                        coll));
                 }
             }
             Class< ? extends Object> clazz = collectionValue.getClass();
@@ -122,7 +127,13 @@
                 }
                 if (length > 1)
                 {
-                    throw new IllegalArgumentException("More than one element in filter array is unsupported.");
+                    throw new IllegalArgumentException(
+                        MessageFormat
+                            .format(
+                                "More than one element in filter array is unsupported.\nproperty: {0}, value: {1} - length: {2}",
+                                propertyName,
+                                collectionValue,
+                                length));
                 }
             }
             // TODO other cases?

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2014-08-01 17:01:13 UTC (rev 4585)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2014-08-01 17:03:08 UTC (rev 4586)
@@ -145,7 +145,7 @@
 
                 if (propertyType.isCollectionType())
                 {
-                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyValue);
+                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyName, propertyValue);
                 }
                 if (propertyValue == null)
                 {

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

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

[<gca...@us...>]

Revision: 4585
          http://openutils.svn.sourceforge.net/openutils/?rev=4585&view=rev
Author:   gcatania
Date:     2014-08-01 17:01:13 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
BSHD-25 improve error reporting in getValueFromCollection()

Modified Paths:
--------------
    trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java
    trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
    trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2014-07-08 11:15:38 UTC (rev 4584)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2014-08-01 17:01:13 UTC (rev 4585)
@@ -306,7 +306,7 @@
                 Object propertyValue = classMetadata.getPropertyValue(entity, propertyName);
                 if (propertyType.isCollectionType())
                 {
-                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyValue);
+                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyName, propertyValue);
                 }
                 if (propertyValue == null)
                 {
@@ -365,7 +365,7 @@
  * workaround to {@link Example} not exposing internal property selectors
  * @author gcatania
  */
-@SuppressWarnings({"serial", "static-method"})
+@SuppressWarnings({"serial", "static-method" })
 class ExampleTreePropertySelectorSupport
 {
 
@@ -378,6 +378,7 @@
     static final class AllPropertySelector implements PropertySelector
     {
 
+        @Override
         public boolean include(Object object, String propertyName, Type type)
         {
             return true;
@@ -392,6 +393,7 @@
     static final class NotNullPropertySelector implements PropertySelector
     {
 
+        @Override
         public boolean include(Object object, String propertyName, Type type)
         {
             return object != null;
@@ -406,6 +408,7 @@
     static final class NotNullOrZeroPropertySelector implements PropertySelector
     {
 
+        @Override
         public boolean include(Object object, String propertyName, Type type)
         {
             return object != null && (!(object instanceof Number) || ((Number) object).longValue() != 0);

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2014-07-08 11:15:38 UTC (rev 4584)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2014-08-01 17:01:13 UTC (rev 4585)
@@ -25,6 +25,7 @@
 package it.openutils.hibernate.example;
 
 import java.lang.reflect.Array;
+import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -87,13 +88,15 @@
     }
 
     /**
-     * retrieves a value from a collection
+     * retrieves a value from a collection property
+     * @param propertyName the property name (will be reported in the exception)
      * @param collectionValue the collection
      * @return a value
      * @see http://opensource2.atlassian.com/projects/hibernate/browse/HHH-879
      * @throws IllegalArgumentException if the input collection contains more than one value
      */
-    public static Object getValueFromCollection(Object collectionValue) throws IllegalArgumentException
+    public static Object getValueFromCollection(String propertyName, Object collectionValue)
+        throws IllegalArgumentException
     {
         if (collectionValue != null)
         {
@@ -107,8 +110,10 @@
                 }
                 if (size > 1)
                 {
-                    throw new IllegalArgumentException("More than one element in filter collection is unsupported.\n"
-                        + coll);
+                    throw new IllegalArgumentException(MessageFormat.format(
+                        "More than one element in filter collection is unsupported.\nproperty: {0}, value: {1}",
+                        propertyName,
+                        coll));
                 }
             }
             Class< ? extends Object> clazz = collectionValue.getClass();
@@ -121,7 +126,13 @@
                 }
                 if (length > 1)
                 {
-                    throw new IllegalArgumentException("More than one element in filter array is unsupported.");
+                    throw new IllegalArgumentException(
+                        MessageFormat
+                            .format(
+                                "More than one element in filter array is unsupported.\nproperty: {0}, value: {1} - length: {2}",
+                                propertyName,
+                                collectionValue,
+                                length));
                 }
             }
             // TODO other cases?

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2014-07-08 11:15:38 UTC (rev 4584)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2014-08-01 17:01:13 UTC (rev 4585)
@@ -141,7 +141,7 @@
 
                 if (propertyType.isCollectionType())
                 {
-                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyValue);
+                    propertyValue = ExampleTreeUtils.getValueFromCollection(propertyName, propertyValue);
                 }
                 if (propertyValue == null)
                 {

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

[Openutils-svn] SF.net SVN: openutils:[4584] branches/openutils-bshd5-backport/pom.xml

[<gca...@us...>]

Revision: 4584
          http://openutils.svn.sourceforge.net/openutils/?rev=4584&view=rev
Author:   gcatania
Date:     2014-07-08 11:15:38 +0000 (Tue, 08 Jul 2014)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml

Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-07-08 11:15:19 UTC (rev 4583)
+++ branches/openutils-bshd5-backport/pom.xml	2014-07-08 11:15:38 UTC (rev 4584)
@@ -9,7 +9,7 @@
   <artifactId>openutils-bshd5</artifactId>
   <packaging>bundle</packaging>
   <name>openutils base Spring-Hibernate DAO</name>
-  <version>1.9.2</version>
+  <version>1.9.3-SNAPSHOT</version>
   <description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
   <licenses>
     <license>
@@ -24,9 +24,9 @@
   </issueManagement>
   <inceptionYear>2005</inceptionYear>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.2</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.2</developerConnection>
-    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-bshd5-1.9.2</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</developerConnection>
+    <url>http://sourceforge.net/p/openutils/code/HEAD/tree//branches/openutils-bshd5-backport</url>
   </scm>
   <build>
     <testResources>

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

[Openutils-svn] SF.net SVN: openutils:[4583] tags/openutils-bshd5-1.9.2/

[<gca...@us...>]

Revision: 4583
          http://openutils.svn.sourceforge.net/openutils/?rev=4583&view=rev
Author:   gcatania
Date:     2014-07-08 11:15:19 +0000 (Tue, 08 Jul 2014)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-bshd5-1.9.2

Added Paths:
-----------
    tags/openutils-bshd5-1.9.2/

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

[Openutils-svn] SF.net SVN: openutils:[4582] branches/openutils-bshd5-backport/pom.xml

[<gca...@us...>]

Revision: 4582
          http://openutils.svn.sourceforge.net/openutils/?rev=4582&view=rev
Author:   gcatania
Date:     2014-07-08 11:15:01 +0000 (Tue, 08 Jul 2014)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-1.9.2

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml

Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:58:57 UTC (rev 4581)
+++ branches/openutils-bshd5-backport/pom.xml	2014-07-08 11:15:01 UTC (rev 4582)
@@ -9,7 +9,7 @@
   <artifactId>openutils-bshd5</artifactId>
   <packaging>bundle</packaging>
   <name>openutils base Spring-Hibernate DAO</name>
-  <version>1.9.2-SNAPSHOT</version>
+  <version>1.9.2</version>
   <description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
   <licenses>
     <license>
@@ -24,9 +24,9 @@
   </issueManagement>
   <inceptionYear>2005</inceptionYear>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</developerConnection>
-    <url>http://sourceforge.net/p/openutils/code/HEAD/tree//branches/openutils-bshd5-backport</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.2</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.2</developerConnection>
+    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-bshd5-1.9.2</url>
   </scm>
   <build>
     <testResources>

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

[Openutils-svn] SF.net SVN: openutils:[4581] branches/openutils-bshd5-backport/

[<gca...@us...>]

Revision: 4581
          http://openutils.svn.sourceforge.net/openutils/?rev=4581&view=rev
Author:   gcatania
Date:     2014-07-04 14:58:57 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
Blocked revisions 4041,4057,4093-4094,4097,4196,4240,4410,4453-4454,4456,4571 via svnmerge

........
  r4041 | gcatania | 2012-05-20 16:42:04 +0200 (dom, 20 mag 2012) | 1 line
  
  snapshot version bump
........
  r4057 | gcatania | 2012-06-06 23:28:38 +0200 (mer, 06 giu 2012) | 1 line
  
  BSHD-10 dependency update
........
  r4093 | gcatania | 2012-07-05 16:55:25 +0200 (gio, 05 lug 2012) | 1 line
  
  BSHD-10 update slfj and spring versions
........
  r4094 | gcatania | 2012-07-05 17:03:58 +0200 (gio, 05 lug 2012) | 1 line
  
  BSHD-16 hibernate 4 compatbility changes
........
  r4097 | gcatania | 2012-07-05 17:11:03 +0200 (gio, 05 lug 2012) | 1 line
  
  BSHD-16 formatting, pom cleanup
........
  r4196 | gcatania | 2013-03-11 16:24:13 +0100 (lun, 11 mar 2013) | 1 line
  
  dependency bumps for spring, hibernate, javassist, slf4j
........
  r4240 | fgiust | 2013-05-19 14:40:38 +0200 (dom, 19 mag 2013) | 1 line
  
  update scm urls
........
  r4410 | fgiust | 2013-10-20 19:55:52 +0200 (dom, 20 ott 2013) | 1 line
  
  update sl4j version
........
  r4453 | fgiust | 2013-11-15 16:18:35 +0100 (ven, 15 nov 2013) | 1 line
  
  license header
........
  r4454 | fgiust | 2013-11-15 16:23:49 +0100 (ven, 15 nov 2013) | 1 line
  
  [maven-release-plugin] prepare release openutils-bshd5-3.0.0
........
  r4456 | fgiust | 2013-11-15 16:24:06 +0100 (ven, 15 nov 2013) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r4571 | fgiust | 2014-05-21 21:28:04 +0200 (mer, 21 mag 2014) | 1 line
  
  test commit
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4041&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4057&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4093&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4094&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4097&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4196&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4240&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4410&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4453&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4454&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4456&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4571&view=rev

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-07-04 14:57:13 UTC (rev 4580)
+++ branches/openutils-bshd5-backport	2014-07-04 14:58:57 UTC (rev 4581)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-blocked
## -1 +1 ##
-/trunk/openutils-bshd5:4041,4057,4093-4094,4097,4196
+/trunk/openutils-bshd5:4041,4057,4093-4094,4097,4196,4240,4410,4453-4454,4456,4571
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[4580] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4580
          http://openutils.svn.sourceforge.net/openutils/?rev=4580&view=rev
Author:   gcatania
Date:     2014-07-04 14:57:13 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
Merged revisions 4383 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4383 | fgiust | 2013-10-19 14:10:45 +0200 (sab, 19 ott 2013) | 1 line
  
  upgrade parent pom (maven 3.1 and java 6 required)
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4383&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadata.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
    branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Bar.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Car.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarMaker.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Designer.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Employee.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Foo.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/FullName.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Owner.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Person.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Sticker.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Title.java

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport	2014-07-04 14:57:13 UTC (rev 4580)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573,4575,4577
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:57:13 UTC (rev 4580)
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
     <relativePath>../openutils-parent</relativePath>
-    <version>1.12</version>
+    <version>1.14</version>
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <packaging>bundle</packaging>

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.dao.hibernate;
 
 import it.openutils.hibernate.example.ExampleTree;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -1,8 +1,8 @@
- /**
+/**
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.dao.hibernate;
 
 import it.openutils.hibernate.example.ExampleTree;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.example;
 
 import it.openutils.hibernate.selectors.ExcludeBackrefPropertySelector;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.example;
 
 import java.lang.reflect.Array;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadata.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadata.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadata.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.example;
 
 import org.hibernate.Criteria;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.example;
 
 import it.openutils.hibernate.selectors.ExcludeBackrefPropertySelector;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.paging;
 
 import java.io.Serializable;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.paging;
 
 import java.util.Collection;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.paging;
 
 import java.util.Collection;

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.selectors;
 
 import java.io.Serializable;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test;
 
 import it.openutils.hibernate.test.model.Address;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test;
 
 import static it.openutils.hibernate.test.EntityBuilder.bobsPrius;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test;
 
 import it.openutils.hibernate.example.ExampleTree;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test;
 
 import it.openutils.dao.hibernate.HibernateDAOImpl;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test;
 
 import it.openutils.hibernate.test.dao.BarDAO;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test;
 
 import static it.openutils.hibernate.test.EntityBuilder.alice;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.dao;
 
 import it.openutils.dao.hibernate.HibernateDAO;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.dao;
 
 import it.openutils.dao.hibernate.HibernateDAO;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.dao;
 
 import it.openutils.dao.hibernate.HibernateDAO;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.dao;
 
 import it.openutils.dao.hibernate.HibernateDAO;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.dao;
 
 import it.openutils.dao.hibernate.HibernateDAO;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.dao;
 
 import it.openutils.dao.hibernate.HibernateDAO;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import javax.persistence.Column;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Bar.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Bar.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Bar.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import javax.persistence.Entity;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Car.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Car.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Car.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import java.util.ArrayList;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarMaker.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarMaker.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarMaker.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import java.util.ArrayList;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import javax.persistence.CascadeType;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import javax.persistence.Embeddable;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Designer.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Designer.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Designer.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import java.util.HashSet;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Employee.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Employee.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Employee.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import java.util.Calendar;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Foo.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Foo.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Foo.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import javax.persistence.Column;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/FullName.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/FullName.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/FullName.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import javax.persistence.Column;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Owner.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Owner.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Owner.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import java.util.HashSet;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Person.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Person.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Person.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import java.util.Calendar;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Sticker.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Sticker.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Sticker.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 import javax.persistence.Column;

Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Title.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Title.java	2014-07-04 14:52:38 UTC (rev 4579)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Title.java	2014-07-04 14:57:13 UTC (rev 4580)
@@ -2,7 +2,7 @@
  *
  * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
  *
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 package it.openutils.hibernate.test.model;
 
 /**

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

[Openutils-svn] SF.net SVN: openutils:[4579] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4579
          http://openutils.svn.sourceforge.net/openutils/?rev=4579&view=rev
Author:   gcatania
Date:     2014-07-04 14:52:38 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
Merged revisions 4575 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4575 | gcatania | 2014-05-22 11:50:40 +0200 (gio, 22 mag 2014) | 1 line
  
  BSHD-22 update spring jira link
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4575&view=rev

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

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-07-04 14:50:58 UTC (rev 4578)
+++ branches/openutils-bshd5-backport	2014-07-04 14:52:38 UTC (rev 4579)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573,4577
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573,4575,4577
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:50:58 UTC (rev 4578)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:52:38 UTC (rev 4579)
@@ -762,7 +762,7 @@
     }
 
     /**
-     * @return This is needed as for http://opensource.atlassian.com/projects/spring/browse/SPR-2226
+     * @return This is needed as for https://jira.spring.io/browse/SPR-2226
      */
     private HibernateDAO<T, K> getThis()
     {

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

[Openutils-svn] SF.net SVN: openutils:[4578] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4578
          http://openutils.svn.sourceforge.net/openutils/?rev=4578&view=rev
Author:   gcatania
Date:     2014-07-04 14:50:58 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
Merged revisions 4577 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4577 | gcatania | 2014-07-04 16:43:33 +0200 (ven, 04 lug 2014) | 1 line
  
  BSHD-24 dependency updates
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4577&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
    branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport	2014-07-04 14:50:58 UTC (rev 4578)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573,4577
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:50:58 UTC (rev 4578)
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
+        <version>2.5.0</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
@@ -125,14 +125,14 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.1</version>
+      <version>3.3.2</version>
     </dependency>
     <dependency>
       <groupId>org.javassist</groupId>
@@ -141,10 +141,16 @@
     </dependency>
     <!-- test dependencies -->
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.0.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -161,7 +167,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.5.2</version>
+      <version>6.8.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:50:58 UTC (rev 4578)
@@ -36,8 +36,8 @@
 import java.util.Map;
 
 import org.aopalliance.aop.AspectException;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;

Modified: branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml
===================================================================
--- branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml	2014-07-04 14:43:33 UTC (rev 4577)
+++ branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml	2014-07-04 14:50:58 UTC (rev 4578)
@@ -10,7 +10,7 @@
            http://www.springframework.org/schema/context/spring-context-2.5.xsd">
   <context:annotation-config />
   <context:component-scan base-package="it.openutils.hibernate.test" />
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="driverClassName" value="${hibernate.driver}" />
     <property name="url" value="${hibernate.url}" />
     <property name="username" value="${hibernate.user}" />

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

[Openutils-svn] SF.net SVN: openutils:[4577] trunk/openutils-bshd5

[<gca...@us...>]

Revision: 4577
          http://openutils.svn.sourceforge.net/openutils/?rev=4577&view=rev
Author:   gcatania
Date:     2014-07-04 14:43:33 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
BSHD-24 dependency updates

Modified Paths:
--------------
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
    trunk/openutils-bshd5/src/test/resources/spring-tests.xml

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2014-07-04 14:12:17 UTC (rev 4576)
+++ trunk/openutils-bshd5/pom.xml	2014-07-04 14:43:33 UTC (rev 4577)
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
+        <version>2.5.0</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
@@ -122,14 +122,14 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.1</version>
+      <version>3.3.2</version>
     </dependency>
     <dependency>
       <groupId>org.javassist</groupId>
@@ -138,10 +138,16 @@
     </dependency>
     <!-- test dependencies -->
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.0.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -170,15 +176,15 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.5.2</version>
+      <version>6.8.8</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
   <properties>
-    <slf4j.version>1.7.5</slf4j.version>
-    <hibernate.version>4.1.10.Final</hibernate.version>
-    <javassist.version>3.17.1-GA</javassist.version>
-    <spring.version>3.2.1.RELEASE</spring.version>
+    <slf4j.version>1.7.7</slf4j.version>
+    <hibernate.version>4.3.5.Final</hibernate.version>
+    <javassist.version>3.18.2-GA</javassist.version>
+    <spring.version>4.0.5.RELEASE</spring.version>
   </properties>
 
   <profiles>

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:12:17 UTC (rev 4576)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-07-04 14:43:33 UTC (rev 4577)
@@ -34,8 +34,8 @@
 import java.util.Map;
 
 import org.aopalliance.aop.AspectException;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;

Modified: trunk/openutils-bshd5/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-bshd5/src/test/resources/spring-tests.xml	2014-07-04 14:12:17 UTC (rev 4576)
+++ trunk/openutils-bshd5/src/test/resources/spring-tests.xml	2014-07-04 14:43:33 UTC (rev 4577)
@@ -10,7 +10,7 @@
            http://www.springframework.org/schema/context/spring-context-3.1.xsd">
   <context:annotation-config />
   <context:component-scan base-package="it.openutils.hibernate.test" />
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="driverClassName" value="${hibernate.driver}" />
     <property name="url" value="${hibernate.url}" />
     <property name="username" value="${hibernate.user}" />

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

[Openutils-svn] SF.net SVN: openutils:[4576] branches/openutils-bshd5-backport/pom.xml

[<gca...@us...>]

Revision: 4576
          http://openutils.svn.sourceforge.net/openutils/?rev=4576&view=rev
Author:   gcatania
Date:     2014-07-04 14:12:17 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
fix scm urls

Modified Paths:
--------------
    branches/openutils-bshd5-backport/pom.xml

Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2014-05-22 09:50:40 UTC (rev 4575)
+++ branches/openutils-bshd5-backport/pom.xml	2014-07-04 14:12:17 UTC (rev 4576)
@@ -24,9 +24,9 @@
   </issueManagement>
   <inceptionYear>2005</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-bshd5-backport</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-bshd5-backport</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/branches/openutils-bshd5-backport</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</developerConnection>
+    <url>http://sourceforge.net/p/openutils/code/HEAD/tree//branches/openutils-bshd5-backport</url>
   </scm>
   <build>
     <testResources>

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

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

[<gca...@us...>]

Revision: 4575
          http://openutils.svn.sourceforge.net/openutils/?rev=4575&view=rev
Author:   gcatania
Date:     2014-05-22 09:50:40 +0000 (Thu, 22 May 2014)
Log Message:
-----------
BSHD-22 update spring jira link

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

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-22 09:38:30 UTC (rev 4574)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-22 09:50:40 UTC (rev 4575)
@@ -727,7 +727,7 @@
     }
 
     /**
-     * @return This is needed as for http://opensource.atlassian.com/projects/spring/browse/SPR-2226
+     * @return This is needed as for https://jira.spring.io/browse/SPR-2226
      */
     private HibernateDAO<T, K> getThis()
     {

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

[Openutils-svn] SF.net SVN: openutils:[4574] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4574
          http://openutils.svn.sourceforge.net/openutils/?rev=4574&view=rev
Author:   gcatania
Date:     2014-05-22 09:38:30 +0000 (Thu, 22 May 2014)
Log Message:
-----------
Merged revisions 4572-4573 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4572 | gcatania | 2014-05-22 11:20:59 +0200 (gio, 22 mag 2014) | 1 line
  
  BSHD-21 fix performance problems with find filtered first
........
  r4573 | gcatania | 2014-05-22 11:22:26 +0200 (gio, 22 mag 2014) | 1 line
  
  add missing override annotations, ignore static modifier warnings
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4572&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4573&view=rev

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

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2014-05-22 09:22:26 UTC (rev 4573)
+++ branches/openutils-bshd5-backport	2014-05-22 09:38:30 UTC (rev 4574)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4572-4573
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-22 09:22:26 UTC (rev 4573)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-22 09:38:30 UTC (rev 4574)
@@ -31,7 +31,6 @@
 
 import java.io.Serializable;
 import java.sql.SQLException;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -110,6 +109,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findAll()
     {
         return getThis().find(Collections.<Criterion> emptyList(), getDefaultOrder());
@@ -118,6 +118,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findAll(Order... orders)
     {
 
@@ -127,6 +128,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(final List< ? extends Criterion> criteria, final Order... orders)
     {
         return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
@@ -157,6 +159,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(String query)
     {
         return getHibernateTemplate().find(query);
@@ -165,14 +168,16 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(String query, Object paramValue, Type paramType)
     {
-        return getThis().find(query, new Object[]{paramValue}, new Type[]{paramType});
+        return getThis().find(query, new Object[]{paramValue }, new Type[]{paramType });
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(final String query, final Object[] paramValues, final Type[] paramTypes)
     {
         return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
@@ -189,6 +194,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(T filter)
     {
         return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, getDefaultOrder());
@@ -197,6 +203,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree)
     {
         return getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, getDefaultOrder());
@@ -205,6 +212,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(T filter, Order... orders)
     {
         return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, orders);
@@ -213,6 +221,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree, Order... orders)
     {
         return getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, orders);
@@ -221,6 +230,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(T filter, int maxResults, int page)
     {
         return getThis().findFiltered(defaultExample(filter), maxResults, page, getDefaultOrder());
@@ -229,6 +239,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree, int maxResults, int page)
     {
         return getThis().findFiltered(exampleTree, maxResults, page, getDefaultOrder());
@@ -238,6 +249,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata)
     {
@@ -254,6 +266,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page)
     {
@@ -269,48 +282,61 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(T filter)
     {
-        return getFirstInCollection(findFiltered(filter));
+        return findFilteredFirst(defaultExample(filter));
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(ExampleTree exampleTree)
     {
-        return getFirstInCollection(findFiltered(exampleTree));
+        return findFilteredFirst(exampleTree, new Order[0]);
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(T filter, final Order... orders)
     {
-        return getFirstInCollection(findFiltered(filter, orders));
+        return findFilteredFirst(defaultExample(filter), orders);
     }
 
     /**
      * {@inheritDoc}
      */
-    public T findFilteredFirst(ExampleTree exampleTree, final Order... orders)
+    @Override
+    public T findFilteredFirst(T filter, List<Criterion> criteria)
     {
-        return getFirstInCollection(findFiltered(exampleTree, orders));
+        ExampleTree exampleTree = defaultExample(filter);
+        appendToRoot(exampleTree, criteria);
+        return findFilteredFirst(exampleTree, new Order[0]);
     }
 
     /**
      * {@inheritDoc}
      */
-    public T findFilteredFirst(T filter, List<Criterion> criteria)
+    @Override
+    public T findFilteredFirst(ExampleTree exampleTree, final Order... orders)
     {
-        ExampleTree exampleTree = defaultExample(filter);
-        appendToRoot(exampleTree, criteria);
-        return getFirstInCollection(getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, getDefaultOrder()));
+        List<T> found = getThis().findFiltered(exampleTree, 1, 0, orders);
+        if (found.isEmpty())
+        {
+            return null;
+        }
+        T result = found.get(0);
+        Hibernate.initialize(result);
+        return result;
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public T load(K key)
     {
         T result = (T) getHibernateTemplate().load(getReferenceClass(), key);
@@ -321,6 +347,8 @@
     /**
      * {@inheritDoc}
      */
+    @Override
+    @Deprecated
     public T loadIfAvailable(K key)
     {
         T result = (T) getHibernateTemplate().get(getReferenceClass(), key);
@@ -335,6 +363,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T get(K key)
     {
         return (T) getHibernateTemplate().get(getReferenceClass(), key);
@@ -343,6 +372,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public K save(T obj)
     {
         return (K) getHibernateTemplate().save(obj);
@@ -351,6 +381,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void update(T obj)
     {
         getHibernateTemplate().update(obj);
@@ -359,6 +390,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void saveOrUpdate(T obj)
     {
         getHibernateTemplate().saveOrUpdate(obj);
@@ -367,6 +399,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean delete(final K key)
     {
         return (Boolean) getHibernateTemplate().execute(new HibernateCallback()
@@ -383,6 +416,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void refresh(T obj)
     {
         getHibernateTemplate().refresh(obj);
@@ -391,6 +425,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void evict(T obj)
     {
         getHibernateTemplate().evict(obj);
@@ -399,6 +434,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T merge(final T obj)
     {
         return (T) getHibernateTemplate().execute(new HibernateCallback()
@@ -415,6 +451,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findAll(Order[] orders, List<Criterion> criteria)
     {
@@ -424,6 +461,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree, int maxResults, int page, Order... orders)
     {
         return (List<T>) getHibernateTemplate().execute(
@@ -433,6 +471,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Object> findFilteredProperties(T filter, int maxResults, int page, List<String> properties,
         Order... orders)
     {
@@ -442,6 +481,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Object> findFilteredProperties(ExampleTree exampleTree, int maxResults, int page,
         List<String> properties, Order... orders)
     {
@@ -453,6 +493,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Order[] customOrder, Map<String, FilterMetadata> metadata, int maxResults,
         int page)
@@ -470,6 +511,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page,
         Order... orders)
@@ -481,6 +523,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, FilterMetadata> metadata, int maxResults, int page,
         List<Criterion> criteria, Order... orders)
@@ -501,6 +544,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Order[] orders, Map<String, FilterMetadata> metadata, int maxResults,
         int page, List<Criterion> criteria)
@@ -512,6 +556,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<?> findFilteredProperties(T filter, Order[] orders, Map<String, FilterMetadata> metadata,
         int maxResults, int page, List<Criterion> criteria, List<String> properties)
@@ -562,6 +607,7 @@
      * Return a list of <code>Order</code> object to be used for the default ordering of the collection.
      * @return the property name
      */
+    @SuppressWarnings("static-method")
     protected Order[] getDefaultOrder()
     {
         return new Order[0];
@@ -692,6 +738,7 @@
      * @deprecated this method uses the deprecated class {@link FilterMetadata}, use {@link #defaultExample(Object)}
      * instead
      */
+    @SuppressWarnings("static-method")
     @Deprecated
     protected Map<String, FilterMetadata> getDefaultFilterMetadata()
     {
@@ -699,22 +746,6 @@
     }
 
     /**
-     * Returns the first object in the collection or null if the collection is null or empty.
-     * @param list collection
-     * @return first element in the list
-     */
-    private T getFirstInCollection(Collection< ? extends T> list)
-    {
-        if (list != null && !list.isEmpty())
-        {
-            T result = list.iterator().next();
-            Hibernate.initialize(result);
-            return result;
-        }
-        return null;
-    }
-
-    /**
      * appends the input criterions to the input example tree as root entity criterions
      * @param exampleTree the example tree
      * @param criterions the criterions to append

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

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

[<gca...@us...>]

Revision: 4573
          http://openutils.svn.sourceforge.net/openutils/?rev=4573&view=rev
Author:   gcatania
Date:     2014-05-22 09:22:26 +0000 (Thu, 22 May 2014)
Log Message:
-----------
add missing override annotations, ignore static modifier warnings

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

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-22 09:20:59 UTC (rev 4572)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-22 09:22:26 UTC (rev 4573)
@@ -122,6 +122,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findAll()
     {
         return getThis().find(Collections.<Criterion> emptyList(), getDefaultOrder());
@@ -130,6 +131,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findAll(Order... orders)
     {
 
@@ -139,6 +141,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(final List< ? extends Criterion> criteria, final Order... orders)
     {
         Criteria crit = createCriteria();
@@ -162,6 +165,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(String query)
     {
         return getCurrentSession().createQuery(query).list();
@@ -170,14 +174,16 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(String query, Object paramValue, Type paramType)
     {
-        return getThis().find(query, new Object[]{paramValue}, new Type[]{paramType});
+        return getThis().find(query, new Object[]{paramValue }, new Type[]{paramType });
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> find(final String query, final Object[] paramValues, final Type[] paramTypes)
     {
         return getCurrentSession().createQuery(query).setParameters(paramValues, paramTypes).list();
@@ -186,6 +192,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(T filter)
     {
         return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, getDefaultOrder());
@@ -194,6 +201,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree)
     {
         return getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, getDefaultOrder());
@@ -202,6 +210,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(T filter, Order... orders)
     {
         return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, orders);
@@ -210,6 +219,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree, Order... orders)
     {
         return getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, orders);
@@ -218,6 +228,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(T filter, int maxResults, int page)
     {
         return getThis().findFiltered(defaultExample(filter), maxResults, page, getDefaultOrder());
@@ -226,6 +237,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree, int maxResults, int page)
     {
         return getThis().findFiltered(exampleTree, maxResults, page, getDefaultOrder());
@@ -235,6 +247,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata)
     {
@@ -251,6 +264,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page)
     {
@@ -266,6 +280,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(T filter)
     {
         return findFilteredFirst(defaultExample(filter));
@@ -274,6 +289,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(ExampleTree exampleTree)
     {
         return findFilteredFirst(exampleTree, new Order[0]);
@@ -282,6 +298,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(T filter, final Order... orders)
     {
         return findFilteredFirst(defaultExample(filter), orders);
@@ -290,6 +307,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(T filter, List< ? extends Criterion> criteria)
     {
         ExampleTree exampleTree = defaultExample(filter);
@@ -300,6 +318,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T findFilteredFirst(ExampleTree exampleTree, final Order... orders)
     {
         List<T> found = getThis().findFiltered(exampleTree, 1, 0, orders);
@@ -315,6 +334,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T load(K key)
     {
         T result = (T) sessionFactory.getCurrentSession().load(getReferenceClass(), key);
@@ -325,6 +345,7 @@
     /**
      * @deprecated same as {@link #get(Serializable)};
      */
+    @Override
     @Deprecated
     public T loadIfAvailable(K key)
     {
@@ -334,6 +355,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T get(K key)
     {
         return (T) sessionFactory.getCurrentSession().get(getReferenceClass(), key);
@@ -342,6 +364,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public K save(T obj)
     {
         return (K) sessionFactory.getCurrentSession().save(obj);
@@ -350,6 +373,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void update(T obj)
     {
         sessionFactory.getCurrentSession().update(obj);
@@ -358,6 +382,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void saveOrUpdate(T obj)
     {
         sessionFactory.getCurrentSession().saveOrUpdate(obj);
@@ -366,6 +391,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean delete(final K key)
     {
         Session s = getCurrentSession();
@@ -377,6 +403,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void refresh(T obj)
     {
         getCurrentSession().refresh(obj);
@@ -385,6 +412,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void evict(T obj)
     {
         getCurrentSession().evict(obj);
@@ -393,6 +421,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public T merge(final T obj)
     {
         return (T) getCurrentSession().merge(obj);
@@ -401,6 +430,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findAll(Order[] orders, List< ? extends Criterion> criteria)
     {
@@ -410,6 +440,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<T> findFiltered(ExampleTree exampleTree, int maxResults, int page, Order... orders)
     {
         return new ExampleTreeCallback<T>(exampleTree, maxResults, page, orders).doInHibernate(getCurrentSession());
@@ -418,6 +449,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Object> findFilteredProperties(T filter, int maxResults, int page, List<String> properties,
         Order... orders)
     {
@@ -427,6 +459,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<Object> findFilteredProperties(ExampleTree exampleTree, int maxResults, int page,
         List<String> properties, Order... orders)
     {
@@ -438,6 +471,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Order[] customOrder, Map<String, ? extends FilterMetadata> metadata,
         int maxResults, int page)
@@ -455,6 +489,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
         Order... orders)
@@ -466,6 +501,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
         List< ? extends Criterion> criteria, Order... orders)
@@ -486,6 +522,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<T> findFiltered(T filter, Order[] orders, Map<String, ? extends FilterMetadata> metadata,
         int maxResults, int page, List< ? extends Criterion> criteria)
@@ -497,6 +534,7 @@
      * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
      * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)} {@inheritDoc}
      */
+    @Override
     @Deprecated
     public List<Object> findFilteredProperties(T filter, Order[] orders,
         Map<String, ? extends FilterMetadata> metadata, int maxResults, int page, List< ? extends Criterion> criteria,
@@ -548,6 +586,7 @@
      * Return a list of <code>Order</code> object to be used for the default ordering of the collection.
      * @return the property name
      */
+    @SuppressWarnings("static-method")
     protected Order[] getDefaultOrder()
     {
         return new Order[0];
@@ -664,6 +703,7 @@
      * @deprecated this method uses the deprecated class {@link FilterMetadata}, use {@link #defaultExample(Object)}
      * instead
      */
+    @SuppressWarnings("static-method")
     @Deprecated
     protected Map<String, ? extends FilterMetadata> getDefaultFilterMetadata()
     {

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

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

[<gca...@us...>]

Revision: 4572
          http://openutils.svn.sourceforge.net/openutils/?rev=4572&view=rev
Author:   gcatania
Date:     2014-05-22 09:20:59 +0000 (Thu, 22 May 2014)
Log Message:
-----------
BSHD-21 fix performance problems with find filtered first

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

Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-21 19:28:04 UTC (rev 4571)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2014-05-22 09:20:59 UTC (rev 4572)
@@ -29,7 +29,6 @@
 import it.openutils.hibernate.example.FilterMetadataSupport;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -269,7 +268,7 @@
      */
     public T findFilteredFirst(T filter)
     {
-        return getFirstInCollection(findFiltered(filter));
+        return findFilteredFirst(defaultExample(filter));
     }
 
     /**
@@ -277,7 +276,7 @@
      */
     public T findFilteredFirst(ExampleTree exampleTree)
     {
-        return getFirstInCollection(findFiltered(exampleTree));
+        return findFilteredFirst(exampleTree, new Order[0]);
     }
 
     /**
@@ -285,25 +284,32 @@
      */
     public T findFilteredFirst(T filter, final Order... orders)
     {
-        return getFirstInCollection(findFiltered(filter, orders));
+        return findFilteredFirst(defaultExample(filter), orders);
     }
 
     /**
      * {@inheritDoc}
      */
-    public T findFilteredFirst(ExampleTree exampleTree, final Order... orders)
+    public T findFilteredFirst(T filter, List< ? extends Criterion> criteria)
     {
-        return getFirstInCollection(findFiltered(exampleTree, orders));
+        ExampleTree exampleTree = defaultExample(filter);
+        appendToRoot(exampleTree, criteria);
+        return findFilteredFirst(exampleTree, new Order[0]);
     }
 
     /**
      * {@inheritDoc}
      */
-    public T findFilteredFirst(T filter, List< ? extends Criterion> criteria)
+    public T findFilteredFirst(ExampleTree exampleTree, final Order... orders)
     {
-        ExampleTree exampleTree = defaultExample(filter);
-        appendToRoot(exampleTree, criteria);
-        return getFirstInCollection(getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, getDefaultOrder()));
+        List<T> found = getThis().findFiltered(exampleTree, 1, 0, orders);
+        if (found.isEmpty())
+        {
+            return null;
+        }
+        T result = found.get(0);
+        Hibernate.initialize(result);
+        return result;
     }
 
     /**
@@ -665,22 +671,6 @@
     }
 
     /**
-     * Returns the first object in the collection or null if the collection is null or empty.
-     * @param list collection
-     * @return first element in the list
-     */
-    private T getFirstInCollection(Collection< ? extends T> list)
-    {
-        if (list != null && !list.isEmpty())
-        {
-            T result = list.iterator().next();
-            Hibernate.initialize(result);
-            return result;
-        }
-        return null;
-    }
-
-    /**
      * appends the input criterions to the input example tree as root entity criterions
      * @param exampleTree the example tree
      * @param criterions the criterions to append

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

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

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

Revision: 4571
          http://openutils.svn.sourceforge.net/openutils/?rev=4571&view=rev
Author:   fgiust
Date:     2014-05-21 19:28:04 +0000 (Wed, 21 May 2014)
Log Message:
-----------
test commit

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

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2014-03-09 15:24:23 UTC (rev 4570)
+++ trunk/openutils-bshd5/pom.xml	2014-05-21 19:28:04 UTC (rev 4571)
@@ -28,6 +28,7 @@
     <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5</developerConnection>
     <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-bshd5</url>
   </scm>
+  
   <build>
     <testResources>
       <testResource>

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

[Openutils-svn] SF.net SVN: openutils:[4570] magnoliamodules/branches/magnolia44/ openutils-mgnlmessages/pom.xml

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

Revision: 4570
          http://openutils.svn.sourceforge.net/openutils/?rev=4570&view=rev
Author:   diego_schivo
Date:     2014-03-09 15:24:23 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
openutils-mgnlmessages pom.xml openutils-mgnlutils

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml	2014-03-09 15:24:03 UTC (rev 4569)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml	2014-03-09 15:24:23 UTC (rev 4570)
@@ -119,6 +119,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlutils</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>info.magnolia</groupId>
+          <artifactId>magnolia-module-admininterface</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <properties>
     <magnolia.version>4.4.7</magnolia.version>

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

[Openutils-svn] SF.net SVN: openutils:[4569] magnoliamodules/branches/magnolia44/ openutils-mgnlcontrols/pom.xml

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

Revision: 4569
          http://openutils.svn.sourceforge.net/openutils/?rev=4569&view=rev
Author:   diego_schivo
Date:     2014-03-09 15:24:03 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
openutils-mgnlcontrols pom.xml google-collections

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml	2014-03-09 15:23:31 UTC (rev 4568)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml	2014-03-09 15:24:03 UTC (rev 4569)
@@ -99,6 +99,11 @@
       <version>2.2</version>
     </dependency>
     <dependency>
+      <groupId>com.google.collections</groupId>
+      <artifactId>google-collections</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <classifier>jdk15</classifier>

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

[Openutils-svn] SF.net SVN: openutils:[4568] magnoliamodules/branches/magnolia44/ magnolia-test-webapp/pom.xml

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

Revision: 4568
          http://openutils.svn.sourceforge.net/openutils/?rev=4568&view=rev
Author:   diego_schivo
Date:     2014-03-09 15:23:31 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
magnolia-test-webapp pom.xml openutils-mgnlcache 1.1.4-SNAPSHOT

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml

Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml	2014-03-04 10:01:29 UTC (rev 4567)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml	2014-03-09 15:23:31 UTC (rev 4568)
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcache</artifactId>
-      <version>1.1.3-SNAPSHOT</version>
+      <version>1.1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

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

[Openutils-svn] SF.net SVN: openutils:[4567] magnoliamodules/branches/magnolia44/ openutils-mgnlcriteria/src

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

Revision: 4567
          http://openutils.svn.sourceforge.net/openutils/?rev=4567&view=rev
Author:   diego_schivo
Date:     2014-03-04 10:01:29 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
XPathTextUtils SPECIAL_CHARS

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
    magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java	2014-03-04 09:55:34 UTC (rev 4566)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java	2014-03-04 10:01:29 UTC (rev 4567)
@@ -61,7 +61,6 @@
             '\u0025', // %
             '\u0026', // &
             '\u002c', // ,
-            '\u003a', // :
             '\u003b', // ;
             '\u003c', // <
             '\u003d', // =

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2014-03-04 09:55:34 UTC (rev 4566)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2014-03-04 10:01:29 UTC (rev 4567)
@@ -138,7 +138,7 @@
     {
         for (int i = 0; i < 0x100; i++)
         {
-            if (i == 0x27 || i == 0x5b || i == 0x5d)
+            if (i == 0x27 || i == 0x3a || i == 0x5b || i == 0x5d)
             {
                 continue;
             }

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

[Openutils-svn] SF.net SVN: openutils:[4566] magnoliamodules/branches/magnolia44/ openutils-mgnlcriteria/src

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

Revision: 4566
          http://openutils.svn.sourceforge.net/openutils/?rev=4566&view=rev
Author:   diego_schivo
Date:     2014-03-04 09:55:34 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
XPathTextUtils SPECIAL_CHARS

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
    magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java	2014-03-04 09:18:57 UTC (rev 4565)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java	2014-03-04 09:55:34 UTC (rev 4566)
@@ -19,10 +19,14 @@
 
 package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.utils;
 
+import java.util.Arrays;
 import java.util.Calendar;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
 import java.util.TimeZone;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.FastDateFormat;
 import org.slf4j.Logger;
@@ -48,6 +52,64 @@
         TimeZone.getDefault(),
         Locale.ENGLISH);
 
+    public static final Set<Character> SPECIAL_CHARS = new HashSet<Character>(Arrays.asList(ArrayUtils
+        .toObject(new char[]{'\u0020', //
+            '\u0021', // !
+            '\u0022', // "
+            '\u0023', // #
+            '\u0024', // $
+            '\u0025', // %
+            '\u0026', // &
+            '\u002c', // ,
+            '\u003a', // :
+            '\u003b', // ;
+            '\u003c', // <
+            '\u003d', // =
+            '\u003e', // >
+            '\u003f', // ?
+            '\u0040', // @
+            '\u005c\', // \
+            '\u005e', // ^
+            '\u0060', // `
+            '\u007b', // {
+            '\u007d', // }
+            '\u007e', // ~
+            '\u00a0', //  
+            '\u00a1', // ¡
+            '\u00a2', // ¢
+            '\u00a3', // £
+            '\u00a4', // ¤
+            '\u00a5', // ¥
+            '\u00a6', // ¦
+            '\u00a7', // §
+            '\u00a8', // ¨
+            '\u00a9', // ©
+            '\u00aa', // ª
+            '\u00ab', // «
+            '\u00ac', // ¬
+            '\u00ad', // ­
+            '\u00ae', // ®
+            '\u00af', // ¯
+            '\u00b0', // °
+            '\u00b1', // ±
+            '\u00b2', // ²
+            '\u00b3', // ³
+            '\u00b4', // ´
+            '\u00b5', // µ
+            '\u00b6', // ¶
+            '\u00b7', // ·
+            '\u00b8', // ¸
+            '\u00b9', // ¹
+            '\u00ba', // º
+            '\u00bb', // »
+            '\u00bc', // ¼
+            '\u00bd', // ½
+            '\u00be', // ¾
+            '\u00bf', // ¿
+            '\u00d7', // ×
+            '\u00f7' // ÷
+        })));
+
     private XPathTextUtils()
     {
     }
@@ -137,28 +199,10 @@
             {
                 encodedPath.append("_x002d_");
             }
-            else if (inXpathCondition <= 0 && ch == ' ')
+            else if (inXpathCondition <= 0 && SPECIAL_CHARS.contains(ch))
             {
-                encodedPath.append("_x0020_");
+                encodedPath.append("_x").append(String.format("%04x", (int) ch)).append("_");
             }
-            else if (inXpathCondition <= 0 && ch == ',')
-            {
-                encodedPath.append("_x002c_");
-            }
-            // CRIT-53
-            else if (inXpathCondition <= 0 && ch == '\u00b0')
-            {
-                encodedPath.append("_x00b0_");
-            }
-            // CRIT-54
-            else if (inXpathCondition <= 0 && ch == '$')
-            {
-                encodedPath.append("_x0024_");
-            }
-            else if (inXpathCondition <= 0 && ch == '©')
-            {
-                encodedPath.append("_x00a9_");
-            }
             else
             {
 

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2014-03-04 09:18:57 UTC (rev 4565)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2014-03-04 09:55:34 UTC (rev 4566)
@@ -138,12 +138,14 @@
     {
         for (int i = 0; i < 0x100; i++)
         {
-            char c = (char) i;
-            if (!isPrintableChar(c))
+            if (i == 0x27 || i == 0x5b || i == 0x5d)
             {
-                log.warn("Skipping \\u{}", String.format("%04x", i));
+                continue;
             }
-            else
+            char c = (char) i;
+            boolean printable = isPrintableChar(c);
+            log.debug("\\u{} (printable={})", String.format("%04x", i), printable);
+            if (printable)
             {
                 Criteria criteria = JCRCriteriaFactory
                     .createCriteria()

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