Author: justin
Date: Tue Aug 24 18:07:29 2010
New Revision: 988640
URL: http://svn.apache.org/viewvc?rev=988640&view=rev
Log:
SLING-1664 - try reading the repository.xml file from the Launchpad context
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java?rev=988640&r1=988639&r2=988640&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
Tue Aug 24 18:07:29 2010
@@ -18,6 +18,7 @@ package org.apache.sling.jcr.jackrabbit.
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Hashtable;
@@ -328,8 +329,22 @@ public class Activator implements Bundle
// ensure the configuration file (inside the home Dir !)
File configFile = new File(homeDir, "repository.xml");
- SlingServerRepository.copyFile(bundleContext.getBundle(),
"repository.xml", configFile);
- return configFile.toURI().toURL().toString();
+ boolean copied = false;
+
+ try {
+ URL contextConfigURL = new URL("context:repository.xml");
+ InputStream contextConfigStream = contextConfigURL.openStream();
+ if (contextConfigStream != null) {
+ SlingServerRepository.copyStream(contextConfigStream,
configFile);
+ copied = true;
+ }
+ } catch (Exception e) {}
+
+ if (!copied) {
+ SlingServerRepository.copyFile(bundleContext.getBundle(),
"repository.xml", configFile);
+ }
+ return configFile.toURI().toURL().toString();
+
}
}
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java?rev=988640&r1=988639&r2=988640&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
Tue Aug 24 18:07:29 2010
@@ -204,8 +204,12 @@ public class SlingServerRepository exten
// check for a file property
InputStream source = entryURL.openStream();
+ copyStream(source, destFile);
+ }
+
+ public static void copyStream(InputStream source, File destFile) throws
FileNotFoundException, IOException {
+ OutputStream dest = null;
- OutputStream dest = null;
try {
// ensure path to parent folder of licFile
