You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2014/11/06 23:43:49 UTC
svn commit: r1637252 -
/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
Author: sseifert
Date: Thu Nov 6 22:43:48 2014
New Revision: 1637252
URL: http://svn.apache.org/r1637252
Log:
SLING-4117 'mountByFS=true' doesn't work a second time (patch supplied by Sandro Boehme)
Modified:
sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
Modified: sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java?rev=1637252&r1=1637251&r2=1637252&view=diff
==============================================================================
--- sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java (original)
+++ sling/trunk/tooling/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java Thu Nov 6 22:43:48 2014
@@ -541,8 +541,9 @@ abstract class AbstractBundleInstallMojo
for(int i=0; i<array.length(); i++) {
final JSONObject obj = array.getJSONObject(i);
final String pid = obj.getString("pid");
- final String path = obj.getJSONObject("provider.file").getString("value");
- final String roots = obj.getJSONObject("provider.roots").getString("value");
+ final JSONObject properties = obj.getJSONObject("properties");
+ final String path = properties.getJSONObject("provider.file").getString("value");
+ final String roots = properties.getJSONObject("provider.roots").getString("value");
if ( path != null && path.startsWith(this.project.getBasedir().getAbsolutePath()) ) {
getLog().debug("Found configuration with pid: " + pid + ", path: " + path + ", roots: " + roots);
result.put(pid, new String[] {path, roots});