directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1669923 - in /directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core: annotations/ApplyLdifFiles.java factory/DSAnnotationProcessor.java
Date Sun, 29 Mar 2015 15:23:09 GMT
Author: seelmann
Date: Sun Mar 29 15:23:09 2015
New Revision: 1669923

URL: http://svn.apache.org/r1669923
Log:
Add class parameter that is used to obtain class loader from which LDIF file is read. Required
for OSGi environment.

Modified:
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ApplyLdifFiles.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ApplyLdifFiles.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ApplyLdifFiles.java?rev=1669923&r1=1669922&r2=1669923&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ApplyLdifFiles.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ApplyLdifFiles.java
Sun Mar 29 15:23:09 2015
@@ -42,4 +42,8 @@ import java.lang.annotation.Target;
 public @interface ApplyLdifFiles
 {
     String[] value();
+
+
+    /** Class which class loader is used to read LDIF files. Required in OSGi environment.
*/
+    Class<?> clazz() default ApplyLdifFiles.class;
 }

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1669923&r1=1669922&r2=1669923&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
Sun Mar 29 15:23:09 2015
@@ -483,7 +483,7 @@ public class DSAnnotationProcessor
         {
             LOG.debug( "Applying {} to {}", applyLdifFiles.value(),
                 desc.getDisplayName() );
-            injectLdifFiles( desc.getClass(), service, applyLdifFiles.value() );
+            injectLdifFiles( applyLdifFiles.clazz(), service, applyLdifFiles.value() );
         }
 
         ApplyLdifs applyLdifs = desc.getAnnotation( ApplyLdifs.class );



Mime
View raw message