openutils-svn Mailing List for openutils (Page 18)

Brought to you by: fcarone, fgiust, molaschi

openutils-svn — developer list with svn commits

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (4)	Nov (39)	Dec (10)
2007	Jan (19)	Feb (150)	Mar (10)	Apr	May (8)	Jun (11)	Jul (27)	Aug (52)	Sep (35)	Oct (30)	Nov (18)	Dec (4)
2008	Jan (76)	Feb (121)	Mar (39)	Apr (55)	May (18)	Jun (49)	Jul (32)	Aug (4)	Sep (10)	Oct	Nov (3)	Dec (33)
2009	Jan (19)	Feb (87)	Mar (69)	Apr (38)	May (47)	Jun (20)	Jul (5)	Aug (76)	Sep (145)	Oct (34)	Nov (8)	Dec (68)
2010	Jan (150)	Feb (379)	Mar (191)	Apr (100)	May (525)	Jun (269)	Jul (127)	Aug (190)	Sep (190)	Oct (29)	Nov (147)	Dec (83)
2011	Jan (188)	Feb (81)	Mar (43)	Apr (97)	May (63)	Jun (129)	Jul (17)	Aug (124)	Sep (6)	Oct (20)	Nov (67)	Dec (23)
2012	Jan (6)	Feb (14)	Mar (181)	Apr (64)	May (102)	Jun (47)	Jul (26)	Aug (3)	Sep (1)	Oct (14)	Nov (13)	Dec (23)
2013	Jan (4)	Feb (14)	Mar (18)	Apr (14)	May (27)	Jun (27)	Jul (5)	Aug (2)	Sep (74)	Oct (79)	Nov (21)	Dec (97)
2014	Jan (6)	Feb (3)	Mar (8)	Apr	May (5)	Jun	Jul (9)	Aug (6)	Sep (3)	Oct (10)	Nov (6)	Dec
2015	Jan	Feb	Mar (1)	Apr (25)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr (5)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 16 17 18 19 20 .. 227 > >> (Page 18 of 227)

[Openutils-svn] SF.net SVN: openutils:[4215] magnoliamodules/trunk/openutils-mgnltagcloud/ pom.xml

From: <fg...@us...> - 2013-04-02 21:24:21

Revision: 4215
          http://openutils.svn.sourceforge.net/openutils/?rev=4215&view=rev
Author:   fgiust
Date:     2013-04-02 21:24:15 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-04-02 21:24:06 UTC (rev 4214)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-04-02 21:24:15 UTC (rev 4215)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltagcloud</artifactId>
   <name>Tagcloud module for Magnolia CMS</name>
-  <version>5.0.0</version>
+  <version>5.0.1-SNAPSHOT</version>
   <description>A module for managing tag clouds for Magnolia CMS</description>
   <licenses>
     <license>
@@ -25,9 +25,9 @@
   </issueManagement>
   <inceptionYear>2010</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.0</developerConnection>
-    <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.0</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
   </scm>
   <build>
     <plugins>

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

[Openutils-svn] SF.net SVN: openutils:[4214] tags/openutils-mgnltagcloud-5.0.0/

From: <fg...@us...> - 2013-04-02 21:24:12

Revision: 4214
          http://openutils.svn.sourceforge.net/openutils/?rev=4214&view=rev
Author:   fgiust
Date:     2013-04-02 21:24:06 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnltagcloud-5.0.0

Added Paths:
-----------
    tags/openutils-mgnltagcloud-5.0.0/

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

[Openutils-svn] SF.net SVN: openutils:[4213] magnoliamodules/trunk/openutils-mgnltagcloud/ pom.xml

From: <fg...@us...> - 2013-04-02 21:23:50

Revision: 4213
          http://openutils.svn.sourceforge.net/openutils/?rev=4213&view=rev
Author:   fgiust
Date:     2013-04-02 21:23:43 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnltagcloud-5.0.0

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-04-02 21:22:09 UTC (rev 4212)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-04-02 21:23:43 UTC (rev 4213)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -11,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltagcloud</artifactId>
   <name>Tagcloud module for Magnolia CMS</name>
-  <version>5.0.0-SNAPSHOT</version>
+  <version>5.0.0</version>
   <description>A module for managing tag clouds for Magnolia CMS</description>
   <licenses>
     <license>
@@ -26,9 +25,9 @@
   </issueManagement>
   <inceptionYear>2010</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltagcloud</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.0</developerConnection>
+    <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-5.0.0</url>
   </scm>
   <build>
     <plugins>

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

[Openutils-svn] SF.net SVN: openutils:[4212] magnoliamodules/trunk/openutils-mgnltagcloud

From: <fg...@us...> - 2013-04-02 21:22:18

Revision: 4212
          http://openutils.svn.sourceforge.net/openutils/?rev=4212&view=rev
Author:   fgiust
Date:     2013-04-02 21:22:09 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
update license headers

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -55,6 +56,30 @@
           <useManifestOnlyJar>false</useManifestOnlyJar>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.mycila.maven-license-plugin</groupId>
+        <artifactId>maven-license-plugin</artifactId>
+        <version>1.5.0</version>
+        <configuration>
+          <header>src/main/etc/header.txt</header>
+          <includes>
+            <include>src/**/*.java</include>
+          </includes>
+          <properties>
+            <year>${project.inceptionYear}-2013</year>
+            <name>${project.name}</name>
+            <description>${project.description}</description>
+            <url>${project.url}</url>
+          </properties>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <resources>
       <resource>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-04-02 21:08:55 UTC (rev 4211)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-04-02 21:22:09 UTC (rev 4212)
