Author: olli
Date: Fri Jul 24 12:18:44 2015
New Revision: 1692488
URL: http://svn.apache.org/r1692488
Log:
add profile for launchpad
Modified:
sling/trunk/samples/fling/README.md
sling/trunk/samples/fling/pom.xml
Modified: sling/trunk/samples/fling/README.md
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/fling/README.md?rev=1692488&r1=1692487&r2=1692488&view=diff
==============================================================================
--- sling/trunk/samples/fling/README.md (original)
+++ sling/trunk/samples/fling/README.md Fri Jul 24 12:18:44 2015
@@ -14,11 +14,19 @@ Additional features used in this sample:
* [Content
Loading](http://sling.apache.org/documentation/bundles/content-loading-jcr-contentloader.html):
see `Sling-Initial-Content` in `pom.xml`
* [Maven Sling
Plugin](http://sling.apache.org/documentation/development/sling.html): see
`maven-sling-plugin` in `pom.xml`
-Run `mvn clean install -P localhost` in this directory to install the sample
with _Maven Sling Plugin_ into a running local _Sling_ instance listening on
port `8181`.
+There are two profiles to install this sample with _Maven Sling Plugin_ into a
running local _Sling_ instance for convenience:
+
+When using _[Sling
Launchpad](https://sling.apache.org/documentation/the-sling-engine/the-sling-launchpad.html)_
listening on port `8080` with default admin credentials run:
+
+ mvn clean install -P launchpad@localhost
+
+When using _[Apache Karaf](http://karaf.apache.org)_ with _[Sling Karaf
Launchpad](https://github.com/apache/sling/tree/trunk/contrib/launchpad/karaf)_
listening on port `8181` with default admin credentials run:
+
+ mvn clean install -P karaf@localhost
This will install initial content under `/apps/fling`, `/content/fling` and
`/etc/i18n/org.apache.sling.samples.fling`.
-Browse to http://localhost:8181/fling.html
+Browse to [http://localhost:8080/fling.html](http://localhost:8080/fling.html)
or [http://localhost:8181/fling.html](http://localhost:8181/fling.html).
To install the required bundles/features on _Apache Karaf_ run the commands
below:
Modified: sling/trunk/samples/fling/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/fling/pom.xml?rev=1692488&r1=1692487&r2=1692488&view=diff
==============================================================================
--- sling/trunk/samples/fling/pom.xml (original)
+++ sling/trunk/samples/fling/pom.xml Fri Jul 24 12:18:44 2015
@@ -105,6 +105,15 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ <version>2.1.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -141,13 +150,36 @@
<profiles>
<profile>
+ <id>launchpad@localhost</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <configuration>
+
<slingUrl>http://localhost:8080/system/console/install</slingUrl>
+ <user>admin</user>
+ <password>admin</password>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>karaf@localhost</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
<executions>
<execution>
<phase>install</phase>
