Changeset 5368

Timestamp:

Jun 22, 2010, 2:51:41 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1459: Named permissions keys that store predefined permissions for projects/groups/users

Added data, core and test classes. Updated data-layer documentation. Implemented the third use case in the ticket description at the core level (A project can be linked with a permission key...).

Location:

trunk

Files:

• doc/src/docbook/developerdoc/api_overview.xml (modified) (3 diffs)
• doc/src/docbook/figures/uml/datalayer.authentication.png (modified) (previous)
• doc/src/docbook/figures/uml/datalayer.overview.png (modified) (previous)
• doc/src/uml/baseuml.mdzip (modified) (previous)
• src/clients/web/net/sf/basedb/clients/web/PermissionUtil.java (modified) (1 diff)
• src/core/common-queries.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/GroupPermissions.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Install.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Item.java (modified) (1 diff)
• src/core/net/sf/basedb/core/PermissionTemplate.java (added)
• src/core/net/sf/basedb/core/Project.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/ProjectPermissions.java (modified) (1 diff)
• src/core/net/sf/basedb/core/SessionControl.java (modified) (5 diffs)
• src/core/net/sf/basedb/core/ShareableUtil.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/SharedItem.java (modified) (5 diffs)
• src/core/net/sf/basedb/core/Update.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/UserPermissions.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/PermissionTemplateData.java (added)
• src/core/net/sf/basedb/core/data/ProjectData.java (modified) (1 diff)
• src/test/TestAll.java (modified) (1 diff)
• src/test/TestGroup.java (modified) (1 diff)
• src/test/TestItemKey.java (modified) (1 diff)
• src/test/TestPermissionTemplate.java (added)
• src/test/TestProject.java (modified) (3 diffs)
• src/test/TestProjectKey.java (modified) (2 diffs)
• src/test/TestUser.java (modified) (1 diff)
• src/test/TestWebservices.java (modified) (1 diff)

trunk/doc/src/docbook/developerdoc/api_overview.xml

@@ -471 +471 @@
 
       <sect3 id="data_api.authentication.groups">
-        <title>Groups, roles and projects</title>     
+        <title>Groups, roles, projects and permission template</title>      
       
         <para>
@@ -481 +481 @@
           project. No matter what permission an item has been shared with the
           user will not get higher permission. Groups may be members of other groups and 
-          also in projects.
+          also in projects. A <classname docapi="net.sf.basedb.core.data">PermissionTemplateData</classname>
+          is just a holder for permissions that users can use when sharing items. The
+          template is never part of the actual permission control mechanism.
         </para>
         
@@ -488 +490 @@
           one project at a time to be use, this is the <emphasis>active project</emphasis>.
           When a project is active new items that are created are automatically
-          added to that project with the permission given by the 
-          <varname>autoPermission</varname> property.
-        </para>
-              
+          shared according to the settings for the project. There are two cases.
+          If the project has a permission template, the new item is given the same 
+          permissions as the template has. If the project doesn't have a permission
+          template, the new item is shared to the active project with the permission
+          given by the <varname>autoPermission</varname> property. Note that in the
+          first case the new item may or may not be shared to the active project
+          depending on if the template is shared to the project or not.
+        </para>
+        
+        <para>
+          Note that the permission template is only used (by the core) when creating 
+          new items. The permissions held by the template are copied and when the new item
+          has been saved to the database there is no longer any reference back to
+          the template that was used to create it. This means that changes to the
+          template does not affect already existing items and that the template
+          can be deleted without problems.
+        </para>
       </sect3>
       

trunk/src/clients/web/net/sf/basedb/clients/web/PermissionUtil.java

@@ -217 +217 @@
             Item.FILESERVER, Item.FILE, Item.DIRECTORY, Item.PROJECT, Item.MESSAGE,
             Item.PLUGINTYPE, Item.PLUGINDEFINITION, Item.PLUGINCONFIGURATION, Item.JOB, 
-            Item.JOBAGENT, Item.CHANGEHISTORY
+            Item.JOBAGENT, Item.CHANGEHISTORY, Item.PERMISSIONTEMPLATE
           })
         );

trunk/src/core/common-queries.xml

@@ -3837 +3837 @@
     </description>
   </query>
