date:20170815

svn commit: r1805120 - /sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt

2017-08-15 Thread pauls

Author: pauls
Date: Tue Aug 15 22:48:30 2017
New Revision: 1805120

URL: http://svn.apache.org/viewvc?rev=1805120=rev
Log:
Update to Events 4.2.6

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt?rev=1805120=1805119=1805120=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt 
(original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt Tue Aug 
15 22:48:30 2017
@@ -20,7 +20,7 @@
 [feature name=sling-event]
 
 [artifacts]
-org.apache.sling/org.apache.sling.event/4.2.2
+org.apache.sling/org.apache.sling.event/4.2.6
 org.apache.sling/org.apache.sling.event.dea/1.1.2
 
 [:repoinit]
@@ -39,4 +39,4 @@
 user.mapping=[
 "org.apache.sling.event\=sling-event",
 "org.apache.sling.event.dea\=sling-event"
-]
\ No newline at end of file
+]

svn commit: r1016854 - /websites/production/sling/content/

2017-08-15 Thread pauls

Author: pauls
Date: Tue Aug 15 22:25:39 2017
New Revision: 1016854

Log:
Apache Sling Event 4.2.6

Added:
websites/production/sling/content/
  - copied from r1016853, websites/staging/sling/trunk/content/

svn commit: r1016853 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html

2017-08-15 Thread buildbot

