Author: cziegeler
Date: Tue Aug 10 10:23:32 2010
New Revision: 983917
URL: http://svn.apache.org/viewvc?rev=983917&view=rev
Log:
SLING-1637 : Support DynamicClassLoader interface
Modified:
sling/trunk/bundles/jcr/classloader/pom.xml
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/DynamicRepositoryClassLoader.java
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderFacade.java
Modified: sling/trunk/bundles/jcr/classloader/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/classloader/pom.xml?rev=983917&r1=983916&r2=983917&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/classloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/classloader/pom.xml Tue Aug 10 10:23:32 2010
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.classloader</artifactId>
- <version>1.1.0</version>
+ <version>1.1.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/DynamicRepositoryClassLoader.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/DynamicRepositoryClassLoader.java?rev=983917&r1=983916&r2=983917&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/DynamicRepositoryClassLoader.java
(original)
+++
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/DynamicRepositoryClassLoader.java
Tue Aug 10 10:23:32 2010
@@ -41,6 +41,7 @@ import javax.jcr.observation.EventIterat
import javax.jcr.observation.EventListener;
import javax.jcr.observation.ObservationManager;
+import org.apache.sling.commons.classloader.DynamicClassLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +64,8 @@ import org.slf4j.LoggerFactory;
* same, though.
*/
public final class DynamicRepositoryClassLoader
- extends SecureClassLoader implements EventListener {
+ extends SecureClassLoader
+ implements EventListener, DynamicClassLoader {
/**
* The special resource representing a resource which could not be
@@ -606,6 +608,13 @@ public final class DynamicRepositoryClas
}
/**
+ * @see org.apache.sling.commons.classloader.DynamicClassLoader#isLive()
+ */
+ public boolean isLive() {
+ return !this.isDirty();
+ }
+
+ /**
* Reinstantiates this class loader. That is, a new ClassLoader with no
* loaded class is created with the same configuration as this class
loader.
* <p>
Modified:
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderFacade.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderFacade.java?rev=983917&r1=983916&r2=983917&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderFacade.java
(original)
+++
sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/RepositoryClassLoaderFacade.java
Tue Aug 10 10:23:32 2010
@@ -31,7 +31,8 @@ import org.slf4j.LoggerFactory;
/**
* The <code>RepositoryClassLoaderFacade</code> TODO
*/
-class RepositoryClassLoaderFacade extends SecureClassLoader {
+class RepositoryClassLoaderFacade
+ extends SecureClassLoader {
/** default log */
private final Logger log =
LoggerFactory.getLogger(RepositoryClassLoaderFacade.class);