@@ -1,7 +1,7 @@
 /**
  *
  * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

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

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

From: <fg...@us...> - 2013-04-02 21:09:03

Revision: 4211
          http://openutils.svn.sourceforge.net/openutils/?rev=4211&view=rev
Author:   fgiust
Date:     2013-04-02 21:08:55 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

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

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-04-02 21:08:45 UTC (rev 4210)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-04-02 21:08:55 UTC (rev 4211)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltagcloud</artifactId>
   <name>Tagcloud module for Magnolia CMS</name>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <description>A module for managing tag clouds for Magnolia CMS</description>
   <licenses>
     <license>
@@ -25,9 +25,9 @@
   </issueManagement>
   <inceptionYear>2010</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-1.2.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-1.2.0</developerConnection>
-    <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-1.2.0</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltagcloud</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltagcloud</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
   </scm>
   <build>
     <plugins>

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

[Openutils-svn] SF.net SVN: openutils:[4210] tags/openutils-mgnltagcloud-1.2.0/

From: <fg...@us...> - 2013-04-02 21:08:51

Revision: 4210
          http://openutils.svn.sourceforge.net/openutils/?rev=4210&view=rev
Author:   fgiust
Date:     2013-04-02 21:08:45 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnltagcloud-1.2.0

Added Paths:
-----------
    tags/openutils-mgnltagcloud-1.2.0/

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

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

From: <fg...@us...> - 2013-04-02 21:08:30

Revision: 4209
          http://openutils.svn.sourceforge.net/openutils/?rev=4209&view=rev
Author:   fgiust
Date:     2013-04-02 21:08:20 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnltagcloud-1.2.0

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

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-04-02 21:03:01 UTC (rev 4208)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-04-02 21:08:20 UTC (rev 4209)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltagcloud</artifactId>
   <name>Tagcloud module for Magnolia CMS</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.2.0</version>
   <description>A module for managing tag clouds for Magnolia CMS</description>
   <licenses>
     <license>
@@ -25,9 +25,9 @@
   </issueManagement>
   <inceptionYear>2010</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltagcloud</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltagcloud</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltagcloud</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-1.2.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-1.2.0</developerConnection>
+    <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltagcloud-1.2.0</url>
   </scm>
   <build>
     <plugins>

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

[Openutils-svn] SF.net SVN: openutils:[4208] magnoliamodules/branches/magnolia44/ openutils-mgnltagcloud

From: <fg...@us...> - 2013-04-02 21:03:08

Revision: 4208
          http://openutils.svn.sourceforge.net/openutils/?rev=4208&view=rev
Author:   fgiust
Date:     2013-04-02 21:03:01 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
TAGCLOUD-18 jackrabbit 2.4 compatibility

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-04-02 21:03:01 UTC (rev 4208)
@@ -171,7 +171,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.2</magnolia.version>
-    <jackrabbit.version>2.4.0</jackrabbit.version>
+    <magnolia.version>4.4.9-jr24</magnolia.version>
+    <jackrabbit.version>2.4.1</jackrabbit.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -51,8 +51,7 @@
         Collection<FacetHandler< ? >> facetHandlers,
         WorkArea workArea) throws IOException
     {
-        super(indexReader, facetHandlers, null, workArea);
-
+        super(indexReader, facetHandlers, null, workArea, false);
         resolver = (HierarchyResolver) indexReader;
     }
 

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -49,8 +49,9 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Query;
 
-import com.browseengine.bobo.api.BoboBrowser;
 import com.browseengine.bobo.api.BoboIndexReader;
+import com.browseengine.bobo.api.BoboSubBrowser;
+import com.browseengine.bobo.api.Browsable;
 import com.browseengine.bobo.api.BrowseException;
 import com.browseengine.bobo.api.BrowseFacet;
 import com.browseengine.bobo.api.BrowseRequest;
@@ -209,23 +210,31 @@
 
             br.setFacetSpec(propertyName, tagsSpec);
 
-            BoboBrowser browser = new BoboBrowser(boboReader);
+            Browsable browser = new BoboSubBrowser(boboReader);
+            try
+            {
 
-            // perform browse
-            BrowseResult result = browser.browse(br);
+                // perform browse
+                BrowseResult result = browser.browse(br);
 
-            // get tags
-            Map<String, FacetAccessible> facetMap = result.getFacetMap();
+                // get tags
+                Map<String, FacetAccessible> facetMap = result.getFacetMap();
 
-            FacetAccessible tagsFacets = facetMap.get(propertyName);
-            List<BrowseFacet> tagsVals = tagsFacets.getFacets();
+                FacetAccessible tagsFacets = facetMap.get(propertyName);
+                List<BrowseFacet> tagsVals = tagsFacets.getFacets();
 
-            // store them in tagCloud itself
-            tagCloud.setTags(new HashMap<String, Integer>());
-            for (BrowseFacet bf : tagsVals)
+                // store them in tagCloud itself
+                tagCloud.setTags(new HashMap<String, Integer>());
+                for (BrowseFacet bf : tagsVals)
+                {
+                    tagCloud.getTags().put(bf.getValue(), bf.getHitCount());
+                }
+            }
+            finally
             {
-                tagCloud.getTags().put(bf.getValue(), bf.getHitCount());
+                browser.close();
             }
+            
 
         }
         catch (RepositoryException ex)

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -124,7 +124,7 @@
         log.debug("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag2"));
         time = System.currentTimeMillis();
-        tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 1);
+        tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 2);
         log.debug("Time: " + (System.currentTimeMillis() - time));
         log.debug("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag1 tag4"));

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

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

From: <gca...@us...> - 2013-03-15 17:40:20

Revision: 4207
          http://openutils.svn.sourceforge.net/openutils/?rev=4207&view=rev
Author:   gcatania
Date:     2013-03-15 17:40:14 +0000 (Fri, 15 Mar 2013)
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	2013-03-15 17:40:06 UTC (rev 4206)
+++ branches/openutils-bshd5-backport/pom.xml	2013-03-15 17:40:14 UTC (rev 4207)
@@ -9,7 +9,7 @@
   <artifactId>openutils-bshd5</artifactId>
   <packaging>bundle</packaging>
   <name>openutils base Spring-Hibernate DAO</name>
-  <version>1.9.1</version>
+  <version>1.9.2-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:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.9.1</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.9.1</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.9.1</url>
+    <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>
   </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:[4206] tags/openutils-bshd5-1.9.1/

From: <gca...@us...> - 2013-03-15 17:40:13

Revision: 4206
          http://openutils.svn.sourceforge.net/openutils/?rev=4206&view=rev
Author:   gcatania
Date:     2013-03-15 17:40:06 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-bshd5-1.9.1

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

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

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

From: <gca...@us...> - 2013-03-15 17:39:55

Revision: 4205
          http://openutils.svn.sourceforge.net/openutils/?rev=4205&view=rev
Author:   gcatania
Date:     2013-03-15 17:39:49 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-1.9.1

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

Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml	2013-03-15 13:55:23 UTC (rev 4204)
+++ branches/openutils-bshd5-backport/pom.xml	2013-03-15 17:39:49 UTC (rev 4205)
@@ -9,7 +9,7 @@
   <artifactId>openutils-bshd5</artifactId>
   <packaging>bundle</packaging>
   <name>openutils base Spring-Hibernate DAO</name>
-  <version>1.9.1-SNAPSHOT</version>
+  <version>1.9.1</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: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:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.9.1</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.9.1</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.9.1</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:[4204] branches/openutils-bshd5-backport

From: <gca...@us...> - 2013-03-15 13:55:32

Revision: 4204
          http://openutils.svn.sourceforge.net/openutils/?rev=4204&view=rev
Author:   gcatania
Date:     2013-03-15 13:55:23 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Merged revisions 4197,4203 via svnmerge from 
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5

........
  r4197 | gcatania | 2013-03-11 16:29:17 +0100 (lun, 11 mar 2013) | 1 line
  
  BSHD-19 re-enable tests that no longer fail after version bump
........
  r4203 | gcatania | 2013-03-14 15:25:36 +0100 (gio, 14 mar 2013) | 1 line
  
  BSHD-20 add flag to change identifier restriction behavior, tests
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4197&view=rev
    http://openutils.svn.sourceforge.net/openutils/?rev=4203&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/FilterMetadataSupport.java
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java

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

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


Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4192,4195,4201
   + /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*,4192*,4195*,4201*
   + /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*,4192*,4195*,4197*,4201*,4203*


Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092,4192,4195,4201
   + /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092,4192,4195,4201,4203

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	2013-03-14 14:25:36 UTC (rev 4203)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2013-03-15 13:55:23 UTC (rev 4204)
@@ -46,6 +46,7 @@
 import org.hibernate.criterion.Example.PropertySelector;
 import org.hibernate.criterion.MatchMode;
 import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.type.Type;
 
 
@@ -68,6 +69,8 @@
 
     private boolean isIgnoreCaseEnabled;
 
+    private boolean jointPropertyAndIdentifierFiltering;
+
     private final Map<String, Set<String>> excludedProperties = new HashMap<String, Set<String>>();
 
     private final Map<String, List<Criterion>> additionalConditions = new HashMap<String, List<Criterion>>();
@@ -183,6 +186,18 @@
     }
 
     /**
+     * The default behaviour of this class ignores properties set on a filter entity with a non-null identifier.
+     * Invoking this method reverses the default behaviour by enabling property filtering regardless of identifier
+     * presence.
+     * @return this, for method concatenation
+     */
+    public ExampleTree enableJointPropertyAndIdentifierFiltering()
+    {
+        jointPropertyAndIdentifierFiltering = true;
+        return this;
+    }
+
+    /**
      * add an additional criterion for properties of the subentity at the given path
      * @param associationPath the association path with respect to the filter entity
      * @param criterion the criterion to add
@@ -261,9 +276,12 @@
                 entity,
                 classMetadata,
                 sessionFactory.getCurrentSession()); // BSHD-11
-            if (isIdSet)
+            if (isIdSet && (HibernateProxy.class.isInstance(entity) || !jointPropertyAndIdentifierFiltering))
             {
-                // BSHD-20 if the identifier is set on a property, do not impose further conditions
+                // BSHD-20 only impose the identifier conditions in the following cases:
+                // 1) if the current entity is an hibernate proxy (because we assume the identifier restriction is
+                // enough and the entity is already aligned
+                // 2) if the corresponding flag has not been explicitly activated
                 return;
             }
 

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	2013-03-14 14:25:36 UTC (rev 4203)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2013-03-15 13:55:23 UTC (rev 4204)
@@ -39,6 +39,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Example;
 import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.type.Type;
 
 
@@ -113,16 +114,7 @@
         private void createSubExamples(Criteria crit, Object entity, String[] walkedProperties)
         {
             ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
-            boolean isIdSet = ExampleTreeUtils.addIdentifierRestriction(
-                crit,
-                entity,
-                classMetadata,
-                sessionFactory.getCurrentSession()); // BSHD-11
-            if (isIdSet)
-            {
-                // BSHD-20 if the identifier is set on a property, do not impose further conditions
-                return;
-            }
+            ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
 
             String path = ExampleTreeUtils.getPath(walkedProperties);
             Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path);
@@ -196,6 +188,14 @@
 
         private Example example(Object entity, Set<String> propertiesToExclude)
         {
+            if (HibernateProxy.class.isInstance(entity))
+            {
+                // BSHD-19 javassist hibernate proxies do not seem to work with examples (property values are not
+                // returned)
+                HibernateProxy proxy = (HibernateProxy) entity;
+                entity = proxy.getHibernateLazyInitializer().getImplementation();
+            }
+
             Example ex = Example.create(entity);
             ex.setPropertySelector(new ExcludeBackrefPropertySelector(ExampleTreePropertySelectorSupport.NOT_NULL)); // BSHD-15
             for (String propertyName : propertiesToExclude)

Copied: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java (from rev 4203, trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java)
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java	                        (rev 0)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java	2013-03-15 13:55:23 UTC (rev 4204)
@@ -0,0 +1,142 @@
+/**
+ *
+ * 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
+ *
+ *
+ * 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.test;
+
+import it.openutils.hibernate.example.ExampleTree;
+import it.openutils.hibernate.test.dao.FooDAO;
+import it.openutils.hibernate.test.model.Bar;
+import it.openutils.hibernate.test.model.Foo;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author gcatania
+ */
+@ContextConfiguration(locations = "/spring-tests.xml")
+public class HibernateDAOFindIdentifierTest extends AbstractTransactionalTestNGSpringContextTests
+{
+
+    @Autowired
+    private FooDAO fooDAO;
+
+    @BeforeClass
+    protected final void preloadData()
+    {
+        executeSqlScript("/preload-data.sql", false);
+    }
+
+    @AfterClass
+    protected final void cleanupData()
+    {
+        super.deleteFromTables("foo", "bar");
+    }
+
+    private List<Foo> searchFoos(Long barId, String barStr, Long fooId, String fooStr)
+    {
+        Bar barFilter = new Bar();
+        barFilter.setId(barId);
+        barFilter.setS(barStr);
+        Foo fooFilter = new Foo();
+        fooFilter.setId(fooId);
+        fooFilter.setBar(barFilter);
+        fooFilter.setS(fooStr);
+        return fooDAO.findFiltered(fooFilter);
+    }
+
+    private Foo findFoo(Long barId, String barStr, Long fooId, String fooStr)
+    {
+        List<Foo> found = searchFoos(barId, barStr, fooId, fooStr);
+        Assert.assertEquals(found.size(), 1);
+        return found.get(0);
+    }
+
+    private void dontFindFoo(Long barId, String barStr, Long fooId, String fooStr)
+    {
+        List<Foo> found = searchFoos(barId, barStr, fooId, fooStr);
+        Assert.assertEquals(found.size(), 0);
+    }
+
+    @Test
+    public void testFindWithParentId()
+    {
+        Foo foundFoo = findFoo(1L, null, null, "fooX_X");
+        Assert.assertEquals(foundFoo.getId().longValue(), 3L);
+    }
+
+    @Test
+    public void testFindWithParentProperty()
+    {
+        Foo foundFoo = findFoo(null, "bar1", null, "fooX_X");
+        Assert.assertEquals(foundFoo.getId().longValue(), 3L);
+    }
+
+    @Test
+    public void testDontFindWithParentId()
+    {
+        dontFindFoo(1L, null, null, "foo2_1");
+    }
+
+    @Test
+    public void testDontFindWithParentProperty()
+    {
+        dontFindFoo(null, "bar1", null, "foo2_1");
+    }
+
+    @Test
+    public void testFindWithBothParentIdAndPropertyKeepingInMindTheMagicFlagIsDisabled()
+    {
+        List<Foo> foundFoos = searchFoos(2L, "bar1", null, null);
+        Assert.assertEquals(foundFoos.size(), 3);
+        for (Foo foo : foundFoos)
+        {
+            Assert.assertEquals(foo.getBar().getId().longValue(), 2L);
+        }
+    }
+
+    @Test
+    public void testDontFindWithBothParentIdAndPropertyKeepingInMindTheMagicFlagIsEnabled()
+    {
+        Bar barFilter = new Bar();
+        barFilter.setId(2L);
+        barFilter.setS("bar1");
+        Foo fooFilter = new Foo();
+        fooFilter.setBar(barFilter);
+        ExampleTree et = new ExampleTree(fooFilter);
+        et.enableJointPropertyAndIdentifierFiltering();
+        List<Foo> foundFoos = fooDAO.findFiltered(et);
+        Assert.assertEquals(foundFoos.size(), 0);
+    }
+
+}

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	2013-03-14 14:25:36 UTC (rev 4203)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2013-03-15 13:55:23 UTC (rev 4204)
@@ -36,6 +36,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
 import org.testng.Assert;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -59,6 +60,12 @@
         executeSqlScript("/preload-data.sql", false);
     }
 
