#
# ChangeLog for DASISH
#
# Generated by Trac 1.2.2
# 06/02/24 18:40:42

Fri, 23 May 2014 14:29:09 GMT olhsha@mpi.nl [5275]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/README.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web-basic.xml (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web-shibboleth.xml (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/web-shibboleth.xml (added)

	redirection using the flag "isShibboleth"


Fri, 23 May 2014 13:40:46 GMT olof.olsson@snd.gu.se [5274]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/autocacheSidebarOverlay.xul (modified)

	added open remote cache menu action


Thu, 22 May 2014 14:22:49 GMT olhsha@mpi.nl [5266]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/logout.jsp (modified)

	Fixing automatic generation of a shibbolized user record and fixing ...


Thu, 15 May 2014 17:35:14 GMT olhsha@mpi.nl [5203]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)

	Fixing small bug: url-encoding with omitting /.  Optimisation of ...


Mon, 12 May 2014 14:37:00 GMT olhsha@mpi.nl [5186]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBDispatcher.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)

	Fixing small bugs + optimisation for update and post principals and ...


Fri, 09 May 2014 17:17:57 GMT olhsha@mpi.nl [5174]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/JaxbUnmarshallerFactory.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceJaxbUnmarshallerProvider.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)

	Fixed schema validation, via apache's implementation of xerces and ...


Wed, 07 May 2014 12:27:30 GMT olhsha@mpi.nl [5145]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/JaxbMarshallerFactory.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/JaxbUnmarshallerFactory.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceJaxbUnmarshallerProvider.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/spring-config/JaxbUnmarshallerFactory.xml (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified)

	Unmarshaller resource provider added, for validating via the  schema. ...


Wed, 07 May 2014 08:57:30 GMT olhsha@mpi.nl [5139]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)

	URL-encoding bug fixing. Tested.


Tue, 06 May 2014 15:32:03 GMT olhsha@mpi.nl [5138]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/PrincipalExists.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/TargetDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDaoTest.java (modified)

	URL-encoding bug fixing


Fri, 02 May 2014 13:00:44 GMT olhsha@mpi.nl [5122]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)

	fixing access bug (READ action was != "read" access)