+  <query id="GET_PROJECTS_FOR_PERMISSION_TEMPLATE" type="HQL">
+    <sql>
+      SELECT {1}
+      FROM ProjectData prj
+      WHERE prj.permissionTemplate = :permissionTemplate
+    </sql>
+    <description>
+      A HQL query that gets the projects that are using a given permission
+      template.
+    </description>
+  </query>
 
 </predefined-queries>

trunk/src/core/net/sf/basedb/core/GroupPermissions.java

@@ -79 +79 @@
 
   /**
+    Merge the permissions for all groups from the given item key with the permissions 
+    in this object. If the item key contains permissions for a group that already 
+    has permissions in this object the permissions are combined (added) to create 
+    a new permission.
+    
+    @param itemKey An item key (if null, this method simply returns)
+    @since 2.16
+  */
+  public void merge(ItemKey itemKey)
+  {
+    if (itemKey == null) return;
+    for (Map.Entry<GroupData, Integer> entry : itemKey.getData().getGroups().entrySet())
+    {
+      GroupData group = entry.getKey();
+      int permissions = IntegerUtil.getInt(entry.getValue());
+      int current = IntegerUtil.getInt(groupPermissions.get(group));
+      groupPermissions.put(group, current | permissions);
+    }
+  }
+
+  
+  /**
     Grant permissions to a group. Use an empty <code>Set</code> or null
     to remove all permissions for the group.

trunk/src/core/net/sf/basedb/core/Install.java

@@ -116 +116 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(81).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(82).intValue();
   
   public static synchronized void createTables(boolean update, final ProgressReporter progress)
@@ -329 +329 @@
       createRoleKey(Item.USER, "Users", "Gives access to users.", administrators_all);
       createRoleKey(Item.PROJECT, "Projects", "Gives access to projects.", users_create);
+      createRoleKey(Item.PERMISSIONTEMPLATE, "Permission templates", "Gives access to permission templates.", users_create);
   
       // Files, directories and quota

trunk/src/core/net/sf/basedb/core/Item.java

@@ -77 +77 @@
   */
   ITEMKEY(25, "Item key", "ik", ItemKey.class, ItemKeyData.class, null,
-    1300),
+    1310),
   /**
     The item is a {@link ProjectKey}.
   */
   PROJECTKEY(26, "Project key", "pk", ProjectKey.class, ProjectKeyData.class, null,
-    1310),
+    1320),
   /**
     The item is a {@link RoleKey}.
   */
   ROLEKEY(27, "Role key", "rk", RoleKey.class, RoleKeyData.class, null,
-    1320),
+    1330),
+  /**
+    The item is a {@link PermissionTemplate}.
+  */
+  PERMISSIONTEMPLATE(28, "Permission template", "pt", PermissionTemplate.class, PermissionTemplateData.class, 
+    DefinedPermissions.shareable, 1300),
+  
 
   /**

trunk/src/core/net/sf/basedb/core/Project.java

@@ -288 +288 @@
     The permissions to use when automatically sharing new items to
     the project when it is the active project. The default is READ, 
-    USE, WRITE and DELETE.
+    USE, WRITE and DELETE. Note that this setting is ignored when
+    a permission template is used ({@link #getPermissionTemplate()}).
     @since 2.10
   */