+    @AfterClass
+    protected final void cleanupData()
+    {
+        super.deleteFromTables("foo", "bar");
+    }
+
     private List<Foo> findFoo(String s, Bar bar)
     {
         Foo filter = new Foo();

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

[Openutils-svn] Build failed in Jenkins: openutils-bshd5 #81

From: <hu...@op...> - 2013-03-14 16:01:26

See <https://hudson.openmindonline.it/job/openutils-bshd5/81/changes>

Changes:

[gcatania] BSHD-20 add flag to change identifier restriction behavior, tests

------------------------------------------
Started by an SCM change
Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
U         src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
AU        src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java
U         src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
U         src/main/java/it/openutils/hibernate/example/ExampleTree.java
At revision 4203
Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties
Parsing POMs
[openutils-bshd5] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 48860 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> clean install
[INFO] Scanning for projects...
[WARNING] POM for 'biz.aQute:bndlib:pom:1.50.0:runtime' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] ------------------------------------------------------------------------
[INFO] Building openutils base Spring-Hibernate DAO
[INFO]    task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/src/main/resources>
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-orm:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-aop:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.pom
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:pom:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.pom
[WARNING] Unable to get resource 'org.javassist:javassist:pom:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-context:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-jdbc/3.2.1.RELEASE/spring-jdbc-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-jdbc:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-test:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-tx/3.2.1.RELEASE/spring-tx-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-tx:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.pom
[WARNING] Unable to get resource 'org.hsqldb:hsqldb:pom:2.2.8' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.jar
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.jar
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.jar
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar
[WARNING] Unable to get resource 'org.javassist:javassist:jar:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:jar:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.springframework:spring-orm:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.jar
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.springframework:spring-aop:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> to /data/hudson-data/jobs/openutils-bshd5/modules/net.sourceforge.openutils$openutils-bshd5/builds/2013-03-14_15-39-10/archive/net.sourceforge.openutils/openutils-bshd5/3.0.0-SNAPSHOT/pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Failed to resolve artifact.

Missing:
----------
1) org.javassist:javassist:jar:3.17.1-GA

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.javassist:javassist:jar:3.17.1-GA

2) org.hibernate:hibernate-core:jar:4.1.10.Final

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.hibernate:hibernate-core:jar:4.1.10.Final

3) org.springframework:spring-orm:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-orm:jar:3.2.1.RELEASE

4) org.slf4j:slf4j-log4j12:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:slf4j-log4j12:jar:1.7.2

5) org.springframework:spring-aop:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-aop:jar:3.2.1.RELEASE

6) org.slf4j:jcl-over-slf4j:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:jcl-over-slf4j:jar:1.7.2

----------
6 required artifacts are missing.

for artifact: 
  net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT

from the specified remote repositories:
  openmind (http://repository.openmindonline.it)



[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 41 minutes 8 seconds
[INFO] Finished at: Thu Mar 14 16:20:30 CET 2013
[INFO] Final Memory: 29M/157M
[INFO] ------------------------------------------------------------------------
channel stopped

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

From: <gca...@us...> - 2013-03-14 14:25:47

Revision: 4203
          http://openutils.svn.sourceforge.net/openutils/?rev=4203&view=rev
Author:   gcatania
Date:     2013-03-14 14:25:36 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
BSHD-20 add flag to change identifier restriction behavior, tests

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

Added Paths:
-----------
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.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	2013-03-12 09:13:58 UTC (rev 4202)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2013-03-14 14:25:36 UTC (rev 4203)
@@ -45,6 +45,7 @@
 import org.hibernate.criterion.Example.PropertySelector;
 import org.hibernate.criterion.MatchMode;
 import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.type.Type;
 
 
@@ -67,6 +68,8 @@
 
     private boolean isIgnoreCaseEnabled;
 
+    private boolean jointPropertyAndIdentifierFiltering;
+
     private final Map<String, Set<String>> excludedProperties = new HashMap<String, Set<String>>();
 
     private final Map<String, List<Criterion>> additionalConditions = new HashMap<String, List<Criterion>>();
@@ -182,6 +185,18 @@
     }
 
     /**
+     * The default behaviour of this class ignores properties set on a filter entity with a non-null identifier.
+     * Invoking this method reverses the default behaviour by enabling property filtering regardless of identifier
+     * presence.
+     * @return this, for method concatenation
+     */
+    public ExampleTree enableJointPropertyAndIdentifierFiltering()
+    {
+        jointPropertyAndIdentifierFiltering = true;
+        return this;
+    }
+
+    /**
      * add an additional criterion for properties of the subentity at the given path
      * @param associationPath the association path with respect to the filter entity
      * @param criterion the criterion to add
@@ -257,9 +272,12 @@
                 entity,
                 classMetadata,
                 sessionFactory.getCurrentSession()); // BSHD-11
-            if (isIdSet)
+            if (isIdSet && (HibernateProxy.class.isInstance(entity) || !jointPropertyAndIdentifierFiltering))
             {
-                // BSHD-20 if the identifier is set on a property, do not impose further conditions
+                // BSHD-20 only impose the identifier conditions in the following cases:
+                // 1) if the current entity is an hibernate proxy (because we assume the identifier restriction is
+                // enough and the entity is already aligned
+                // 2) if the corresponding flag has not been explicitly activated
                 return;
             }
 

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	2013-03-12 09:13:58 UTC (rev 4202)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2013-03-14 14:25:36 UTC (rev 4203)
@@ -38,6 +38,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Example;
 import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.type.Type;
 
 
@@ -109,16 +110,7 @@
         private void createSubExamples(Criteria crit, Object entity, String[] walkedProperties)
         {
             ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
-            boolean isIdSet = ExampleTreeUtils.addIdentifierRestriction(
-                crit,
-                entity,
-                classMetadata,
-                sessionFactory.getCurrentSession()); // BSHD-11
-            if (isIdSet)
-            {
-                // BSHD-20 if the identifier is set on a property, do not impose further conditions
-                return;
-            }
+            ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
 
             String path = ExampleTreeUtils.getPath(walkedProperties);
             Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path);
@@ -192,6 +184,14 @@
 
         private Example example(Object entity, Set<String> propertiesToExclude)
         {
+            if (HibernateProxy.class.isInstance(entity))
+            {
+                // BSHD-19 javassist hibernate proxies do not seem to work with examples (property values are not
+                // returned)
+                HibernateProxy proxy = (HibernateProxy) entity;
+                entity = proxy.getHibernateLazyInitializer().getImplementation();
+            }
+
             Example ex = Example.create(entity);
             ex.setPropertySelector(new ExcludeBackrefPropertySelector(ExampleTreePropertySelectorSupport.NOT_NULL)); // BSHD-15
             for (String propertyName : propertiesToExclude)

Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java	                        (rev 0)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java	2013-03-14 14:25:36 UTC (rev 4203)
@@ -0,0 +1,142 @@
+/**
+ *
+ * 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
+ *
+ *
+ * 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.test;
+
+import it.openutils.hibernate.example.ExampleTree;
+import it.openutils.hibernate.test.dao.FooDAO;
+import it.openutils.hibernate.test.model.Bar;
+import it.openutils.hibernate.test.model.Foo;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author gcatania
+ */
+@ContextConfiguration(locations = "/spring-tests.xml")
+public class HibernateDAOFindIdentifierTest extends AbstractTransactionalTestNGSpringContextTests
+{
+
+    @Autowired
+    private FooDAO fooDAO;
+
+    @BeforeClass
+    protected final void preloadData()
+    {
+        executeSqlScript("/preload-data.sql", false);
+    }
+
+    @AfterClass
+    protected final void cleanupData()
+    {
+        super.deleteFromTables("foo", "bar");
+    }
+
+    private List<Foo> searchFoos(Long barId, String barStr, Long fooId, String fooStr)
+    {
+        Bar barFilter = new Bar();
+        barFilter.setId(barId);
+        barFilter.setS(barStr);
+        Foo fooFilter = new Foo();
+        fooFilter.setId(fooId);
+        fooFilter.setBar(barFilter);
+        fooFilter.setS(fooStr);
+        return fooDAO.findFiltered(fooFilter);
+    }
+
+    private Foo findFoo(Long barId, String barStr, Long fooId, String fooStr)
+    {
+        List<Foo> found = searchFoos(barId, barStr, fooId, fooStr);
+        Assert.assertEquals(found.size(), 1);
+        return found.get(0);
+    }
+
+    private void dontFindFoo(Long barId, String barStr, Long fooId, String fooStr)
+    {
+        List<Foo> found = searchFoos(barId, barStr, fooId, fooStr);
+        Assert.assertEquals(found.size(), 0);
+    }
+
+    @Test
+    public void testFindWithParentId()
+    {
+        Foo foundFoo = findFoo(1L, null, null, "fooX_X");
+        Assert.assertEquals(foundFoo.getId().longValue(), 3L);
+    }
+
+    @Test
+    public void testFindWithParentProperty()
+    {
+        Foo foundFoo = findFoo(null, "bar1", null, "fooX_X");
+        Assert.assertEquals(foundFoo.getId().longValue(), 3L);
+    }
+
+    @Test
+    public void testDontFindWithParentId()
+    {
+        dontFindFoo(1L, null, null, "foo2_1");
+    }
+
+    @Test
+    public void testDontFindWithParentProperty()
+    {
+        dontFindFoo(null, "bar1", null, "foo2_1");
+    }
+
+    @Test
+    public void testFindWithBothParentIdAndPropertyKeepingInMindTheMagicFlagIsDisabled()
+    {
+        List<Foo> foundFoos = searchFoos(2L, "bar1", null, null);
+        Assert.assertEquals(foundFoos.size(), 3);
+        for (Foo foo : foundFoos)
+        {
+            Assert.assertEquals(foo.getBar().getId().longValue(), 2L);
+        }
+    }
+
+    @Test
+    public void testDontFindWithBothParentIdAndPropertyKeepingInMindTheMagicFlagIsEnabled()
+    {
+        Bar barFilter = new Bar();
+        barFilter.setId(2L);
+        barFilter.setS("bar1");
+        Foo fooFilter = new Foo();
+        fooFilter.setBar(barFilter);
+        ExampleTree et = new ExampleTree(fooFilter);
+        et.enableJointPropertyAndIdentifierFiltering();
+        List<Foo> foundFoos = fooDAO.findFiltered(et);
+        Assert.assertEquals(foundFoos.size(), 0);
+    }
+
+}


Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2013-03-12 09:13:58 UTC (rev 4202)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2013-03-14 14:25:36 UTC (rev 4203)
@@ -36,6 +36,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
 import org.testng.Assert;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -59,6 +60,12 @@
         executeSqlScript("/preload-data.sql", false);
     }
 
+    @AfterClass
+    protected final void cleanupData()
+    {
+        super.deleteFromTables("foo", "bar");
+    }
+
     private List<Foo> findFoo(String s, Bar bar)
     {
         Foo filter = new Foo();

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

[Openutils-svn] Build failed in Jenkins: openutils-bshd5 #80

From: <hu...@op...> - 2013-03-12 11:01:06

See <https://hudson.openmindonline.it/job/openutils-bshd5/80/changes>

Changes:

[gcatania] BSHD-20 make identifier restrictions alternative to examples and filter metadata

------------------------------------------
Started by an SCM change
Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
U         src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
U         src/main/java/it/openutils/hibernate/example/ExampleTree.java
U         src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
At revision 4202
Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties
Parsing POMs
[openutils-bshd5] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 52830 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> clean install
[INFO] Scanning for projects...
[WARNING] POM for 'biz.aQute:bndlib:pom:1.50.0:runtime' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] ------------------------------------------------------------------------
[INFO] Building openutils base Spring-Hibernate DAO
[INFO]    task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/src/main/resources>
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-orm:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-aop:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.pom
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:pom:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.pom
[WARNING] Unable to get resource 'org.javassist:javassist:pom:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-context:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-jdbc/3.2.1.RELEASE/spring-jdbc-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-jdbc:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-test:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-tx/3.2.1.RELEASE/spring-tx-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-tx:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.pom
[WARNING] Unable to get resource 'org.hsqldb:hsqldb:pom:2.2.8' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.jar
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.jar
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.jar
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:jar:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.springframework:spring-orm:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.jar
[WARNING] Unable to get resource 'org.javassist:javassist:jar:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.springframework:spring-aop:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> to /data/hudson-data/jobs/openutils-bshd5/modules/net.sourceforge.openutils$openutils-bshd5/builds/2013-03-12_10-39-12/archive/net.sourceforge.openutils/openutils-bshd5/3.0.0-SNAPSHOT/pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Failed to resolve artifact.

