Changeset 5693 for DASISH

Timestamp:

10/06/14 14:45:21 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Fixing typo in cached rpresentation related elements: sh --> ch

Location:

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

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified) (1 diff)
• src/main/webapp/SCHEMA/DASISH-schema.xsd (modified) (1 diff)

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

@@ -5 +5 @@
     <groupId>eu.dasish.annotation</groupId>
     <artifactId>annotator-backend</artifactId>
-    <version>${project.version}</version>    
+    <version>1.5.3</version>    
     <packaging>war</packaging>
     <name>annotator-backend Jersey Webapp</name>
@@ -400 +400 @@
         <netbeans.hint.license>gpl20</netbeans.hint.license>  
         <plugin.license.copyrightYear>2013</plugin.license.copyrightYear>
-        <project.version>1.5.2</project.version>
         <shibboleth.version>1.0.4</shibboleth.version>
-        <surefire.version>2.9</surefire.version>
     </properties>
     

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

@@ -73 +73 @@
             CachedRepresentationInfo result = (CachedRepresentationInfo) (new RequestWrappers(this)).wrapRequestResource(params, new GetCachedRepresentationInfo(), Resource.CACHED_REPRESENTATION, ResourceAction.READ, externalId);
             if (result != null) {
-                return (new ObjectFactory()).createCashedRepresentationInfo(result);
-            } else {
-                return (new ObjectFactory()).createCashedRepresentationInfo(new CachedRepresentationInfo());
-            }
-        } catch (NotInDataBaseException e1) {
-            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e1.getMessage());
-            return new ObjectFactory().createCashedRepresentationInfo(new CachedRepresentationInfo());
-        } catch (ForbiddenException e2) {
-            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, e2.getMessage());
-            return new ObjectFactory().createCashedRepresentationInfo(new CachedRepresentationInfo());
+                return (new ObjectFactory()).createCachedRepresentationInfo(result);
+            } else {
+                return (new ObjectFactory()).createCachedRepresentationInfo(new CachedRepresentationInfo());
+            }
+        } catch (NotInDataBaseException e1) {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e1.getMessage());
+            return new ObjectFactory().createCachedRepresentationInfo(new CachedRepresentationInfo());
+        } catch (ForbiddenException e2) {
+            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, e2.getMessage());
+            return new ObjectFactory().createCachedRepresentationInfo(new CachedRepresentationInfo());
         }
     }

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

@@ -155 +155 @@
             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);
+                return new ObjectFactory().createCachedRepresentationInfo(result);
             } else {
-                return new ObjectFactory().createCashedRepresentationInfo(new CachedRepresentationInfo());
+                return new ObjectFactory().createCachedRepresentationInfo(new CachedRepresentationInfo());
             }
         } catch (NotInDataBaseException e1) {
             httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e1.getMessage());
-            return new ObjectFactory().createCashedRepresentationInfo(new CachedRepresentationInfo());
+            return new ObjectFactory().createCachedRepresentationInfo(new CachedRepresentationInfo());
         } catch (ForbiddenException e2) {
             httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, e2.getMessage());
-            return new ObjectFactory().createCashedRepresentationInfo(new CachedRepresentationInfo());
+            return new ObjectFactory().createCachedRepresentationInfo(new CachedRepresentationInfo());
         }
     }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/SCHEMA/DASISH-schema.xsd

@@ -323 +323 @@
     <xs:element name="annotationList" type="dasish:ReferenceList"/>
 
-    <xs:element name="cashedRepresentationInfo" type="dasish:CachedRepresentationInfo"/>
-
-    <xs:element name="cashedRepresentationList" type="dasish:ReferenceList"/>
+    <xs:element name="cachedRepresentationInfo" type="dasish:CachedRepresentationInfo"/>
+
+    <xs:element name="cachedRepresentationList" type="dasish:ReferenceList"/>
     
     <xs:element name="cachedRepresentationFragment" type="dasish:CachedRepresentationFragment"/>