@@ -298 +299 @@
   /**
     Set the default permissions to use when automatically sharing
-    new item the project when it is the active project.
+    new item the project when it is the active project. Note that
+    this setting is ignored when a permission template is used 
+    ({@link #getPermissionTemplate()}).
     @param permissions The permissions, must not be null or empty
     @throws PermissionDeniedException If the logged in user doesn't
@@ -316 +319 @@
   }
 
+  /**
+    Get the permission template that is used to share new items when this project
+    is active. Note that if a permission template is used the new items are only
+    shared to the active project if the project is part of the template.
+    @return A permission template or null if no template has been specified
+    @since 2.16
+  */
+  public PermissionTemplate getPermissionTemplate()
+  {
+    return getDbControl().getItem(PermissionTemplate.class, getData().getPermissionTemplate());
+  }
+  
+  /**
+    Set the permission template that should be used to share new items when
+    this project is active.
+    @param template A permission template, or null to not use any template
+    @since 2.16
+  */
+  public void setPermissionTemplate(PermissionTemplate template)
+  {
+    checkPermission(Permission.WRITE);
+    getData().setPermissionTemplate(template == null ? null : template.getData());
+  }
+  
   /**
     Grant a user permissions to this project. Use an empty <code>Set</code> or null

trunk/src/core/net/sf/basedb/core/ProjectPermissions.java

@@ -81 +81 @@
   
   /**
+    Merge the permissions for all projects from the given project key with the permissions 
+    in this object. If the project key contains permissions for a project that already 
+    has permissions in this object the permissions are combined (added) to create 
+    a new permission.
+    
+    @param projectKey A project key (if null, this method simply returns)
+    @since 2.16
+  */
+  public void merge(ProjectKey projectKey)
+  {
+    if (projectKey == null) return;
+    for (Map.Entry<ProjectData, Integer> entry : projectKey.getData().getProjects().entrySet())
+    {
+      ProjectData project = entry.getKey();
+      int permissions = IntegerUtil.getInt(entry.getValue());
+      int current = IntegerUtil.getInt(projectPermissions.get(project));
+      projectPermissions.put(project, current | permissions);
+    }
+  }
+
+  
+  /**
     Grant permissions to a project. Use an empty <code>Set</code> or null
     to remove all permissions for the project.

trunk/src/core/net/sf/basedb/core/SessionControl.java

@@ -25 +25 @@
 
 import net.sf.basedb.core.data.OwnableData;
+import net.sf.basedb.core.data.PermissionTemplateData;
 import net.sf.basedb.core.data.UserData;
 import net.sf.basedb.core.data.PasswordData;
@@ -897 +898 @@
         loginInfo.activeProjectId = 0;
         loginInfo.projectKeyId = 0;
+        loginInfo.itemKeyId = 0;
       }
       else
@@ -905 +907 @@
         if (project.hasPermission(Permission.USE))
         {
-          ProjectPermissions pp = new ProjectPermissions();
-          pp.setPermissions(project, project.getAutoPermission());
-          loginInfo.projectKeyId = ProjectKey.getNewOrExistingId(null, pp.getProjectPermissions());
+          PermissionTemplateData template = project.getData().getPermissionTemplate();
+          if (template != null)
+          {
+            org.hibernate.Session session = null;
+            org.hibernate.Transaction tx = null;
+            try
+            {
+              if (project.isDetached())
+              {
+                // Make sure that we can load the template's item and project keys
+                session = HibernateUtil.newSession();
+                tx = HibernateUtil.newTransaction(session);
+                template = HibernateUtil.loadData(session, PermissionTemplateData.class, template.getId());
+              }
+              ProjectKeyData pk = template.getProjectKey();
+              ItemKeyData ik = template.getItemKey();
+              loginInfo.projectKeyId = pk == null ? 0 : pk.getId();
+              loginInfo.itemKeyId = ik == null ? 0 : ik.getId();
+            }
+            finally
+            {
+              if (tx != null) HibernateUtil.commit(tx);
+              if (session != null) HibernateUtil.close(session);
+            }
+          }
+          else
+          {
+            ProjectPermissions pp = new ProjectPermissions();
+            pp.setPermissions(project, project.getAutoPermission());
+            loginInfo.projectKeyId = ProjectKey.getNewOrExistingId(null, pp.getProjectPermissions());
+            loginInfo.itemKeyId = 0;
+          }
         }
         else
         {
           loginInfo.projectKeyId = 0;
+          loginInfo.itemKeyId = 0;
         }
       }
@@ -940 +972 @@
   {
     return loginInfo == null ? 0 : loginInfo.projectKeyId;
+  }
+  
+  /**
+    Get the id of the {@link ItemKey} that new items should be shared to
+    according to the settings in the currently active project. If no
+    project is active or if the projects doesn't share to any item
+    key, 0 is returned.
+    Use {@link ItemKey#getById(DbControl, int)} to get the {@link ItemKey} object.
+    @see #getActiveProjectId()
+    @see #setActiveProject(Project)
+    @see #getProjectKeyId()
+    @since 2.16
+  */
+  public int getItemKeyId()
+  {
+    return loginInfo == null ? 0 : loginInfo.itemKeyId;
   }
   
@@ -2105 +2153 @@
 
     /**
-      The id of the {@link ProjectKeyData} object that shares an item with
-      full permission to the active project.
+      The id of the {@link ProjectKeyData} object that new items should 
+      be shared to.
     */
     private int projectKeyId;