Missing:
----------
1) org.hibernate:hibernate-core:jar:4.1.10.Final

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.hibernate:hibernate-core:jar:4.1.10.Final

2) org.springframework:spring-orm:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-orm:jar:3.2.1.RELEASE

3) org.slf4j:slf4j-log4j12:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:slf4j-log4j12:jar:1.7.2

4) org.javassist:javassist:jar:3.17.1-GA

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.javassist:javassist:jar:3.17.1-GA

5) org.slf4j:jcl-over-slf4j:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:jcl-over-slf4j:jar:1.7.2

6) org.springframework:spring-aop:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-aop:jar:3.2.1.RELEASE

----------
6 required artifacts are missing.

for artifact: 
  net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT

from the specified remote repositories:
  openmind (http://repository.openmindonline.it)



[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 41 minutes 4 seconds
[INFO] Finished at: Tue Mar 12 11:20:20 CET 2013
[INFO] Final Memory: 29M/190M
[INFO] ------------------------------------------------------------------------
channel stopped

[Openutils-svn] Build failed in Jenkins: openutils-bshd5 #79

From: <hu...@op...> - 2013-03-12 10:01:09

See <https://hudson.openmindonline.it/job/openutils-bshd5/79/>

------------------------------------------
Started by an SCM change
Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
At revision 4199
WARNING: clock of the subversion server appears to be out of sync. This can result in inconsistent check out behavior.
no change for https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5 since the previous build
Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties
Parsing POMs
[openutils-bshd5] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 42915 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> clean install
[INFO] Scanning for projects...
[WARNING] POM for 'biz.aQute:bndlib:pom:1.50.0:runtime' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] ------------------------------------------------------------------------
[INFO] Building openutils base Spring-Hibernate DAO
[INFO]    task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/src/main/resources>
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-orm:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-aop:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.pom
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:pom:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.pom
[WARNING] Unable to get resource 'org.javassist:javassist:pom:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-context:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-jdbc/3.2.1.RELEASE/spring-jdbc-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-jdbc:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-test:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-tx/3.2.1.RELEASE/spring-tx-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-tx:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.pom
[WARNING] Unable to get resource 'org.hsqldb:hsqldb:pom:2.2.8' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.jar
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.jar
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.jar
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.javassist:javassist:jar:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:jar:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.springframework:spring-orm:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.jar
[WARNING] Unable to get resource 'org.springframework:spring-aop:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> to /data/hudson-data/jobs/openutils-bshd5/modules/net.sourceforge.openutils$openutils-bshd5/builds/2013-03-12_09-39-06/archive/net.sourceforge.openutils/openutils-bshd5/3.0.0-SNAPSHOT/pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Failed to resolve artifact.

Missing:
----------
1) org.slf4j:slf4j-log4j12:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:slf4j-log4j12:jar:1.7.2

2) org.javassist:javassist:jar:3.17.1-GA

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.javassist:javassist:jar:3.17.1-GA

3) org.hibernate:hibernate-core:jar:4.1.10.Final

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.hibernate:hibernate-core:jar:4.1.10.Final

4) org.springframework:spring-orm:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-orm:jar:3.2.1.RELEASE

5) org.springframework:spring-aop:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-aop:jar:3.2.1.RELEASE

6) org.slf4j:jcl-over-slf4j:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:jcl-over-slf4j:jar:1.7.2

----------
6 required artifacts are missing.

for artifact: 
  net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT

from the specified remote repositories:
  openmind (http://repository.openmindonline.it)



[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 41 minutes 8 seconds
[INFO] Finished at: Tue Mar 12 10:20:25 CET 2013
[INFO] Final Memory: 30M/157M
[INFO] ------------------------------------------------------------------------
channel stopped

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

From: <gca...@us...> - 2013-03-12 09:14:07

Revision: 4202
          http://openutils.svn.sourceforge.net/openutils/?rev=4202&view=rev
Author:   gcatania
Date:     2013-03-12 09:13:58 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Merged revisions 4201 via svnmerge from 
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5

........
  r4201 | gcatania | 2013-03-12 10:06:55 +0100 (mar, 12 mar 2013) | 1 line
  
  BSHD-20 make identifier restrictions alternative to examples and filter metadata
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4201&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/
    branches/openutils-bshd5-backport/src/


Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4192,4195
   + /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4192,4195,4201
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*,4192*,4195*
   + /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*,4192*,4195*,4201*


Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092,4192,4195
   + /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092,4192,4195,4201

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	2013-03-12 09:06:55 UTC (rev 4201)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2013-03-12 09:13:58 UTC (rev 4202)
@@ -255,6 +255,18 @@
 
         private void createSubExamples(Criteria crit, Object entity, String[] walkedProperties)
         {
+            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
+            boolean isIdSet = ExampleTreeUtils.addIdentifierRestriction(
+                crit,
+                entity,
+                classMetadata,
+                sessionFactory.getCurrentSession()); // BSHD-11
+            if (isIdSet)
+            {
+                // BSHD-20 if the identifier is set on a property, do not impose further conditions
+                return;
+            }
+
             String associationPath = ExampleTreeUtils.getPath(walkedProperties);
             crit.add(example(entity, associationPath));
             for (Criterion c : getAdditionalConditions(associationPath))
@@ -262,8 +274,6 @@
                 crit.add(c);
             }
 
-            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
-            ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
             Type[] types = classMetadata.getPropertyTypes();
             String[] names = classMetadata.getPropertyNames();
             for (int i = 0; i < types.length; i++)

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	2013-03-12 09:06:55 UTC (rev 4201)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2013-03-12 09:13:58 UTC (rev 4202)
@@ -178,9 +178,11 @@
      * @param entity the entity to use as example
      * @param classMetadata the class metadata to use
      * @param ses the current session
-     * @see BSHD-11
+     * @return true if the identifier restriction has been added, false otherwise
+     * @see BSHD-11, BSHD-20
      */
-    public static void addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata, Session ses)
+    public static boolean addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata,
+        Session ses)
     {
         String identifierName = classMetadata.getIdentifierPropertyName();
         if (identifierName != null)
@@ -199,8 +201,10 @@
             if (idValue != null) // TODO should we use property selectors instead?
             {
                 crit.add(Restrictions.idEq(idValue));
+                return true;
             }
         }
+        return false;
     }
 
 }

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	2013-03-12 09:06:55 UTC (rev 4201)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2013-03-12 09:13:58 UTC (rev 4202)
@@ -112,12 +112,22 @@
 
         private void createSubExamples(Criteria crit, Object entity, String[] walkedProperties)
         {
+            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
+            boolean isIdSet = ExampleTreeUtils.addIdentifierRestriction(
+                crit,
+                entity,
+                classMetadata,
+                sessionFactory.getCurrentSession()); // BSHD-11
+            if (isIdSet)
+            {
+                // BSHD-20 if the identifier is set on a property, do not impose further conditions
+                return;
+            }
+
             String path = ExampleTreeUtils.getPath(walkedProperties);
             Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path);
             crit.add(example(entity, currFilterMetadata.keySet()));
 
-            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
-            ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
             Type[] types = classMetadata.getPropertyTypes();
             String[] names = classMetadata.getPropertyNames();
             for (int i = 0; i < types.length; i++)

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

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

From: <gca...@us...> - 2013-03-12 09:07:06

Revision: 4201
          http://openutils.svn.sourceforge.net/openutils/?rev=4201&view=rev
