Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
45741193 10/09/2015 02:29 PM Cherian Mathew

Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"

This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca.

9524fa39 10/09/2015 02:07 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT

fbedcb23 09/16/2015 09:24 PM Cherian Mathew

Fix merge

999d37c4 09/16/2015 07:19 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml

64a4022f 09/16/2015 07:14 PM Cherian Mathew

Fix versions

a22860ff 09/16/2015 06:27 PM jenkins

Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT

ec3a353f 09/15/2015 08:38 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

d7cab35d 09/15/2015 08:35 PM Cherian Mathew

Correct versions

995aa2c5 09/15/2015 06:21 PM jenkins

Updated version in pom / project files to taxeditor version : 3.11.0-SNAPSHOT and cdmlib version : 3.11.0-SNAPSHOT

e3bcf994 09/15/2015 10:55 AM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

129e2ea3 09/14/2015 06:00 PM jenkins

Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT

18358a52 09/10/2015 05:58 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

4991d5fa 09/10/2015 04:57 PM jenkins

Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT

627fcabe 09/10/2015 04:22 PM Andreas Kohlbecker

Revert "Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT"

This reverts commit 7ed2ce1e9eca6a9dd72c740e72efdcd6ef1135c9.

7ed2ce1e 09/10/2015 03:53 PM jenkins

Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT

26d19e4f 08/04/2015 06:34 PM Cherian Mathew

#5129 Extend export ui for remoting

5a49a28f 07/23/2015 01:54 PM Cherian Mathew

#4932 Remove autowired members, Use serliaised cdm model map

ad69c198 07/17/2015 06:07 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...

9c0b77f7 07/17/2015 12:07 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

c5685107 07/15/2015 05:30 PM jenkins

Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0

a3dc6527 07/15/2015 05:21 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

f63c8f53 07/15/2015 05:03 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

cc43d828 07/15/2015 05:00 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

34377444 07/15/2015 04:52 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

2eeb388f 07/15/2015 04:50 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

4e1119d7 07/15/2015 04:03 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

3dbbe399 07/15/2015 03:56 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

6215c3a6 07/15/2015 03:49 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

de0ecbd7 07/15/2015 03:47 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

044b193c 07/15/2015 03:31 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

880412d5 07/15/2015 03:29 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

dc7c101f 07/15/2015 03:17 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

63b69f9e 07/15/2015 02:14 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT

ac1f29b5 07/10/2015 04:47 PM Cherian Mathew

Add method to sessionOwner objects to fine tune performance using property paths

71aeb5d9 07/10/2015 12:06 PM Cherian Mathew

Fix merge commit

bb3317c0 06/26/2015 03:11 PM Cherian Mathew

Add log4j extras to apply expression filters

19a8bfe7 06/24/2015 09:40 AM Cherian Mathew

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

8b7b09a5 06/23/2015 06:22 PM Cherian Mathew

Update cdmlib version to 3.6.3-SNAPSHOT

e70b1617 06/16/2015 10:18 AM Cherian Mathew

eu.etaxonomy.taxeditor.cdmlib/.classpath,MANIFEST.MF : removed cdm-server jar from classpath
OperationTestBase, TaxonNameEditorTest, : refactoring
MockConversationEnabled : class to mock interface IConversationEnabled
TaxonNavigatorTest (.xml) : added test + data...

608f7100 06/11/2015 10:50 AM Cherian Mathew

corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven

c5485129 06/09/2015 09:32 AM Cherian Mathew

fixed classpath issues and issues from last merge

9ee1c500 06/08/2015 12:13 PM Cherian Mathew

fixed update to snapshot

e51599a4 06/05/2015 06:15 PM Cherian Mathew

version updates for 3.6.1

491389ea 06/05/2015 05:53 PM Cherian Mathew

fixing classpath config

1925ef97 06/05/2015 05:51 PM Cherian Mathew

fixing classpath config

5b9d4ad5 06/05/2015 04:42 PM Cherian Mathew

Release 3.6.0 merge

43c0aada 06/05/2015 01:23 PM Cherian Mathew

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...

5f02ad3e 06/04/2015 03:55 PM Cherian Mathew

updated to snapshot version

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

02176688 06/04/2015 03:49 PM edit-jenkins

Updated version in config files to 3.6.1-SNAPSHOT

afd232b8 06/04/2015 03:30 PM Cherian Mathew

Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

ebd5e5e5 06/04/2015 02:58 PM edit-jenkins

Updated version in config files to 3.6.0

93b0eb6b 06/03/2015 01:56 PM Cherian Mathew

eu.etaxonomy.taxeditor.cdmlib/.classpath, eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF, eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF : moved test jars to test project
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF : added packages required by test project to exported package list...

e138e599 05/29/2015 06:33 PM Cherian Mathew

MANIFEST.MF : added apache commons exception package for use in messaging utils
MessagingUtils : updated to add all causes in the child statuses

4b94c9cf 05/22/2015 10:54 AM Cherian Mathew

Merge branch 'move-to-luna' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...

e1f2a065 05/20/2015 07:16 PM Cherian Mathew

dependency changes to move to e4

1cd65199 05/20/2015 04:05 PM Cherian Mathew

.classpath, MANIFEST.MF, build.properties, pom.xml : added cdm-server jar to lib dir and project classpath
/lib : added ignore for cdm-server jar
CacheLoader : reverted update of cached entity field
cdmlib-remote-webapp.war : updated to latest version

9b10f34c 05/04/2015 02:43 PM edit-jenkins

Updated version in config files to 3.5.2-SNAPSHOT

dec40d07 05/04/2015 02:38 PM edit-jenkins

Updated version in config files to 3.5.1