+    
+    /**
+      The id of the {@link ItemKeyData} object that new items should be
+      shared to.
+    */
+    private int itemKeyId;
     
     /**

trunk/src/core/net/sf/basedb/core/ShareableUtil.java

@@ -28 +28 @@
 import net.sf.basedb.core.data.GroupData;
 import net.sf.basedb.core.data.ItemKeyData;
-import net.sf.basedb.core.data.ProjectData;
 import net.sf.basedb.core.data.ProjectKeyData;
 import net.sf.basedb.core.data.ShareableData;
@@ -161 +160 @@
     is shared to the 'EVERYONE' group, but the logged in user lacks
     the {@link Permission#SHARE_TO_EVERYONE} permission, the share to
-    everyone is removed. If the 'to' item is a new item, a project 
-    is active and the 'from' item isn't already shared to the project,
-    the 'to' item will be shared to the project.
+    everyone is removed. If the 'to' item is a new item and a project 
+    is active the new item is also shared with the settings from 
+    the project. 
 
     @param from The item to copy permissions from
@@ -179 +178 @@
     ProjectKey projectKey = from.getProjectKey();
     
+    GroupPermissions newGroupPermissions = null;
+    UserPermissions newUserPermissions = null;
+    ProjectPermissions newProjectPermissions = null;
+    
+    // If 'to' is a new item we may need to merge permission from the active project
+    if (to.getId() == 0)
+    {
+      // Merge with item key permissions from active project
+      if (sc.getItemKeyId() != 0 && itemKey != null)
+      {
+        ItemKey activeKey = ItemKey.getById(dc, sc.getItemKeyId());
+        newUserPermissions = new UserPermissions(itemKey);
+        newUserPermissions.merge(activeKey);
+        newGroupPermissions = new GroupPermissions(itemKey);
+        newGroupPermissions.merge(activeKey);
+      }
+      if (sc.getProjectKeyId() != 0 && projectKey != null)
+      {
+        newProjectPermissions = new ProjectPermissions(projectKey);
+        newProjectPermissions.merge(ProjectKey.getById(dc, sc.getProjectKeyId()));
+      }
+    }
+    
     // Check if we need to remove permissions for the EVERYONE group
     if (itemKey != null && !sc.hasSystemPermission(Permission.SHARE_TO_EVERYONE))
@@ -185 +207 @@
         SystemItems.getId(Group.EVERYONE));
 
-      if (itemKey.getData().getGroups().containsKey(everyone))
+      if (itemKey.getData().getGroups().containsKey(everyone) || 
+        (newGroupPermissions != null && newGroupPermissions.getGroupPermissions().containsKey(everyone)))
       {
         // Remove the EVERYONE grup
-        GroupPermissions gp = new GroupPermissions(itemKey);
-        gp.getGroupPermissions().remove(everyone);
-        
-        UserPermissions up = new UserPermissions(itemKey);
-        if (up.size() == 0 && gp.size() == 0)
-        {
-          itemKey = null;
-        }
-        else
-        {
-          itemKey = ItemKey.getNewOrExisting(dc, up, gp);
-        }
-      }
-    }
-
-    // Check if we need to add permissions for the current project
-    if (projectKey != null && sc.getProjectKeyId() != 0 && to.getId() == 0)
-    {
-      ProjectData project = HibernateUtil.loadData(dc.getHibernateSession(), 
-          ProjectData.class, sc.getActiveProjectId());
-      
-      if (!projectKey.getData().getProjects().containsKey(project))
-      {
-        // Add the current project
-        ProjectKey activeKey = ProjectKey.getById(dc, sc.getProjectKeyId());
-        ProjectPermissions pp = new ProjectPermissions(projectKey);
-        pp.getProjectPermissions().put(project, activeKey.getData().getProjects().get(project));
-        projectKey = ProjectKey.getNewOrExisting(dc, pp);
+        if (newGroupPermissions == null) newGroupPermissions = new GroupPermissions(itemKey);
+        if (newUserPermissions == null) newUserPermissions = new UserPermissions(itemKey);
+        newGroupPermissions.getGroupPermissions().remove(everyone);
+      }
+    }
+
+    if (newUserPermissions != null || newGroupPermissions != null)
+    {
+      if (newUserPermissions.size() == 0 && newGroupPermissions.size() == 0)
+      {
+        itemKey = null;
+      }
+      else
+      {
+        itemKey = ItemKey.getNewOrExisting(dc, newUserPermissions, newGroupPermissions);
+      }
+    }
+    if (newProjectPermissions != null)
+    {
+      if (newProjectPermissions.size() == 0)
+      {
+        projectKey = null;
+      }
+      else
+      {
+        projectKey = ProjectKey.getNewOrExisting(dc, newProjectPermissions);
       }
     }

trunk/src/core/net/sf/basedb/core/SharedItem.java

@@ -23 +23 @@
 package net.sf.basedb.core;
 
+import net.sf.basedb.core.data.ItemKeyData;
 import net.sf.basedb.core.data.SharedData;
 import net.sf.basedb.core.data.ProjectKeyData;
@@ -44 +45 @@
   
   private boolean projectKeySet = false;
+  private boolean itemKeySet = false;
   
   SharedItem(D sharedData)
@@ -64 +66 @@
     checkPermission(Permission.SET_PERMISSION);
     ShareableUtil.setItemKey(getDbControl(), getData(), itemKey);
+    itemKeySet = true;
   }
   public ProjectKey getProjectKey()
@@ -88 +91 @@
   */
   /**
-    If a project is active, automatically share the new item to that project
-    unless a project key has been explicitely set (including null).
+    If a project is active, automatically share the new item according to
+    the settings of that project, unless a project or item key has been 
+    explicitely set (including null).
     @throws BaseException If there is another error
   */