Author:   gcatania
Date:     2013-03-12 09:06:55 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
BSHD-20 make identifier restrictions alternative to examples and filter metadata

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	2013-03-12 08:58:39 UTC (rev 4200)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java	2013-03-12 09:06:55 UTC (rev 4201)
@@ -251,6 +251,18 @@
 
         private void createSubExamples(Criteria crit, Object entity, String[] walkedProperties)
         {
+            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
+            boolean isIdSet = ExampleTreeUtils.addIdentifierRestriction(
+                crit,
+                entity,
+                classMetadata,
+                sessionFactory.getCurrentSession()); // BSHD-11
+            if (isIdSet)
+            {
+                // BSHD-20 if the identifier is set on a property, do not impose further conditions
+                return;
+            }
+
             String associationPath = ExampleTreeUtils.getPath(walkedProperties);
             crit.add(example(entity, associationPath));
             for (Criterion c : getAdditionalConditions(associationPath))
@@ -258,8 +270,6 @@
                 crit.add(c);
             }
 
-            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
-            ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
             Type[] types = classMetadata.getPropertyTypes();
             String[] names = classMetadata.getPropertyNames();
             for (int i = 0; i < types.length; i++)

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	2013-03-12 08:58:39 UTC (rev 4200)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2013-03-12 09:06:55 UTC (rev 4201)
@@ -177,9 +177,11 @@
      * @param entity the entity to use as example
      * @param classMetadata the class metadata to use
      * @param ses the current session
-     * @see BSHD-11
+     * @return true if the identifier restriction has been added, false otherwise
+     * @see BSHD-11, BSHD-20
      */
-    public static void addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata, Session ses)
+    public static boolean addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata,
+        Session ses)
     {
         String identifierName = classMetadata.getIdentifierPropertyName();
         if (identifierName != null)
@@ -191,8 +193,10 @@
             if (idValue != null) // TODO should we use property selectors instead?
             {
                 crit.add(Restrictions.idEq(idValue));
+                return true;
             }
         }
+        return false;
     }
 
 }

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	2013-03-12 08:58:39 UTC (rev 4200)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java	2013-03-12 09:06:55 UTC (rev 4201)
@@ -108,12 +108,22 @@
 
         private void createSubExamples(Criteria crit, Object entity, String[] walkedProperties)
         {
+            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
+            boolean isIdSet = ExampleTreeUtils.addIdentifierRestriction(
+                crit,
+                entity,
+                classMetadata,
+                sessionFactory.getCurrentSession()); // BSHD-11
+            if (isIdSet)
+            {
+                // BSHD-20 if the identifier is set on a property, do not impose further conditions
+                return;
+            }
+
             String path = ExampleTreeUtils.getPath(walkedProperties);
             Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path);
             crit.add(example(entity, currFilterMetadata.keySet()));
 
-            ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory);
-            ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
             Type[] types = classMetadata.getPropertyTypes();
             String[] names = classMetadata.getPropertyNames();
             for (int i = 0; i < types.length; i++)

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

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

From: <gca...@us...> - 2013-03-12 08:58:46

Revision: 4200
          http://openutils.svn.sourceforge.net/openutils/?rev=4200&view=rev
Author:   gcatania
Date:     2013-03-12 08:58:39 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
BSHD-19 fixed for backport branch

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

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	2013-03-11 15:45:30 UTC (rev 4199)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java	2013-03-12 08:58:39 UTC (rev 4200)
@@ -37,6 +37,7 @@
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.proxy.HibernateProxy;
 
 
 /**
@@ -184,11 +185,17 @@
         String identifierName = classMetadata.getIdentifierPropertyName();
         if (identifierName != null)
         {
-            // TODO is this cast really necessary? Will it fail in future hibernate versions?
-            SessionImplementor si = (SessionImplementor) ses;
+            Object idValue;
+            // backport fix for BSHD-19 from Hibernate v4.1.10.Final
+            if (HibernateProxy.class.isInstance(entity))
+            {
+                idValue = ((HibernateProxy) entity).getHibernateLazyInitializer().getIdentifier();
+            }
+            else
+            {
+                idValue = classMetadata.getIdentifier(entity, ses.getEntityMode());
+            }
 
-            // Object idValue = classMetadata.getIdentifier(entity, si);
-            Object idValue = classMetadata.getIdentifier(entity, ses.getEntityMode());
             if (idValue != null) // TODO should we use property selectors instead?
             {
                 crit.add(Restrictions.idEq(idValue));

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	2013-03-11 15:45:30 UTC (rev 4199)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2013-03-12 08:58:39 UTC (rev 4200)
@@ -113,10 +113,7 @@
         testFindLazy(1L, "foo1_2");
     }
 
-    /**
-     * FIXME enable this test and fix BSHD-19
-     */
-    @Test(enabled = false)
+    @Test
     public void testFindWithLazyParent2()
     {
         testFindLazy(1L, "fooX_X");
@@ -132,10 +129,7 @@
         testDontFind(fooStr, bar1);
     }
 
-    /**
-     * FIXME enable this test and fix BSHD-19
-     */
-    @Test(enabled = false)
+    @Test
     public void testDontFindWithLazyParent()
     {
         long barId = 1L;

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

[Openutils-svn] Build failed in Jenkins: openutils-bshd5 #78

From: <hu...@op...> - 2013-03-11 17:01:01

See <https://hudson.openmindonline.it/job/openutils-bshd5/78/changes>

Changes:

[gcatania] BSHD-19 re-enable tests that no longer fail after version bump

[gcatania] dependency bumps for spring, hibernate, javassist, slf4j

[gcatania] BSHD-19 failing tests added (currently disabled)

------------------------------------------
Started by an SCM change
Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
AU        src/test/java/it/openutils/hibernate/test/model/Foo.java
AU        src/test/java/it/openutils/hibernate/test/model/Bar.java
AU        src/test/java/it/openutils/hibernate/test/dao/FooDAO.java
AU        src/test/java/it/openutils/hibernate/test/dao/BarDAO.java
AU        src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
AU        src/test/resources/preload-data.sql
U         src/test/resources/hibernate.cfg.xml
U         pom.xml
At revision 4198
WARNING: clock of the subversion server appears to be out of sync. This can result in inconsistent check out behavior.
Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties
Parsing POMs
[openutils-bshd5] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 45391 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> clean install
[INFO] Scanning for projects...
[WARNING] POM for 'biz.aQute:bndlib:pom:1.50.0:runtime' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] ------------------------------------------------------------------------
[INFO] Building openutils base Spring-Hibernate DAO
[INFO]    task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/src/main/resources>
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.pom
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:pom:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-orm:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-aop:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.pom
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:pom:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.pom
[WARNING] Unable to get resource 'org.javassist:javassist:pom:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-context:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-jdbc/3.2.1.RELEASE/spring-jdbc-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-jdbc:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-test:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-tx/3.2.1.RELEASE/spring-tx-3.2.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-tx:pom:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.pom
[WARNING] Unable to get resource 'org.hsqldb:hsqldb:pom:2.2.8' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final.jar
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar
Downloading: http://repository.openmindonline.it/org/javassist/javassist/3.17.1-GA/javassist-3.17.1-GA.jar
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.2.1.RELEASE/spring-orm-3.2.1.RELEASE.jar
[WARNING] Unable to get resource 'org.springframework:spring-orm:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:jar:4.1.10.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.javassist:javassist:jar:3.17.1-GA' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.jar
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar
[WARNING] Unable to get resource 'org.springframework:spring-aop:jar:3.2.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:jar:1.7.2' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> to /data/hudson-data/jobs/openutils-bshd5/modules/net.sourceforge.openutils$openutils-bshd5/builds/2013-03-11_16-39-12/archive/net.sourceforge.openutils/openutils-bshd5/3.0.0-SNAPSHOT/pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Failed to resolve artifact.

Missing:
----------
1) org.springframework:spring-orm:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-orm:jar:3.2.1.RELEASE

2) org.javassist:javassist:jar:3.17.1-GA

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.javassist -DartifactId=javassist -Dversion=3.17.1-GA -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.javassist:javassist:jar:3.17.1-GA

3) org.hibernate:hibernate-core:jar:4.1.10.Final

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.10.Final -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.hibernate:hibernate-core:jar:4.1.10.Final

4) org.slf4j:slf4j-log4j12:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:slf4j-log4j12:jar:1.7.2

5) org.springframework:spring-aop:jar:3.2.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.2.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-aop:jar:3.2.1.RELEASE