Author: buildbot
Date: Tue Aug 15 22:20:35 2017
New Revision: 1016853

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Aug 15 22:20:35 2017
@@ -1 +1 @@
-1804957
+1805118

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Tue Aug 15 22:20:35 2017
@@ -640,9 +640,9 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Event
-4.2.4
-Bundle (http://www.apache.org/dist/sling/org.apache.sling.event-4.2.4.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.event-4.2.4.jar.md5;>md5)
-Source 
ZIP (http://www.apache.org/dist/sling/org.apache.sling.event-4.2.4-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.event-4.2.4-source-release.zip.md5;>md5)
+4.2.6
+Bundle (http://www.apache.org/dist/sling/org.apache.sling.event-4.2.6.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.event-4.2.6.jar.md5;>md5)
+Source 
ZIP (http://www.apache.org/dist/sling/org.apache.sling.event-4.2.6-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.event-4.2.6-source-release.zip.md5;>md5)
 
 
 Explorer
@@ -1556,7 +1556,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1804955 by rombert on Mon, 14 Aug 2017 08:41:47 +
+Rev. 1805118 by pauls on Tue, 15 Aug 2017 22:19:59 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Modified: websites/staging/sling/trunk/content/news.html
==
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Tue Aug 15 22:20:35 2017
@@ -116,6 +116,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
 
+New Release: Apache Sling Event 4.2.6 (August 16th, 2017)
 New Release: Apache Sling Default POST Servlets 2.3.22 (August 14th, 
2017)
 New Release: Apache Sling Parent 31 (August 8th, 2017)
 New Releases: Apache Sling Security 1.1.6, Apache Sling Scripting HTL 
Engine 1.0.38, Apache Sling Scripting HTL Compiler 1.0.10, Apache Sling HTL 
Maven Plugin 1.0.8 (August 7th, 2017)
@@ -616,7 +617,7 @@ Apache Sling Scripting Sightly JS Use Pr
 Apache Sling has graduated into a top level project! (June 17, 2009)
 
   
-Rev. 1804955 by rombert on Mon, 14 Aug 2017 08:41:47 +
+Rev. 1805118 by pauls on Tue, 15 Aug 2017 22:19:59 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1805118 - in /sling/site/trunk/content: downloads.list news.mdtext

2017-08-15 Thread pauls

Author: pauls
Date: Tue Aug 15 22:19:59 2017
New Revision: 1805118

URL: http://svn.apache.org/viewvc?rev=1805118=rev
Log:
Apache Sling Event 4.2.6

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1805118=1805117=1805118=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Tue Aug 15 22:19:59 2017
@@ -78,7 +78,7 @@ Distribution Integration Tests|org.apach
 Distribution Sample|org.apache.sling.distribution.sample|0.1.6
 Dynamic Include|org.apache.sling.dynamic-include|3.0.0
 Engine|org.apache.sling.engine|2.6.8
-Event|org.apache.sling.event|4.2.4
+Event|org.apache.sling.event|4.2.6
 Event API|org.apache.sling.event.api|1.0.0
 Explorer|org.apache.sling.extensions.explorer|1.0.4
 Feature Flags|org.apache.sling.featureflags|1.2.0

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1805118=1805117=1805118=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Tue Aug 15 22:19:59 2017
@@ -1,5 +1,6 @@
 Title: News
 
+* New Release: Apache Sling Event 4.2.6 (August 16th, 2017)
 * New Release: Apache Sling Default POST Servlets 2.3.22 (August 14th, 2017)
 * New Release: Apache Sling Parent 31 (August 8th, 2017)
 * New Releases: Apache Sling Security 1.1.6, Apache Sling Scripting HTL Engine 
1.0.38, Apache Sling Scripting HTL Compiler 1.0.10, Apache Sling HTL Maven 
Plugin 1.0.8 (August 7th, 2017)
@@ -500,4 +501,4 @@ Apache Sling Scripting Sightly JS Use Pr
 * Apache Sling has graduated into a top level project! (June 17, 2009)
 
 
-  [1]: http://s.apache.org/CVE-2012-2138
+  [1]: http://s.apache.org/CVE-2012-2138
\ No newline at end of file

Nexus: Promotion Completed

2017-08-15 Thread Nexus Repository Manager

Message from: https://repository.apache.orgDescription:Apache Sling Event 4.2.6Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_121; Mac OS X 10.12.5)""userId" = "pauls""ip" = "193.105.139.131"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6-source-release.zip.asc(SHA1: 2a3b88b189f7aa22a7512bcc42188aa52f2188b9)/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6.jar.asc(SHA1: 07ace50c4d7c200fd78c8459538c411284b69b10)/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6.jar(SHA1: 86b804f4940f6856f918e0c2f049cacd1ca6252a)/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6-sources.jar.asc(SHA1: a1c7e7e708bc24adbb96422affcf5a9f35de)/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6-sources.jar(SHA1: de314538c9e47ebef67d5d8d7776fa4e2d0bcb81)/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6.pom.asc(SHA1: c074981b0b2ba02ab4669f58dd33e0e7984f280b)/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6.pom(SHA1: 3caa55dd31ec4cfb810733b8436e73cb548ed4d2)/org/apache/sling/org.apache.sling.event/4.2.6/org.apache.sling.event-4.2.6-source-release.zip(SHA1: d4fdbd8b904b6b94ca61bd9d255caeb2d447a736)Action performed by Karl Pauls (pauls)

svn commit: r21178 - /release/sling/

2017-08-15 Thread pauls

Author: pauls
Date: Tue Aug 15 22:16:39 2017
New Revision: 21178

Log:
Add the Apache Sling Event 4.2.6 release.

Added:
release/sling/org.apache.sling.event-4.2.6-source-release.zip   (with props)
release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc
release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5
release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1
release/sling/org.apache.sling.event-4.2.6-sources.jar   (with props)
release/sling/org.apache.sling.event-4.2.6-sources.jar.asc
release/sling/org.apache.sling.event-4.2.6-sources.jar.md5
release/sling/org.apache.sling.event-4.2.6-sources.jar.sha1
release/sling/org.apache.sling.event-4.2.6.jar   (with props)
release/sling/org.apache.sling.event-4.2.6.jar.asc
release/sling/org.apache.sling.event-4.2.6.jar.md5
release/sling/org.apache.sling.event-4.2.6.jar.sha1
release/sling/org.apache.sling.event-4.2.6.pom
release/sling/org.apache.sling.event-4.2.6.pom.asc
release/sling/org.apache.sling.event-4.2.6.pom.md5
release/sling/org.apache.sling.event-4.2.6.pom.sha1
Removed:
release/sling/org.apache.sling.event-4.2.4-javadoc.jar
release/sling/org.apache.sling.event-4.2.4-javadoc.jar.asc
release/sling/org.apache.sling.event-4.2.4-javadoc.jar.md5
release/sling/org.apache.sling.event-4.2.4-javadoc.jar.sha1
release/sling/org.apache.sling.event-4.2.4-source-release.zip
release/sling/org.apache.sling.event-4.2.4-source-release.zip.asc
release/sling/org.apache.sling.event-4.2.4-source-release.zip.md5
release/sling/org.apache.sling.event-4.2.4-source-release.zip.sha1
release/sling/org.apache.sling.event-4.2.4-sources.jar
release/sling/org.apache.sling.event-4.2.4-sources.jar.asc
release/sling/org.apache.sling.event-4.2.4-sources.jar.md5
release/sling/org.apache.sling.event-4.2.4-sources.jar.sha1
release/sling/org.apache.sling.event-4.2.4.jar
release/sling/org.apache.sling.event-4.2.4.jar.asc
release/sling/org.apache.sling.event-4.2.4.jar.md5
release/sling/org.apache.sling.event-4.2.4.jar.sha1
release/sling/org.apache.sling.event-4.2.4.pom
release/sling/org.apache.sling.event-4.2.4.pom.asc
release/sling/org.apache.sling.event-4.2.4.pom.md5
release/sling/org.apache.sling.event-4.2.4.pom.sha1

Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip
==
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.event-4.2.6-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc
==
--- release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc (added)
+++ release/sling/org.apache.sling.event-4.2.6-source-release.zip.asc Tue Aug 
15 22:16:39 2017
@@ -0,0 +1,6 @@
+-BEGIN PGP SIGNATURE-
+
+iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWYwtmAAKCRCQVII6hZpy
+N6Y6AJsHg6z05twwin3w5twK4IOPRvUmBgCfersa4zzPBfJ5aR3KE5jLol8kCmw=
+=PoLZ
+-END PGP SIGNATURE-

Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5
==
--- release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5 (added)
+++ release/sling/org.apache.sling.event-4.2.6-source-release.zip.md5 Tue Aug 
15 22:16:39 2017
@@ -0,0 +1 @@
+79003b87cf9f0830e649bc7e2263a1a0
\ No newline at end of file

Added: release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1
==
--- release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1 (added)
+++ release/sling/org.apache.sling.event-4.2.6-source-release.zip.sha1 Tue Aug 
15 22:16:39 2017
@@ -0,0 +1 @@
+d4fdbd8b904b6b94ca61bd9d255caeb2d447a736
\ No newline at end of file

Added: release/sling/org.apache.sling.event-4.2.6-sources.jar
==
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.event-4.2.6-sources.jar
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.event-4.2.6-sources.jar.asc
==
--- release/sling/org.apache.sling.event-4.2.6-sources.jar.asc (added)
+++ release/sling/org.apache.sling.event-4.2.6-sources.jar.asc Tue Aug 15 
22:16:39 2017
@@ -0,0 +1,6 @@
+-BEGIN PGP SIGNATURE-
+
+iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWYwtmAAKCRCQVII6hZpy
+N1K4AKCyslLohK2UGm1CCqHgg9wugnuengCfaklK3qYYf5hnPyq0MV8rKybze44=
+=xjdq
+-END PGP SIGNATURE-

Added:

Build failed in Jenkins: sling-bundles-extensions-repoinit-parser-1.8 #16

2017-08-15 Thread Apache Jenkins Server

See 


--
[...truncated 32.84 KB...]
at 
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgUpdate.run(SvnNgUpdate.java:18)
at 
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner.run(SvnNgOperationRunner.java:20)
at 
org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:21)
at 
org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235)
at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:294)
at 
org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:311)
at 
org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:291)
at 
org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:387)
at 
hudson.scm.subversion.UpdateUpdater$TaskImpl.perform(UpdateUpdater.java:158)
Caused: hudson.scm.subversion.UpdaterException: failed to perform svn update
at 
hudson.scm.subversion.UpdateUpdater$TaskImpl.perform(UpdateUpdater.java:212)
at 
hudson.scm.subversion.WorkspaceUpdater$UpdateTask.delegateTo(WorkspaceUpdater.java:162)
at 
hudson.scm.SubversionSCM$CheckOutTask.perform(SubversionSCM.java:1001)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:977)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:953)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2739)
at hudson.remoting.UserRequest.perform(UserRequest.java:153)
at hudson.remoting.UserRequest.perform(UserRequest.java:50)
at hudson.remoting.Request$2.run(Request.java:336)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:748)
Caused: java.io.IOException
at 
hudson.scm.subversion.UpdateUpdater$TaskImpl.perform(UpdateUpdater.java:212)
at 
hudson.scm.subversion.WorkspaceUpdater$UpdateTask.delegateTo(WorkspaceUpdater.java:162)
at 
hudson.scm.SubversionSCM$CheckOutTask.perform(SubversionSCM.java:1001)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:977)
at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:953)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2739)
at hudson.remoting.UserRequest.perform(UserRequest.java:153)
at hudson.remoting.UserRequest.perform(UserRequest.java:50)
at hudson.remoting.Request$2.run(Request.java:336)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:748)
at ..remote call to H21(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1545)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:253)
at hudson.remoting.Channel.call(Channel.java:830)
at hudson.FilePath.act(FilePath.java:986)
Caused: java.io.IOException: remote file operation failed: 

 at hudson.remoting.Channel@4b715ff3:H21