@@ -96 +100 @@
   {
     super.onBeforeCommit(action);
-    if (action == Transactional.Action.CREATE && !projectKeySet)
+    if (action == Transactional.Action.CREATE)
     {
+      org.hibernate.Session session = getDbControl().getHibernateSession();
       int activeProjectKeyId = getSessionControl().getProjectKeyId();
-      if (activeProjectKeyId != 0)
+      if (activeProjectKeyId != 0 && !projectKeySet)
       {
-        org.hibernate.Session session = getDbControl().getHibernateSession();
         getData().setProjectKey(HibernateUtil.loadData(session, ProjectKeyData.class, activeProjectKeyId));
+      }
+      int activeItemKeyId = getSessionControl().getItemKeyId();
+      if (activeItemKeyId != 0 && !itemKeySet)
+      {
+        getData().setItemKey(HibernateUtil.loadData(session, ItemKeyData.class, activeItemKeyId));
       }
     }

trunk/src/core/net/sf/basedb/core/Update.java

@@ -51 +51 @@
 import net.sf.basedb.core.data.JobData;
 import net.sf.basedb.core.data.MeasuredBioMaterialData;
+import net.sf.basedb.core.data.PermissionTemplateData;
 import net.sf.basedb.core.data.PlateData;
 import net.sf.basedb.core.data.PlateMappingData;
@@ -890 +891 @@
     <td>
       Added {@link FileData#getUrl()} and {@link FileServer}.
+      No special update is needed. Only increase the schema version.
+    </td>
+  </tr>
+  <tr>
+    <td>82</td>
+    <td>
+      Added {@link PermissionTemplateData} and {@link ProjectData#getPermissionTemplate()}.
+      No special update is needed. Only increase the schema version.
     </td>
   </tr>
@@ -1216 +1225 @@
       }
       
-      // Schemaversion 81 only updates the version number
-      if (schemaVersion < 81)
-      {
-        if (progress != null) progress.display((int)(80*progress_factor), "--Updating schema version: " + schemaVersion + " -> 81...");
-        schemaVersion = setSchemaVersionInTransaction(session, 81);
+      // Schemaversion 81-82 only updates the version number
+      if (schemaVersion < 82)
+      {
+        if (progress != null) progress.display((int)(81*progress_factor), "--Updating schema version: " + schemaVersion + " -> 82...");
+        schemaVersion = setSchemaVersionInTransaction(session, 82);
       }
     

trunk/src/core/net/sf/basedb/core/UserPermissions.java

@@ -80 +80 @@
 
   /**
+    Merge the permissions for all users from the given item key with the permissions 
+    in this object. If the item key contains permissions for a user that already 
+    has permissions in this object the permissions are combined (added) to create 
+    a new permission.
+    
+    @param itemKey An item key (if null, this method simply returns)
+    @since 2.16
+  */
+  public void merge(ItemKey itemKey)
+  {
+    if (itemKey == null) return;
+    for (Map.Entry<UserData, Integer> entry : itemKey.getData().getUsers().entrySet())
+    {
+      UserData user = entry.getKey();
+      int permissions = IntegerUtil.getInt(entry.getValue());
+      int current = IntegerUtil.getInt(userPermissions.get(user));
+      userPermissions.put(user, current | permissions);
+    }
+  }
+  
+  /**
     Grant permissions to a user. Use an empty <code>Set</code> or null
     to remove all permissions for the user.

trunk/src/core/net/sf/basedb/core/data/ProjectData.java

@@ -114 +114 @@
   }
   
+  private PermissionTemplateData permissionTemplate;
+  /**
+    A permission template can be used to set default permissions
+    when this project is active.
+    @return A permission template or null
+    @since 2.16
+    @hibernate.many-to-one column="`permissiontemplate_id`" not-null="false"
+  */
+  public PermissionTemplateData getPermissionTemplate()
+  {
+    return permissionTemplate;
+  }
+  public void setPermissionTemplate(PermissionTemplateData permissionTemplate)
+  {
+    this.permissionTemplate = permissionTemplate;
+  }
+  
   private Map<UserData,Integer> users;
   /**

trunk/src/test/TestAll.java

@@ -44 +44 @@
     results.put("TestProjectKey", TestProjectKey.test_all());
     results.put("TestItemKey", TestItemKey.test_all());
+    results.put("TestPermissionTemplate", TestPermissionTemplate.test_all());
 
     // Settings, sessions and client

trunk/src/test/TestGroup.java

@@ -66 +66 @@
 
     // Extra tests: add, list and remove projects
-    int projectId = TestProject.test_create(true);
+    int projectId = TestProject.test_create("Group project", true);
     test_listprojects(id, 0);
     TestProject.test_addgroup(projectId, id, EnumSet.of(Permission.WRITE));

trunk/src/test/TestItemKey.java

@@ -137 +137 @@
           numDeleted + "; expected " + expected);
       }
-      write("--Delete unused item keys OK (" + expected + ")");
+      write("--Delete unused item keys OK (" + numDeleted + ")");
     }
     catch (Throwable ex)

trunk/src/test/TestProject.java

@@ -46 +46 @@
     write_header();
     // Standard tests: create, load, list
-    int id = test_create(true);
-    int id2 = test_create(false);
+    int id = test_create("Test project #1", true);
+    int id2 = test_create("Test project #2", false);
     test_load(id);
     test_list(-1);
@@ -126 +126 @@
   }
 
-  static int test_create(boolean setAll)
+  static int test_create(String name, boolean setAll)
   {
     if (!TestUtil.hasPermission(Permission.CREATE, Item.PROJECT)) return 0;
@@ -135 +135 @@
       dc = TestUtil.getDbControl();
       Project p = Project.getNew(dc);
+      p.setName(name);
       if (setAll)
       {
-        p.setName("Test project");
         p.setDescription("Added at "+new Date());
       }

trunk/src/test/TestProjectKey.java

@@ -46 +46 @@
     
     // Extra test: create project for the key
-    int projectId = TestProject.test_create(true);
+    int projectId = TestProject.test_create("Test project", true);
     
     // Standard tests: create, load
@@ -158 +158 @@
           numDeleted + "; expected " + expected);
       }
-      write("--Delete unused project keys OK (" + expected + ")");
+      write("--Delete unused project keys OK (" + numDeleted + ")");
     }
     catch (Throwable ex)

trunk/src/test/TestUser.java

@@ -76 +76 @@
     
     // Extra tests: add, list and remove projects
-    int projectId = TestProject.test_create(true);
+    int projectId = TestProject.test_create("User project", true);
     test_listprojects(id, 0);
     TestProject.test_adduser(projectId, id, EnumSet.of(Permission.WRITE));

trunk/src/test/TestWebservices.java

@@ -94 +94 @@
 
     //Create items to use in the tests    
-    int projectId = TestProject.test_create(true);
+    int projectId = TestProject.test_create("Web service project", true);
 
     int reporterListId1 = TestReporterList.test_create("net.sf.basedb.clients.test.reporterlist1", true);