6) org.slf4j:jcl-over-slf4j:jar:1.7.2

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.7.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:jcl-over-slf4j:jar:1.7.2

----------
6 required artifacts are missing.

for artifact: 
  net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT

from the specified remote repositories:
  openmind (http://repository.openmindonline.it)



[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 41 minutes 4 seconds
[INFO] Finished at: Mon Mar 11 17:20:21 CET 2013
[INFO] Final Memory: 30M/190M
[INFO] ------------------------------------------------------------------------
channel stopped

[Openutils-svn] Build failed in Jenkins: openutils-bshd5 #77

From: <hu...@op...> - 2013-03-11 16:06:24

See <https://hudson.openmindonline.it/job/openutils-bshd5/77/>

------------------------------------------
Started by an SCM change
Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
At revision 4194
WARNING: clock of the subversion server appears to be out of sync. This can result in inconsistent check out behavior.
no change for https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5 since the previous build
Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties
Parsing POMs
[openutils-bshd5] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 45515 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> clean install
[INFO] Scanning for projects...
[WARNING] POM for 'biz.aQute:bndlib:pom:1.50.0:runtime' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] ------------------------------------------------------------------------
[INFO] Building openutils base Spring-Hibernate DAO
[INFO]    task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/src/main/resources>
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.6.6/slf4j-log4j12-1.6.6.pom
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:pom:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.pom
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:pom:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.1.1.RELEASE/spring-orm-3.1.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-orm:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.1.1.RELEASE/spring-aop-3.1.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-aop:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final.pom
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:pom:4.1.1.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-test/3.1.1.RELEASE/spring-test-3.1.1.RELEASE.pom
[WARNING] Unable to get resource 'org.springframework:spring-test:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.pom
[WARNING] Unable to get resource 'org.hsqldb:hsqldb:pom:2.2.8' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.1.1.RELEASE/spring-orm-3.1.1.RELEASE.jar
Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.6.6/slf4j-log4j12-1.6.6.jar
Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final.jar
[WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:jar:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.hibernate:hibernate-core:jar:4.1.1.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar
[WARNING] Unable to get resource 'org.springframework:spring-orm:jar:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.1.1.RELEASE/spring-aop-3.1.1.RELEASE.jar
[WARNING] Unable to get resource 'org.springframework:spring-aop:jar:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:jar:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out
[JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> to /data/hudson-data/jobs/openutils-bshd5/modules/net.sourceforge.openutils$openutils-bshd5/builds/2013-03-11_15-39-06/archive/net.sourceforge.openutils/openutils-bshd5/3.0.0-SNAPSHOT/pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Failed to resolve artifact.

Missing:
----------
1) org.slf4j:slf4j-log4j12:jar:1.6.6

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:slf4j-log4j12:jar:1.6.6

2) org.hibernate:hibernate-core:jar:4.1.1.Final

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.1.Final -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.1.Final -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.hibernate:hibernate-core:jar:4.1.1.Final

3) org.springframework:spring-orm:jar:3.1.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-orm:jar:3.1.1.RELEASE

4) org.springframework:spring-aop:jar:3.1.1.RELEASE

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.springframework:spring-aop:jar:3.1.1.RELEASE

5) org.slf4j:jcl-over-slf4j:jar:1.6.6

  Try downloading the file manually from the project website.

  Then, install it using the command: 
      mvn install:install-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file

  Alternatively, if you host your own repository you can deploy the file there: 
      mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]

  Path to dependency: 
  	1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT
  	2) org.slf4j:jcl-over-slf4j:jar:1.6.6

----------
5 required artifacts are missing.

for artifact: 
  net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT

