[GeoNetwork-commit] SF.net SVN: geonetwork:[4852] sandbox/3.0.x/geonetwork-gaap/ geonetwork-gaap-persistence/src

[<jos...@us...>]

Revision: 4852
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=4852&view=rev
Author:   josegar74
Date:     2009-08-11 14:08:44 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Change to use metadatauuid in permissions instead of metadataid

Modified Paths:
--------------
    sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/java/org/geonetwork/gaap/dao/OperationDao.java
    sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/resources/org/geonetwork/gaap/domain/operation/Permission.hbm.xml
    sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/java/org/geonetwork/gaap/dao/OperationDaoTest.java
    sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/resources/jdbc.properties.mysql

Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/java/org/geonetwork/gaap/dao/OperationDao.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/java/org/geonetwork/gaap/dao/OperationDao.java	2009-08-11 14:07:27 UTC (rev 4851)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/java/org/geonetwork/gaap/dao/OperationDao.java	2009-08-11 14:08:44 UTC (rev 4852)
@@ -61,9 +61,9 @@
     }
 
 
-    public List<Permission> findOperationsAllowedByMetadataId(long id) {
-        String queryTemplate = "from org.geonetwork.gaap.domain.operation.Permission where metadataId = ?";
+    public List<Permission> findOperationsAllowedByMetadataUuid(String uuid) {
+        String queryTemplate = "from org.geonetwork.gaap.domain.operation.Permission where metadataUuid = ?";
 
-        return this.getHibernateTemplate().find(queryTemplate, id);
+        return this.getHibernateTemplate().find(queryTemplate, uuid);
     }
 }
\ No newline at end of file

Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/resources/org/geonetwork/gaap/domain/operation/Permission.hbm.xml
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/resources/org/geonetwork/gaap/domain/operation/Permission.hbm.xml	2009-08-11 14:07:27 UTC (rev 4851)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/main/resources/org/geonetwork/gaap/domain/operation/Permission.hbm.xml	2009-08-11 14:08:44 UTC (rev 4852)
@@ -10,7 +10,7 @@
 			<generator class="hilo" />
 		</id>
 
-		<property name="metadataId" column="METADATAID" type="long" not-null="true"/>
+		<property name="metadataUuid" column="METADATAUUID" type="string" not-null="true"/>
 
         <many-to-one name="group" class="org.geonetwork.gaap.domain.group.Group" column="GROUPID" not-null="true"/>
 

Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/java/org/geonetwork/gaap/dao/OperationDaoTest.java
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/java/org/geonetwork/gaap/dao/OperationDaoTest.java	2009-08-11 14:07:27 UTC (rev 4851)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/java/org/geonetwork/gaap/dao/OperationDaoTest.java	2009-08-11 14:08:44 UTC (rev 4852)
@@ -140,7 +140,7 @@
         operationDao.saveOperation(op);
 
         Permission permission = new Permission();
-        permission.setMetadataId(new Long(10));
+        permission.setMetadataUuid("aaa-bbb-ccc-fff");
         permission.setGroup(group);
         permission.setOperation(op);
         operationDao.savePermission(permission);
@@ -159,7 +159,7 @@
         operationDao.saveOperation(op);
 
         Permission permission = new Permission();
-        permission.setMetadataId(new Long(10));
+        permission.setMetadataUuid("aaa-bbb-ccc-fff");
         permission.setGroup(group);
         permission.setOperation(op);
         operationDao.savePermission(permission);
@@ -186,7 +186,7 @@
         operationDao.saveOperation(op);
 
         Permission permission = new Permission();
-        permission.setMetadataId(new Long(10));
+        permission.setMetadataUuid("aaa-bbb-ccc-fff");
         permission.setGroup(group);
         permission.setOperation(op);
         operationDao.savePermission(permission);
@@ -196,24 +196,24 @@
         operationDao.saveOperation(op2);
 
         permission = new Permission();
-        permission.setMetadataId(new Long(10));
+        permission.setMetadataUuid("aaa-bbb-ccc-fff");
         permission.setGroup(group);
         permission.setOperation(op2);
         operationDao.savePermission(permission);
 
         permission = new Permission();
-        permission.setMetadataId(new Long(11));
+        permission.setMetadataUuid("mmm-bbb-ccc-fff");
         permission.setGroup(group);
         permission.setOperation(op2);
         operationDao.savePermission(permission);
 
-        List<Permission> result = operationDao.findOperationsAllowedByMetadataId(10);
+        List<Permission> result = operationDao.findOperationsAllowedByMetadataUuid("aaa-bbb-ccc-fff");
         assertEquals(2, result.size());
 
-        result = operationDao.findOperationsAllowedByMetadataId(11);
+        result = operationDao.findOperationsAllowedByMetadataUuid("mmm-bbb-ccc-fff");
         assertEquals(1, result.size());
 
-        result = operationDao.findOperationsAllowedByMetadataId(0);
+        result = operationDao.findOperationsAllowedByMetadataUuid("ccc");
         assertEquals(0, result.size());
     }
 }
\ No newline at end of file

Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/resources/jdbc.properties.mysql
===================================================================
--- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/resources/jdbc.properties.mysql	2009-08-11 14:07:27 UTC (rev 4851)
+++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-persistence/src/test/resources/jdbc.properties.mysql	2009-08-11 14:08:44 UTC (rev 4852)
@@ -3,7 +3,7 @@
 jdbc.url=jdbc:mysql://localhost/geonetwork-gaap-test
 jdbc.username=root
 jdbc.password=root
-
+                          
 hibernateHbm2ddlAuto=create-drop
 hibernate.generate_statistics=true
 hibernate.show_sql=true


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