hibernate4 :  First step in the support of Hibernate 4
hibernate4 :  Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core into hibernate4
(nobranch) :  hibernate4 :  Add a new annotation wrapping the Spring one to designate a bean is a repository of entities. Update the Service annotation to wrap directly the Service Spring annotation instead of Component. The UserIdCountVolumeCouple object returns a long now instead of an int.
hibernate4 : extract an interface from the CommentUserNotificationService: the CommentUserNotificationService is now an interface and the previous class becomes DefaultCommentUserNotificationService. By extracting an interface, it is now more easy to mock/stub the service for tests on services depending on the comment user notification service.
hibernate4 :  Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core into hibernate4
hibernate4 :  Now antlr is provided only for tests (it is required by Hibernate) and clean up properties about truststore settings (normaly they have to be left commented
hibernate4 :  Remove the spring configuration for direct Hibernate use as no more components are using the Hibernate O/R mapping
hibernate4 :  Fix merge conflict with master
hibernate4 :  reset the version of the parent POM at 25-SNAPSHOT
hibernate4 :  Add a dependency on spring-context and fix the implementation of the SimpleMemoryContext#close() method (now it does nothing)
hibernate4 :  Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core into hibernate4
hibernate4 :  Fix the merge conflict with the properties in the systemSettings.properties configuration file
on feature #4473, adding some global parameters to manage behavior of import according to existing methods (XML, manual or drag and drop)
Simplifying signature of methods by using an object instead of several parameters
fixing importExportMapping.xml after a bad merge integrated as is.
on feature #4473, removing some code relative to DB model import
closing feature #4262
now, by default, a publication created from a file is named without its extension
Adding compatibility supports for permalinks.
Bug #4471 : fixing problem of inheritance rights between spaces and applications

Conflicts:

	lib-core/src/main/java/com/stratelia/webactiv/beans/admin/Admin.java
Merge branch 'hibernate4' of https://github.com/mmoqui/Silverpeas-Core into mmo-feature4472
Merge branch 'permalinks' of https://github.com/ehsavoie/Silverpeas-Core into ehu-permalinks