Mon, 28 Apr 2014 16:01:50 GMT olhsha@mpi.nl [5088]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBDispatcher.java (moved)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (moved)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/VerboseOutput.java (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/spring-config/dbDispatcher.xml (moved)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/MockObjectsFactoryRest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java (moved)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/spring-test-config/mockDBDispatcher.xml (moved)

	removing redundant "VerboseOutput"


Mon, 28 Apr 2014 14:44:33 GMT olhsha@mpi.nl [5086]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/NotInDataBaseException.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/NotLoggedInException.java (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/ResourceAction.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)

	Refactored, and update headers added. unit test: works, localhost: ...


Sat, 26 Apr 2014 20:07:46 GMT olhsha@mpi.nl [5074]
	* DASISH/t5.6/docs/presentations/Vitamin-28-04 (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/API-backend-GET.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/API-backend-POST.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/Create-Annotation-3-Posting.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/Create-Annotation-4-technical-check.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/Create-annotation-1-selection.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/Create-annotation-2-editing.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/DASISH-t5.6-29.01.2014.pptx (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/DASISH_t5.6_26.11_13.pptx (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/DWAN.LRECFinal.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/DWANframework.emf (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/DWANmodel.emf (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/Shibboleth-login.png (added)
	* DASISH/t5.6/docs/presentations/Vitamin-28-04/vitamin_2804.pptx (added)

	TLA vitamin first commit


Thu, 24 Apr 2014 16:34:51 GMT olhsha@mpi.nl [5053]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ILambda.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ILambdaPrincipal.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/VerboseOutput.java (modified)

	Making a separate class for wrappers (wrapping exceptions around ...


Wed, 23 Apr 2014 15:20:54 GMT olhsha@mpi.nl [5030]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)

	Refactoring principal: making one wrapper out of two.


Tue, 22 Apr 2014 17:23:11 GMT olhsha@mpi.nl [5022]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ILambda.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/registerShibbolethPrincipal.html (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/updatePrincipal.html (added)

	Refactoring principal: adding higher-order exception handling wrapper ...


Thu, 17 Apr 2014 17:52:56 GMT olhsha@mpi.nl [5014]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/createprincipal.jsp (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/error.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/loginform.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/logout.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/registerNonShibbolethPrincipal.html (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/registerShibbolethAlsoAsNonShibboleth.html (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/registerShibbolethPrincipal.html (added)

	creating user records via froms, shibb and non-shibb


Wed, 16 Apr 2014 19:08:59 GMT olhsha@mpi.nl [4997]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/spring-config/springSecurity.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/createprincipal.jsp (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/error.jsp (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/loginform.jsp (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/logout.jsp (added)

	login-via-form


Wed, 16 Apr 2014 15:35:03 GMT olhsha@mpi.nl [4995]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/PrincipalExists.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/spring-config/springSecurity.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/sql/principal_non-shibb.sql (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java (modified)

	adding spring security tables, hashing and the method for posting ...


Tue, 15 Apr 2014 17:36:50 GMT olhsha@mpi.nl [4985]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/spring-config/springSecurity.xml (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)

	restored simple spring authentication


Mon, 14 Apr 2014 13:21:44 GMT olhsha@mpi.nl [4969]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/VerboseOutput.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/shhaa.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)

	fixing new-principal record generation


Sun, 13 Apr 2014 19:02:57 GMT stephanie.roth@snd.gu.se [4960]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/skin/classic/markingcollection/sidebar.css (modified)

	Added more properties for DASISH login labels.


Sun, 13 Apr 2014 18:44:31 GMT stephanie.roth@snd.gu.se [4959]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js (modified)

	Replaces "users" with "principals" in ownerRef value.


Fri, 11 Apr 2014 17:04:00 GMT olhsha@mpi.nl [4956]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE databaseexample.txt (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)

	fixing new-principal record generation


Thu, 10 Apr 2014 13:29:20 GMT olhsha@mpi.nl [4941]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/CachedRepresentationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/TargetDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)

	posting/updating cached is fixed and tested


Thu, 10 Apr 2014 13:04:19 GMT olof.olsson@snd.gu.se [4940]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/loginDialog.xul (modified)

	removed default action on enter


Thu, 10 Apr 2014 12:31:13 GMT olof.olsson@snd.gu.se [4938]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/loginDialog.xul (modified)

	removed the "ok" button


Wed, 09 Apr 2014 09:02:33 GMT stephanie.roth@snd.gu.se [4929]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)

	Changed authURL to .../principal.


Wed, 09 Apr 2014 08:30:19 GMT stephanie.roth@snd.gu.se [4927]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/autocacheSidebarOverlay.xul (modified)

	Removed test menu items.


Wed, 09 Apr 2014 07:54:15 GMT olof.olsson@snd.gu.se [4926]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)

	updated login path


Tue, 08 Apr 2014 15:12:49 GMT stephanie.roth@snd.gu.se [4923]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/autocacheOverlay.xul (modified)

	Removed unused (test) menu item.


Tue, 08 Apr 2014 15:12:06 GMT stephanie.roth@snd.gu.se [4922]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/autocacheSidebarOverlay.xul (modified)

	Added new menu items.


Tue, 08 Apr 2014 15:11:34 GMT stephanie.roth@snd.gu.se [4921]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/locale/en-US/markingcollection/markingcollection.dtd (modified)

	Added new labels.


Tue, 08 Apr 2014 13:10:33 GMT stephanie.roth@snd.gu.se [4918]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/locale/en-US/markingcollection/markingcollection.properties (modified)

	Changed label for uncategorized folder to "Incoming".


Tue, 08 Apr 2014 12:23:37 GMT olhsha@mpi.nl [4917]
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd (modified)
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/access1.xml (added)

	adding access element of type Access


Tue, 08 Apr 2014 09:28:17 GMT olhsha@mpi.nl [4914]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/shhaa.xml (modified)

	error status debugged. when error status is sent, not null must be ...


Mon, 07 Apr 2014 15:01:01 GMT olhsha@mpi.nl [4909]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/JaxbMarshallerFactory.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java (modified)

	IO exception instead of returning null for the getRemotePrinciplaID ...


Mon, 07 Apr 2014 14:52:49 GMT olhsha@mpi.nl [4908]
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd (modified)

	pilot schema is now the main schema


Fri, 04 Apr 2014 17:27:24 GMT olhsha@mpi.nl [4903]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/VerboseOutput.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/sql/DashishAnnotatorCreate.sql (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql (modified)

	tested and debugged on localhost. Error status messages are
	corrected.


Fri, 04 Apr 2014 13:23:28 GMT olof.olsson@snd.gu.se [4898]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js (modified)

	added default public read


Fri, 04 Apr 2014 11:33:12 GMT olof.olsson@snd.gu.se [4894]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/locale/en-US/markingcollection/markingcollection.dtd (modified)

	changed label to local cache


Fri, 04 Apr 2014 08:49:06 GMT olof.olsson@snd.gu.se [4890]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)

	full annotation update done


Thu, 03 Apr 2014 15:54:19 GMT olof.olsson@snd.gu.se [4888]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/objectmng.js (modified)

	started preparation for function for full annotation update


Thu, 03 Apr 2014 13:38:50 GMT olhsha@mpi.nl [4887]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/PrincipalCannotBeDeleted.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/VerboseOutput.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)

	revised rest services. Update (two tests added)  unit test ...


Wed, 02 Apr 2014 21:15:22 GMT olhsha@mpi.nl [4886]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)

	updated unit test annotation dao works fully, as a standalone class ...


Wed, 02 Apr 2014 20:59:43 GMT olhsha@mpi.nl [4885]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)

	updated unit test annotation and integrity service works except weird ...


Tue, 01 Apr 2014 09:23:45 GMT olhsha@mpi.nl [4865]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql (modified)

	version depending on the pilot schema with the branch (+ 1 bug fixed)


Tue, 01 Apr 2014 08:42:03 GMT olhsha@mpi.nl [4861]
	* DASISH/t5.6/schema/branches/pilot-schema/src/main/resources/DASISH-schema-pilot.xsd (moved)

	added public attribute to the pilot schema


Tue, 01 Apr 2014 08:31:18 GMT olhsha@mpi.nl [4860]
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/Untitled1.xml (deleted)
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/annotation1.xml (deleted)
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/annotation2.xml (deleted)
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/annotation3.xml (deleted)
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/userDaan.xml (deleted)
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/uwpl1.xml (deleted)

	restoring the old version of the schema after the branch with the ...


Tue, 01 Apr 2014 08:26:39 GMT olhsha@mpi.nl [4859]
	* DASISH/t5.6/schema/branches/pilot-schema/src/main/resources/DASISH-schema.xsd (modified)

	unit tests works again after refactoring (renaming after changing the ...


Tue, 01 Apr 2014 08:17:34 GMT olhsha@mpi.nl [4858]
	* DASISH/t5.6/schema/branches/pilot-schema (copied)

	creating abranch vere a new version of schema is placed to be tested ...


Tue, 01 Apr 2014 08:08:32 GMT olhsha@mpi.nl [4856]
	* DASISH/t5.6/schema/branches/pilot-new-version (copied)

	creating abranch vere a new version of schema is placed to be tested ...


Fri, 28 Mar 2014 13:13:55 GMT olhsha@mpi.nl [4834]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/NotInDataBaseException.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/NotLoggedInException.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/PrincipalExists.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/CachedRepresentationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/NotebookDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/TargetDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/VerboseOutput.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/sql/DashishAnnotatorCreate.sql (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestBackendConstants.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql (modified)

	unit tests works again after refactoring (renaming after changing the ...


Sat, 22 Mar 2014 19:54:39 GMT Menzo Windhouwer [4826]
	* DASISH/t5.6/docs/LREC/final/DWANmodel.emf (modified)
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	M    final/DWANmodel.emf
	- fixed Principal

	M    ...


Sat, 22 Mar 2014 17:10:38 GMT stephanie.roth@snd.gu.se [4824]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	Another commit of suggestions regarding minor changes.


Sat, 22 Mar 2014 15:23:47 GMT Menzo Windhouwer [4823]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	M    final/LREC.DASISH.Annotator.Abstract.FINAL.docx
	- some final changes


Fri, 21 Mar 2014 17:09:38 GMT Menzo Windhouwer [4819]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	M    final/LREC.DASISH.Annotator.Abstract.FINAL.docx
	- took over ...


Fri, 21 Mar 2014 16:27:22 GMT Menzo Windhouwer [4818]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	M    final/LREC.DASISH.Annotator.Abstract.FINAL.docx
	- some small fixes


Fri, 21 Mar 2014 15:20:16 GMT Menzo Windhouwer [4815]
	* DASISH/t5.6/docs/LREC/final/DWANmodel.emf (modified)
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	M    final/DWANmodel.emf
	- User -> Principal

	M    ...


Fri, 21 Mar 2014 13:01:51 GMT olhsha@mpi.nl [4806]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	updating permissions in xml, user by principal + minor


Thu, 20 Mar 2014 16:40:25 GMT olhsha@mpi.nl [4800]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/INSTALL.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/license.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/NotebookDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/UserDao.java (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/JaxbMarshallerFactory.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/NotebookResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/UserResource.java (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/VerboseOutput.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/log4j.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/spring-config/principalDao.xml (moved)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/sql/DashishAnnotatorCreate.sql (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/MockObjectsFactoryDao.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestBackendConstants.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDaoTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java (added)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDaoTest.java (deleted)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/DummyPrincipal.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/DummySecurityFilter.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/PrincipalCredentials.java (moved)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/spring-test-config/mockPrincipalDao.xml (moved)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql (modified)

	refactoring (renaming after changing the schema)


Thu, 20 Mar 2014 15:06:29 GMT stephanie.roth@snd.gu.se [4799]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	Added new changes and comments. My review is complete now.


Thu, 20 Mar 2014 14:16:28 GMT stephanie.roth@snd.gu.se [4797]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebarUserLogin.js (modified)

	Added label to else { } for server connection error.


Thu, 20 Mar 2014 13:49:23 GMT olof.olsson@snd.gu.se [4796]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebarUserLogin.js (modified)

	login button hide show. still a bug with logut button


Thu, 20 Mar 2014 11:46:33 GMT stephanie.roth@snd.gu.se [4795]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	Added new comments for sections up until section 2.4.


Thu, 20 Mar 2014 10:43:16 GMT olof.olsson@snd.gu.se [4794]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/loginDialog.xul (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebar.xul (modified)

	added autoclose for login dialog


Thu, 20 Mar 2014 10:36:05 GMT olof.olsson@snd.gu.se [4793]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/autocacheOverlay.xul (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/loginDialog.xul (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebar.xul (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebarUserLogin.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/locale/en-US/markingcollection/markingcollection.dtd (modified)

	login check working


Thu, 20 Mar 2014 06:12:39 GMT Menzo Windhouwer [4784]
	* DASISH/t5.6/docs/LREC/final/DWAN-figures.pptx (modified)
	* DASISH/t5.6/docs/LREC/final/DWANframework.emf (modified)
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	M    final/DWAN-figures.pptx
	M    final/DWANframework.emf
	- updated ...


Wed, 19 Mar 2014 21:17:06 GMT stephanie.roth@snd.gu.se [4783]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	Added some new comments and suggestions concerning the sections up ...


Wed, 19 Mar 2014 15:47:11 GMT Menzo Windhouwer [4780]
	* DASISH/t5.6/docs/LREC/final/DWAN-figures.pptx (modified)
	* DASISH/t5.6/docs/LREC/final/DWANmodel.emf (modified)
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	Updated figure 1 and 2, added more related work, added XML example


Wed, 19 Mar 2014 14:47:57 GMT olof.olsson@snd.gu.se [4775]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)

	fix small bug, boundary variable was in the wrong place


Wed, 19 Mar 2014 13:43:38 GMT stephanie.roth@snd.gu.se [4774]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/loginDialog.xul (modified)

	Added dialog with login iFrame.


Wed, 19 Mar 2014 13:42:50 GMT stephanie.roth@snd.gu.se [4773]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)

	Changes in getLoggedInInfo().


Wed, 19 Mar 2014 13:26:49 GMT stephanie.roth@snd.gu.se [4772]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebar.xul (modified)

	Added annotationFramework.getBackend() parameter.


Wed, 19 Mar 2014 10:03:46 GMT Twan Goosen [4762]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	Reviewed LREC paper


Wed, 19 Mar 2014 08:58:18 GMT stephanie.roth@snd.gu.se [4761]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/skin/classic/markingcollection/sidebar.css (modified)

	Element styling for result === 401.


Wed, 19 Mar 2014 08:57:30 GMT stephanie.roth@snd.gu.se [4760]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebarUserLogin.js (modified)

	Element styling and functionality for result === 401.


Wed, 19 Mar 2014 08:55:22 GMT stephanie.roth@snd.gu.se [4759]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebar.xul (modified)

	Changed element structure for login info.


Wed, 19 Mar 2014 08:47:32 GMT Menzo Windhouwer [4758]
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	Incorporated Stephanies comments


Tue, 18 Mar 2014 20:12:27 GMT olhsha@mpi.nl [4755]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/INSTALL.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/README.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)

	fixing redirection problem


Tue, 18 Mar 2014 18:25:52 GMT Menzo Windhouwer [4753]
	* DASISH/t5.6/docs/LREC/final/DWAN-figures.pptx (added)
	* DASISH/t5.6/docs/LREC/final/DWANframework.emf (added)
	* DASISH/t5.6/docs/LREC/final/DWANmodel.emf (modified)
	* DASISH/t5.6/docs/LREC/final/LREC.DASISH.Annotator.Abstract.FINAL.docx (modified)

	M    final/LREC.DASISH.Annotator.Abstract.FINAL.docx
	- working ...


Tue, 18 Mar 2014 17:09:43 GMT olhsha@mpi.nl [4752]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified)

	getting zipped cachedrepresentations and updating a jsp page. Welcome ...


Tue, 18 Mar 2014 17:05:43 GMT olof.olsson@snd.gu.se [4751]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/loginDialog.xul (modified)

	cleanup of old stuff in the dialog


Tue, 18 Mar 2014 17:01:58 GMT olof.olsson@snd.gu.se [4750]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/autocache.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/loginDialog.xul (copied)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebar.xul (modified)

	loginDialog xul


Tue, 18 Mar 2014 14:31:25 GMT olhsha@mpi.nl [4745]
	* DASISH/t5.6/docs/LREC/final/DWANmodel.emf (added)

	model diagram for the paper


Tue, 18 Mar 2014 13:30:03 GMT olof.olsson@snd.gu.se [4742]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)

	using wiredmarker function for geting the current DOM


Tue, 18 Mar 2014 10:45:07 GMT olof.olsson@snd.gu.se [4738]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)

	send cache as multipart/mixed fixed


Mon, 17 Mar 2014 18:11:20 GMT olhsha@mpi.nl [4735]
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/CachedRepresentationResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified)
	* DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml (modified)

	getting a cached representation as an input stream.


Mon, 17 Mar 2014 10:44:13 GMT stephanie.roth@snd.gu.se [4726]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js (modified)

	Changed permissions element to empty element, because ...


Mon, 17 Mar 2014 09:53:44 GMT olhsha@mpi.nl [4722]
	* DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd (modified)

	removing owner as a possible value for permissions in schema.


Sun, 16 Mar 2014 16:57:03 GMT olof.olsson@snd.gu.se [4721]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/markingcollection.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/objectmng.js (modified)

	removed some old stuff


Sun, 16 Mar 2014 15:17:52 GMT olof.olsson@snd.gu.se [4720]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/objectmng.js (modified)

	fix id check for local and uncategoriezed db


Sun, 16 Mar 2014 13:37:55 GMT olof.olsson@snd.gu.se [4719]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/objectmng.js (modified)

	changed to local database


Sun, 16 Mar 2014 12:44:52 GMT olof.olsson@snd.gu.se [4718]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)

	added function for logout


Sun, 16 Mar 2014 12:38:11 GMT stephanie.roth@snd.gu.se [4717]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebarUserLogin.js (modified)

	Changed type from string to number for status response if comparison.


Sun, 16 Mar 2014 12:27:31 GMT stephanie.roth@snd.gu.se [4716]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)

	Callback function updates for 401.


Sun, 16 Mar 2014 12:27:15 GMT stephanie.roth@snd.gu.se [4715]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebarUserLogin.js (modified)

	Callback function updates for 401.


Sat, 15 Mar 2014 19:32:43 GMT olof.olsson@snd.gu.se [4714]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified)
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js (modified)

	almost working for simple post of cache


Sat, 15 Mar 2014 18:32:46 GMT stephanie.roth@snd.gu.se [4713]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/lib/jquery.popupWindow.js (added)

	Added js popupWindow library.


Sat, 15 Mar 2014 17:44:36 GMT stephanie.roth@snd.gu.se [4712]
	* DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/sidebar.xul (modified)

	Added js file references and description element for user login ...