svn commit: r1790503 - in /jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3: S3DataStoreService.java SharedS3DataStoreService.java

[amitj]

Author: amitj
Date: Fri Apr  7 05:07:46 2017
New Revision: 1790503

URL: http://svn.apache.org/viewvc?rev=1790503&view=rev
Log:
OAK-6047: incorrect metatype annotations

Remove metatype=true

Modified:
    
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
    
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java

Modified: 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java?rev=1790503&r1=1790502&r2=1790503&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
 Fri Apr  7 05:07:46 2017
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.blob.c
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.ConfigurationPolicy;
 
-@Component(policy = ConfigurationPolicy.REQUIRE, name = 
S3DataStoreService.NAME, metatype = true)
+@Component(policy = ConfigurationPolicy.REQUIRE, name = 
S3DataStoreService.NAME)
 public class S3DataStoreService extends AbstractS3DataStoreService {
     public static final String NAME = 
"org.apache.jackrabbit.oak.plugins.blob.datastore.S3DataStore";
 }

Modified: 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java?rev=1790503&r1=1790502&r2=1790503&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java
 Fri Apr  7 05:07:46 2017
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.blob.c
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.ConfigurationPolicy;
 
-@Component(policy = ConfigurationPolicy.REQUIRE, name = 
SharedS3DataStoreService.NAME, metatype = true)
+@Component(policy = ConfigurationPolicy.REQUIRE, name = 
SharedS3DataStoreService.NAME)
 public class SharedS3DataStoreService extends AbstractS3DataStoreService {
     public static final String NAME = 
"org.apache.jackrabbit.oak.plugins.blob.datastore.SharedS3DataStore";
 }