at hudson.FilePath.act(FilePath.java:993)
at hudson.FilePath.act(FilePath.java:975)
at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:902)
at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:838)
at hudson.scm.SCM.checkout(SCM.java:495)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1276)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:560)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:485)
at hudson.model.Run.execute(Run.java:1735)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:542)
at hudson.model.ResourceController.execute(ResourceController.java:97)
at hudson.model.Executor.run(Executor.java:405)
Retrying after 10 seconds
Updating 
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/parser 
at revision '2017-08-15T15:16:33.195 +'
ERROR: Failed to update 
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/repoinit/parser
org.tmatesoft.svn.core.SVNException:

svn commit: r1805085 - in /sling/trunk/bundles/extensions/repoinit/parser: pom.xml src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java

2017-08-15 Thread cziegeler

Author: cziegeler
Date: Tue Aug 15 15:14:59 2017
New Revision: 1805085

URL: http://svn.apache.org/viewvc?rev=1805085=rev
Log:
Add service vendor

Modified:
sling/trunk/bundles/extensions/repoinit/parser/pom.xml

sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java

Modified: sling/trunk/bundles/extensions/repoinit/parser/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/pom.xml?rev=1805085=1805084=1805085=diff
==
--- sling/trunk/bundles/extensions/repoinit/parser/pom.xml (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/pom.xml Tue Aug 15 15:14:59 
2017
@@ -82,17 +82,22 @@
 
 
   
-  
-  
-
-  junit
-  junit
-
-
-  commons-io
-  commons-io
-  2.4
-  test
-
-  
+
+
+
+org.osgi
+osgi.core
+
+  
+
+junit
+junit
+
+
+commons-io
+commons-io
+2.4
+test
+
+
 

Modified: 
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java?rev=1805085=1805084=1805085=diff
==
--- 
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
 (original)
+++ 
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
 Tue Aug 15 15:14:59 2017
@@ -25,10 +25,14 @@ import java.util.List;
 import org.apache.sling.repoinit.parser.RepoInitParser;
 import org.apache.sling.repoinit.parser.RepoInitParsingException;
 import org.apache.sling.repoinit.parser.operations.Operation;
+import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
 
 /** ACL definitions parser service */
-@Component(service=RepoInitParser.class)
+@Component(service=RepoInitParser.class,
+property = {
+Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
+})
 public class RepoInitParserService implements RepoInitParser {
 
 @Override

svn commit: r1805082 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

2017-08-15 Thread cziegeler

Author: cziegeler
Date: Tue Aug 15 14:28:59 2017
New Revision: 1805082

URL: http://svn.apache.org/viewvc?rev=1805082=rev
Log:
Clean up repoinit content

Modified:

sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

Modified: 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1805082=1805081=1805082=diff
==
--- 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 Tue Aug 15 14:28:59 2017
@@ -20,6 +20,8 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -63,7 +65,6 @@ import org.apache.sling.provisioning.mod
 import org.apache.sling.provisioning.model.Section;
 import org.apache.sling.provisioning.model.Traceable;
 import org.apache.sling.provisioning.model.io.ModelReader;
-import org.osgi.framework.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -83,6 +84,8 @@ public class Main {
 
 private static String repoUrls;
 
+private static String propsFile;
+
 /**
  * Parse the command line parameters and update a configuration object.
  * @param args Command line parameters
@@ -93,6 +96,7 @@ public class Main {
 
 final Option repoOption =  new Option("u", true, "Set repository url");
 final Option modelOption =  new Option("f", true, "Set feature 
files/directories");
+final Option propsOption =  new Option("p", true, "sling.properties 
file");
 final Option runModeOption =  new Option("r", true, "Set run modes 
(comma separated)");
 final Option createAppOption = new Option("a", false, "If enabled, 
create application json");
 createAppOption.setArgs(0);
@@ -104,6 +108,7 @@ public class Main {
 options.addOption(createAppOption);
 options.addOption(outputOption);
 options.addOption(includeModelOption);
+options.addOption(propsOption);
 
 final CommandLineParser clp = new BasicParser();
 try {
@@ -127,6 +132,9 @@ public class Main {
 if ( cl.hasOption(outputOption.getOpt()) ) {
 output = cl.getOptionValue(outputOption.getOpt());
 }
+if ( cl.hasOption(propsOption.getOpt()) ) {
+propsFile = cl.getOptionValue(propsOption.getOpt());
+}
 } catch ( final ParseException pe) {
 LOGGER.error("Unable to parse command line: {}", pe.getMessage(), 
pe);
 System.exit(1);
@@ -218,10 +226,16 @@ public class Main {
 buildFromFeature(feature, app.getBundles(), 
app.getConfigurations(), app.getExtensions(), app.getFrameworkProperties());
 }
 
-// TODO - parse launchpad base to get sling.properties
-// hard coded for now
+// hard coded dependency to launchpad api
+app.getBundles().add(1, new 
org.apache.sling.feature.Artifact(ArtifactId.fromMvnId("org.apache.sling/org.apache.sling.launchpad.api/1.2.0")));
+// sling.properties (TODO)
+if ( propsFile == null ) {
+
app.getFrameworkProperties().put("org.osgi.framework.bootdelegation", 
"sun.*,com.sun.*");
+} else {
+
+}
+// felix framework hard coded for now
 app.setFramework(FeatureUtil.getFelixFrameworkId(null));
-
app.getFrameworkProperties().put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, 
"org.apache.sling.launchpad.api;version=\"1.2.0\"");
 return app;
 }
 
@@ -291,6 +305,30 @@ public class Main {
 repoExtension.setText(repoExtension.getText() + "\n\n" + text);
 }
 }
+if ( repoExtension != null ) {
+// remove trailing comments and empty lines
+final List lines = new ArrayList<>();
+try ( final LineNumberReader lnr = new LineNumberReader(new 
StringReader(repoExtension.getText( {
+String line = null;
+while ( (line = lnr.readLine()) != null ) {
+lines.add(line);
+}
+} catch ( final IOException ioe ) {
+LOGGER.error("Unable to read repoinit", ioe);
+System.exit(1);
+}
+int index = lines.size() - 1;
+while ( index >= 0 ) {
+final String line = lines.get(index).trim();
+

svn commit: r1805079 - in /sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl: FeatureProcessor.java Main.java

2017-08-15 Thread cziegeler

Author: cziegeler
Date: Tue Aug 15 13:32:51 2017
New Revision: 1805079

URL: http://svn.apache.org/viewvc?rev=1805079=rev
Log:
Fix application launching and add missing support for framework properties

Modified:

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java

Modified: 
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java?rev=1805079=1805078=1805079=diff
==
--- 
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
 Tue Aug 15 13:32:51 2017
@@ -16,6 +16,13 @@
  */
 package org.apache.sling.feature.launcher.impl;
 
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Configuration;
@@ -28,13 +35,6 @@ import org.apache.sling.feature.support.
 import org.apache.sling.feature.support.json.ApplicationJSONReader;
 import org.apache.sling.feature.support.json.ApplicationJSONWriter;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
 public class FeatureProcessor {
 
 /**
@@ -94,6 +94,7 @@ public class FeatureProcessor {
 config.getInstallation().addBundle(entry.getKey(), 
artifactFile);
 }
 }
+int index = 1;
 for(final Extension ext : app.getExtensions()) {
 if ( ext.getType() == ExtensionType.ARTIFACTS ) {
 for(final Artifact a : ext.getArtifacts() ) {
@@ -103,6 +104,20 @@ public class FeatureProcessor {
 final ArtifactHandler handler = 
artifactManager.getArtifactHandler(":" + a.getId().toMvnPath());
 
config.getInstallation().addInstallableArtifact(handler.getFile());
 }
+} else {
+if ( ext.getName().equals(Extension.NAME_REPOINIT) ) {
+if ( ext.getType() != ExtensionType.TEXT ) {
+throw new Exception(Extension.NAME_REPOINIT + " 
extension must be of type text and not json");
+}
+final Configuration cfg = new 
Configuration("org.apache.sling.jcr.repoinit.RepositoryInitializer", "repoinit" 
+ String.valueOf(index));
+index++;
+cfg.getProperties().put("scripts", ext.getText());
+config.getInstallation().addConfiguration(cfg.getName(), 
cfg.getFactoryPid(), cfg.getProperties());
+} else {
+if ( ext.isRequired() ) {
+throw new Exception("Unknown required extension " + 
ext.getName());
+}
+}
 }
 }
 
@@ -113,5 +128,11 @@ public class FeatureProcessor {
 config.getInstallation().addConfiguration(cfg.getPid(), null, 
cfg.getProperties());
 }
 }
+
+for(final Map.Entry prop : 
app.getFrameworkProperties()) {
+if ( 
!config.getInstallation().getFrameworkProperties().containsKey(prop.getKey()) ) 
{
+
config.getInstallation().getFrameworkProperties().put(prop.getKey(), 
prop.getValue());
+}
+}
 }
 }

Modified: 
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java?rev=1805079=1805078=1805079=diff
==
--- 
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
 Tue Aug 15 13:32:51 2017
@@ -16,6 +16,15 @@
  */
 package org.apache.sling.feature.launcher.impl;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.cli.BasicParser;
 import org.apache.commons.cli.CommandLine;

svn commit: r1805076 - in /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json: ApplicationJSONReader.java FeatureJSONReader.java JSONReaderBase.java

2017-08-15 Thread cziegeler

Author: cziegeler
Date: Tue Aug 15 13:06:02 2017
New Revision: 1805076

URL: http://svn.apache.org/viewvc?rev=1805076=rev
Log:
Add missing read of framework id

Modified:

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java

Modified: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java?rev=1805076=1805075=1805076=diff
==
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java
 Tue Aug 15 13:06:02 2017
@@ -16,16 +16,18 @@
  */
 package org.apache.sling.feature.support.json;
 
-import org.apache.felix.configurator.impl.json.JSONUtil;
-import org.apache.sling.feature.Application;
-
-import javax.json.Json;
-import javax.json.JsonObject;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Map;
 
+import javax.json.Json;
+import javax.json.JsonObject;
+
+import org.apache.felix.configurator.impl.json.JSONUtil;
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.ArtifactId;
+
 /**
  * This class offers a method to read an {@code Application} using a {@code 
Reader} instance.
  */
@@ -73,6 +75,10 @@ public class ApplicationJSONReader exten
 @SuppressWarnings("unchecked")
 final Map map = (Map) 
JSONUtil.getValue(json);
 
+final String frameworkId = this.getProperty(map, 
JSONConstants.APP_FRAMEWORK);
+if ( frameworkId != null ) {
+app.setFramework(ArtifactId.fromMvnId(frameworkId));
+}
 this.readBundles(map, app.getBundles(), app.getConfigurations());
 this.readFrameworkProperties(map, app.getFrameworkProperties());
 this.readConfigurations(map, app.getConfigurations());

Modified: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java?rev=1805076=1805075=1805076=diff
==
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
 Tue Aug 15 13:06:02 2017
@@ -16,15 +16,10 @@
  */
 package org.apache.sling.feature.support.json;
 
-import org.apache.felix.configurator.impl.json.JSONUtil;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Capability;
-import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.Include;
-import org.apache.sling.feature.Requirement;
+import static 
org.apache.sling.feature.support.util.LambdaUtil.rethrowBiConsumer;
+import static 
org.apache.sling.feature.support.util.ManifestUtil.unmarshalAttribute;
+import static 
org.apache.sling.feature.support.util.ManifestUtil.unmarshalDirective;
 
-import javax.json.Json;
-import javax.json.JsonObject;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
@@ -32,9 +27,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static 
org.apache.sling.feature.support.util.LambdaUtil.rethrowBiConsumer;
-import static 
org.apache.sling.feature.support.util.ManifestUtil.unmarshalAttribute;
-import static 
org.apache.sling.feature.support.util.ManifestUtil.unmarshalDirective;
+import javax.json.Json;
+import javax.json.JsonObject;
+
+import org.apache.felix.configurator.impl.json.JSONUtil;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.Include;
+import org.apache.sling.feature.Requirement;
 
 /**
  * This class offers a method to read a {@code Feature} using a {@code Reader} 
instance.
@@ -157,15 +158,6 @@ public class FeatureJSONReader extends J
 return feature;
 }
 
-private String getProperty(final Map map, final String 
key) throws IOException {
-final Object val = map.get(key);
-if ( val != null ) {
-

svn commit: r1805075 - in /sling/trunk/bundles/jcr/repoinit/src: main/java/org/apache/sling/jcr/repoinit/impl/ test/java/org/apache/sling/jcr/repoinit/

2017-08-15 Thread cziegeler

Author: cziegeler
Date: Tue Aug 15 12:49:53 2017
New Revision: 1805075

URL: http://svn.apache.org/viewvc?rev=1805075=rev
Log:
Minor clean up and add missing vendor to service

Modified:

sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java

sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java

sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java

sling/trunk/bundles/jcr/repoinit/src/test/java/org/apache/sling/jcr/repoinit/GeneralAclTest.java

Modified: 
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java?rev=1805075=1805074=1805075=diff
==
--- 
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java
 (original)
+++ 
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java
 Tue Aug 15 12:49:53 2017
@@ -27,7 +27,6 @@ import java.util.Set;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
 import javax.jcr.ValueFactory;
 import javax.jcr.security.AccessControlEntry;
@@ -39,11 +38,8 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import 
org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
-
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
-
 import org.apache.sling.repoinit.parser.operations.RestrictionClause;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,8 +67,8 @@ public class AclUtil {
  * @throws RepositoryException
  */
 private static LocalRestrictions 
createLocalRestrictions(List list, 
JackrabbitAccessControlList jacl, Session s) throws RepositoryException {
-Map restrictions = new HashMap();
-Map mvrestrictions = new HashMap();
+Map restrictions = new HashMap<>();
+Map mvrestrictions = new HashMap<>();
 
 if(list != null && !list.isEmpty()){
 ValueFactory vf = s.getValueFactory();
@@ -146,7 +142,7 @@ public class AclUtil {
 if ( changed ) {
 getJACM(session).setPolicy(path, acl);
 }
-
+
 }
 }
 
@@ -200,7 +196,7 @@ public class AclUtil {
  * Helper class which allows easy comparison of a local (proposed) access 
control entry with an existing one
  */
 static class LocalAccessControlEntry {
-
+
 private final Principal principal;
 private final Privilege[] privileges;
 private final boolean isAllow;
@@ -216,7 +212,7 @@ public class AclUtil {
 this.isAllow = isAllow;
 this.restrictions = restrictions != null ? restrictions : new 
LocalRestrictions();
 }
-
+
 public boolean isContainedIn(JackrabbitAccessControlEntry other) 
throws RepositoryException {
 return other.getPrincipal().equals(principal) &&
 contains(other.getPrivileges(), privileges) &&
@@ -270,12 +266,12 @@ public class AclUtil {
 private boolean contains(Privilege[] first, Privilege[] second) {
 // we need to ensure that the privilege order is not taken into 
account, so we use sets
 Set set1 = expandPrivileges(first);
-
+
 Set set2 = expandPrivileges(second);
-
+
 return set1.containsAll(set2);
 }
-
+
 @Override
 public String toString() {
 return "[" + getClass().getSimpleName() + "# principal " + 
principal+ ", privileges: " + Arrays.toString(privileges) + ", isAllow : " + 
isAllow + "]";

Modified: 
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java?rev=1805075=1805074=1805075=diff
==
--- 
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java
 (original)
+++ 
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java
 Tue Aug 15 12:49:53 2017
@@ -23,12 +23,16 @@ import javax.jcr.Session;
 import

svn commit: r1805071 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

2017-08-15 Thread cziegeler

Author: cziegeler
Date: Tue Aug 15 12:36:00 2017
New Revision: 1805071

URL: http://svn.apache.org/viewvc?rev=1805071=rev
Log:
Add support for repoinit

Modified:

sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

Modified: 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1805071=1805070=1805071=diff
==
--- 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 Tue Aug 15 12:36:00 2017
@@ -46,6 +46,7 @@ import org.apache.sling.feature.KeyValue
 import org.apache.sling.feature.support.ArtifactHandler;
 import org.apache.sling.feature.support.ArtifactManager;
 import org.apache.sling.feature.support.ArtifactManagerConfig;
+import org.apache.sling.feature.support.FeatureUtil;
 import org.apache.sling.feature.support.json.ApplicationJSONWriter;
 import org.apache.sling.feature.support.json.FeatureJSONWriter;
 import org.apache.sling.provisioning.model.Artifact;
@@ -59,6 +60,7 @@ import org.apache.sling.provisioning.mod
 import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
 import org.apache.sling.provisioning.model.ModelUtility.VariableResolver;
 import org.apache.sling.provisioning.model.RunMode;
+import org.apache.sling.provisioning.model.Section;
 import org.apache.sling.provisioning.model.Traceable;
 import org.apache.sling.provisioning.model.io.ModelReader;
 import org.osgi.framework.Constants;
@@ -218,9 +220,7 @@ public class Main {
 
 // TODO - parse launchpad base to get sling.properties
 // hard coded for now
-app.setFramework(new ArtifactId("org.apache.felix",
-"org.apache.felix.framework",
-"5.6.4", null, null));
+app.setFramework(FeatureUtil.getFelixFrameworkId(null));
 
app.getFrameworkProperties().put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, 
"org.apache.sling.launchpad.api;version=\"1.2.0\"");
 return app;
 }
@@ -230,7 +230,7 @@ public class Main {
 final Configurations configurations,
 final Extensions extensions,
 final KeyValueMap properties) {
-Extension cpExtension = extensions.getByName("content-packages");
+Extension cpExtension = 
extensions.getByName(Extension.NAME_CONTENT_PACKAGES);
 for(final RunMode runMode : feature.getRunModes() ) {
 if ( !ModelConstants.FEATURE_LAUNCHPAD.equals(feature.getName()) ) 
{
 for(final ArtifactGroup group : runMode.getArtifactGroups()) {
@@ -244,7 +244,7 @@ public class Main {
 
 if ( newArtifact.getId().getType().equals("zip") ) {
 if ( cpExtension == null ) {
-cpExtension = new 
Extension(ExtensionType.ARTIFACTS, "content-packages", true);
+cpExtension = new 
Extension(ExtensionType.ARTIFACTS, Extension.NAME_CONTENT_PACKAGES, true);
 extensions.add(cpExtension);
 }
 cpExtension.getArtifacts().add(newArtifact);
@@ -280,6 +280,17 @@ public class Main {
 properties.put(prop.getKey(), prop.getValue());
 }
 }
+Extension repoExtension = 
extensions.getByName(Extension.NAME_REPOINIT);
+for(final Section sect : feature.getAdditionalSections("repoinit")) {
+final String text = sect.getContents();
+if ( repoExtension == null ) {
+repoExtension = new Extension(ExtensionType.TEXT, 
Extension.NAME_REPOINIT, true);
+extensions.add(repoExtension);
+repoExtension.setText(text);
+} else {
+repoExtension.setText(repoExtension.getText() + "\n\n" + text);
+}
+}
 }
 
 private static void writeApplication(final Application app, final String 
out) {

svn commit: r1805120 - /sling/trunk/launchpad/builder/src/main/provisioning/sling-event.txt

svn commit: r1016854 - /websites/production/sling/content/

svn commit: r1016853 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html

svn commit: r1805118 - in /sling/site/trunk/content: downloads.list news.mdtext

Nexus: Promotion Completed

svn commit: r21178 - /release/sling/

Build failed in Jenkins: sling-bundles-extensions-repoinit-parser-1.8 #16

svn commit: r1805085 - in /sling/trunk/bundles/extensions/repoinit/parser: pom.xml src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java

svn commit: r1805082 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

svn commit: r1805079 - in /sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl: FeatureProcessor.java Main.java

svn commit: r1805076 - in /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json: ApplicationJSONReader.java FeatureJSONReader.java JSONReaderBase.java

svn commit: r1805075 - in /sling/trunk/bundles/jcr/repoinit/src: main/java/org/apache/sling/jcr/repoinit/impl/ test/java/org/apache/sling/jcr/repoinit/

svn commit: r1805071 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

13 matches

Site Navigation

Mail list logo

Footer information