e3259fb3 04/14/2015 01:52 PM Katja Luther
74b4e0d9 03/28/2015 11:32 AM Patrick Plitzner
  • exported missing package
6dcccd22 03/25/2015 01:47 PM edit-jenkins

Updated version in config files to 3.5.1-SNAPSHOT

688085e0 03/25/2015 01:40 PM edit-jenkins

Updated version in config files to 3.5.0

2415984f 03/20/2015 02:28 AM Andreas Müller

3.4.1->3.5.0 in MANIFEST

db42120d 03/20/2015 01:09 AM Andreas Müller

update Manifest from 3.4.1 -> 3.5.0

17cdf390 03/19/2015 10:34 PM Andreas Müller
a8e762da 03/19/2015 04:36 PM Cherian Mathew

wrong target revision in the last commit

b19a1b74 03/19/2015 04:25 PM Cherian Mathew

reverting back wrongly committed files

68fe5da5 03/19/2015 04:16 PM Cherian Mathew

Updated version in config files to 3.4.1-SNAPSHOT

91759c63 03/19/2015 04:11 PM Cherian Mathew

Updated version in config files to 3.4.0

703e8efc 02/17/2015 12:43 PM Cherian Mathew

CdmRemoteCacheManager : added cache getter methods
CdmTransientEntityCacher, CdmEntitySession, CdmEntitySessionManager, ICdmEntitySession, ICdmEntitySessionManager, ICdmEntitySessionManagerObserver, MockCdmEntitySession, MockCdmEntitySessionManager , eu.etaxonomy.taxeditor.cdmlib/src/main/resources/cdmlib-ehcache.xml : added statistics config , getter method for live stats and observer to update when sessions are bound and disposed...

5c6184af 02/02/2015 04:18 PM Cherian Mathew

merge from trunk

79c42b3f 01/28/2015 02:26 PM Cherian Mathew

merge from trunk

5e394236 01/27/2015 10:34 AM Cherian Mathew

MANIFEST.MF : New apache http client packages added
CdmServerInfo : changed name and added inner class for cdm instance
httpInvokerServiceClients : added new services
remotingApplicationContext : refactor for cache package

862604f8 01/23/2015 02:32 PM Patrick Plitzner
  • added swagger annotations jar to taxeditor.cdmlib
5285bd70 01/22/2015 10:36 AM Cherian Mathew

CdmServerInstanceInfo, RemotingLoginDialog, ShowRemotingLoginWindowHandler : functionality for remoting login
moved classes to appropriate locations.
merged from trunk.

48a32bd3 01/20/2015 12:20 PM Cherian Mathew

merge from trunk

2b9a216d 01/09/2015 12:37 AM Andreas Müller

merge validation editor branch to trunk

0393a168 12/15/2014 06:15 PM edit-jenkins

Updated version in config files to 3.4.1-SNAPSHOT

52a70f7b 12/15/2014 05:37 PM edit-jenkins

Updated version in config files to 3.4.0

07012f35 12/15/2014 11:25 AM Andreas Müller

upgrade poi to 3.10-FINAL and add ooxml functionality

80de230c 12/10/2014 06:01 PM Cherian Mathew

updated manifest for deleted test dir
removed unnecessary commit root entity methods in session and session manager

25864e07 12/09/2014 06:21 PM Cherian Mathew

merge from trunk

2e4de8d1 12/09/2014 06:18 PM Alexander Oppermann

last fix for revision number of classpath

d59e5382 12/09/2014 06:05 PM Cherian Mathew

merge from trunk

58afb673 12/09/2014 05:55 PM Cherian Mathew

moving all source files from the remoting project to the cdmlib project

3fd7eb7e 12/08/2014 04:43 PM Cherian Mathew

moving code to remoting project

fd6cdafb 11/25/2014 01:56 PM Alexander Oppermann

changed classpath to 3.5.0

e139a136 11/17/2014 10:54 AM Patrick Plitzner
  • exported eu.etaxonomy.cdm.io.csv.redlist.demo package to fix compile errors
f1b8fe07 10/14/2014 01:42 PM Patrick Plitzner

merge-update from trunk

76aa4c25 10/14/2014 12:58 PM Katja Luther
032e39ab 10/09/2014 03:34 PM Patrick Plitzner

adapted cdmlib dependencies

c63055a7 10/09/2014 03:17 PM Patrick Plitzner

increased version number

2321a544 10/09/2014 11:45 AM Katja Luther
ed6e20d7 09/04/2014 05:32 PM edit-jenkins

Updated version in config files to 3.3.8-SNAPSHOT

14f96448 09/04/2014 05:06 PM edit-jenkins

Updated version in config files to 3.3.7

4db49a38 08/13/2014 02:07 PM Alexander Oppermann

reintegrated redlist branch into trunk

80168e3c 07/08/2014 03:34 PM edit-jenkins

Updated version in config files to 3.3.7-SNAPSHOT

43c9550c 07/08/2014 03:20 PM edit-jenkins

Updated version in config files to 3.3.6

20ed1f92 06/25/2014 05:15 PM Cherian Mathew

remotingApplicationContext : added CdmCacher as bean to be initialised
META-INF/MANIFEST.MF, .classpath, lib/ehcache-core-2.4.3.jar, lib/ehcache-core-2.6.9.jar: replaced ehcache-core-2.4.3 with ehcache-core-2.6.9 for the CdmCacher.
It seems that even though hibernate-ehcache-4.1.10.Final is embedded with ehcache-core-2.4.3, it is compatible with ehcache-core-2.6.9 according to http://architects.dzone.com/articles/hibernate-4-and-ehcache-higher.

eca44d67 05/30/2014 11:12 AM edit-jenkins

Updated version in config files to 3.3.6-SNAPSHOT