from the specified remote repositories:
  openmind (http://repository.openmindonline.it)



[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 28 minutes 31 seconds
[INFO] Finished at: Mon Mar 11 16:07:49 CET 2013
[INFO] Final Memory: 29M/158M
[INFO] ------------------------------------------------------------------------
channel stopped

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

From: <gca...@us...> - 2013-03-11 15:45:37

Revision: 4199
          http://openutils.svn.sourceforge.net/openutils/?rev=4199&view=rev
Author:   gcatania
Date:     2013-03-11 15:45:30 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Merged revisions 4195 via svnmerge from 
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5

........
  r4195 | gcatania | 2013-03-11 16:03:14 +0100 (lun, 11 mar 2013) | 1 line
  
  BSHD-19 failing tests added (currently disabled)
........

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

Modified Paths:
--------------
    branches/openutils-bshd5-backport/src/test/resources/hibernate.cfg.xml

Added Paths:
-----------
    branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.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/FooDAO.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/Foo.java
    branches/openutils-bshd5-backport/src/test/resources/preload-data.sql

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


Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4192
   + /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4192,4195
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*,4192*
   + /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*,4192*,4195*


Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092,4192
   + /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092,4192,4195

Copied: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java (from rev 4195, trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java)
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	                        (rev 0)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2013-03-11 15:45:30 UTC (rev 4199)
@@ -0,0 +1,147 @@
+/**
+ *
+ * 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
+ *
+ *
+ * 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.test;
+
+import it.openutils.hibernate.test.dao.BarDAO;
+import it.openutils.hibernate.test.dao.FooDAO;
+import it.openutils.hibernate.test.model.Bar;
+import it.openutils.hibernate.test.model.Foo;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author gcatania
+ */
+@ContextConfiguration(locations = "/spring-tests.xml")
+public class HibernateDAOLazyLoadTest extends AbstractTransactionalTestNGSpringContextTests
+{
+
+    @Autowired
+    private FooDAO fooDAO;
+
+    @Autowired
+    private BarDAO barDAO;
+
+    @BeforeClass
+    protected final void preloadData()
+    {
+        executeSqlScript("/preload-data.sql", false);
+    }
+
+    private List<Foo> findFoo(String s, Bar bar)
+    {
+        Foo filter = new Foo();
+        filter.setBar(bar);
+        filter.setS(s);
+        List<Foo> found = fooDAO.findFiltered(filter);
+        return found;
+    }
+
+    private void testFind(long barId, String fooStr, Bar bar)
+    {
+        List<Foo> found = findFoo(fooStr, bar);
+        Assert.assertEquals(found.size(), 1);
+        Foo foo = found.get(0);
+        Assert.assertEquals(foo.getS(), fooStr);
+        Assert.assertEquals(foo.getBar().getId().longValue(), barId);
+    }
+
+    private void testDontFind(String fooStr, Bar bar)
+    {
+        List<Foo> found = findFoo(fooStr, bar);
+        Assert.assertEquals(found.size(), 0);
+    }
+
+    private void testFindEager(long barId, String fooStr)
+    {
+        Bar bar = barDAO.get(barId);
+        testFind(barId, fooStr, bar);
+    }
+
+    private void testFindLazy(long barId, String fooStr)
+    {
+        Bar bar = barDAO.load(barId);
+        testFind(barId, fooStr, bar);
+    }
+
+    @Test
+    public void testFindWithEagerParent1()
+    {
+        testFindEager(1L, "foo1_2");
+    }
+
+    @Test
+    public void testFindWithEagerParent2()
+    {
+        testFindEager(1L, "fooX_X");
+    }
+
+    @Test
+    public void testFindWithLazyParent1()
+    {
+        testFindLazy(1L, "foo1_2");
+    }
+
+    /**
+     * FIXME enable this test and fix BSHD-19
+     */
+    @Test(enabled = false)
+    public void testFindWithLazyParent2()
+    {
+        testFindLazy(1L, "fooX_X");
+    }
+
+    @Test
+    public void testDontFindWithEagerParent()
+    {
+        long barId = 1L;
+        String fooStr = "foo2_2";
+
+        Bar bar1 = barDAO.get(barId);
+        testDontFind(fooStr, bar1);
+    }
+
+    /**
+     * FIXME enable this test and fix BSHD-19
+     */
+    @Test(enabled = false)
+    public void testDontFindWithLazyParent()
+    {
+        long barId = 1L;
+        String fooStr = "foo2_2";
+
+        Bar bar1 = barDAO.load(barId);
+        testDontFind(fooStr, bar1);
+    }
+}

Copied: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java (from rev 4195, trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java)
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java	                        (rev 0)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java	2013-03-11 15:45:30 UTC (rev 4199)
@@ -0,0 +1,55 @@
+/**
+ *
+ * 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
+ *
+ *
+ * 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.test.dao;
+
+import it.openutils.dao.hibernate.HibernateDAO;
+import it.openutils.dao.hibernate.HibernateDAOImpl;
+import it.openutils.hibernate.test.model.Bar;
+
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @author gcatania
+ */
+public interface BarDAO extends HibernateDAO<Bar, Long>
+{
+
+    @Repository("barDAO")
+    class PersonDAOImpl extends HibernateDAOImpl<Bar, Long> implements BarDAO
+    {
+
+        @Autowired
+        public PersonDAOImpl(SessionFactory factory)
+        {
+            super(Bar.class);
+            setSessionFactory(factory);
+        }
+    }
+
+}

Copied: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java (from rev 4195, trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java)
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java	                        (rev 0)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java	2013-03-11 15:45:30 UTC (rev 4199)
@@ -0,0 +1,55 @@
+/**
+ *
+ * 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
+ *
+ *
+ * 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.test.dao;
+
+import it.openutils.dao.hibernate.HibernateDAO;
+import it.openutils.dao.hibernate.HibernateDAOImpl;
+import it.openutils.hibernate.test.model.Foo;
+
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @author gcatania
+ */
+public interface FooDAO extends HibernateDAO<Foo, Long>
+{
+
+    @Repository("fooDAO")
+    class PersonDAOImpl extends HibernateDAOImpl<Foo, Long> implements FooDAO
+    {
+
+        @Autowired
+        public PersonDAOImpl(SessionFactory factory)
+        {
+            super(Foo.class);
+            setSessionFactory(factory);
+        }
+    }
+
+}

Copied: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Bar.java (from rev 4195, trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java)
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Bar.java	                        (rev 0)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Bar.java	2013-03-11 15:45:30 UTC (rev 4199)
@@ -0,0 +1,80 @@
+/**
+ *
+ * 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
+ *
+ *
+ * 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.test.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+
+/**
+ * @author gcatania
+ * @version $Id$
+ */
+@Entity
+public class Bar implements Cloneable
+{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String s;
+
+    /**
+     * @return the id
+     */
+    public Long getId()
+    {
+        return id;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    /**
+     * @return the s
+     */
+    public String getS()
+    {
+        return s;
+    }
+
+    /**
+     * @param s the s to set
+     */
+    public void setS(String s)
+    {
+        this.s = s;
+    }
+
+}

Copied: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Foo.java (from rev 4195, trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java)
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Foo.java	                        (rev 0)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Foo.java	2013-03-11 15:45:30 UTC (rev 4199)
@@ -0,0 +1,102 @@
+/**
+ *
+ * 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
+ *
+ *
+ * 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.test.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+
+/**
+ * @author gcatania
+ * @version $Id$
+ */
+@Entity
+public class Foo implements Cloneable
+{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @ManyToOne
+    private Bar bar;
+
+    @Column
+    private String s;
+
+    /**
+     * @return the id
+     */
+    public Long getId()
+    {
+        return id;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    /**
+     * @return the bar
+     */
+    public Bar getBar()
+    {
+        return bar;
+    }
+
+    /**
+     * @param bar the bar to set
+     */
+    public void setBar(Bar bar)
+    {
+        this.bar = bar;
+    }
+
+    /**
+     * @return the s
+     */
+    public String getS()
+    {
+        return s;
+    }
+
+    /**
+     * @param s the s to set
+     */
+    public void setS(String s)
+    {
+        this.s = s;
+    }
+
+}

Modified: branches/openutils-bshd5-backport/src/test/resources/hibernate.cfg.xml
===================================================================
--- branches/openutils-bshd5-backport/src/test/resources/hibernate.cfg.xml	2013-03-11 15:34:58 UTC (rev 4198)
+++ branches/openutils-bshd5-backport/src/test/resources/hibernate.cfg.xml	2013-03-11 15:45:30 UTC (rev 4199)
@@ -13,5 +13,8 @@
     <mapping class="it.openutils.hibernate.test.model.Owner" />
     <mapping class="it.openutils.hibernate.test.model.Person" />
     <mapping class="it.openutils.hibernate.test.model.Sticker" />
+    
+    <mapping class="it.openutils.hibernate.test.model.Foo" />
+    <mapping class="it.openutils.hibernate.test.model.Bar" />
   </session-factory>
 </hibernate-configuration>
\ No newline at end of file

Copied: branches/openutils-bshd5-backport/src/test/resources/preload-data.sql (from rev 4195, trunk/openutils-bshd5/src/test/resources/preload-data.sql)
===================================================================
--- branches/openutils-bshd5-backport/src/test/resources/preload-data.sql	                        (rev 0)
+++ branches/openutils-bshd5-backport/src/test/resources/preload-data.sql	2013-03-11 15:45:30 UTC (rev 4199)
@@ -0,0 +1,17 @@
+insert into bar (id, s)
+values (1, 'bar1');
+insert into bar (id, s)
+values (2, 'bar2');
+
+insert into foo (id, bar_id, s)
+values ( 1, 1, 'foo1_1' );
+insert into foo (id, bar_id, s)
+values ( 2, 1, 'foo1_2' );
+insert into foo (id, bar_id, s)
+values ( 3, 1, 'fooX_X' );
+insert into foo (id, bar_id, s)
+values ( 4, 2, 'foo2_1' );
+insert into foo (id, bar_id, s)
+values ( 5, 2, 'foo2_2' );
+insert into foo (id, bar_id, s)
+values ( 6, 2, 'fooX_X' );
\ No newline at end of file

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

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

From: <gca...@us...> - 2013-03-11 15:35:05

Revision: 4198
          http://openutils.svn.sourceforge.net/openutils/?rev=4198&view=rev
Author:   gcatania
Date:     2013-03-11 15:34:58 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Blocked revisions 4196 via svnmerge

........
  r4196 | gcatania | 2013-03-11 16:24:13 +0100 (lun, 11 mar 2013) | 1 line
  
  dependency bumps for spring, hibernate, javassist, slf4j
........

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

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


Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-blocked
   - /trunk/openutils-bshd5:4041,4057,4093-4094,4097
   + /trunk/openutils-bshd5:4041,4057,4093-4094,4097,4196

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

[Openutils-svn] SF.net SVN: openutils:[4197] trunk/openutils-bshd5/src/test/java/it/ openutils/hibernate/test/HibernateDAOLazyLoadTest.java

From: <gca...@us...> - 2013-03-11 15:29:25

Revision: 4197
          http://openutils.svn.sourceforge.net/openutils/?rev=4197&view=rev
Author:   gcatania
Date:     2013-03-11 15:29:17 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
BSHD-19 re-enable tests that no longer fail after version bump

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

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2013-03-11 15:24:13 UTC (rev 4196)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java	2013-03-11 15:29:17 UTC (rev 4197)
@@ -113,10 +113,7 @@
         testFindLazy(1L, "foo1_2");
     }
 
-    /**
-     * FIXME enable this test and fix BSHD-19
-     */
-    @Test(enabled = false)
+    @Test
     public void testFindWithLazyParent2()
     {
         testFindLazy(1L, "fooX_X");
@@ -132,10 +129,7 @@
         testDontFind(fooStr, bar1);
     }
 
-    /**
-     * FIXME enable this test and fix BSHD-19
-     */
-    @Test(enabled = false)
+    @Test
     public void testDontFindWithLazyParent()
     {
         long barId = 1L;

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

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

From: <gca...@us...> - 2013-03-11 15:24:20

Revision: 4196
          http://openutils.svn.sourceforge.net/openutils/?rev=4196&view=rev
Author:   gcatania
Date:     2013-03-11 15:24:13 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
dependency bumps for spring, hibernate, javassist, slf4j

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

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2013-03-11 15:03:14 UTC (rev 4195)
+++ trunk/openutils-bshd5/pom.xml	2013-03-11 15:24:13 UTC (rev 4196)
@@ -144,11 +144,29 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
       <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <version>6.5.2</version>
@@ -156,10 +174,10 @@
     </dependency>
   </dependencies>
   <properties>
-    <slf4j.version>1.6.6</slf4j.version>
-    <hibernate.version>4.1.1.Final</hibernate.version>
-    <javassist.version>3.16.1-GA</javassist.version>
-    <spring.version>3.1.1.RELEASE</spring.version>
+    <slf4j.version>1.7.2</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>
   </properties>
 
   <profiles>

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

Flat | Threaded

<< < 1 .. 16 17 18 19 20 .. 227 > >> (Page 18 of 227)