Changeset 5385 for DASISH

Timestamp:

06/24/14 17:43:30 (10 years ago)

Author:

olhsha@mpi.nl

Message:

ref --> href
+ xml:id for instances
refactoring

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend

Files:

• src/main/java/eu/dasish/annotation/backend/dao/DBDispatcher.java (modified) (3 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/ResourceDao.java (modified) (2 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/TargetDao.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified) (29 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (6 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java (modified) (2 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java (modified) (3 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified) (5 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified) (6 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java (modified) (3 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified) (14 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified) (5 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified) (5 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java (modified) (2 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified) (12 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java (modified) (4 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified) (4 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified) (3 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java (modified) (2 diffs)
• src/main/webapp/WEB-INF/web-basic.xml (modified) (1 diff)
• src/main/webapp/WEB-INF/web-shibboleth.xml (modified) (1 diff)
• src/main/webapp/WEB-INF/web.xml (modified) (2 diffs)
• src/test/java/eu/dasish/annotation/backend/MockObjectsFactoryRest.java (modified) (2 diffs)
• src/test/java/eu/dasish/annotation/backend/TestBackendConstants.java (deleted)
• src/test/java/eu/dasish/annotation/backend/TestInstances.java (modified) (7 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java (modified) (69 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (14 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java (modified) (11 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDaoTest.java (modified) (3 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java (modified) (11 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDaoTest.java (modified) (12 diffs)
• src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified) (20 diffs)
• src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified) (10 diffs)
• src/test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified) (1 diff)
• src/test/resources/spring-test-config/mockUriInfo.xml (deleted)
• web-shibboleth.xml (deleted)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBDispatcher.java

@@ -51 +51 @@
 public interface DBDispatcher {
 
-    void setServiceURI(String serviceURI);
+    void setResourcesPaths(String relServiceURI);
 
     /**
@@ -59 +59 @@
     Number getResourceInternalIdentifier(UUID externalID, Resource resource) throws NotInDataBaseException;
 
-    Number getResourceInternalIdentifierFromURI(String uri, Resource resource) throws NotInDataBaseException;
-
     UUID getResourceExternalIdentifier(Number resourceID, Resource resource);
-
-    String getResourceURI(Number resourceID, Resource resource);
 
     PermissionList getPermissions(Number resourceID, Resource resource);
@@ -179 +175 @@
 
     Number getPrincipalInternalIDFromRemoteID(String remoteID) throws NotInDataBaseException;
+    
+    UUID getPrincipalExternalIDFromRemoteID(String remoteID) throws NotInDataBaseException;
 
     /**

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java

@@ -51 +51 @@
      public Number getPrincipalInternalIDFromRemoteID(String remoteID) throws NotInDataBaseException;
      
+     public UUID getPrincipalExternalIDFromRemoteID(String remoteID) throws NotInDataBaseException;
+     
+     
      public List<Number> getPrincipalIDsWithAccessForNotebook(Number notebookID, Access access);
      

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ResourceDao.java

@@ -30 +30 @@
 public interface ResourceDao {
 
-    void setServiceURI(String serviceURI);
+    void setResourcePath(String relResourcePath);
 
     Number getInternalID(UUID externalId) throws NotInDataBaseException;
 
-    Number getInternalIDFromURI(String uri) throws NotInDataBaseException;
-
     UUID getExternalID(Number internalId);
 
-    String externalIDtoURI(String externalID);
-
-    /**
-     *
-     * @param stringURI
-     * @return returns the extranlID which is a suffix of stringURI
-     */
-    String stringURItoExternalID(String stringURI);
-
+  
+  
     /**
      *
@@ -53 +44 @@
      * with internalID
      */
-    String getURIFromInternalID(Number internalID);
+    String getHrefFromInternalID(Number internalID);
+    
+    Number getInternalIDFromHref(String href)  throws NotInDataBaseException;
 
     List<Map<Number, String>> getPermissions(Number resourceID);

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/TargetDao.java

@@ -118 +118 @@
     /**
      *
-     * @param TargetID
+     * @param targetID
      * @return # deleted rows in the table "Targets_cached_representation" when
      * deleting the pair (TargetID, chachedID)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java

@@ -106 +106 @@
 
     @Override
-    public void setServiceURI(String serviceURI) {
-        principalDao.setServiceURI(serviceURI + "principals/");
-        cachedRepresentationDao.setServiceURI(serviceURI + "cached/");
-        targetDao.setServiceURI(serviceURI + "targets/");
-        annotationDao.setServiceURI(serviceURI + "annotations/");
-        notebookDao.setServiceURI(serviceURI + "notebooks/");
+    public void setResourcesPaths(String relServiceURI) {
+        principalDao.setResourcePath(relServiceURI + "/principals/");
+        cachedRepresentationDao.setResourcePath(relServiceURI + "/cached/");
+        targetDao.setResourcePath(relServiceURI + "/targets/");
+        annotationDao.setResourcePath(relServiceURI + "/annotations/");
+        notebookDao.setResourcePath(relServiceURI + "/notebooks/");
     }
 
@@ -120 +120 @@
     }
 
-    @Override
-    public Number getResourceInternalIdentifierFromURI(String uri, Resource resource) throws NotInDataBaseException {
-        return this.getDao(resource).getInternalIDFromURI(uri);
-    }
-
+  
     @Override
     public UUID getResourceExternalIdentifier(Number resourceID, Resource resource) {
@@ -130 +126 @@
     }
 
-    @Override
-    public String getResourceURI(Number resourceID, Resource resource) {
-        return this.getDao(resource).getURIFromInternalID(resourceID);
-    }
-
+   
     @Override
     public Annotation getAnnotation(Number annotationID) {
         Annotation result = annotationDao.getAnnotationWithoutTargetsAndPemissions(annotationID);
-        result.setOwnerRef(principalDao.getURIFromInternalID(annotationDao.getOwner(annotationID)));
+        result.setOwnerHref(principalDao.getHrefFromInternalID(annotationDao.getOwner(annotationID)));
         List<Number> targetIDs = targetDao.getTargetIDs(annotationID);
         TargetInfoList sis = new TargetInfoList();
         for (Number targetID : targetIDs) {
-            TargetInfo targetInfo = getTargetInfoFromTarget(targetDao.getTarget(targetID));
+            TargetInfo targetInfo = this.getTargetInfoFromTarget(targetDao.getTarget(targetID));
             sis.getTargetInfo().add(targetInfo);
         }
@@ -173 +165 @@
             principalAccess.keySet().toArray(principal);
             Permission permission = new Permission();
-            permission.setPrincipalRef(principalDao.getURIFromInternalID(principal[0]));
+            permission.setPrincipalHref(principalDao.getHrefFromInternalID(principal[0]));
             permission.setLevel(Access.fromValue(principalAccess.get(principal[0])));
             list.add(permission);
@@ -311 +303 @@
         List<Number> targetIDs = targetDao.getTargetIDs(annotationID);
         for (Number targetID : targetIDs) {
-            result.getRef().add(targetDao.getURIFromInternalID(targetID));
+            result.getHref().add(targetDao.getHrefFromInternalID(targetID));
         }
         return result;
@@ -324 +316 @@
             List<Number> versions = cachedRepresentationDao.getCachedRepresentationsForTarget(targetID);
             if (versions.isEmpty()) {
-                result.add(targetDao.getURIFromInternalID(targetID));
+                result.add(targetDao.getHrefFromInternalID(targetID));
             }
         }
@@ -339 +331 @@
             Principal principal = principalDao.getPrincipal(principalID[0]);
             if (principal.getDisplayName() == null || principal.getDisplayName().trim().isEmpty() || principal.getEMail() == null || principal.getEMail().trim().isEmpty()) {
-                result.add(principalDao.getURIFromInternalID(principalID[0]));
+                result.add(principalDao.getHrefFromInternalID(principalID[0]));
 
             }
@@ -353 +345 @@
             AnnotationInfo annotationInfo = annotationDao.getAnnotationInfoWithoutTargetsAndOwner(annotationID);
             annotationInfo.setTargets(this.getAnnotationTargets(annotationID));
-            annotationInfo.setOwnerRef(principalDao.getURIFromInternalID(annotationDao.getOwner(annotationID)));
+            annotationInfo.setOwnerHref(principalDao.getHrefFromInternalID(annotationDao.getOwner(annotationID)));
             result.getAnnotationInfo().add(annotationInfo);
         }
@@ -365 +357 @@
         for (Number annotationID : annotationIDs) {
             Number ownerID = annotationDao.getOwner(annotationID);
-            ReferenceList targets = getAnnotationTargets(annotationID);
+            ReferenceList targets = this.getAnnotationTargets(annotationID);
             AnnotationInfo annotationInfo = annotationDao.getAnnotationInfoWithoutTargetsAndOwner(annotationID);
             annotationInfo.setTargets(targets);
-            annotationInfo.setOwnerRef(principalDao.getURIFromInternalID(ownerID));
+            annotationInfo.setOwnerHref(principalDao.getHrefFromInternalID(ownerID));
             result.getAnnotationInfo().add(annotationInfo);
         }
@@ -384 +376 @@
         for (Number key : cachedIDsFragments.keySet()) {
             CachedRepresentationFragment cachedRepresentationFragment = new CachedRepresentationFragment();
-            cachedRepresentationFragment.setRef(cachedRepresentationDao.getURIFromInternalID(key));
+            cachedRepresentationFragment.setHref(cachedRepresentationDao.getHrefFromInternalID(key));
             cachedRepresentationFragment.setFragmentString(cachedIDsFragments.get(key));
             cachedRepresentationFragmentList.getCached().add(cachedRepresentationFragment);
@@ -409 +401 @@
         ReferenceList referenceList = new ReferenceList();
         for (Number siblingID : targetIDs) {
-            referenceList.getRef().add(targetDao.externalIDtoURI(targetDao.getExternalID(siblingID).toString()));
+            referenceList.getHref().add(targetDao.getHrefFromInternalID(siblingID));
         }
         return referenceList;
@@ -461 +453 @@
         return principalDao.getPrincipalInternalIDFromRemoteID(remoteID);
     }
+    
+    @Override
+    public UUID getPrincipalExternalIDFromRemoteID(String remoteID) throws NotInDataBaseException {
+        return principalDao.getPrincipalExternalIDFromRemoteID(remoteID);
+    }
 
     @Override
@@ -519 +516 @@
                 NotebookInfo notebookInfo = notebookDao.getNotebookInfoWithoutOwner(notebookID);
                 Number ownerID = notebookDao.getOwner(notebookID);
-                notebookInfo.setOwnerRef(principalDao.getURIFromInternalID(ownerID));
+                notebookInfo.setOwnerHref(principalDao.getHrefFromInternalID(ownerID));
                 result.getNotebookInfo().add(notebookInfo);
             }
@@ -537 +534 @@
         List<Number> notebookIDs = notebookDao.getNotebookIDsOwnedBy(principalID);
         for (Number notebookID : notebookIDs) {
-            String reference = notebookDao.getURIFromInternalID(notebookID);
-            result.getRef().add(reference);
+            String reference = notebookDao.getHrefFromInternalID(notebookID);
+            result.getHref().add(reference);
         }
         return result;
@@ -548 +545 @@
         List<Number> principalIDs = principalDao.getPrincipalIDsWithAccessForNotebook(notebookID, Access.fromValue(access));
         for (Number principalID : principalIDs) {
-            String reference = principalDao.getURIFromInternalID(principalID);
-            result.getRef().add(reference);
+            String reference = principalDao.getHrefFromInternalID(principalID);
+            result.getHref().add(reference);
         }
         return result;
@@ -558 +555 @@
         Notebook result = notebookDao.getNotebookWithoutAnnotationsAndAccesssAndOwner(notebookID);
 
-        result.setOwnerRef(principalDao.getURIFromInternalID(notebookDao.getOwner(notebookID)));
+        result.setOwnerRef(principalDao.getHrefFromInternalID(notebookDao.getOwner(notebookID)));
 
         ReferenceList annotations = new ReferenceList();
         List<Number> annotationIDs = annotationDao.getAnnotations(notebookID);
         for (Number annotationID : annotationIDs) {
-            annotations.getRef().add(annotationDao.getURIFromInternalID(annotationID));
+            annotations.getHref().add(annotationDao.getHrefFromInternalID(annotationID));
         }
         result.setAnnotations(annotations);
@@ -576 +573 @@
                 for (Number principal : principals) {
                     Permission up = new Permission();
-                    up.setPrincipalRef(principalDao.getURIFromInternalID(principal));
+                    up.setPrincipalHref(principalDao.getHrefFromInternalID(principal));
                     up.setLevel(access);
                     ups.getPermission().add(up);
@@ -611 +608 @@
         ReferenceList references = new ReferenceList();
         for (Number annotationID : selectedAnnotIDs) {
-            references.getRef().add(annotationDao.getURIFromInternalID(annotationID));
+            references.getHref().add(annotationDao.getHrefFromInternalID(annotationID));
         }
         return references;
@@ -649 +646 @@
         int result = 0;
         for (Permission permission : permissions) {
-            Number principalID = principalDao.getInternalIDFromURI(permission.getPrincipalRef());
+            Number principalID = principalDao.getInternalIDFromHref(permission.getPrincipalHref());
             Access access = permission.getLevel();
             Access currentAccess = annotationDao.getAccess(annotationID, principalID);
@@ -670 +667 @@
     @Override
     public int updateAnnotation(Annotation annotation) throws NotInDataBaseException {
-        Number annotationID = annotationDao.getInternalIDFromURI(annotation.getURI());
-        int updatedAnnotations = annotationDao.updateAnnotation(annotation, annotationID, principalDao.getInternalIDFromURI(annotation.getOwnerRef()));
+        Number annotationID = annotationDao.getInternalID(UUID.fromString(annotation.getId()));
+        int updatedAnnotations = annotationDao.updateAnnotation(annotation, annotationID, principalDao.getInternalIDFromHref(annotation.getOwnerHref()));
         int deletedTargets = annotationDao.deleteAllAnnotationTarget(annotationID);
         int deletedPrinsipalsAccesss = annotationDao.deleteAnnotationPermissions(annotationID);
@@ -688 +685 @@
 
     @Override
-    public int updateAnnotationHeadline(Number internalID, String newHeader) {
+    public int updateAnnotationHeadline(Number internalID, String newHeader){
         return annotationDao.updateAnnotationHeadline(internalID, newHeader);
     }
@@ -704 +701 @@
     @Override
     public int updateCachedMetada(CachedRepresentationInfo cachedInfo) throws NotInDataBaseException {
-        Number internalID = cachedRepresentationDao.getInternalIDFromURI(cachedInfo.getURI());
+        Number internalID = cachedRepresentationDao.getInternalID(UUID.fromString(cachedInfo.getId()));
         return cachedRepresentationDao.updateCachedRepresentationMetadata(internalID, cachedInfo);
     }
@@ -716 +713 @@
     @Override
     public boolean updateNotebookMetadata(Number notebookID, NotebookInfo upToDateNotebookInfo) throws NotInDataBaseException {
-        Number ownerID = principalDao.getInternalIDFromURI(upToDateNotebookInfo.getOwnerRef());
+        Number ownerID = principalDao.getInternalIDFromHref(upToDateNotebookInfo.getOwnerHref());
         return notebookDao.updateNotebookMetadata(notebookID, upToDateNotebookInfo.getTitle(), ownerID);
     }
@@ -741 +738 @@
     }
 
+    
     @Override
     public Map<String, String> addTargetsForAnnotation(Number annotationID, List<TargetInfo> targets) throws NotInDataBaseException {
@@ -746 +744 @@
         for (TargetInfo targetInfo : targets) {
             try {
-                Number targetIDRunner = targetDao.getInternalIDFromURI(targetInfo.getRef());
+                Number targetIDRunner = targetDao.getInternalIDFromHref(targetInfo.getHref());
                 int affectedRows = annotationDao.addAnnotationTarget(annotationID, targetIDRunner);
             } catch (NotInDataBaseException e) {
                 Target newTarget = this.createFreshTarget(targetInfo);
                 Number targetID = targetDao.addTarget(newTarget);
-                String targetTemporaryID = targetDao.stringURItoExternalID(targetInfo.getRef());
-                result.put(targetTemporaryID, targetDao.getExternalID(targetID).toString());
+                String targetTemporaryId = targetInfo.getHref();
+                result.put(targetTemporaryId, targetDao.getHrefFromInternalID(targetID));
                 int affectedRows = annotationDao.addAnnotationTarget(annotationID, targetID);
             }
@@ -784 +782 @@
         List<Permission> permissions = notebook.getPermissions().getPermission();
         for (Permission permission : permissions) {
-            Number principalID = principalDao.getInternalIDFromURI(permission.getPrincipalRef());
+            Number principalID = principalDao.getInternalIDFromHref(permission.getPrincipalHref());
             Access access = permission.getLevel();
             boolean updateAccesss = notebookDao.addAccessToNotebook(notebookID, principalID, access);
@@ -947 +945 @@
     }
 
-    //// priveee ///
+    //// privee ///
     private Target createFreshTarget(TargetInfo targetInfo) {
         Target target = new Target();
@@ -982 +980 @@
             int addedPermissions = 0;
             for (Permission permission : permissions) {
-                addedPermissions = addedPermissions + annotationDao.addAnnotationPrincipalAccess(annotationID, principalDao.getInternalIDFromURI(permission.getPrincipalRef()), permission.getLevel());
+                addedPermissions = addedPermissions + annotationDao.addAnnotationPrincipalAccess(annotationID, principalDao.getInternalIDFromHref(permission.getPrincipalHref()), permission.getLevel());
             }
             return addedPermissions;
@@ -992 +990 @@
     private TargetInfo getTargetInfoFromTarget(Target target) {
         TargetInfo targetInfo = new TargetInfo();
-        targetInfo.setRef(target.getURI());
+        targetInfo.setHref(target.getHref());
         targetInfo.setLink(target.getLink());
         targetInfo.setVersion(target.getVersion());

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java

@@ -61 +61 @@
 
     @Override
-    public void setServiceURI(String serviceURI) {
-        _serviceURI = serviceURI;
+    public void setResourcePath(String relResourcePath) {
+        _relResourcePath = relResourcePath;
     }
 
@@ -218 +218 @@
         public AnnotationInfo mapRow(ResultSet rs, int rowNumber) throws SQLException {
             AnnotationInfo annotationInfo = new AnnotationInfo();
-            annotationInfo.setRef(externalIDtoURI(rs.getString(external_id)));
+            String externalId = rs.getString(external_id);
+            annotationInfo.setHref(externalIDtoHref(externalId));
             annotationInfo.setHeadline(rs.getString(headline));
             annotationInfo.setLastModified(timeStampToXMLGregorianCalendar(rs.getString(last_modified)));
@@ -249 +250 @@
         @Override
         public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            return externalIDtoURI(rs.getString(external_id));
+            return externalIDtoHref(rs.getString(external_id));
         }
     };
@@ -300 +301 @@
 
             annotation.setTargets(null);
-            annotation.setURI(externalIDtoURI(rs.getString(external_id)));
+            String externalId = rs.getString(external_id);
+            annotation.setId(externalId);            
+            annotation.setHref(externalIDtoHref(externalId));
             annotation.setLastModified(timeStampToXMLGregorianCalendar(rs.getString(last_modified)));
             return annotation;
@@ -398 +401 @@
 
         String[] body = retrieveBodyComponents(annotation.getBody());
-        
-        String externalID = this.stringURItoExternalID(annotation.getURI());
+                
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("owner", newOwnerID);
@@ -406 +408 @@
         params.put("headline", annotation.getHeadline());
         params.put("isXml", annotation.getBody().getXmlBody() != null);
-        params.put("externalId", externalID);
+        params.put("externalId", annotation.getId());
         params.put("annotationId", annotationID);
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java

@@ -51 +51 @@
 
     @Override
-    public void setServiceURI(String serviceURI) {
-        _serviceURI = serviceURI;
+    public void setResourcePath(String relResourcePath) {
+        _relResourcePath = relResourcePath;
     }
 
@@ -68 +68 @@
             CachedRepresentationInfo result = new CachedRepresentationInfo();
             result.setMimeType(rs.getString(mime_type));
-            result.setURI(externalIDtoURI(rs.getString(external_id)));
+            String externalId = rs.getString(external_id);
+            result.setId(externalId);
+            result.setHref(externalIDtoHref(externalId));
             result.setTool(rs.getString(tool));
             result.setType(rs.getString(type_));

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java

@@ -107 +107 @@
         public NotebookInfo mapRow(ResultSet rs, int rowNumber) throws SQLException {
             NotebookInfo notebookInfo = new NotebookInfo();
-            notebookInfo.setRef(externalIDtoURI(rs.getString(external_id)));
+            String externalId = rs.getString(external_id);
+            notebookInfo.setHref(externalIDtoHref(externalId));
             notebookInfo.setTitle(rs.getString(title));
             return notebookInfo;
@@ -128 +129 @@
             notebook.setTitle(rs.getString(title));
             notebook.setLastModified(timeStampToXMLGregorianCalendar(rs.getString(last_modified)));
-            notebook.setURI(externalIDtoURI(rs.getString(external_id)));
+            String externalId = rs.getString(external_id);
+            notebook.setId(externalId);
+            notebook.setHref(externalIDtoHref(externalId));
             return notebook;
         }
@@ -247 +250 @@
                 append(" ) VALUES (:externalId, :owner, :title)");
         int affectedRows = this.loggedUpdate(sql.toString(), params);
-        return getInternalID(externalID);
+        return this.getInternalID(externalID);
     }
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java

@@ -50 +50 @@
 
     @Override
-    public void setServiceURI(String serviceURI) {
-        _serviceURI = serviceURI;
+    public void setResourcePath(String relResourcePath) {
+        _relResourcePath = relResourcePath;
     }
 
@@ -66 +66 @@
         public Principal mapRow(ResultSet rs, int rowNumber) throws SQLException {
             Principal result = new Principal();
-            result.setURI(externalIDtoURI(rs.getString(external_id)));
+            String externalId = rs.getString(external_id);
+            result.setId(externalId);
+            result.setHref(externalIDtoHref(externalId));
             result.setDisplayName(rs.getString(principal_name));
             result.setEMail(rs.getString(e_mail));
@@ -142 +144 @@
     }
 
+    @Override
+    public UUID getPrincipalExternalIDFromRemoteID(String remoteID) throws NotInDataBaseException {
+
+        StringBuilder requestDB = new StringBuilder("SELECT ");
+        requestDB.append(external_id).append(" FROM ").append(principalTableName).append(" WHERE ").append(remote_id).append("= ? LIMIT 1");
+        List<UUID> result = this.loggedQuery(requestDB.toString(), externalIDRowMapper, remoteID);
+        if (result.isEmpty()) {
+            throw new NotInDataBaseException("principal", "remote ID", remoteID);
+        }
+        return result.get(0);
+    }
+    
     @Override
     public String getTypeOfPrincipalAccount(Number internalID) {
@@ -244 +258 @@
     @Override
     public Number updatePrincipal(Principal principal) throws NotInDataBaseException {
-        Number principalID = this.getInternalIDFromURI(principal.getURI());
+        Number principalID = this.getInternalID(UUID.fromString(principal.getId()));
         StringBuilder sql = new StringBuilder("UPDATE ");
         sql.append(principalTableName).append(" SET ").
@@ -262 +276 @@
 
         if (principalIsInUse(internalID)) {
-            throw new PrincipalCannotBeDeleted(this.getURIFromInternalID(internalID));
+            throw new PrincipalCannotBeDeleted(this.getHrefFromInternalID(internalID));
         }
         StringBuilder sql = new StringBuilder("DELETE FROM ");

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java

@@ -28 +28 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 import javax.xml.datatype.DatatypeConfigurationException;
@@ -103 +102 @@
     protected String internalIdName = null;
     protected String resourceTableName = null;
-    protected String _serviceURI;
+    protected String _relResourcePath;
     private final Logger _logger = LoggerFactory.getLogger(JdbcResourceDao.class);
     protected String nullArgument = "Null argument is given to the method.";
@@ -149 +148 @@
     /////////////////// Class field SETTERS /////////////
     @Override
-    public void setServiceURI(String serviceURI) {
-        _serviceURI = serviceURI;
+    public void setResourcePath(String relResourcePath) {
+        _relResourcePath = relResourcePath;
     }
 
@@ -176 +175 @@
     }
 
+    
+
     //////////////////////////////////////////////
     @Override
-    public Number getInternalIDFromURI(String uri) throws NotInDataBaseException {
-        String externalID = this.stringURItoExternalID(uri);
-        try {
-            UUID externalUUID = UUID.fromString(externalID);
-            return this.getInternalID(externalUUID);
-        } catch (IllegalArgumentException e) {
-            _logger.info(externalID + " is not a valid <uuid>.  Therefore, I expect that it is a temporary idendifier of a new resource that is not yet.");
-            throw new NotInDataBaseException(resourceTableName, "external  ID", externalID);
-        }
-    }
-
-    //////////////////////////////////////////////
-    @Override
-    public String getURIFromInternalID(Number internalID) {
-        return externalIDtoURI(getExternalID(internalID).toString());
+    public String getHrefFromInternalID(Number internalID) {
+        return this.externalIDtoHref(getExternalID(internalID).toString());
+    }
+    
+     //////////////////////////////////////////////
+    @Override
+    public Number getInternalIDFromHref(String href) throws NotInDataBaseException{
+        try{
+        return this.getInternalID(UUID.fromString(this.hrefToExternalID(href)));
+        } catch (IllegalArgumentException e){
+           throw new NotInDataBaseException("resource", "identifier", href);  
+        }
     }
 
@@ -257 +255 @@
 
     ////// END ROW MAPPERS /////
-    @Override
-    public String externalIDtoURI(String externalID) {
-        if (_serviceURI != null) {
-            return _serviceURI + externalID;
+    
+    protected String externalIDtoHref(String externalID) {
+        if (_relResourcePath != null) {
+            return _relResourcePath + externalID;
         } else {
             return externalID;
@@ -266 +264 @@
     }
 
-    @Override
-    public String stringURItoExternalID(String stringURI) {        
-        if (stringURI.length() > _serviceURI.length()) {
-            return stringURI.substring(_serviceURI.length());
+    
+    protected String hrefToExternalID(String stringURI) {        
+        if (stringURI.length() > _relResourcePath.length()) {
+            return stringURI.substring(_relResourcePath.length());
         } else {
-            logger.debug(stringURI + " does not have the form <service url>/<isentifier>, therefore I return the input value.");
+            logger.debug(stringURI + " does not have the form <rel url>/<isentifier>, therefore I return the input value.");
             return stringURI;
         }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java

@@ -50 +50 @@
 
     @Override
-    public void setServiceURI(String serviceURI) {
-        _serviceURI = serviceURI;
+    public void setResourcePath(String relResourcePath) {
+        _relResourcePath = relResourcePath;
     }
 
@@ -240 +240 @@
     private TargetInfo constructTargetInfo(String externalID, String link, String version, String fragment) {
         TargetInfo targetInfo = new TargetInfo();
-        targetInfo.setRef(externalIDtoURI(externalID));
+        targetInfo.setHref(externalIDtoHref(externalID));
         targetInfo.setLink(((new StringBuilder(link)).append("#").append(fragment)).toString());
         targetInfo.setVersion(version);
@@ -248 +248 @@
     private Target constructTarget(String externalID, String link, String version, XMLGregorianCalendar xmlTimeStamp, String fragment) {
         Target target = new Target();
-        target.setURI(externalIDtoURI(externalID));
+        target.setId(externalID);
+        target.setHref(externalIDtoHref(externalID));
         target.setLastModified(xmlTimeStamp);
         if (fragment != null) {

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java

@@ -48 +48 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Providers;
 import javax.xml.bind.JAXBElement;
@@ -62 +61 @@
 @Transactional(rollbackFor = {Exception.class})
 public class AnnotationResource extends ResourceResource {
-
-    public void setUriInfo(UriInfo uriInfo) {
-        this.uriInfo = uriInfo;
-    }
-
+   
     public void setHttpServletResponse(HttpServletResponse httpServletResponse) {
         this.httpServletResponse = httpServletResponse;
@@ -88 +83 @@
     public JAXBElement<Annotation> getAnnotation(@PathParam("annotationid") String externalIdentifier) throws IOException {
         Map params = new HashMap();
-        Annotation result = (Annotation) (new RequestWrappers(this)).wrapRequestResource(params, new GetAnnotation(), Resource.ANNOTATION, ResourceAction.READ, externalIdentifier, false);
+        Annotation result = (Annotation) (new RequestWrappers(this)).wrapRequestResource(params, new GetAnnotation(), Resource.ANNOTATION, ResourceAction.READ, externalIdentifier);
         if (result != null) {
             return (new ObjectFactory()).createAnnotation(result);
@@ -111 +106 @@
     public JAXBElement<ReferenceList> getAnnotationTargets(@PathParam("annotationid") String externalIdentifier) throws IOException {
         Map params = new HashMap();
-        ReferenceList result = (ReferenceList) (new RequestWrappers(this)).wrapRequestResource(params, new GetTargetList(), Resource.ANNOTATION, ResourceAction.READ, externalIdentifier, false);
+        ReferenceList result = (ReferenceList) (new RequestWrappers(this)).wrapRequestResource(params, new GetTargetList(), Resource.ANNOTATION, ResourceAction.READ, externalIdentifier);
         if (result != null) {
             return (new ObjectFactory()).createTargetList(result);
@@ -171 +166 @@
     public JAXBElement<PermissionList> getAnnotationPermissions(@PathParam("annotationid") String externalIdentifier) throws IOException {
         Map params = new HashMap();
-        PermissionList result = (PermissionList) (new RequestWrappers(this)).wrapRequestResource(params, new GetPermissionList(), Resource.ANNOTATION, ResourceAction.READ, externalIdentifier, false);
+        PermissionList result = (PermissionList) (new RequestWrappers(this)).wrapRequestResource(params, new GetPermissionList(), Resource.ANNOTATION, ResourceAction.READ, externalIdentifier);
         if (result != null) {
             return (new ObjectFactory()).createPermissionList(result);
@@ -192 +187 @@
     public String deleteAnnotation(@PathParam("annotationid") String externalIdentifier) throws IOException {
         Map params = new HashMap();
-        int[] result = (int[]) (new RequestWrappers(this)).wrapRequestResource(params, new DeleteAnnotation(), Resource.ANNOTATION, ResourceAction.DELETE, externalIdentifier, false);
+        int[] result = (int[]) (new RequestWrappers(this)).wrapRequestResource(params, new DeleteAnnotation(), Resource.ANNOTATION, ResourceAction.DELETE, externalIdentifier);
         if (result != null) {
             return result[0] + " annotation(s) is(are) deleted.";
@@ -246 +241 @@
     public JAXBElement<ResponseBody> updateAnnotation(@PathParam("annotationid") String externalId, Annotation annotation) throws IOException {
 
-        String annotationURI = annotation.getURI();
-        String path = uriInfo.getBaseUri().toString();
-        if (!(path + "annotations/" + externalId).equals(annotationURI)) {
-            loggerServer.debug("Wrong request: the annotation (notebook) identifier   " + externalId + " and the annotation (notebook) ID from the request body do not match.");
+        String annotationExtId = annotation.getId();
+        if (!(externalId).equals(annotationExtId)) {
+            loggerServer.debug("Wrong request: the annotation identifier   " + externalId + " and the annotation (notebook) ID from the request body do not match.");
             httpServletResponse.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return null;
@@ -255 +249 @@
         Map params = new HashMap();
         params.put("annotation", annotation);
-        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateAnnotation(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, externalId, false);
+        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateAnnotation(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, externalId);
         if (result != null) {
             return (new ObjectFactory()).createResponseBody(result);
@@ -285 +279 @@
         Map params = new HashMap();
         params.put("annotationBody", annotationBody);
-        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateAnnotationBody(), Resource.ANNOTATION, ResourceAction.WRITE, externalIdentifier, false);
+        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateAnnotationBody(), Resource.ANNOTATION, ResourceAction.WRITE, externalIdentifier);
         if (result != null) {
             return (new ObjectFactory()).createResponseBody(result);
@@ -313 +307 @@
         Map params = new HashMap();
         params.put("headline", newHeadline);
-        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateAnnotationHeadline(), Resource.ANNOTATION, ResourceAction.WRITE, externalIdentifier, false);
+        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateAnnotationHeadline(), Resource.ANNOTATION, ResourceAction.WRITE, externalIdentifier);
         if (result != null) {
             return (new ObjectFactory()).createResponseBody(result);
@@ -341 +335 @@
     public String updateAccess(@PathParam("annotationid") String annotationExternalId,
             @PathParam("principalid") String principalExternalId, Access access) throws IOException {
-        return genericUpdateDeleteAccess(annotationExternalId, principalExternalId, access);
+        return this.genericUpdateDeleteAccess(annotationExternalId, principalExternalId, access);
     }
     ////////////////////////////////////////////
@@ -351 +345 @@
             final Number inputPrincipalID = dbDispatcher.getResourceInternalIdentifier(UUID.fromString(principalId), Resource.PRINCIPAL);
             params.put("inputPrincipalID", inputPrincipalID);
-            Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePrincipalAccess(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, annotationId, false);
+            Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePrincipalAccess(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, annotationId);
             if (result != null) {
                 return result + " row(s) is(are) updated.";
@@ -386 +380 @@
         params.put("permissions", permissions);
 
-        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePermissions(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, annotationExternalId, false);
+        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePermissions(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, annotationExternalId);
         if (result != null) {
             return new ObjectFactory().createResponseBody(result);
@@ -414 +408 @@
     public String deletePrincipalsAccess(@PathParam("annotationId") String annotationId,
             @PathParam("principalId") String principalId) throws IOException {
-        return genericUpdateDeleteAccess(annotationId, principalId, null);
+        return this.genericUpdateDeleteAccess(annotationId, principalId, null);
     }
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.Helpers;
-import eu.dasish.annotation.backend.NotInDataBaseException;
 import eu.dasish.annotation.schema.ObjectFactory;
 import eu.dasish.annotation.schema.Principal;
@@ -27 +26 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.JAXBElement;
 import javax.xml.parsers.ParserConfigurationException;
@@ -41 +42 @@
 @Transactional(rollbackFor = {Exception.class, IOException.class, ParserConfigurationException.class})
 public class AutheticationResource extends ResourceResource {
-
+    
+   
     @GET
     @Produces(MediaType.TEXT_XML)
@@ -66 +68 @@
             Number principalID = this.getPrincipalID();
             String remoteID = dbDispatcher.getPrincipalRemoteID(principalID);
-            return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", remoteID);
+            return Helpers.welcomeString(httpServletRequest.getContextPath(), remoteID);
         } catch (IOException e) {
             return e.getMessage();
@@ -80 +82 @@
         boolean isShibboleth = Boolean.parseBoolean(context.getInitParameter("eu.dasish.annotation.backend.isShibbolethSession"));
         String redirect = isShibboleth ? context.getInitParameter("eu.dasish.annotation.backend.logout") : 
-                uriInfo.getBaseUri().toString() + ".."+context.getInitParameter("eu.dasish.annotation.backend.logout");        
+                httpServletRequest.getContextPath() + context.getInitParameter("eu.dasish.annotation.backend.logout");        
         httpServletResponse.sendRedirect(redirect);
     }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java

@@ -66 +66 @@
     public JAXBElement<CachedRepresentationInfo> getCachedRepresentationInfo(@PathParam("cachedid") String externalId) throws IOException {
         Map params = new HashMap();
-        CachedRepresentationInfo result = (CachedRepresentationInfo) (new RequestWrappers(this)).wrapRequestResource(params, new GetCachedRepresentationInfo(), Resource.CACHED_REPRESENTATION, ResourceAction.READ, externalId, false);
+        CachedRepresentationInfo result = (CachedRepresentationInfo) (new RequestWrappers(this)).wrapRequestResource(params, new GetCachedRepresentationInfo(), Resource.CACHED_REPRESENTATION, ResourceAction.READ, externalId);
         if (result != null) {
             return (new ObjectFactory()).createCashedRepresentationInfo(result);
@@ -90 +90 @@
     public BufferedImage getCachedRepresentationContent(@PathParam("cachedid") String externalId) throws IOException {
         Map params = new HashMap();
-        InputStream result = (InputStream) (new RequestWrappers(this)).wrapRequestResource(params, new GetCachedRepresentationInputStream(), Resource.CACHED_REPRESENTATION, ResourceAction.READ, externalId, false);
+        InputStream result = (InputStream) (new RequestWrappers(this)).wrapRequestResource(params, new GetCachedRepresentationInputStream(), Resource.CACHED_REPRESENTATION, ResourceAction.READ, externalId);
         if (result != null) {
             ImageIO.setUseCache(false);
@@ -114 +114 @@
     public InputStream getCachedRepresentationContentStream(@PathParam("cachedid") String externalId) throws IOException {
         Map params = new HashMap();
-        return (InputStream) (new RequestWrappers(this)).wrapRequestResource(params, new GetCachedRepresentationInputStream(), Resource.CACHED_REPRESENTATION, ResourceAction.READ, externalId, false);
+        return (InputStream) (new RequestWrappers(this)).wrapRequestResource(params, new GetCachedRepresentationInputStream(), Resource.CACHED_REPRESENTATION, ResourceAction.READ, externalId);
     }
 
@@ -136 +136 @@
         BodyPartEntity bpe = (BodyPartEntity) multiPart.getBodyParts().get(0).getEntity();
         params.put("stream", bpe.getInputStream());
-        Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateCachedBlob(), Resource.CACHED_REPRESENTATION, ResourceAction.WRITE, cachedIdentifier, false);
+        Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateCachedBlob(), Resource.CACHED_REPRESENTATION, ResourceAction.WRITE, cachedIdentifier);
         if (result != null) {
             return result + "rows are updated";
@@ -168 +168 @@
         Map params = new HashMap();
         params.put("info", cachedInfo);
-        Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateCachedMetadata(), Resource.CACHED_REPRESENTATION, ResourceAction.WRITE_W_METAINFO, cachedInfo.getURI(), true);
+        Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdateCachedMetadata(), Resource.CACHED_REPRESENTATION, ResourceAction.WRITE_W_METAINFO, cachedInfo.getId());
         if (result != null) {
             return result + "rows are updated";

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java

@@ -65 +65 @@
     @Transactional(readOnly = true)
     public JAXBElement<NotebookInfoList> getNotebookInfos(@QueryParam("access") String accessMode) throws IOException {
-        dbDispatcher.setServiceURI(uriInfo.getBaseUri().toString());
+        dbDispatcher.setResourcesPaths(this.getRelativeServiceURI());
         Number remotePrincipalID = this.getPrincipalID();
         if (accessMode.equalsIgnoreCase("read") || accessMode.equalsIgnoreCase("write")) {
@@ -188 +188 @@
             return new ObjectFactory().createResponseBody(new ResponseBody());
         }
-        String path = uriInfo.getBaseUri().toString();
-        String notebookURI = notebookInfo.getRef();
-        if (!(path + "notebook/" + externalIdentifier).equals(notebookURI)) {
+        String path = this.getRelativeServiceURI();
+        String notebookURI = notebookInfo.getHref();
+        if (!(path + "/notebooks/" + externalIdentifier).equals(notebookURI)) {
             httpServletResponse.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return new ObjectFactory().createResponseBody(new ResponseBody());

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java

@@ -130 +130 @@
         Map params = new HashMap<String, String>();
         params.put("externalId", externalIdentifier);
-        params.put("resource", this);
         CurrentPrincipalInfo result = (CurrentPrincipalInfo) (new RequestWrappers(this)).wrapRequestResource(params, new GetCurrentPrincipalInfo());
         return (result != null) ? (new ObjectFactory().createCurrentPrincipalInfo(result)) : (new ObjectFactory().createCurrentPrincipalInfo(new CurrentPrincipalInfo()));
@@ -139 +138 @@
         @Override
         public CurrentPrincipalInfo apply(Map params) throws NotInDataBaseException {
-            final Number principalID = dbDispatcher.getResourceInternalIdentifier(UUID.fromString((String) params.get("externalId")), Resource.PRINCIPAL);
+            String externalId = (String) params.get("externalId");
+            String loggedInExternalId = (dbDispatcher.getPrincipalExternalIDFromRemoteID(httpServletRequest.getRemoteUser())).toString();
             final CurrentPrincipalInfo principalInfo = new CurrentPrincipalInfo();
-            principalInfo.setRef(dbDispatcher.getResourceURI(principalID, Resource.PRINCIPAL));
-            principalInfo.setCurrentPrincipal(((PrincipalResource) params.get("resource")).ifLoggedIn(principalID));
+            principalInfo.setHref(getRelativeServiceURI() + "/principals/" + externalId);
+            principalInfo.setCurrentPrincipal(externalId.equals(loggedInExternalId));
             return principalInfo;
         }
@@ -148 +148 @@
     ////////////////////////////// 
 
-    @POST
-    @Produces(MediaType.TEXT_PLAIN)
-    @Path("create/{remoteId}/{password}")
-    public String createSpringAuthenticationRecord(@PathParam("remoteId") String remoteId, @PathParam("password") String password) throws IOException {
-        Number remotePrincipalID = this.getPrincipalID();
-        if (remotePrincipalID == null) {
-            return "Logged in principal is null or anonymous.";
-        }
-
-        if (dbDispatcher.getTypeOfPrincipalAccount(remotePrincipalID).equals(admin)) {
-            try {
-                int result = dbDispatcher.addSpringUser(remoteId, password, shaStrength, remoteId);
-                return result + " record(s) has been added. Must be 2: 1 record for the principal, another for the authorities table.";
-            } catch (DuplicateKeyException e) {
-                loggerServer.error(e.toString());
-                httpServletResponse.sendError(HttpServletResponse.SC_BAD_REQUEST);
-                return e.toString();
-            }
-        } else {
-            this.ADMIN_RIGHTS_EXPECTED();
-            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
-            return "Nothing is added.";
-        }
-
-    }
-
+//    @POST
+//    @Produces(MediaType.TEXT_PLAIN)
+//    @Path("create/{remoteId}/{password}")
+//    public String createSpringAuthenticationRecord(@PathParam("remoteId") String remoteId, @PathParam("password") String password) throws IOException {
+//        Number remotePrincipalID = this.getPrincipalID();
+//        if (remotePrincipalID == null) {
+//            return "Logged in principal is null or anonymous.";
+//        }
+//
+//        if (dbDispatcher.getTypeOfPrincipalAccount(remotePrincipalID).equals(admin)) {
+//            try {
+//                int result = dbDispatcher.addSpringUser(remoteId, password, shaStrength, remoteId);
+//                return result + " record(s) has been added. Must be 2: 1 record for the principal, another for the authorities table.";
+//            } catch (DuplicateKeyException e) {
+//                loggerServer.error(e.toString());
+//                httpServletResponse.sendError(HttpServletResponse.SC_BAD_REQUEST);
+//                return e.toString();
+//            }
+//        } else {
+//            this.ADMIN_RIGHTS_EXPECTED();
+//            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
+//            return "Nothing is added.";
+//        }
+//
+//    }
     ///////////////////////////////////////
-    @POST
-    @Consumes(MediaType.APPLICATION_XML)
-    @Produces(MediaType.APPLICATION_XML)
-    @Path("{remoteId}")
-    public JAXBElement<Principal> addPrincipal(@PathParam("remoteId") String remoteId, Principal principal) throws IOException {
-
-        Number remotePrincipalID = this.getPrincipalID();
-        if (remotePrincipalID == null) {
-            return new ObjectFactory().createPrincipal(new Principal());
-        }
-
-        Map params = new HashMap<String, Object>();
-        params.put("remoteId", remoteId);
-        params.put("newPrincipal", principal);
-
-        if (dbDispatcher.getTypeOfPrincipalAccount(remotePrincipalID).equals(admin)) {
-            return (new RequestWrappers(this)).wrapAddPrincipalRequest(params, new AddPrincipal());
-        } else {
-            this.ADMIN_RIGHTS_EXPECTED();
-            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
-            return new ObjectFactory().createPrincipal(new Principal());
-        }
-
-    }
-
-    private class AddPrincipal implements ILambdaPrincipal<Map, Principal> {
-
-        @Override
-        public Principal apply(Map params) throws NotInDataBaseException, PrincipalExists {
-            final Number principalID = dbDispatcher.addPrincipal((Principal) params.get("newPrincipal"), (String) params.get("remoteId"));
-            return dbDispatcher.getPrincipal(principalID);
-        }
-    }
-
+//    @POST
+//    @Consumes(MediaType.APPLICATION_XML)
+//    @Produces(MediaType.APPLICATION_XML)
+//    @Path("{remoteId}")
+//    public JAXBElement<Principal> addPrincipal(@PathParam("remoteId") String remoteId, Principal principal) throws IOException {
+//
+//        Number remotePrincipalID = this.getPrincipalID();
+//        if (remotePrincipalID == null) {
+//            return new ObjectFactory().createPrincipal(new Principal());
+//        }
+//
+//        Map params = new HashMap<String, Object>();
+//        params.put("remoteId", remoteId);
+//        params.put("newPrincipal", principal);
+//
+//        if (dbDispatcher.getTypeOfPrincipalAccount(remotePrincipalID).equals(admin)) {
+//            return (new RequestWrappers(this)).wrapAddPrincipalRequest(params, new AddPrincipal());
+//        } else {
+//            this.ADMIN_RIGHTS_EXPECTED();
+//            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
+//            return new ObjectFactory().createPrincipal(new Principal());
+//        }
+//
+//    }
     /////////////////////////////////////
     @POST
@@ -227 +216 @@
         params.put("newPrincipal", newPrincipal);
 
-        dbDispatcher.setServiceURI(uriInfo.getBaseUri().toString());
+        dbDispatcher.setResourcesPaths(this.getRelativeServiceURI());
         return (new RequestWrappers(this)).wrapAddPrincipalRequest(params, new RegisterNonShibbolizedPrincipal());
     }
@@ -253 +242 @@
             @FormParam("remoteId") String remoteId, @FormParam("email") String email)
             throws IOException {
-        dbDispatcher.setServiceURI(uriInfo.getBaseUri().toString());
+        dbDispatcher.setResourcesPaths(this.getRelativeServiceURI());
         Principal newPrincipal = new Principal();
         newPrincipal.setDisplayName(name);
@@ -261 +250 @@
         params.put("newPrincipal", newPrincipal);
 
-        dbDispatcher.setServiceURI(uriInfo.getBaseUri().toString());
-        return (new RequestWrappers(this)).wrapAddPrincipalRequest(params, new AddPrincipal());
+        dbDispatcher.setResourcesPaths(this.getRelativeServiceURI());
+        return (new RequestWrappers(this)).wrapAddPrincipalRequest(params, new RegisterShibbolizedPrincipal());
+    }
+
+    private class RegisterShibbolizedPrincipal implements ILambdaPrincipal<Map, Principal> {
+
+        @Override
+        public Principal apply(Map params) throws NotInDataBaseException, PrincipalExists {
+            final Number principalID = dbDispatcher.addPrincipal((Principal) params.get("newPrincipal"), (String) params.get("remoteId"));
+            return dbDispatcher.getPrincipal(principalID);
+        }
     }
 
@@ -303 +301 @@
         }
     }
-    ///////////////////////////////////
-
+    /////////////////////////////////
+
+    // logged in user can update his/her account
+    // or account can be updated by the admin in a separate request, see above
     @POST
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@@ -310 +310 @@
     @Path("updateme")
     public JAXBElement<Principal> updatePrincipalFromForm(@FormParam("name") String name, @FormParam("email") String email)
-            throws IOException {
-        
+            throws IOException, NotInDataBaseException {
+
         Principal newPrincipal = new Principal();
         newPrincipal.setDisplayName(name);
         newPrincipal.setEMail(email);
+        String remoteId = httpServletRequest.getRemoteUser();
+        String externalId = (dbDispatcher.getPrincipalExternalIDFromRemoteID(remoteId)).toString();
+        String href = this.getRelativeServiceURI() + "/principals/" + externalId;
+        newPrincipal.setId(externalId);
+        newPrincipal.setHref(href);
         Map params = new HashMap<String, Object>();
         params.put("newPrincipal", newPrincipal);
@@ -326 +331 @@
         public Principal apply(Map params) throws NotInDataBaseException {
             Principal principal = (Principal) params.get("newPrincipal");
-            Number principalID = (Number) params.get("principalID");
-            String principalURI = dbDispatcher.getResourceURI(principalID, Resource.PRINCIPAL);
-            principal.setURI(principalURI);
-            Number principalIDupd = dbDispatcher.updatePrincipal(principal);            
+            Number principalIDupd = dbDispatcher.updatePrincipal(principal);
             return dbDispatcher.getPrincipal(principalIDupd);
         }
@@ -354 +356 @@
                 }
             } catch (NotInDataBaseException e) {
-                loggerServer.debug(e.toString());;
+                loggerServer.debug(e.toString());
                 httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
                 return "Account is updated.";
@@ -385 +387 @@
                 }
             } catch (NotInDataBaseException e) {
-                loggerServer.debug(e.toString());;
+                loggerServer.debug(e.toString());
                 httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.toString());
                 return "Nothing is deleted.";
@@ -392 +394 @@
             this.ADMIN_RIGHTS_EXPECTED();
             httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
-            return "Account is not updated.";
-        }
-
-    }
-
-    // silly because it is trivial. harvest all logged in users via shibboleth!!
-    private boolean ifLoggedIn(Number principalID) {
-        return (httpServletRequest.getRemoteUser()).equals(dbDispatcher.getPrincipalRemoteID(principalID));
+            return "Principal is not deleted.";
+        }
+
     }
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java

@@ -38 +38 @@
 public class RequestWrappers<T> {
 
-    
     private ResourceResource resourceResource;
     private String _internalID = "internalID";
@@ -68 +67 @@
     }
 
-    public T wrapRequestResource(Map params, ILambda<Map, T> dbRequestor, Resource resource, ResourceAction action, String externalId, boolean isUri) throws IOException {
+    public T wrapRequestResource(Map params, ILambda<Map, T> dbRequestor, Resource resource, ResourceAction action, String externalId) throws IOException {
         Number principalID = resourceResource.getPrincipalID();
         if (principalID == null) {
@@ -75 +74 @@
         params.put(_principalID, principalID);
         try {
-            final Number resourceID;
-            if (isUri) {
-                resourceID = resourceResource.dbDispatcher.getResourceInternalIdentifierFromURI(externalId, resource);
-                params.put(_externalId,  resourceResource.dbDispatcher.getResourceExternalIdentifier(resourceID, resource).toString());
-            } else {
-                resourceID = resourceResource.dbDispatcher.getResourceInternalIdentifier(UUID.fromString(externalId), resource);
-                params.put(_externalId, externalId);
-            }
+            final Number resourceID = resourceResource.dbDispatcher.getResourceInternalIdentifier(UUID.fromString(externalId), resource);
             if (resourceResource.dbDispatcher.canDo(action, principalID, resourceID, resource)) {
+                params.put(_externalId, externalId);            
                 params.put(_internalID, resourceID);
                 params.put(_resourceType, resource);
@@ -89 +82 @@
             } else {
                 this.FORBIDDEN_RESOURCE_ACTION(externalId, resource.name(), action.name());
-                resourceResource.loggerServer.debug("Principal "+resourceResource.dbDispatcher.getResourceExternalIdentifier(principalID, Resource.PRINCIPAL)+" cannot "+action.name()+" "+resource.name()+" with the id "+externalId);
+                resourceResource.loggerServer.debug("Principal " + resourceResource.dbDispatcher.getResourceExternalIdentifier(principalID, Resource.PRINCIPAL) + " cannot " + action.name() + " " + resource.name() + " with the id " + externalId);
                 resourceResource.httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
                 return null;

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java

@@ -28 +28 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Providers;
 import org.slf4j.Logger;
@@ -45 +44 @@
     protected HttpServletRequest httpServletRequest;
     @Context
-    protected HttpServletResponse httpServletResponse;
-    @Context
-    protected UriInfo uriInfo;
+    protected HttpServletResponse httpServletResponse;    
     @Context
     protected Providers providers;
@@ -59 +56 @@
 
     public Number getPrincipalID() throws IOException {
-        dbDispatcher.setServiceURI(uriInfo.getBaseUri().toString());
+        
+        dbDispatcher.setResourcesPaths(this.getRelativeServiceURI());
         String remotePrincipal = httpServletRequest.getRemoteUser();
         if (remotePrincipal != null) {
@@ -102 +100 @@
         loggerServer.debug(accessMode + " is an invalid access value, which must be either owner, or read, or write.");
     }
+    
+    protected String getRelativeServiceURI(){
+        return httpServletRequest.getContextPath()+httpServletRequest.getServletPath();
+    }
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java

@@ -79 +79 @@
     public JAXBElement<Target> getTarget(@PathParam("targetid") String externalIdentifier) throws IOException {
         Map params = new HashMap();
-        Target result = (Target) (new RequestWrappers(this)).wrapRequestResource(params, new GetTarget(), Resource.TARGET, ResourceAction.READ, externalIdentifier, false);
+        Target result = (Target) (new RequestWrappers(this)).wrapRequestResource(params, new GetTarget(), Resource.TARGET, ResourceAction.READ, externalIdentifier);
         if (result != null) {
             return new ObjectFactory().createTarget(result);
@@ -103 +103 @@
     public JAXBElement<ReferenceList> getSiblingTargets(@PathParam("targetid") String externalIdentifier) throws HTTPException, IOException {
         Map params = new HashMap();
-        ReferenceList result = (ReferenceList) (new RequestWrappers(this)).wrapRequestResource(params, new GetSiblingTargets(), Resource.TARGET, ResourceAction.READ, externalIdentifier, false);
+        ReferenceList result = (ReferenceList) (new RequestWrappers(this)).wrapRequestResource(params, new GetSiblingTargets(), Resource.TARGET, ResourceAction.READ, externalIdentifier);
         if (result != null) {
             return new ObjectFactory().createReferenceList(result);
@@ -135 +135 @@
         params.put("fragmentDescriptor", fragmentDescriptor);
         
-        CachedRepresentationInfo result = (CachedRepresentationInfo) (new RequestWrappers(this)).wrapRequestResource(params, new PostCached(), Resource.TARGET, ResourceAction.WRITE_W_METAINFO, targetIdentifier, false);
+        CachedRepresentationInfo result = (CachedRepresentationInfo) (new RequestWrappers(this)).wrapRequestResource(params, new PostCached(), Resource.TARGET, ResourceAction.WRITE_W_METAINFO, targetIdentifier);
         if (result != null) {
             return new ObjectFactory().createCashedRepresentationInfo(result);

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java

@@ -22 +22 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
 import org.springframework.stereotype.Component;
 
@@ -39 +41 @@
         String remotePrincipal= httpServletRequest.getRemoteUser();
         if (remotePrincipal != null) {
-        return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..",remotePrincipal);
+        return Helpers.welcomeString(httpServletRequest.getContextPath(),remotePrincipal);
         }
         else {
-           return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", "null-principal"); 
+           return Helpers.welcomeString(httpServletRequest.getContextPath(), "null-principal"); 
         }
     } 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web-basic.xml

@@ -19 +19 @@
 
 -->
+
+
 <!-- This web.xml file is not required when using Servlet 3.0 container, 
 see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 -->

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web-shibboleth.xml

@@ -19 +19 @@
 
 -->
+
 <!-- This web.xml file is not required when using Servlet 3.0 container, 
 see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 -->

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml

@@ -26 +26 @@
         <param-value>/WEB-INF/shhaa.xml</param-value>
     </context-param>
-    
-    
     <context-param>
         <param-name>contextConfigLocation</param-name>
@@ -34 +32 @@
     <context-param>
         <param-name>eu.dasish.annotation.backend.schemaLocation</param-name>
-        <param-value>http://lux17.mpi.nl/schemacat/schemas/s15/files/dwan.xsd</param-value>
+        <param-value>/Users/olhsha/repositories/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd</param-value>    
     </context-param>
     <context-param>

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/MockObjectsFactoryRest.java

@@ -21 +21 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Providers;
 import org.jmock.Mockery;
@@ -38 +37 @@
     }
 
-    
     public DBDispatcher newDBDispatcher() {
         return context.mock(DBDispatcher.class);
     }
-    
-    public UriInfo newUriInfo() {
-        return context.mock(UriInfo.class);
-    }
-   
-    
-     public Providers newProviders() {
+
+    public Providers newProviders() {
         return context.mock(Providers.class);
     }
-   
+
     public HttpServletRequest newHttpServletRequest() {
         return context.mock(HttpServletRequest.class);
     }
-    
+
     public HttpServletResponse newHttpServletResponce() {
         return context.mock(HttpServletResponse.class);
     }
-   
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java

@@ -26 +26 @@
 import eu.dasish.annotation.schema.Permission;
 import eu.dasish.annotation.schema.PermissionList;
+import java.util.UUID;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
@@ -38 +39 @@
     final private Annotation _annotationToAdd;
 
-    public TestInstances(String baseURI) {
-        _annotationOne = makeAnnotationOne(baseURI);
-        _annotationToAdd = makeAnnotationToAdd(baseURI);
+    public TestInstances(String relativePath) {
+        _annotationOne = makeAnnotationOne(relativePath);
+        _annotationToAdd = makeAnnotationToAdd(relativePath);
     }
 
-    private Annotation makeAnnotationOne(String baseURI) {
-        Annotation result = makeAnnotation(baseURI, "<html><body>some html 1</body></html>", "text/html", "Sagrada Famiglia", "00000000-0000-0000-0000-000000000111");
-        result.setURI(baseURI+"annotations/00000000-0000-0000-0000-000000000021");
-        
+    private Annotation makeAnnotationOne(String relativePath) {
+        Annotation result = makeAnnotation(relativePath, "<html><body>some html 1</body></html>", "text/html", "Sagrada Famiglia", "00000000-0000-0000-0000-000000000111", "00000000-0000-0000-0000-000000000021");
+
         try {
             result.setLastModified(DatatypeFactory.newInstance().newXMLGregorianCalendar("2013-08-12T09:25:00.383000Z"));
@@ -59 +59 @@
 
         Permission up1 = new Permission();
-        up1.setPrincipalRef(baseURI + "principals/00000000-0000-0000-0000-000000000112");
+        up1.setPrincipalHref(relativePath + "/principals/00000000-0000-0000-0000-000000000112");
         up1.setLevel(Access.WRITE);
 
         Permission up2 = new Permission();
-        up2.setPrincipalRef(baseURI + "principals/00000000-0000-0000-0000-000000000113");
+        up2.setPrincipalHref(relativePath + "/principals/00000000-0000-0000-0000-000000000113");
         up2.setLevel(Access.READ);
 
@@ -72 +72 @@
         TargetInfo target1 = new TargetInfo();
         target1.setLink("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia");
-        target1.setRef(baseURI + "targets/00000000-0000-0000-0000-000000000031");
+        target1.setHref(relativePath + "/targets/00000000-0000-0000-0000-000000000031");
         target1.setVersion("version 1.0");
 
         TargetInfo target2 = new TargetInfo();
         target2.setLink("http://nl.wikipedia.org/wiki/Antoni_Gaud%C3%AD");
-        target2.setRef(baseURI + "targets/00000000-0000-0000-0000-000000000032");
+        target2.setHref(relativePath + "/targets/00000000-0000-0000-0000-000000000032");
         target2.setVersion("version 1.1");
 
@@ -86 +86 @@
     }
 
-    private Annotation makeAnnotationToAdd(String baseURI) {
-        Annotation result = makeAnnotation(baseURI, "<html><body>some html 3</body></html>", "text/plain", "Annotation to add to test DAO", "00000000-0000-0000-0000-000000000113");
+    private Annotation makeAnnotationToAdd(String relativePath) {
+        Annotation result = makeAnnotation(relativePath, "<html><body>some html 3</body></html>", "text/plain", "Annotation to add to test DAO", "00000000-0000-0000-0000-000000000113",  UUID.randomUUID().toString());
 
         TargetInfo TargetInfo = new TargetInfo();
         TargetInfo.setLink("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#de_Opdracht");
-        TargetInfo.setRef(baseURI+  "targets/00000000-0000-0000-0000-000000000031");
+        TargetInfo.setHref(relativePath + "/targets/00000000-0000-0000-0000-000000000031");
         TargetInfo.setVersion("version 1.0");
 
@@ -97 +97 @@
         targetInfos.getTargetInfo().add(TargetInfo);
         result.setTargets(targetInfos);
-        
+
         PermissionList permissions = new PermissionList();
         permissions.setPublic(Access.WRITE);
         result.setPermissions(permissions);
-        
+
         return result;
     }
 
-    private Annotation makeAnnotation(String baseURI, String bodyTxt, String bodyMimeType, String headline, String ownerExternalId) {
+    private Annotation makeAnnotation(String relativePath, String bodyTxt, String bodyMimeType, String headline, String ownerExternalId, String externalId) {
         Annotation result = new Annotation();
+        
         AnnotationBody body = new AnnotationBody();
         result.setBody(body);
@@ -113 +114 @@
         textBody.setMimeType(bodyMimeType);
         textBody.setBody(bodyTxt);
-
+        
         result.setHeadline(headline);
-
-        if (baseURI != null) {
-            result.setOwnerRef(baseURI + "principals/" + ownerExternalId);
-        } else {
-            result.setOwnerRef("principals/" + ownerExternalId);
-        }
-
+        result.setOwnerHref(relativePath + "/principals/" + ownerExternalId);
         result.setLastModified(null);
-        result.setURI(null);
+        result.setId(externalId);
+        result.setHref(relativePath + "/annotations/"+externalId);
         result.setTargets(null);
-        result.setURI(null);
-
         return result;
     }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java

@@ -22 +22 @@
 import eu.dasish.annotation.backend.PrincipalExists;
 import eu.dasish.annotation.backend.Resource;
-import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
 import eu.dasish.annotation.backend.dao.AnnotationDao;
@@ -93 +92 @@
     @Autowired
     private NotebookDao notebookDao;
-    TestInstances testInstances = new TestInstances(TestBackendConstants._TEST_SERVLET_URI);
-
-    public DBDispatcherTest() {
-    }
+    TestInstances testInstances = new TestInstances("/api");
+
+    public DBDispatcherTest() {        
+    }
+    
+   
 
     ///////// GETTERS /////////////
@@ -103 +104 @@
      * DBIntegrityServiceImlp.
      */
+    
     @Test
     public void testGetAnnotationInternalIdentifier() throws NotInDataBaseException {
         System.out.println("getAnnotationInternalIdentifier");
+        
         final UUID externalID = UUID.fromString("00000000-0000-0000-0000-000000000021");
-        //dbIntegrityService.setResourceList();
         mockeryDao.checking(new Expectations() {
             {
@@ -125 +127 @@
         System.out.println("getAnnotationExternalIdentifier");
         final UUID externalID = UUID.fromString("00000000-0000-0000-0000-000000000021");
-
+        
         mockeryDao.checking(new Expectations() {
             {
@@ -142 +144 @@
     public void testGetPrincipalInternalIdentifier() throws NotInDataBaseException {
         System.out.println("getPrincipalInternalIdentifier");
-
+        
         final UUID externalID = UUID.fromString("00000000-0000-0000-0000-000000000111");
 
@@ -162 +164 @@
         System.out.println("getPrincipalExternalIdentifier");
         final UUID externalID = UUID.fromString("00000000-0000-0000-0000-000000000111");
-
+        
         mockeryDao.checking(new Expectations() {
             {
@@ -178 +180 @@
     public void testGetAnnotation() throws Exception {
         System.out.println("test getAnnotation");
-
+        
         final Annotation mockAnnotation = new Annotation();// corresponds to the annotation # 1
-        mockAnnotation.setURI(TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000021");
+        mockAnnotation.setHref("/api/annotations/00000000-0000-0000-0000-000000000021");
+        mockAnnotation.setId("00000000-0000-0000-0000-000000000021");
         mockAnnotation.setHeadline("Sagrada Famiglia");
         XMLGregorianCalendar mockTimeStamp = DatatypeFactory.newInstance().newXMLGregorianCalendar("2013-08-12T09:25:00.383000Z");
         mockAnnotation.setLastModified(mockTimeStamp);
-        mockAnnotation.setOwnerRef(TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000111");
+        mockAnnotation.setOwnerHref("/api/principals/00000000-0000-0000-0000-000000000111");
 
         AnnotationBody mockBody = new AnnotationBody();
@@ -201 +204 @@
         final Target mockTargetOne = new Target();
         mockTargetOne.setLink("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia");
-        mockTargetOne.setURI(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031");
+        mockTargetOne.setId("00000000-0000-0000-0000-000000000031");
+        mockTargetOne.setHref("/api/targets/00000000-0000-0000-0000-000000000031");
         mockTargetOne.setVersion("version 1.0");
 
         final Target mockTargetTwo = new Target();
         mockTargetTwo.setLink("http://nl.wikipedia.org/wiki/Antoni_Gaud%C3%AD");
-        mockTargetTwo.setURI(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000032");
+        mockTargetTwo.setId("00000000-0000-0000-0000-000000000032");
+        mockTargetTwo.setHref("/api/targets/00000000-0000-0000-0000-000000000032");
         mockTargetTwo.setVersion("version 1.1");
 
@@ -220 +225 @@
         listMap.add(map4);
 
-        final String uri1 = TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000111";
-        final String uri2 = TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000112";
-        final String uri3 = TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000113";
-        final String uri4 = TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000221";
+        final String uri1 = "/api/principals/00000000-0000-0000-0000-000000000111";
+        final String uri2 = "/api/principals/00000000-0000-0000-0000-000000000112";
+        final String uri3 = "/api/principals/00000000-0000-0000-0000-000000000113";
+        final String uri4 = "/api/principals/00000000-0000-0000-0000-000000000221";
 
 
@@ -234 +239 @@
                 will(returnValue(1));
 
-                oneOf(principalDao).getURIFromInternalID(1);
+                oneOf(principalDao).getHrefFromInternalID(1);
                 will(returnValue(uri1));
 
@@ -254 +259 @@
                 will(returnValue(Access.WRITE));
 
-                oneOf(principalDao).getURIFromInternalID(2);
+                oneOf(principalDao).getHrefFromInternalID(2);
                 will(returnValue(uri2));
 
-                oneOf(principalDao).getURIFromInternalID(3);
+                oneOf(principalDao).getHrefFromInternalID(3);
                 will(returnValue(uri3));
 
-                oneOf(principalDao).getURIFromInternalID(11);
+                oneOf(principalDao).getHrefFromInternalID(11);
                 will(returnValue(uri4));
             }
@@ -266 +271 @@
 
         Annotation result = dbDispatcher.getAnnotation(1);
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000021", result.getURI());
+        assertEquals("00000000-0000-0000-0000-000000000021", result.getId());
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000021", result.getHref());
         assertEquals("text/plain", result.getBody().getTextBody().getMimeType());
         assertEquals("<html><body>some html 1</body></html>", result.getBody().getTextBody().getBody());
         assertEquals("Sagrada Famiglia", result.getHeadline());
         assertEquals("2013-08-12T09:25:00.383000Z", result.getLastModified().toString());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000111", result.getOwnerRef());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000111", result.getOwnerHref());
 
         assertEquals(mockTargetOne.getLink(), result.getTargets().getTargetInfo().get(0).getLink());
-        assertEquals(mockTargetOne.getURI(), result.getTargets().getTargetInfo().get(0).getRef());
+        assertEquals(mockTargetOne.getHref(), result.getTargets().getTargetInfo().get(0).getHref());
         assertEquals(mockTargetOne.getVersion(), result.getTargets().getTargetInfo().get(0).getVersion());
         assertEquals(mockTargetTwo.getLink(), result.getTargets().getTargetInfo().get(1).getLink());
-        assertEquals(mockTargetTwo.getURI(), result.getTargets().getTargetInfo().get(1).getRef());
+        assertEquals(mockTargetTwo.getHref(), result.getTargets().getTargetInfo().get(1).getHref());
         assertEquals(mockTargetTwo.getVersion(), result.getTargets().getTargetInfo().get(1).getVersion());
 
@@ -283 +289 @@
 
         assertEquals(Access.WRITE, result.getPermissions().getPermission().get(0).getLevel());
-        assertEquals(uri2, result.getPermissions().getPermission().get(0).getPrincipalRef());
+        assertEquals(uri2, result.getPermissions().getPermission().get(0).getPrincipalHref());
 
         assertEquals(Access.READ, result.getPermissions().getPermission().get(1).getLevel());
-        assertEquals(uri3, result.getPermissions().getPermission().get(1).getPrincipalRef());
+        assertEquals(uri3, result.getPermissions().getPermission().get(1).getPrincipalHref());
 
         assertEquals(Access.READ, result.getPermissions().getPermission().get(2).getLevel());
-        assertEquals(uri4, result.getPermissions().getPermission().get(2).getPrincipalRef());
+        assertEquals(uri4, result.getPermissions().getPermission().get(2).getPrincipalHref());
 
         assertEquals(Access.WRITE, result.getPermissions().getPublic());
@@ -300 +306 @@
     public void testGetFilteredAnnotationIDs() throws NotInDataBaseException {
         System.out.println("test getFilteredAnnotationIDs");
-       
+        
         final List<Number> mockAnnotationIDs1 = new ArrayList<Number>();
         mockAnnotationIDs1.add(1);
@@ -367 +373 @@
     public void testGetFilteredAnnotationIDs2() throws NotInDataBaseException {
         System.out.println("test getFilteredAnnotationIDs");
-
-        
+       
         final List<Number> mockAnnotationIDs1 = new ArrayList<Number>();
         mockAnnotationIDs1.add(1);
@@ -434 +439 @@
     public void testGetFilteredAnnotationIDs3() throws NotInDataBaseException {
         System.out.println("test getFilteredAnnotationIDs");
-
         
         final List<Number> mockAnnotationIDs1 = new ArrayList<Number>();
@@ -459 +463 @@
     public void testGetFilteredAnnotationIDs4() throws NotInDataBaseException {
         System.out.println("test getFilteredAnnotationIDs");
-
-       
-
+        
         final String after = (new Timestamp(0)).toString();
         final String before = (new Timestamp(System.currentTimeMillis())).toString();
@@ -488 +490 @@
     public void testGetAnnotationTargets() throws SQLException {
         System.out.println("test getAnnotationTargets");
-        final List<Number> TargetIDs = new ArrayList<Number>();
-        TargetIDs.add(1);
-        TargetIDs.add(2);
+        
+        final List<Number> targetIDs = new ArrayList<Number>();
+        targetIDs.add(1);
+        targetIDs.add(2);
         mockeryDao.checking(new Expectations() {
             {
                 oneOf(targetDao).getTargetIDs(1);
-                will(returnValue(TargetIDs));
-
-                oneOf(targetDao).getURIFromInternalID(1);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031"));
-
-                oneOf(targetDao).getURIFromInternalID(2);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000032"));
+                will(returnValue(targetIDs));
+
+                oneOf(targetDao).getHrefFromInternalID(1);
+                will(returnValue("/api/targets/00000000-0000-0000-0000-000000000031"));
+
+                oneOf(targetDao).getHrefFromInternalID(2);
+                will(returnValue("/api/targets/00000000-0000-0000-0000-000000000032"));
 
             }
@@ -506 +509 @@
 
         ReferenceList result = dbDispatcher.getAnnotationTargets(1);
-        assertEquals(2, result.getRef().size());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031", result.getRef().get(0));
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000032", result.getRef().get(1));
+        assertEquals(2, result.getHref().size());
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000031", result.getHref().get(0));
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000032", result.getHref().get(1));
 
     }
@@ -524 +527 @@
     public void testGetFilteredAnnotationInfos() throws NotInDataBaseException {
         System.out.println("test getetFilteredAnnotationInfos");
-
-
+        
         final List<Number> mockAnnotationIDs1 = new ArrayList<Number>();
         mockAnnotationIDs1.add(1);
@@ -563 +565 @@
 
         mockAnnotInfo.setHeadline("Sagrada Famiglia");
-        mockAnnotInfo.setRef(TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000021");
-        mockAnnotInfo.setOwnerRef(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000111");
+        mockAnnotInfo.setHref("/api/annotations/00000000-0000-0000-0000-000000000021");
+        mockAnnotInfo.setOwnerHref("/api/principals/00000000-0000-0000-0000-000000000111");
 
         final List<Number> targetIDs = new ArrayList<Number>();
@@ -608 +610 @@
                 will(returnValue(1));
 
-                oneOf(principalDao).getURIFromInternalID(1);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000111"));
+                oneOf(principalDao).getHrefFromInternalID(1);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000111"));
 
                 ////
@@ -615 +617 @@
                 will(returnValue(targetIDs));
 
-                oneOf(targetDao).getURIFromInternalID(1);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031"));
-
-
-                oneOf(targetDao).getURIFromInternalID(2);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000032"));
+                oneOf(targetDao).getHrefFromInternalID(1);
+                will(returnValue("/api/targets/00000000-0000-0000-0000-000000000031"));
+
+
+                oneOf(targetDao).getHrefFromInternalID(2);
+                will(returnValue("/api/targets/00000000-0000-0000-0000-000000000032"));
 
 
@@ -630 +632 @@
         assertEquals(1, result.getAnnotationInfo().size());
         AnnotationInfo resultAnnotInfo = result.getAnnotationInfo().get(0);
-        assertEquals(mockAnnotInfo.getHeadline(), resultAnnotInfo.getHeadline());
-        assertEquals(mockAnnotInfo.getRef(), resultAnnotInfo.getRef());
-        assertEquals(mockAnnotInfo.getOwnerRef(), resultAnnotInfo.getOwnerRef());
-        assertEquals(mockAnnotInfo.getRef(), result.getAnnotationInfo().get(0).getRef());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031", resultAnnotInfo.getTargets().getRef().get(0));
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000032", resultAnnotInfo.getTargets().getRef().get(1));
+        assertEquals("Sagrada Famiglia", resultAnnotInfo.getHeadline());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000111", resultAnnotInfo.getOwnerHref());
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000021", result.getAnnotationInfo().get(0).getHref());
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000031", resultAnnotInfo.getTargets().getHref().get(0));
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000032", resultAnnotInfo.getTargets().getHref().get(1));
 
     }
@@ -642 +643 @@
     public void testGetTargetsWithNoCachedRepresentation() {
         System.out.println("test getTargetsWithNoCachedRepresentation");
+      
         final List<Number> targetIDs = new ArrayList<Number>();
         targetIDs.add(5);
@@ -663 +665 @@
                 will(returnValue(cachedIDs7));
 
-                oneOf(targetDao).getURIFromInternalID(7);
-                will(returnValue("00000000-0000-0000-0000-000000000037"));
+                oneOf(targetDao).getHrefFromInternalID(7);
+                will(returnValue("/api/targets/00000000-0000-0000-0000-000000000037"));
 
             }
@@ -671 +673 @@
         List<String> result = dbDispatcher.getTargetsWithNoCachedRepresentation(3);
         assertEquals(1, result.size());
-        assertEquals("00000000-0000-0000-0000-000000000037", result.get(0)); // Target number 7 has no cached
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000037", result.get(0)); // Target number 7 has no cached
     }
 
@@ -680 +682 @@
     @Test
     public void testAddCached() throws SerialException, IOException, NotInDataBaseException {
-        System.out.println("addCached");
+        System.out.println("test addCached");
+        
         String mime = "text/html";
         String type = "text";
@@ -689 +692 @@
         newCachedInfo.setType(type);
         newCachedInfo.setTool(tool);
-        newCachedInfo.setURI(TestBackendConstants._TEST_SERVLET_URI_cached + externalID);
-
+        newCachedInfo.setHref("/api/cached/" + externalID);
+        newCachedInfo.setId(externalID);
+        
         String blobString = "aaa";
         byte[] blobBytes = blobString.getBytes();
@@ -697 +701 @@
         mockeryDao.checking(new Expectations() {
             {
-
-                oneOf(cachedRepresentationDao).getInternalIDFromURI(newCachedInfo.getURI());
-                will(returnValue(null));
 
                 oneOf(cachedRepresentationDao).addCachedRepresentation(newCachedInfo, newCachedBlob);
@@ -729 +730 @@
     public void testAddTargetsForAnnotation() throws Exception {
         System.out.println("test addTargetsForAnnotation");
-
+        
         // test 1: adding an existing target
         TargetInfo testTargetOne = new TargetInfo();
         testTargetOne.setLink("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia");
-        testTargetOne.setRef(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031");
+        testTargetOne.setHref("/api/targets/00000000-0000-0000-0000-000000000031");
         testTargetOne.setVersion("version 1.0");
         final List<TargetInfo> mockTargetListOne = new ArrayList<TargetInfo>();
@@ -740 +741 @@
         mockeryDao.checking(new Expectations() {
             {
-                oneOf(targetDao).getInternalIDFromURI(mockTargetListOne.get(0).getRef());
+                oneOf(targetDao).getInternalIDFromHref(mockTargetListOne.get(0).getHref());
                 will(returnValue(1));
 
@@ -753 +754 @@
         // test 2: adding a new Target
         TargetInfo testTargetTwo = new TargetInfo();
-        final String tempTargetID = UUID.randomUUID().toString();
-        testTargetTwo.setRef(TestBackendConstants._TEST_SERVLET_URI_targets + tempTargetID);
+        final String tempTargetID = "/api/targets/"+UUID.randomUUID().toString();
+        testTargetTwo.setHref(tempTargetID);
         testTargetTwo.setLink("http://www.sagradafamilia.cat/docs_instit/historia.php");
         testTargetTwo.setVersion("version 1.0");
@@ -763 +764 @@
         final NotInDataBaseException e = new NotInDataBaseException("target", "external ID", tempTargetID);
 
-        mockeryDao.checking(new Expectations() {
-            {
-                oneOf(targetDao).getInternalIDFromURI(mockTargetListTwo.get(0).getRef());
+//        Target newTarget = this.createFreshTarget(targetInfo);
+//                Number targetID = targetDao.addTarget(newTarget);
+//                String targetTemporaryId = targetInfo.getHref();
+//                result.put(targetTemporaryId, targetDao.getExternalID(targetID).toString());
+//                int affectedRows = annotationDao.addAnnotationTarget(annotationID, targetID);
+//        
+        mockeryDao.checking(new Expectations() {
+            {
+                oneOf(targetDao).getInternalIDFromHref(mockTargetListTwo.get(0).getHref());
                 will(throwException(e));
 
@@ -771 +778 @@
                 will(returnValue(8)); //# the next new number is 8, we have already 7 Targets
 
-                oneOf(targetDao).stringURItoExternalID(mockTargetListTwo.get(0).getRef());
-                will(returnValue(tempTargetID));
-
-                oneOf(targetDao).getExternalID(8);
-                will(returnValue(mockNewTargetUUID));
+                oneOf(targetDao).getHrefFromInternalID(8);
+                will(returnValue("/api/targets/"+mockNewTargetUUID.toString()));
 
                 oneOf(annotationDao).addAnnotationTarget(1, 8);
@@ -785 +789 @@
         Map<String, String> resultTwo = dbDispatcher.addTargetsForAnnotation(1, mockTargetListTwo);
         assertEquals(1, resultTwo.size());
-        assertEquals(mockNewTargetUUID.toString(), resultTwo.get(tempTargetID));
+        assertEquals("/api/targets/"+mockNewTargetUUID.toString(), resultTwo.get(tempTargetID));
 
     }
@@ -805 +809 @@
 
                 //  expectations for addTargetsForannotation
-                oneOf(targetDao).getInternalIDFromURI(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031");
+                oneOf(targetDao).getInternalIDFromHref("/api/targets/00000000-0000-0000-0000-000000000031");
                 will(returnValue(1));
 
@@ -824 +828 @@
         assertEquals(5, result);
 
-//        Annotation newAnnotation = dbIntegrityService.getAnnotation(5);
-//        assertEquals(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000113", newAnnotation.getOwnerRef());
+//        Annotation newAnnotation = dbDispatcher.getAnnotation(5);
+//        assertEquals("/api/principals/00000000-0000-0000-0000-000000000113", newAnnotation.getOwnerHref());
 //        assertEquals(testAnnotation.getHeadline(), newAnnotation.getHeadline());
 //        assertEquals(testAnnotation.getBody().getTextBody().getBody(), newAnnotation.getBody().getTextBody().getBody());
@@ -1071 +1075 @@
 
         final NotebookInfo mockNotebookInfo = new NotebookInfo();
-        mockNotebookInfo.setRef("00000000-0000-0000-0000-000000000011");
+        mockNotebookInfo.setHref("/api/notebooks/00000000-0000-0000-0000-000000000011");
         mockNotebookInfo.setTitle("Notebook 1");
 
@@ -1085 +1089 @@
                 will(returnValue(1));
 
-                oneOf(principalDao).getURIFromInternalID(1);
-                will(returnValue("00000000-0000-0000-0000-000000000111"));
+                oneOf(principalDao).getHrefFromInternalID(1);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000111"));
 
             }
@@ -1092 +1096 @@
 
         NotebookInfoList result = dbDispatcher.getNotebooks(3, Access.READ);
-        assertEquals("00000000-0000-0000-0000-000000000011", result.getNotebookInfo().get(0).getRef());
-        assertEquals("00000000-0000-0000-0000-000000000111", result.getNotebookInfo().get(0).getOwnerRef());
+        assertEquals("/api/notebooks/00000000-0000-0000-0000-000000000011", result.getNotebookInfo().get(0).getHref());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000111", result.getNotebookInfo().get(0).getOwnerHref());
         assertEquals("Notebook 1", result.getNotebookInfo().get(0).getTitle());
 
@@ -1107 +1111 @@
 
         final NotebookInfo mockNotebookInfo1 = new NotebookInfo();
-        mockNotebookInfo1.setRef("00000000-0000-0000-0000-000000000013");
+        mockNotebookInfo1.setHref("/api/notebooks/00000000-0000-0000-0000-000000000013");
         mockNotebookInfo1.setTitle("Notebook 3");
 
         final NotebookInfo mockNotebookInfo2 = new NotebookInfo();
-        mockNotebookInfo2.setRef("00000000-0000-0000-0000-000000000014");
+        mockNotebookInfo2.setHref("/api/notebooks/00000000-0000-0000-0000-000000000014");
         mockNotebookInfo2.setTitle("Notebook 4");
 
@@ -1119 +1123 @@
                 will(returnValue(mockNotebookIDs));
 
-                oneOf(principalDao).getURIFromInternalID(3);
-                will(returnValue("00000000-0000-0000-0000-000000000113"));
+                oneOf(principalDao).getHrefFromInternalID(3);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000113"));
 
                 oneOf(notebookDao).getNotebookInfoWithoutOwner(3);
@@ -1131 +1135 @@
         });
 
-//       NotebookInfoList result = dbIntegrityService.getNotebooks(3, "owner");        
-//       assertEquals("00000000-0000-0000-0000-000000000013", result.getNotebookInfo().get(0).getRef());//        assertEquals("00000000-0000-0000-0000-000000000113", result.getNotebookInfo().get(0).getOwnerRef());
+        //??
+//        NotebookInfoList result = dbDispatcher.getNotebooks(3, "owner");
+//        assertEquals("00000000-0000-0000-0000-000000000013", result.getNotebookInfo().get(0).getRef());//        assertEquals("00000000-0000-0000-0000-000000000113", result.getNotebookInfo().get(0).getOwnerRef());
 //        assertEquals("Notebook 3", result.getNotebookInfo().get(0).getTitle());
 //        assertEquals("00000000-0000-0000-0000-000000000014", result.getNotebookInfo().get(1).getRef());
@@ -1161 +1166 @@
                 will(returnValue(mockNotebookIDs));
 
-                oneOf(notebookDao).getURIFromInternalID(3);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_notebooks + "00000000-0000-0000-0000-000000000013"));
-
-                oneOf(notebookDao).getURIFromInternalID(4);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_notebooks + "00000000-0000-0000-0000-000000000014"));
+                oneOf(notebookDao).getHrefFromInternalID(3);
+                will(returnValue("/api/notebooks/00000000-0000-0000-0000-000000000013"));
+
+                oneOf(notebookDao).getHrefFromInternalID(4);
+                will(returnValue("/api/notebooks/00000000-0000-0000-0000-000000000014"));
 
             }
@@ -1171 +1176 @@
 
         ReferenceList result = dbDispatcher.getNotebooksOwnedBy(3);
-        assertEquals(2, result.getRef().size());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_notebooks + "00000000-0000-0000-0000-000000000013", result.getRef().get(0));
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_notebooks + "00000000-0000-0000-0000-000000000014", result.getRef().get(1));
+        assertEquals(2, result.getHref().size());
+        assertEquals("/api/notebooks/00000000-0000-0000-0000-000000000013", result.getHref().get(0));
+        assertEquals("/api/notebooks/00000000-0000-0000-0000-000000000014", result.getHref().get(1));
     }
 
@@ -1229 +1234 @@
                 will(returnValue(mockPrincipalIDs));
 
-                oneOf(principalDao).getURIFromInternalID(2);
-                will(returnValue("serviceURI/principals/00000000-0000-0000-0000-000000000112"));
-
-                oneOf(principalDao).getURIFromInternalID(4);
-                will(returnValue("serviceURI/principals/00000000-0000-0000-0000-000000000114"));
+                oneOf(principalDao).getHrefFromInternalID(2);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000112"));
+
+                oneOf(principalDao).getHrefFromInternalID(4);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000114"));
 
 
@@ -1240 +1245 @@
 
         ReferenceList result = dbDispatcher.getPrincipals(1, "write");
-        assertEquals("serviceURI/principals/00000000-0000-0000-0000-000000000112", result.getRef().get(0).toString());
-        assertEquals("serviceURI/principals/00000000-0000-0000-0000-000000000114", result.getRef().get(1).toString());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000112", result.getHref().get(0).toString());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000114", result.getHref().get(1).toString());
 
     }
@@ -1281 +1286 @@
 
         final Notebook mockNotebook = new Notebook();
-        mockNotebook.setURI("serviceURI/notebooks/00000000-0000-0000-0000-000000000012");
+        mockNotebook.setHref("/api/notebooks/00000000-0000-0000-0000-000000000012");
+        mockNotebook.setId("00000000-0000-0000-0000-000000000012");
         mockNotebook.setTitle("Notebook 2");
         mockNotebook.setLastModified(DatatypeFactory.newInstance().newXMLGregorianCalendar("2014-02-12T09:25:00.383000Z"));
@@ -1302 +1308 @@
                 will(returnValue(2));
 
-                oneOf(principalDao).getURIFromInternalID(2);
-                will(returnValue("serviceURI/principals/00000000-0000-0000-0000-000000000112"));
+                oneOf(principalDao).getHrefFromInternalID(2);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000112"));
 
                 oneOf(annotationDao).getAnnotations(2);
                 will(returnValue(mockAnnotations));
 
-                oneOf(annotationDao).getURIFromInternalID(3);
-                will(returnValue("serviceURI/annotations/00000000-0000-0000-0000-000000000023"));
+                oneOf(annotationDao).getHrefFromInternalID(3);
+                will(returnValue("/api/annotations/00000000-0000-0000-0000-000000000023"));
 
                 oneOf(principalDao).getPrincipalIDsWithAccessForNotebook(2, Access.READ);
                 will(returnValue(mockREADs));
 
-                oneOf(principalDao).getURIFromInternalID(1);
-                will(returnValue("serviceURI/principals/00000000-0000-0000-0000-000000000111"));
+                oneOf(principalDao).getHrefFromInternalID(1);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000111"));
 
                 oneOf(principalDao).getPrincipalIDsWithAccessForNotebook(2, Access.WRITE);
                 will(returnValue(mockWRITEs));
 
-                oneOf(principalDao).getURIFromInternalID(3);
-                will(returnValue("serviceURI/principals/00000000-0000-0000-0000-000000000113"));
+                oneOf(principalDao).getHrefFromInternalID(3);
+                will(returnValue("/api/principals/00000000-0000-0000-0000-000000000113"));
 
 
@@ -1329 +1335 @@
 
         Notebook result = dbDispatcher.getNotebook(2);
-        assertEquals("serviceURI/notebooks/00000000-0000-0000-0000-000000000012", result.getURI());
-        assertEquals("serviceURI/principals/00000000-0000-0000-0000-000000000112", result.getOwnerRef());
+        assertEquals("/api/notebooks/00000000-0000-0000-0000-000000000012", result.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000012", result.getId());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000112", result.getOwnerRef());
         assertEquals("2014-02-12T09:25:00.383000Z", result.getLastModified().toString());
         assertEquals("Notebook 2", result.getTitle());
-        assertEquals(1, result.getAnnotations().getRef().size());
-        assertEquals("serviceURI/annotations/00000000-0000-0000-0000-000000000023", result.getAnnotations().getRef().get(0));
+        assertEquals(1, result.getAnnotations().getHref().size());
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000023", result.getAnnotations().getHref().get(0));
         assertEquals(2, result.getPermissions().getPermission().size());
-        assertEquals("serviceURI/principals/00000000-0000-0000-0000-000000000111", result.getPermissions().getPermission().get(0).getPrincipalRef());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000111", result.getPermissions().getPermission().get(0).getPrincipalHref());
         assertEquals("read", result.getPermissions().getPermission().get(0).getLevel().value());
-        assertEquals("serviceURI/principals/00000000-0000-0000-0000-000000000113", result.getPermissions().getPermission().get(1).getPrincipalRef());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000113", result.getPermissions().getPermission().get(1).getPrincipalHref());
         assertEquals("write", result.getPermissions().getPermission().get(1).getLevel().value());
 
@@ -1357 +1364 @@
                 will(returnValue(mockAnnotationIDs));
 
-                oneOf(annotationDao).getURIFromInternalID(1);
-                will(returnValue("serviceURI/annotations/00000000-0000-0000-0000-000000000021"));
-
-                oneOf(annotationDao).getURIFromInternalID(2);
-                will(returnValue("serviceURI/annotations/00000000-0000-0000-0000-000000000022"));
+                oneOf(annotationDao).getHrefFromInternalID(1);
+                will(returnValue("/api/annotations/00000000-0000-0000-0000-000000000021"));
+
+                oneOf(annotationDao).getHrefFromInternalID(2);
+                will(returnValue("/api/annotations/00000000-0000-0000-0000-000000000022"));
 
 
@@ -1369 +1376 @@
 
         ReferenceList result = dbDispatcher.getAnnotationsForNotebook(1, -1, 3, "last_modified", true);
-        assertEquals(2, result.getRef().size());
-        assertEquals("serviceURI/annotations/00000000-0000-0000-0000-000000000021", result.getRef().get(0).toString());
-        assertEquals("serviceURI/annotations/00000000-0000-0000-0000-000000000022", result.getRef().get(1).toString());
+        assertEquals(2, result.getHref().size());
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000021", result.getHref().get(0).toString());
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000022", result.getHref().get(1).toString());
 
     }
@@ -1386 +1393 @@
 
         final NotebookInfo mockNotebookInfo = new NotebookInfo();
-        mockNotebookInfo.setOwnerRef(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000113");
+        mockNotebookInfo.setOwnerHref("/api/principals/00000000-0000-0000-0000-000000000113");
         mockNotebookInfo.setTitle("New Title");
 
         mockeryDao.checking(new Expectations() {
             {
-                oneOf(principalDao).getInternalIDFromURI(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000113");
+                oneOf(principalDao).getInternalIDFromHref("/api/principals/00000000-0000-0000-0000-000000000113");
                 will(returnValue(3));
 
@@ -1441 +1448 @@
         notebook.setOwnerRef("tmpXXX");
         notebook.setTitle("(Almost) Copy of Notebook 1");
-        notebook.setURI("tmpYYY");
+        notebook.setId("tmpYYY");
+        notebook.setHref("whatever");
 
         PermissionList accesss = new PermissionList();
         Permission p1 = new Permission();
         p1.setLevel(Access.WRITE);
-        p1.setPrincipalRef(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000112");
+        p1.setPrincipalHref("/api/principals/00000000-0000-0000-0000-000000000112");
         accesss.getPermission().add(p1);
         Permission p2 = new Permission();
         p2.setLevel(Access.READ);
-        p2.setPrincipalRef(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000113");
+        p2.setPrincipalHref("/api/principals/00000000-0000-0000-0000-000000000113");
         accesss.getPermission().add(p2);
         notebook.setPermissions(accesss);
@@ -1462 +1470 @@
                 will(returnValue(true));
 
-                oneOf(principalDao).getInternalIDFromURI(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000112");
+                oneOf(principalDao).getInternalIDFromHref("/api/principals/00000000-0000-0000-0000-000000000112");
                 will(returnValue(2));
 
-                oneOf(principalDao).getInternalIDFromURI(TestBackendConstants._TEST_SERVLET_URI_principals + "00000000-0000-0000-0000-000000000113");
+                oneOf(principalDao).getInternalIDFromHref("/api/principals/00000000-0000-0000-0000-000000000113");
                 will(returnValue(3));
 
@@ -1497 +1505 @@
 
                 //  expectations for addTargetsForannotation
-                oneOf(targetDao).getInternalIDFromURI(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031");
+                oneOf(targetDao).getInternalIDFromHref("/api/targets/00000000-0000-0000-0000-000000000031");
                 will(returnValue(1));
 
@@ -1642 +1650 @@
         System.out.println("test updateAnnotation");
 
-        final Annotation annotation = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationOne();
+        final Annotation annotation = (new TestInstances("/api")).getAnnotationOne();
         final NotInDataBaseException e = new NotInDataBaseException("annotation", "external ID", "00000000-0000-0000-0000-000000000031");
         final String mockTempID = "00000000-0000-0000-0000-000000000031";
@@ -1652 +1660 @@
         mockeryDao.checking(new Expectations() {
             {
-                oneOf(annotationDao).getInternalIDFromURI(annotation.getURI());
-                will(returnValue(1));
-
-                oneOf(principalDao).getInternalIDFromURI(annotation.getOwnerRef());
+                oneOf(annotationDao).getInternalID(UUID.fromString(annotation.getId()));
+                will(returnValue(1));
+
+                oneOf(principalDao).getInternalIDFromHref(annotation.getOwnerHref());
                 will(returnValue(1));
 
@@ -1670 +1678 @@
                 /// adding the first target, nt foind in the DB
 
-                oneOf(targetDao).getInternalIDFromURI(annotation.getTargets().getTargetInfo().get(0).getRef());
+                oneOf(targetDao).getInternalIDFromHref(annotation.getTargets().getTargetInfo().get(0).getHref());
                 will(throwException(e));
 
@@ -1676 +1684 @@
                 will(returnValue(8));
 
-                oneOf(targetDao).stringURItoExternalID(annotation.getTargets().getTargetInfo().get(0).getRef());
-                will(returnValue(mockTempID));
-
-                oneOf(targetDao).getExternalID(8);
-                will(returnValue(mockNewID));
+                oneOf(targetDao).getHrefFromInternalID(8);
+                will(returnValue("/api/targets/"+mockNewID.toString()));
 
                 oneOf(annotationDao).addAnnotationTarget(1, 8);
@@ -1686 +1691 @@
 
                 /////////
-                oneOf(targetDao).getInternalIDFromURI(annotation.getTargets().getTargetInfo().get(1).getRef());
+                oneOf(targetDao).getInternalIDFromHref(annotation.getTargets().getTargetInfo().get(1).getHref());
                 will(returnValue(2));
 
@@ -1693 +1698 @@
 
                 /////
-                oneOf(principalDao).getInternalIDFromURI(permissions.getPermission().get(0).getPrincipalRef());
+                oneOf(principalDao).getInternalIDFromHref(permissions.getPermission().get(0).getPrincipalHref());
                 will(returnValue(2));
 
@@ -1699 +1704 @@
                 will(returnValue(1));
 
-                oneOf(principalDao).getInternalIDFromURI(permissions.getPermission().get(1).getPrincipalRef());
+                oneOf(principalDao).getInternalIDFromHref(permissions.getPermission().get(1).getPrincipalHref());
                 will(returnValue(3));
 
@@ -1725 +1730 @@
     public void testUpdateHeadline() throws NotInDataBaseException {
 
-        System.out.println("test updateAnnotation");
-
-        final Annotation annotation = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationOne();
-        
-
-        System.out.println("test updateAnnotation");
-        mockeryDao.checking(new Expectations() {
-            {
-                oneOf(annotationDao).getInternalIDFromURI(annotation.getURI());
-                will(returnValue(1));
-
-                oneOf(principalDao).getInternalIDFromURI(annotation.getOwnerRef());
-                will(returnValue(1));
-
-                oneOf(annotationDao).updateAnnotationHeadline(1, "new Headline");
+        System.out.println("test updateAnnotationHeadline  ");
+        mockeryDao.checking(new Expectations() {
+            { oneOf(annotationDao).updateAnnotationHeadline(1, "new Headline");
                 will(returnValue(1));
 
@@ -1794 +1787 @@
         
         Permission permission2 = new Permission();
-        permission2.setPrincipalRef("ref2");
+        permission2.setPrincipalHref("/api/principals/ref2");
         permission2.setLevel(Access.WRITE);
 
         Permission permission3 = new Permission();
-        permission3.setPrincipalRef("ref3");
+        permission3.setPrincipalHref("/api/principals/ref3");
         permission3.setLevel(Access.READ);
               
         Permission permission4 = new Permission();
         permission4.setLevel(Access.READ);
-        permission4.setPrincipalRef("ref4");
+        permission4.setPrincipalHref("/api/principals/ref4");
         
         permissions.getPermission().add(permission2);
@@ -1816 +1809 @@
                 will(returnValue(1));
 
-                oneOf(principalDao).getInternalIDFromURI(permissions.getPermission().get(0).getPrincipalRef());
+                oneOf(principalDao).getInternalIDFromHref(permissions.getPermission().get(0).getPrincipalHref());
                 will(returnValue(2));
 
@@ -1822 +1815 @@
                 will(returnValue(Access.WRITE));
 
-                oneOf(principalDao).getInternalIDFromURI(permissions.getPermission().get(1).getPrincipalRef());
+                oneOf(principalDao).getInternalIDFromHref(permissions.getPermission().get(1).getPrincipalHref());
                 will(returnValue(3));
 
@@ -1828 +1821 @@
                 will(returnValue(Access.WRITE));
                 
-                oneOf(principalDao).getInternalIDFromURI(permissions.getPermission().get(2).getPrincipalRef());
+                oneOf(principalDao).getInternalIDFromHref(permissions.getPermission().get(2).getPrincipalHref());
                 will(returnValue(4));
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java

@@ -20 +20 @@
 import eu.dasish.annotation.backend.Helpers;
 import eu.dasish.annotation.backend.NotInDataBaseException;
-import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
 import eu.dasish.annotation.schema.Annotation;
@@ -57 +56 @@
     @Autowired
     JdbcAnnotationDao jdbcAnnotationDao;
-    TestInstances testInstances = new TestInstances(TestBackendConstants._TEST_SERVLET_URI);
+    TestInstances testInstances = new TestInstances("/api");
 
     /**
@@ -64 +63 @@
      */
     @Test
-    public void testStringURItoExternalID() {
+    public void testHrefToExternalID() {
         System.out.println("test stringURItoExternalID");
-        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_annotations + randomUUID;
-        String externalID = jdbcAnnotationDao.stringURItoExternalID(uri);
-        assertEquals(randomUUID, externalID);
+        String uri = "/api/annotations/" + randomUUID;
+        String uuid = jdbcAnnotationDao.hrefToExternalID(uri);
+        assertEquals(randomUUID, uuid);
     }
 
@@ -78 +77 @@
      */
     @Test
-    public void testExternalIDtoURI() {
-        System.out.println("test stringURItoExternalID");
-        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
+    public void testExternalIDtoHref() {
+        System.out.println("test externalIDtoHref");
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_annotations + randomUUID;
-        String uriResult = jdbcAnnotationDao.externalIDtoURI(randomUUID);
+        String uri = "/api/annotations/" + randomUUID;
+        String uriResult = jdbcAnnotationDao.externalIDtoHref(randomUUID);
         assertEquals(uri, uriResult);
     }
@@ -147 +146 @@
         annotIds.add(3);
 
-        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
         final List<String> testList = jdbcAnnotationDao.getAnnotationREFs(annotIds);
         assertEquals(3, testList.size());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000021", testList.get(0));
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000022", testList.get(1));
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000023", testList.get(2));
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000021", testList.get(0));
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000022", testList.get(1));
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000023", testList.get(2));
 
         final List<String> testListTwo = jdbcAnnotationDao.getAnnotationREFs(new ArrayList<Number>());
@@ -185 +184 @@
      */
     @Test
-    public void testGetInternalIDFRomURI() throws NotInDataBaseException {
-        System.out.println("test getInternalIDFromURI");
-        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
-        String uri = TestBackendConstants._TEST_SERVLET_URI_annotations + "00000000-0000-0000-0000-000000000021";
-        Number result = jdbcAnnotationDao.getInternalIDFromURI(uri);
+    public void testGetInternalIDFRomHref() throws NotInDataBaseException {
+        System.out.println("test getInternalIDFromHref");
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
+        String uri = "/api/annotations/00000000-0000-0000-0000-000000000021";
+        Number result = jdbcAnnotationDao.getInternalIDFromHref(uri);
         assertEquals(1, result.intValue());
+        assertEquals(1, result);
     }
 
@@ -201 +201 @@
     public void getAnnotationWithoutTargetsAndPermisions() throws DatatypeConfigurationException {
         System.out.println("test getAnnotationWithoutTargetsAndPermissions");
-        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
         final Annotation result = jdbcAnnotationDao.getAnnotationWithoutTargetsAndPemissions(1);
 
@@ -207 +207 @@
         assertEquals("<html><body>some html 1</body></html>", result.getBody().getTextBody().getBody());
         assertEquals("text/html", result.getBody().getTextBody().getMimeType());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations
-                + "00000000-0000-0000-0000-000000000021", result.getURI());
+        assertEquals("00000000-0000-0000-0000-000000000021", result.getId());
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000021", result.getHref());
         assertEquals(DatatypeFactory.newInstance().newXMLGregorianCalendar("2013-08-12T09:25:00.383000Z"), result.getLastModified());
     }
@@ -238 +238 @@
     public void testAddAnnotation() throws SQLException, Exception {
         System.out.println("test_addAnnotation ");
-
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
         final Annotation annotationToAdd = testInstances.getAnnotationToAdd();// existing Targets
-        assertEquals(null, annotationToAdd.getURI());
-        assertEquals(null, annotationToAdd.getLastModified());
-
+        
         Number newAnnotationID = jdbcAnnotationDao.addAnnotation(annotationToAdd, 3);
         assertEquals(5, newAnnotationID);
@@ -248 +246 @@
         // checking
         Annotation addedAnnotation = jdbcAnnotationDao.getAnnotationWithoutTargetsAndPemissions(5);
-        assertFalse(null == addedAnnotation.getURI());
+        assertEquals(addedAnnotation.getHref(), "/api/annotations/"+addedAnnotation.getId());
         assertFalse(null == addedAnnotation.getLastModified());
         assertEquals(annotationToAdd.getBody().getTextBody().getMimeType(), addedAnnotation.getBody().getTextBody().getMimeType());
@@ -393 +391 @@
     public void testGetAnnotationInfoWithoutTargetsAndOwner() throws DatatypeConfigurationException {
         System.out.println("test getAnnotationInfoWithoutTargets");
-        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
         final AnnotationInfo result = jdbcAnnotationDao.getAnnotationInfoWithoutTargetsAndOwner(1);
 
         assertEquals("Sagrada Famiglia", result.getHeadline());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations
-                + "00000000-0000-0000-0000-000000000021", result.getRef());
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000021", result.getHref());
         assertEquals(DatatypeFactory.newInstance().newXMLGregorianCalendar("2013-08-12T09:25:00.383000Z"), result.getLastModified());
     }
@@ -496 +493 @@
     public void testUpdateAnnotation() {
         System.out.println("test UpdateAnnotation");
-        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
+        jdbcAnnotationDao.setResourcePath("/api/annotations/");
         
         Annotation annotation = testInstances.getAnnotationOne();
@@ -503 +500 @@
         annotation.getBody().getTextBody().setMimeType("text/plain");
 
-        System.out.println(annotation.getURI());
+        
         int result = jdbcAnnotationDao.updateAnnotation(annotation,1, 1);
         assertEquals(1, result);
@@ -511 +508 @@
         assertEquals("text/plain", check.getBody().getTextBody().getMimeType());
         assertEquals("updated headline 1", check.getHeadline());
-
+        assertEquals("/api/annotations/00000000-0000-0000-0000-000000000021", check.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000021", check.getId());
     }
     

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.NotInDataBaseException;
-import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.schema.CachedRepresentationInfo;
 import java.io.ByteArrayInputStream;
@@ -49 +48 @@
      */
     @Test
-    public void testStringURItoExternalID() {
-        System.out.println("test stringURItoExternalID");
-        jdbcCachedRepresentationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_cached);
+    public void testHrefToExternalID() {
+        System.out.println("test hrefToExternalID");
+        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_cached + randomUUID;
-        String externalID = jdbcCachedRepresentationDao.stringURItoExternalID(uri);
-        assertEquals(randomUUID, externalID);
+        String uri = "/api/cached/" + randomUUID;
+        String check = jdbcCachedRepresentationDao.hrefToExternalID(uri);
+        assertEquals(randomUUID, check);
     }
     
@@ -63 +62 @@
      */
     @Test
-    public void testExternalIDtoURI() {
+    public void testExternalIdToHref() {
         System.out.println("test stringURItoExternalID");
-        jdbcCachedRepresentationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_cached);
+        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_cached+randomUUID;
-        String uriResult = jdbcCachedRepresentationDao.externalIDtoURI(randomUUID);
+        String uri = "/api/cached/"+randomUUID;
+        String uriResult = jdbcCachedRepresentationDao.externalIDtoHref(randomUUID);
         assertEquals(uri, uriResult);
     }
@@ -84 +83 @@
     public void testGetExternalId() {
         System.out.println("getExternalId");
-        Number internalID = 1;
         UUID expResult = UUID.fromString("00000000-0000-0000-0000-000000000051");
-        UUID result = jdbcCachedRepresentationDao.getExternalID(internalID);
+        UUID result = jdbcCachedRepresentationDao.getExternalID(1);
         assertEquals(expResult, result);
     }
@@ -110 +108 @@
     public void testGetInternalIDFRomURI() throws NotInDataBaseException{
         System.out.println("test getInternalIDFromURI");
-        jdbcCachedRepresentationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_cached);
-        String uri = TestBackendConstants._TEST_SERVLET_URI_cached +"00000000-0000-0000-0000-000000000051";
-        Number result = jdbcCachedRepresentationDao.getInternalIDFromURI(uri);
+        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
+        String uri = "/api/cached/00000000-0000-0000-0000-000000000051";
+        Number result = jdbcCachedRepresentationDao.getInternalIDFromHref(uri);
         assertEquals(1, result.intValue());
     }
@@ -125 +123 @@
         System.out.println("getCachedRepresentationInfo");
 
-        jdbcCachedRepresentationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_cached);
+        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
         CachedRepresentationInfo result = jdbcCachedRepresentationDao.getCachedRepresentationInfo(1);
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_cached + "00000000-0000-0000-0000-000000000051", result.getURI());
+        assertEquals("/api/cached/00000000-0000-0000-0000-000000000051", result.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000051", result.getId());
         assertEquals("image/png", result.getMimeType());
         assertEquals("screen-shot", result.getTool());
@@ -140 +139 @@
     public void testGetCachedRepresentations() {
         System.out.println("test getCachedRepresentationsForTarget");
-        Number TargetID = 1;
-        List<Number> result = jdbcCachedRepresentationDao.getCachedRepresentationsForTarget(TargetID);
+        List<Number> result = jdbcCachedRepresentationDao.getCachedRepresentationsForTarget(1);
         assertEquals(1, result.get(0));
         assertEquals(2, result.get(1));
@@ -154 +152 @@
     public void testDeleteCachedRepresentation() {
         System.out.println("deleteCachedRepresentationInfo");
-        Number internalID = 6; /// deleted because no version refers to it
-        int result = jdbcCachedRepresentationDao.deleteCachedRepresentation(internalID);
+        /// deleted because no version refers to it
+        int result = jdbcCachedRepresentationDao.deleteCachedRepresentation(6);
         assertEquals(1, result);
 
@@ -163 +161 @@
     public void testUpdateCachedRepresentationMetadata(){
         System.out.println("test updateCachedRepresentationInfo");
-        jdbcCachedRepresentationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_cached);
+        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
         CachedRepresentationInfo cachedInfo = new CachedRepresentationInfo();
         cachedInfo.setMimeType("update mime type  1");
         cachedInfo.setType("update type  1");
         cachedInfo.setTool("update tool  1");
-        cachedInfo.setURI(TestBackendConstants._TEST_SERVLET_URI_cached + "00000000-0000-0000-0000-00000000005c");
         
         int result = jdbcCachedRepresentationDao.updateCachedRepresentationMetadata(1, cachedInfo);
@@ -174 +171 @@
         
         CachedRepresentationInfo newCached = jdbcCachedRepresentationDao.getCachedRepresentationInfo(1);
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_cached + "00000000-0000-0000-0000-000000000051", newCached.getURI());
+        assertEquals("/api/cached/00000000-0000-0000-0000-000000000051", newCached.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000051", newCached.getId());
         assertEquals("update mime type  1", newCached.getMimeType());
         assertEquals("update tool  1", newCached.getTool());
@@ -184 +182 @@
     public void testUpdateCachedRepresentationBlob() throws IOException{
         System.out.println("test updateCachedRepresentationBlob");
-        jdbcCachedRepresentationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_cached);
+        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
         String blobString = " test blobbie ";
         byte[] blobBytes = blobString.getBytes();

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDaoTest.java

@@ -85 +85 @@
     public void testGetNotebookInfoWithoutOwner() {
         System.out.println("test getNotebookInfoWithoutOwner");
+        jdbcNotebookDao.setResourcePath("/api/notebooks/");
         NotebookInfo result = jdbcNotebookDao.getNotebookInfoWithoutOwner(1);
-        assertEquals("00000000-0000-0000-0000-000000000011", result.getRef());
+        assertEquals("/api/notebooks/00000000-0000-0000-0000-000000000011", result.getHref());
         assertEquals("Notebook 1", result.getTitle());
-        assertEquals(null, result.getOwnerRef());
+        assertEquals(null, result.getOwnerHref());
     }
 
@@ -98 +99 @@
     public void testGetNotebookWithoutAnnotationsAndAccesssAndOwner() {
         System.out.println("test getNotebookWithoutAnnotationsAndAccesssAndOwner");
+        jdbcNotebookDao.setResourcePath("/api/notebooks/");
         Notebook result = jdbcNotebookDao.getNotebookWithoutAnnotationsAndAccesssAndOwner(1);
-        assertEquals("00000000-0000-0000-0000-000000000011", result.getURI());
+        assertEquals("/api/notebooks/00000000-0000-0000-0000-000000000011", result.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000011", result.getId());
         assertEquals("Notebook 1", result.getTitle());
         assertEquals("2013-08-12T09:25:00.383000Z", result.getLastModified().toString());
@@ -149 +152 @@
     public void testCreateNotebookWithoutAccesssAndAnnotations() throws NotInDataBaseException, DatatypeConfigurationException {
         System.out.println("test createNotebookWithoutAccesssAndAnnotations");
+        jdbcNotebookDao.setResourcePath("/api/notebooks/");
         Notebook notebook = new Notebook();
         notebook.setTitle("New test notebook");

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java

@@ -18 +18 @@
 package eu.dasish.annotation.backend.dao.impl;
 
-import eu.dasish.annotation.backend.Helpers;
+
 import eu.dasish.annotation.backend.NotInDataBaseException;
 import eu.dasish.annotation.backend.PrincipalCannotBeDeleted;
-import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
 import eu.dasish.annotation.schema.Access;
@@ -45 +44 @@
     @Autowired
     JdbcPrincipalDao jdbcPrincipalDao;
-    TestInstances testInstances = new TestInstances(TestBackendConstants._TEST_SERVLET_URI);
     
      /**
@@ -52 +50 @@
      */
     @Test
-    public void testStringURItoExternalID() {
-        System.out.println("test stringURItoExternalID");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+    public void testHrefToExternalID() {
+        System.out.println("test hrefToExternalID");
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_principals + randomUUID;
-        String externalID = jdbcPrincipalDao.stringURItoExternalID(uri);
+        String uri = "/api/principals/" + randomUUID;
+        String externalID = jdbcPrincipalDao.hrefToExternalID(uri).toString();
         assertEquals(randomUUID, externalID);
     }
@@ -68 +66 @@
     public void testExternalIDtoURI() {
         System.out.println("test stringURItoExternalID");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_principals+randomUUID;
-        String uriResult = jdbcPrincipalDao.externalIDtoURI(randomUUID);
+        String uri = "/api/principals/"+randomUUID;
+        String uriResult = jdbcPrincipalDao.externalIDtoHref(randomUUID);
         assertEquals(uri, uriResult);
     }
@@ -98 +96 @@
     @Test
     public void testGetExternalID() {
-        UUID testOne = jdbcPrincipalDao.getExternalID(3);
-        assertEquals("00000000-0000-0000-0000-000000000113", testOne.toString());
+        assertEquals("00000000-0000-0000-0000-000000000113", jdbcPrincipalDao.getExternalID(3).toString());
 
     }
@@ -106 +103 @@
     public void testGetPrincipal() {
         System.out.println("test getPrincipal");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         Principal result = jdbcPrincipalDao.getPrincipal(1);
         assertEquals("Twan", result.getDisplayName());
         assertEquals("Twan.Goosen@mpi.nl", result.getEMail());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_principals+"00000000-0000-0000-0000-000000000111", result.getURI());
+        assertEquals("/api/principals/00000000-0000-0000-0000-000000000111", result.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000111", result.getId());
     }
 
@@ -116 +114 @@
     public void testAddPrincipal() throws NotInDataBaseException{
         System.out.println("test addPrincipal");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
         String freshPrincipalName = "Guilherme";
         String freshPrincipalEmail = "guisil@mpi.nl";
@@ -129 +127 @@
         assertEquals(freshPrincipalName, addedPrincipal.getDisplayName());
         assertEquals(freshPrincipalEmail, addedPrincipal.getEMail());
-        assertFalse(null == jdbcPrincipalDao.stringURItoExternalID(addedPrincipal.getURI()));
+        assertEquals(addedPrincipal.getHref(), "/api/principals/"+addedPrincipal.getId());
+        
     }
 
@@ -135 +134 @@
     public void testDeletePrincipal() throws PrincipalCannotBeDeleted{
         System.out.println("test deletePrincipal");
-        jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);
+        jdbcPrincipalDao.setResourcePath("/api/principals/");
 
         int result = jdbcPrincipalDao.deletePrincipal(10);
@@ -152 +151 @@
     @Test
     public void tesPrincipalExists() {
-        System.out.println("test principalExists");
-        //jdbcPrincipalDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_principals);        
+        System.out.println("test principalExists");      
         assertEquals(false,jdbcPrincipalDao.principalExists("guisil@mpi.nl"));       
         assertTrue(jdbcPrincipalDao.principalExists("olhsha@mpi.nl"));
@@ -170 +168 @@
         assertEquals(expResult, result);
     }
-    
-   @Test
-   public void generateHashes() {
-        System.out.println("*****"); 
-        System.out.println("generate hashes");
-        System.out.println(Helpers.hashPswd("1234", 512, "olhsha@mpi.nl"));
-        System.out.println(Helpers.hashPswd("5678", 512, "olasei@mpi.nl"));
-        System.out.println("*****");
-        
-    }
+//    
+//   @Test
+//   public void generateHashes() {
+//        System.out.println("*****"); 
+//        System.out.println("generate hashes");
+//        System.out.println(Helpers.hashPswd("1234", 512, "olhsha@mpi.nl"));
+//        System.out.println(Helpers.hashPswd("5678", 512, "olasei@mpi.nl"));
+//        System.out.println("*****");
+//        
+//    }
 
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDaoTest.java

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.NotInDataBaseException;
-import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.schema.Target;
 import eu.dasish.annotation.schema.TargetInfo;
@@ -50 +49 @@
      */
     @Test
-    public void testStringURItoExternalID() {
-        System.out.println("test stringURItoExternalID");
-        jdbcTargetDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_targets);
+    public void testHrefToExternalID() {
+        System.out.println("test hrefToExternalID");
+        jdbcTargetDao.setResourcePath("/api/targets/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_targets + randomUUID;
-        String externalID = jdbcTargetDao.stringURItoExternalID(uri);
+        String uri = "/api/targets/" + randomUUID;
+        String externalID = (jdbcTargetDao.hrefToExternalID(uri)).toString();
         assertEquals(randomUUID, externalID);
     }
@@ -66 +65 @@
     public void testExternalIDtoURI() {
         System.out.println("test stringURItoExternalID");
-        jdbcTargetDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_targets);
+        jdbcTargetDao.setResourcePath("/api/targets/");
         String randomUUID = UUID.randomUUID().toString();
-        String uri = TestBackendConstants._TEST_SERVLET_URI_targets + randomUUID;
-        String uriResult = jdbcTargetDao.externalIDtoURI(randomUUID);
+        String uri = "/api/targets/" + randomUUID;
+        String uriResult = jdbcTargetDao.externalIDtoHref(randomUUID);
         assertEquals(uri, uriResult);
     }
@@ -79 +78 @@
     public void testGetExternalID() {
         System.out.println("getExternalID");
-        Number internalID = 1;
-        UUID result = jdbcTargetDao.getExternalID(internalID);
+        UUID result = jdbcTargetDao.getExternalID(1);
         assertEquals("00000000-0000-0000-0000-000000000031", result.toString());
     }
@@ -91 +89 @@
         System.out.println("getInternalId");
         UUID externalID = UUID.fromString("00000000-0000-0000-0000-000000000031");
-        Number expResult = 1;
         Number result = jdbcTargetDao.getInternalID(externalID);
-        assertEquals(expResult, result);
+        assertEquals(1, result);
     }
 
@@ -103 +100 @@
     public void testGetInternalIDFRomURI() throws NotInDataBaseException{
         System.out.println("test getInternalIDFromURI");
-        jdbcTargetDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_targets);
-        String uri = TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031";
-        Number result = jdbcTargetDao.getInternalIDFromURI(uri);
+        jdbcTargetDao.setResourcePath("/api/targets/");
+        String uri = "/api/targets/00000000-0000-0000-0000-000000000031";
+        Number result = jdbcTargetDao.getInternalIDFromHref(uri);
         assertEquals(1, result.intValue());
     }
@@ -115 +112 @@
     public void testGetTarget() {
         System.out.println("getTarget");
-        jdbcTargetDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_targets);
+        jdbcTargetDao.setResourcePath("/api/targets/");
         Target result = jdbcTargetDao.getTarget(1);
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031", result.getURI());
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000031", result.getHref());
+        assertEquals("00000000-0000-0000-0000-000000000031", result.getId());
         assertEquals("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia" + "#" + "de_Opdracht", result.getLink());
         assertEquals("version 1.0", result.getVersion());
@@ -167 +165 @@
         assertEquals("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia" + "#Het_ontwerp", addedTarget.getLink());
         assertEquals("version 1.0", addedTarget.getVersion());
-        assertTrue(addedTarget.getURI().startsWith(TestBackendConstants._TEST_SERVLET_URI_targets));
+        assertTrue(addedTarget.getHref().startsWith("/api/targets/"));
     }
 
@@ -176 +174 @@
     public void testGetTargetInfos() {
         System.out.println("getTargetInfos");
-        jdbcTargetDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_targets);
+        jdbcTargetDao.setResourcePath("/api/targets/");
         List<Number> test = new ArrayList<Number>();
         test.add(1);
@@ -182 +180 @@
         List<TargetInfo> result = jdbcTargetDao.getTargetInfos(test);
         assertEquals(2, result.size());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000031", result.get(0).getRef());
-        assertEquals(TestBackendConstants._TEST_SERVLET_URI_targets + "00000000-0000-0000-0000-000000000032", result.get(1).getRef());
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000031", result.get(0).getHref());
+        assertEquals("/api/targets/00000000-0000-0000-0000-000000000032", result.get(1).getHref());
         assertEquals("version 1.0", result.get(0).getVersion());
         assertEquals("version 1.1", result.get(1).getVersion());
@@ -196 +194 @@
     public void testRetrieveTargetIDs() {
         System.out.println("retrieveTargetIDs");
-        Number annotationID = 1;
-        List<Number> result = jdbcTargetDao.getTargetIDs(annotationID);
+        List<Number> result = jdbcTargetDao.getTargetIDs(1);
         assertEquals(2, result.size());
         assertEquals(1, result.get(0));
@@ -206 +203 @@
     public void testUpdateTargetCachedRepresentationFragment(){
         System.out.println("test updateTargetCachedRepresentationFragment");
-        jdbcTargetDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_cached);
         int result = jdbcTargetDao.updateTargetCachedRepresentationFragment(1, 1, "updated fragment");
         assertEquals(1, result);

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java

@@ -22 +22 @@
 import eu.dasish.annotation.backend.ResourceAction;
 import eu.dasish.annotation.backend.dao.DBDispatcher;
-import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
 import eu.dasish.annotation.schema.Access;
@@ -45 +44 @@
 import java.net.URI;
 import java.util.UUID;
-import javax.ws.rs.core.UriInfo;
 import org.springframework.mock.web.MockHttpServletRequest;
 
@@ -54 +52 @@
 @RunWith(value = SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"/spring-test-config/mockeryRest.xml", "/spring-test-config/mockDBDispatcher.xml",
-    "/spring-test-config/mockUriInfo.xml",
     "/spring-config/jaxbMarshallerFactory.xml", "/spring-config/jaxbUnmarshallerFactory.xml"})
 public class AnnotationResourceTest {
@@ -61 +58 @@
     private Mockery mockeryRest;
     @Autowired
-    private DBDispatcher mockDbDispatcher;
-    @Autowired
-    UriInfo mockUriInfo;
+    private DBDispatcher mockDbDispatcher;    
     @Autowired
     private AnnotationResource annotationResource;
@@ -73 +68 @@
 
 //    public Number getPrincipalID() throws IOException {
-//        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
+//        dbIntegrityService.setServiceURI(this.getRelativeServiceURI());
 //        verboseOutput = new VerboseOutput(httpServletResponse, loggerServer);
 //        String remotePrincipal = httpServletRequest.getRemotePrincipal();
@@ -95 +90 @@
         System.out.println("getAnnotation");
         final String externalIDstring = "00000000-0000-0000-0000-000000000021";
-        final Annotation expectedAnnotation = (new TestInstances(null)).getAnnotationOne();
-        annotationResource.setHttpServletRequest(mockRequest);
-        annotationResource.setUriInfo(mockUriInfo);
+        final Annotation expectedAnnotation = (new TestInstances("/api")).getAnnotationOne();
+        annotationResource.setHttpServletRequest(mockRequest);
         mockRequest.setRemoteUser("olhsha@mpi.nl");
-
-        final URI baseUri = URI.create(TestBackendConstants._TEST_SERVLET_URI);
-
-        mockeryRest.checking(new Expectations() {
-            {
-                oneOf(mockUriInfo).getBaseUri();
-                will(returnValue(baseUri));
-
-                oneOf(mockDbDispatcher).setServiceURI(baseUri.toString());
+        mockRequest.setContextPath("/backend");
+        mockRequest.setServletPath("/api");
+        mockeryRest.checking(new Expectations() {
+            {
+                
+                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
@@ -143 +134 @@
 
         annotationResource.setHttpServletRequest(mockRequest);
-        annotationResource.setUriInfo(mockUriInfo);
         mockRequest.setRemoteUser("olhsha@mpi.nl");
-
-        final URI baseUri = URI.create(TestBackendConstants._TEST_SERVLET_URI);
-
-
-        mockeryRest.checking(new Expectations() {
-            {
-                oneOf(mockUriInfo).getBaseUri();
-                will(returnValue(baseUri));
-
-                oneOf(mockDbDispatcher).setServiceURI(baseUri.toString());
+        mockRequest.setContextPath("/backend");
+        mockRequest.setServletPath("/api");
+        
+        mockeryRest.checking(new Expectations() {
+            {
+                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
@@ -186 +172 @@
         System.out.println("test createAnnotation");
 
-        final Annotation annotationToAdd = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationToAdd();
+        final Annotation annotationToAdd = (new TestInstances("/api")).getAnnotationToAdd();
         final Number newAnnotationID = 5;
 
 
         final Annotation addedAnnotation = (new ObjectFactory()).createAnnotation(annotationToAdd).getValue();
-        addedAnnotation.setURI("http://localhost:8080/annotator-backend/api/annotations/" + UUID.randomUUID().toString());
-        addedAnnotation.setOwnerRef("http://localhost:8080/annotator-backend/api/principals/" + "00000000-0000-0000-0000-000000000113");
+        String externalId = UUID.randomUUID().toString();
+        addedAnnotation.setId(externalId);
+        addedAnnotation.setHref("/backend/api/annotations/" + externalId);
+        addedAnnotation.setOwnerHref("/backend/api/principals/00000000-0000-0000-0000-000000000113");
 
         final ResponseBody mockEnvelope = new ResponseBody();
@@ -201 +189 @@
         actionList.getAction().add(action);
         action.setMessage(AnnotationActionName.CREATE_CACHED_REPRESENTATION.value());
-        action.setObject("http://localhost:8080/annotator-backend/api/targets/00000000-0000-0000-0000-000000000036");
-
-        annotationResource.setHttpServletRequest(mockRequest);
-        annotationResource.setUriInfo(mockUriInfo);
+        action.setObject("/backend/api/targets/00000000-0000-0000-0000-000000000036");
+
+        annotationResource.setHttpServletRequest(mockRequest);
         mockRequest.setRemoteUser("olhsha@mpi.nl");
-        final URI baseUri = URI.create(TestBackendConstants._TEST_SERVLET_URI);
-
-//        final List<String> targets = new ArrayList<String>();
-//        targets.add("http://localhost:8080/annotator-backend/api/targets/00000000-0000-0000-0000-000000000036");
-
-        mockeryRest.checking(new Expectations() {
-            {
-                oneOf(mockUriInfo).getBaseUri();
-                will(returnValue(baseUri));
-
-                oneOf(mockDbDispatcher).setServiceURI(baseUri.toString());
+         mockRequest.setContextPath("/backend");
+        mockRequest.setServletPath("/api");
+        mockeryRest.checking(new Expectations() {
+            {
+               
+                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("olhsha@mpi.nl");
@@ -238 +220 @@
         Annotation newAnnotation = result.getValue().getAnnotation();
         String actionName = result.getValue().getActionList().getAction().get(0).getMessage();
-        assertEquals(addedAnnotation.getOwnerRef(), newAnnotation.getOwnerRef());
-        assertEquals(addedAnnotation.getURI(), newAnnotation.getURI());
+        assertEquals(addedAnnotation.getOwnerHref(), newAnnotation.getOwnerHref());
+        assertEquals(addedAnnotation.getId(), newAnnotation.getId());
+        assertEquals(addedAnnotation.getHref(), newAnnotation.getHref());
         assertEquals(addedAnnotation.getHeadline(), newAnnotation.getHeadline());
         assertEquals(addedAnnotation.getTargets(), newAnnotation.getTargets());
@@ -252 +235 @@
         System.out.println("test updateAnnotation");
 
-        final Annotation annotation = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationOne();
+        final Annotation annotation = (new TestInstances("/backend/api")).getAnnotationOne();
         annotation.getPermissions().setPublic(Access.READ);
         annotation.setHeadline("updated annotation 1");
@@ -269 +252 @@
 
         annotationResource.setHttpServletRequest(mockRequest);
-        annotationResource.setUriInfo(mockUriInfo);
         mockRequest.setRemoteUser("twagoo@mpi.nl");
-        final URI baseUri = URI.create(TestBackendConstants._TEST_SERVLET_URI);
-
+        mockRequest.setContextPath("/backend");
+        mockRequest.setServletPath("/api");
         final UUID externalId = UUID.fromString("00000000-0000-0000-0000-000000000021");
 
@@ -283 +265 @@
         mockeryRest.checking(new Expectations() {
             {
-                oneOf(mockUriInfo).getBaseUri();
-                will(returnValue(baseUri));
-
-                oneOf(mockDbDispatcher).setServiceURI(baseUri.toString());
+                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("twagoo@mpi.nl");
-                will(returnValue(1));
-                
-                oneOf(mockUriInfo).getBaseUri();
-                will(returnValue(baseUri));
-
+                will(returnValue(1));                
+               
                 oneOf(mockDbDispatcher).getResourceInternalIdentifier(externalId, Resource.ANNOTATION);
                 will(returnValue(1));
@@ -316 +292 @@
         JAXBElement<ResponseBody> result = annotationResource.updateAnnotation("00000000-0000-0000-0000-000000000021", annotation);
         Annotation newAnnotation = result.getValue().getAnnotation();
-        assertEquals(annotation.getOwnerRef(), newAnnotation.getOwnerRef());
-        assertEquals(annotation.getURI(), newAnnotation.getURI());
+        assertEquals(annotation.getOwnerHref(), newAnnotation.getOwnerHref());
+        assertEquals(annotation.getId(), newAnnotation.getId());
+        assertEquals(annotation.getHref(), newAnnotation.getHref());
         assertEquals("updated annotation 1", newAnnotation.getHeadline());
         assertEquals("text/plain", newAnnotation.getBody().getTextBody().getMimeType());
@@ -329 +306 @@
         System.out.println("test updateAnnotationBody");
 
-        Annotation annotation = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationOne();
+        Annotation annotation = (new TestInstances("/backend/api")).getAnnotationOne();
         
         final AnnotationBody ab = new AnnotationBody();
@@ -344 +321 @@
 
         annotationResource.setHttpServletRequest(mockRequest);
-        annotationResource.setUriInfo(mockUriInfo);
         mockRequest.setRemoteUser("twagoo@mpi.nl");
-        final URI baseUri = URI.create(TestBackendConstants._TEST_SERVLET_URI);
-
+        mockRequest.setContextPath("/backend");
+        mockRequest.setServletPath("/api");
         final UUID externalId = UUID.fromString("00000000-0000-0000-0000-000000000021");
 
@@ -358 +334 @@
         mockeryRest.checking(new Expectations() {
             {
-                oneOf(mockUriInfo).getBaseUri();
-                will(returnValue(baseUri));
-
-                oneOf(mockDbDispatcher).setServiceURI(baseUri.toString());
+               
+                oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("twagoo@mpi.nl");
@@ -395 +369 @@
         System.out.println("test updateAnnotationHeadline");
 
-        Annotation annotation = (new TestInstances(TestBackendConstants._TEST_SERVLET_URI)).getAnnotationOne();
+        Annotation annotation = (new TestInstances("/api")).getAnnotationOne();
         
         final String newHeadline = "new Headline";        
@@ -406 +380 @@
 
         annotationResource.setHttpServletRequest(mockRequest);
-        annotationResource.setUriInfo(mockUriInfo);
         mockRequest.setRemoteUser("twagoo@mpi.nl");
-        final URI baseUri = URI.create(TestBackendConstants._TEST_SERVLET_URI);
-
+        mockRequest.setContextPath("/backend");
+        mockRequest.setServletPath("/api");
         final UUID externalId = UUID.fromString("00000000-0000-0000-0000-000000000021");
 
@@ -415 +388 @@
         mockeryRest.checking(new Expectations() {
             {
-                oneOf(mockUriInfo).getBaseUri();
-                will(returnValue(baseUri));
-
-                oneOf(mockDbDispatcher).setServiceURI(baseUri.toString());
+                 oneOf(mockDbDispatcher).setResourcesPaths("/backend/api");
 
                 oneOf(mockDbDispatcher).getPrincipalInternalIDFromRemoteID("twagoo@mpi.nl");

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java

@@ -70 +70 @@
     private JdbcTemplate jdbcTemplate;
     
-    
+    String _relativePath = "/backend/api";
     
     
@@ -81 +81 @@
                 .requestListenerClass(RequestContextListener.class)
                 .contextListenerClass(ContextLoaderListener.class)
+                .contextPath("/backend").servletPath("/api")
                 .build();
         
@@ -101 +102 @@
         jdbcTemplate.execute(JdbcResourceDaoTest.getNormalisedSql());
         jdbcTemplate.execute(JdbcResourceDaoTest.getTestDataInsertSql());
+        
     }
 
@@ -122 +124 @@
         // Getting annotation
         System.out.println("testGetAnnotation");
-        final String externalIDstring = "00000000-0000-0000-0000-000000000021";
-        final Annotation testAnnotation = (new TestInstances(resource().getURI().toString())).getAnnotationOne();        
-        
-        final String requestUrl = "annotations/" + externalIDstring;
-        System.out.println("requestUrl: " + requestUrl);
-        
-        Builder responseBuilder = getAuthenticatedResource(resource().path(requestUrl)).accept(MediaType.TEXT_XML);        
+        final Annotation testAnnotation = (new TestInstances(_relativePath)).getAnnotationOne();        
+        
+        Builder responseBuilder = getAuthenticatedResource(resource().path("annotations/00000000-0000-0000-0000-000000000021")).accept(MediaType.TEXT_XML);        
         ClientResponse response = responseBuilder.get(ClientResponse.class);        
         
@@ -136 +134 @@
         assertEquals(testAnnotation.getBody().getTextBody().getBody(), entity.getBody().getTextBody().getBody());
         assertEquals(testAnnotation.getHeadline(), entity.getHeadline());
-        assertEquals(testAnnotation.getOwnerRef(), entity.getOwnerRef());
+        assertEquals(testAnnotation.getOwnerHref(), entity.getOwnerHref());
         assertEquals(Access.WRITE, entity.getPermissions().getPublic());
         assertEquals(3, entity.getPermissions().getPermission().size());
         assertEquals("write", entity.getPermissions().getPermission().get(0).getLevel().value());
-        assertEquals(resource().getURI()+"principals/"+"00000000-0000-0000-0000-000000000112", entity.getPermissions().getPermission().get(0).getPrincipalRef()); 
+        assertEquals(_relativePath+"/principals/00000000-0000-0000-0000-000000000112", entity.getPermissions().getPermission().get(0).getPrincipalHref()); 
         assertEquals("read", entity.getPermissions().getPermission().get(1).getLevel().value()); 
-        assertEquals(resource().getURI()+"principals/"+"00000000-0000-0000-0000-000000000113", entity.getPermissions().getPermission().get(1).getPrincipalRef()); 
+        assertEquals(_relativePath+"/principals/00000000-0000-0000-0000-000000000113", entity.getPermissions().getPermission().get(1).getPrincipalHref()); 
         assertEquals("read", entity.getPermissions().getPermission().get(1).getLevel().value()); 
-        assertEquals(resource().getURI()+"principals/"+"00000000-0000-0000-0000-000000000221", entity.getPermissions().getPermission().get(2).getPrincipalRef()); 
+        assertEquals(_relativePath+"/principals/00000000-0000-0000-0000-000000000221", entity.getPermissions().getPermission().get(2).getPrincipalHref()); 
         assertEquals(2, entity.getTargets().getTargetInfo().size());
-        assertEquals(resource().getURI().toString()+"targets/"+"00000000-0000-0000-0000-000000000031", entity.getTargets().getTargetInfo().get(0).getRef());
-        assertEquals(resource().getURI().toString()+"targets/"+"00000000-0000-0000-0000-000000000032", entity.getTargets().getTargetInfo().get(1).getRef());
+        assertEquals(_relativePath+"/targets/00000000-0000-0000-0000-000000000031", entity.getTargets().getTargetInfo().get(0).getHref());
+        assertEquals(_relativePath+"/targets/00000000-0000-0000-0000-000000000032", entity.getTargets().getTargetInfo().get(1).getHref());
         assertEquals(testAnnotation.getLastModified(), entity.getLastModified());
-        assertEquals(resource().getURI()+requestUrl, entity.getURI());
+        assertEquals(_relativePath+"/annotations/00000000-0000-0000-0000-000000000021", entity.getHref());
     }
 
@@ -194 +192 @@
         System.out.println("test createAnnotation");
         System.out.println("POST "+resource().getURI().toString()+"annotations/");
-        final Annotation annotationToAdd = (new TestInstances(this.getBaseURI().toString())).getAnnotationToAdd();
+        
+        final Annotation annotationToAdd = (new TestInstances(_relativePath)).getAnnotationToAdd();
         final JAXBElement<Annotation> jaxbElement = (new ObjectFactory()).createAnnotation(annotationToAdd);
        
@@ -208 +207 @@
         assertEquals(0, entityA.getPermissions().getPermission().size());
         assertEquals(Access.WRITE, entityA.getPermissions().getPublic());
-        assertEquals(this.getBaseURI() + "principals/00000000-0000-0000-0000-000000000113", entityA.getOwnerRef());
+        assertEquals(_relativePath + "/principals/00000000-0000-0000-0000-000000000113", entityA.getOwnerHref());
         assertEquals("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#de_Opdracht", entityA.getTargets().getTargetInfo().get(0).getLink());
-        assertEquals(this.getBaseURI()+ "targets/00000000-0000-0000-0000-000000000031", entityA.getTargets().getTargetInfo().get(0).getRef());
+        assertEquals(_relativePath+ "/targets/00000000-0000-0000-0000-000000000031", entityA.getTargets().getTargetInfo().get(0).getHref());
         assertEquals("version 1.0", entityA.getTargets().getTargetInfo().get(0).getVersion());
         
@@ -231 +230 @@
         System.out.println("test updateAnnotation");
         System.out.println("PUT "+resource().getURI().toString()+"annotations/00000000-0000-0000-0000-000000000021");
-        Annotation annotation = (new TestInstances(this.getBaseURI().toString())).getAnnotationOne();
+                
+        Annotation annotation = (new TestInstances(_relativePath)).getAnnotationOne();
         annotation.getPermissions().setPublic(Access.READ);
         annotation.setHeadline("updated annotation 1");
@@ -254 +254 @@
         assertEquals(2, entityA.getPermissions().getPermission().size());
         assertEquals(Access.READ, entityA.getPermissions().getPublic());
-        assertEquals(this.getBaseURI() + "principals/00000000-0000-0000-0000-000000000111", entityA.getOwnerRef());
+        assertEquals(_relativePath + "/principals/00000000-0000-0000-0000-000000000111", entityA.getOwnerHref());
         assertEquals("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#de_Opdracht", entityA.getTargets().getTargetInfo().get(0).getLink());
-        assertEquals(this.getBaseURI()+ "targets/00000000-0000-0000-0000-000000000031", entityA.getTargets().getTargetInfo().get(0).getRef());
+        assertEquals(_relativePath+ "/targets/00000000-0000-0000-0000-000000000031", entityA.getTargets().getTargetInfo().get(0).getHref());
         
     }
@@ -297 +297 @@
         assertEquals(3, entityA.getPermissions().getPermission().size());
         assertEquals(Access.WRITE , entityA.getPermissions().getPublic());
-        assertEquals(this.getBaseURI() + "principals/00000000-0000-0000-0000-000000000111", entityA.getOwnerRef());
+        
+     
+        assertEquals(_relativePath + "/principals/00000000-0000-0000-0000-000000000111", entityA.getOwnerHref());
         assertEquals("http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#de_Opdracht", entityA.getTargets().getTargetInfo().get(0).getLink());
-        assertEquals(this.getBaseURI()+ "targets/00000000-0000-0000-0000-000000000031", entityA.getTargets().getTargetInfo().get(0).getRef());
+        assertEquals(_relativePath+ "/targets/00000000-0000-0000-0000-000000000031", entityA.getTargets().getTargetInfo().get(0).getHref());
         
     }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java

@@ -32 +32 @@
 @RunWith(value = SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"/spring-test-config/mockeryRest.xml", "/spring-test-config/mockDBDispatcher.xml", "/spring-config/jaxbMarshallerFactory.xml",
-    "/spring-config/jaxbUnmarshallerFactory.xml","/spring-test-config/mockUriInfo.xml"})
+    "/spring-config/jaxbUnmarshallerFactory.xml"})
 public class NotebookResourceTest {