svn commit: r1499649 - in /sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server: ./ src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/

[fmeschbe]

Author: fmeschbe
Date: Thu Jul  4 04:35:44 2013
New Revision: 1499649

URL: http://svn.apache.org/r1499649
Log:
Implement support for service based ResourceResolver and Session access

- Update with latest changes from trunk

Modified:
    
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/ 
  (props changed)
    
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
    
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
   (props changed)
    
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
   (props changed)

Propchange: 
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/
------------------------------------------------------------------------------
    svn:mergeinfo = /sling/trunk/bundles/jcr/jackrabbit-server:1464119-1499648

Modified: 
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml?rev=1499649&r1=1499648&r2=1499649&view=diff
==============================================================================
--- 
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
 (original)
+++ 
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
 Thu Jul  4 04:35:44 2013
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>15</version>
+        <version>16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Propchange: 
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
            ('svn:mergeinfo' removed)

Propchange: 
sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
            ('svn:mergeinfo' removed)