svn commit: r936169 - /sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
Author: fmeschbe
Date: Wed Apr 21 06:23:44 2010
New Revision: 936169
URL: http://svn.apache.org/viewvc?rev=936169view=rev
Log:
SLING-1493 Prevent binding to an authentication handler which cannot be accessed
Modified:
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
Modified:
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java?rev=936169r1=936168r2=936169view=diff
==
---
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
(original)
+++
sling/trunk/bundles/commons/auth/src/main/java/org/apache/sling/commons/auth/impl/SlingAuthenticator.java
Wed Apr 21 06:23:44 2010
@@ -1325,14 +1325,18 @@ public class SlingAuthenticator implemen
@Override
public Object addingService(ServiceReference reference) {
final Object service = super.addingService(reference);
-bindAuthHandler(service, reference);
+if (service != null) {
+bindAuthHandler(service, reference);
+}
return service;
}
@Override
public void modifiedService(ServiceReference reference, Object
service) {
unbindAuthHandler(reference);
-bindAuthHandler(service, reference);
+if (service != null) {
+bindAuthHandler(service, reference);
+}
}
@Override
svn commit: r936201 - /sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
Author: cziegeler Date: Wed Apr 21 08:34:51 2010 New Revision: 936201 URL: http://svn.apache.org/viewvc?rev=936201view=rev Log: Clarify javadoc Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java?rev=936201r1=936200r2=936201view=diff == --- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java (original) +++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java Wed Apr 21 08:34:51 2010 @@ -36,6 +36,12 @@ import org.apache.sling.api.adapter.Adap * adapters to other types. A JCR based resource resolver might support adapting * to the JCR Session used by the resolver to access the JCR Repository. * p + * A codeResourceResolver/code is generally not thread safe! As a consequence, + * an application which uses the resolver, its returned resources and/or objects + * resulting from adapting either the resolver or a resource, must provide + * proper synchronization to ensure no more than one thread concurrently operates + * against a single resolver, resource or resulting objects. + * p * This interface defines two kinds of methods to access resources: The * coderesolve/code methods and the codegetResource/code methods. The * difference lies in the algorithm applied to find the requested resource and
svn commit: r936202 - /sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
Author: cziegeler Date: Wed Apr 21 08:38:06 2010 New Revision: 936202 URL: http://svn.apache.org/viewvc?rev=936202view=rev Log: Correct javadoc Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java?rev=936202r1=936201r2=936202view=diff == --- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java (original) +++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java Wed Apr 21 08:38:06 2010 @@ -53,8 +53,8 @@ public class ResourceMetadata extends Ha * p * This property is optional. If missing, it should be assumed equal to an * empty string. - * - * @since 2.0.3-incubator-SNAPSHOT + * + * @since 2.0.4 */ public static final String RESOLUTION_PATH_INFO = sling.resolutionPathInfo;
svn commit: r936287 - in /sling/trunk/bundles/extensions/event/src: main/java/org/apache/sling/event/ main/java/org/apache/sling/event/impl/ main/java/org/apache/sling/event/impl/job/ test/java/org/ap
Author: cziegeler
Date: Wed Apr 21 12:44:53 2010
New Revision: 936287
URL: http://svn.apache.org/viewvc?rev=936287view=rev
Log:
SLING-1494 : Update to JCR 2 API
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventPropertiesMap.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/EventHelper.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/job/JobBlockingQueue.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/JobEventHandlerTest.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventPropertiesMap.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventPropertiesMap.java?rev=936287r1=936286r2=936287view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventPropertiesMap.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventPropertiesMap.java
Wed Apr 21 12:44:53 2010
@@ -38,6 +38,8 @@ public class EventPropertiesMap
extends DictionaryString, Object
implements MapString, Object, Serializable {
+private static final long serialVersionUID = 835179638502569708L;
+
private final MapString, Object delegatee;
/**
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java?rev=936287r1=936286r2=936287view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
Wed Apr 21 12:44:53 2010
@@ -27,13 +27,13 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.observation.EventIterator;
import javax.jcr.query.Query;
+import javax.jcr.query.qom.QueryObjectModelFactory;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
-import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.commons.osgi.OsgiUtil;
import org.apache.sling.event.EventUtil;
import org.osgi.service.component.ComponentContext;
@@ -83,24 +83,26 @@ public class DistributingEventHandler
}
/**
- * Return the query string for the clean up.
+ * Return the query for the clean up.
*/
-protected String getCleanUpQueryString() {
+protected Query getCleanUpQuery(final Session s)
+throws RepositoryException {
+final String selectorName = nodetype;
final Calendar deleteBefore = Calendar.getInstance();
deleteBefore.add(Calendar.MINUTE, -this.cleanupPeriod);
-final String dateString = ISO8601.format(deleteBefore);
-final StringBuilder buffer = new StringBuilder(/jcr:root);
-buffer.append(this.repositoryPath);
-buffer.append(//element(*, );
-buffer.append(getEventNodeType());
-buffer.append()[@);
-buffer.append(EventHelper.NODE_PROPERTY_CREATED);
-buffer.append( xs:dateTime(');
-buffer.append(dateString);
-buffer.append(')]);
+final QueryObjectModelFactory qomf =
s.getWorkspace().getQueryManager().getQOMFactory();
-return buffer.toString();
+final Query q = qomf.createQuery(
+qomf.selector(getEventNodeType(), selectorName),
+qomf.and(qomf.descendantNode(selectorName,
this.repositoryPath),
+ qomf.comparison(qomf.propertyValue(selectorName,
EventHelper.NODE_PROPERTY_CREATED),
+
QueryObjectModelFactory.JCR_OPERATOR_LESS_THAN,
+
qomf.literal(s.getValueFactory().createValue(deleteBefore,
+null,
+null
+);
+return q;
}
/**
@@ -111,14 +113,14 @@ public class DistributingEventHandler
if ( this.cleanupPeriod 0 ) {
this.logger.debug(Cleaning up repository, removing all entries
older than {} minutes.,
svn commit: r936303 - /sling/trunk/bundles/commons/osgi/pom.xml
Author: justin Date: Wed Apr 21 13:53:20 2010 New Revision: 936303 URL: http://svn.apache.org/viewvc?rev=936303view=rev Log: formatting Modified: sling/trunk/bundles/commons/osgi/pom.xml Modified: sling/trunk/bundles/commons/osgi/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi/pom.xml?rev=936303r1=936302r2=936303view=diff == --- sling/trunk/bundles/commons/osgi/pom.xml (original) +++ sling/trunk/bundles/commons/osgi/pom.xml Wed Apr 21 13:53:20 2010 @@ -111,20 +111,20 @@ groupIdorg.jmock/groupId artifactIdjmock-junit4/artifactId /dependency - dependency - !-- Not used by our code, but need a non-bundle jar for unit tests -- - groupIdjavax.jcr/groupId - artifactIdjcr/artifactId - version1.0/version - scopetest/scope - /dependency - dependency - !-- Not used by our code, but need a bundle jar for unit tests -- - groupIdorg.apache.sling/groupId - artifactIdorg.apache.sling.api/artifactId - version2.0.6/version - scopetest/scope - /dependency +dependency +!-- Not used by our code, but need a non-bundle jar for unit tests -- +groupIdjavax.jcr/groupId +artifactIdjcr/artifactId +version1.0/version +scopetest/scope +/dependency +dependency +!-- Not used by our code, but need a bundle jar for unit tests -- +groupIdorg.apache.sling/groupId +artifactIdorg.apache.sling.api/artifactId +version2.0.6/version +scopetest/scope +/dependency /dependencies /project
svn commit: r936307 - /sling/trunk/bundles/commons/osgi/pom.xml
Author: justin Date: Wed Apr 21 13:56:30 2010 New Revision: 936307 URL: http://svn.apache.org/viewvc?rev=936307view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/commons/osgi/pom.xml Modified: sling/trunk/bundles/commons/osgi/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi/pom.xml?rev=936307r1=936306r2=936307view=diff == --- sling/trunk/bundles/commons/osgi/pom.xml (original) +++ sling/trunk/bundles/commons/osgi/pom.xml Wed Apr 21 13:56:30 2010 @@ -28,16 +28,16 @@ /parent artifactIdorg.apache.sling.commons.osgi/artifactId -version2.0.6/version +version2.0.7-SNAPSHOT/version packagingbundle/packaging nameApache Sling Commons OSGi support/name descriptionCommons OSGi/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.osgi-2.0.6/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.osgi-2.0.6/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.osgi-2.0.6/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/osgi/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi/url /scm properties
svn commit: r936306 - /sling/tags/org.apache.sling.commons.osgi-2.0.6/
Author: justin Date: Wed Apr 21 13:56:28 2010 New Revision: 936306 URL: http://svn.apache.org/viewvc?rev=936306view=rev Log: [maven-scm] copy for tag org.apache.sling.commons.osgi-2.0.6 Added: sling/tags/org.apache.sling.commons.osgi-2.0.6/ - copied from r936305, sling/trunk/bundles/commons/osgi/
svn commit: r936308 - /sling/trunk/launchpad/base/pom.xml
Author: justin Date: Wed Apr 21 14:07:16 2010 New Revision: 936308 URL: http://svn.apache.org/viewvc?rev=936308view=rev Log: updating to released commons osgi Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=936308r1=936307r2=936308view=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Wed Apr 21 14:07:16 2010 @@ -254,7 +254,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.osgi/artifactId -version2.0.5-SNAPSHOT/version +version2.0.6/version scopeprovided/scope /dependency dependency
svn commit: r936311 - /sling/tags/org.apache.sling.launchpad.base-2.2.0/
Author: justin Date: Wed Apr 21 14:09:55 2010 New Revision: 936311 URL: http://svn.apache.org/viewvc?rev=936311view=rev Log: [maven-scm] copy for tag org.apache.sling.launchpad.base-2.2.0 Added: sling/tags/org.apache.sling.launchpad.base-2.2.0/ (props changed) - copied from r936310, sling/trunk/launchpad/base/ Propchange: sling/tags/org.apache.sling.launchpad.base-2.2.0/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 21 14:09:55 2010 @@ -0,0 +1,14 @@ +target +sling +bin +logs +jackrabbit-repository +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml Propchange: sling/tags/org.apache.sling.launchpad.base-2.2.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Apr 21 14:09:55 2010 @@ -0,0 +1 @@ +/incubator/sling/whiteboard/fmeschbe/launchpad/base:734114-735986
svn commit: r936312 - /sling/trunk/launchpad/base/pom.xml
Author: justin Date: Wed Apr 21 14:09:58 2010 New Revision: 936312 URL: http://svn.apache.org/viewvc?rev=936312view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/launchpad/base/pom.xml Modified: sling/trunk/launchpad/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=936312r1=936311r2=936312view=diff == --- sling/trunk/launchpad/base/pom.xml (original) +++ sling/trunk/launchpad/base/pom.xml Wed Apr 21 14:09:58 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.launchpad.base/artifactId -version2.2.0/version +version2.2.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling Launchpad Base/name @@ -42,9 +42,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-2.2.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-2.2.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.base-2.2.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base/developerConnection +urlhttp://svn.apache.org/viewvc/sling/trunk/launchpad/base/url /scm build
svn commit: r936355 - /sling/trunk/maven/maven-launchpad-plugin/pom.xml
Author: justin Date: Wed Apr 21 15:34:57 2010 New Revision: 936355 URL: http://svn.apache.org/viewvc?rev=936355view=rev Log: updating to released launchpad base Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/pom.xml?rev=936355r1=936354r2=936355view=diff == --- sling/trunk/maven/maven-launchpad-plugin/pom.xml (original) +++ sling/trunk/maven/maven-launchpad-plugin/pom.xml Wed Apr 21 15:34:57 2010 @@ -130,12 +130,12 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.launchpad.base/artifactId -version2.1.1-SNAPSHOT/version +version2.2.0/version /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.launchpad.base/artifactId -version2.1.1-SNAPSHOT/version +version2.2.0/version classifierapp/classifier /dependency dependency
svn commit: r936357 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: justin Date: Wed Apr 21 15:38:51 2010 New Revision: 936357 URL: http://svn.apache.org/viewvc?rev=936357view=rev Log: reverting too-soon change to bundle list Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=936357r1=936356r2=936357view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Apr 21 15:38:51 2010 @@ -25,7 +25,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.osgi/artifactId -version2.0.6/version +version2.0.5-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r936358 - /sling/trunk/maven/maven-launchpad-plugin/pom.xml
Author: justin Date: Wed Apr 21 15:40:25 2010 New Revision: 936358 URL: http://svn.apache.org/viewvc?rev=936358view=rev Log: reformatting pom Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/pom.xml?rev=936358r1=936357r2=936358view=diff == --- sling/trunk/maven/maven-launchpad-plugin/pom.xml (original) +++ sling/trunk/maven/maven-launchpad-plugin/pom.xml Wed Apr 21 15:40:25 2010 @@ -11,8 +11,7 @@ either express or implied. See the License for the specific language governing permissions and limitations under the License. -- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; -xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion parent
svn commit: r936360 - /sling/trunk/maven/maven-launchpad-plugin/pom.xml
Author: justin Date: Wed Apr 21 15:42:21 2010 New Revision: 936360 URL: http://svn.apache.org/viewvc?rev=936360view=rev Log: [maven-release-plugin] prepare release maven-launchpad-plugin-2.0.6 Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/pom.xml?rev=936360r1=936359r2=936360view=diff == --- sling/trunk/maven/maven-launchpad-plugin/pom.xml (original) +++ sling/trunk/maven/maven-launchpad-plugin/pom.xml Wed Apr 21 15:42:21 2010 @@ -23,7 +23,7 @@ groupIdorg.apache.sling/groupId artifactIdmaven-launchpad-plugin/artifactId -version2.0.5-SNAPSHOT/version +version2.0.6/version packagingmaven-plugin/packaging nameApache Sling Launchpad Maven Plugin/name @@ -32,9 +32,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/maven-launchpad-plugin-2.0.6/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/maven-launchpad-plugin-2.0.6/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/maven-launchpad-plugin-2.0.6/url /scm build
svn commit: r936362 - /sling/trunk/maven/maven-launchpad-plugin/pom.xml
Author: justin Date: Wed Apr 21 15:42:29 2010 New Revision: 936362 URL: http://svn.apache.org/viewvc?rev=936362view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/pom.xml?rev=936362r1=936361r2=936362view=diff == --- sling/trunk/maven/maven-launchpad-plugin/pom.xml (original) +++ sling/trunk/maven/maven-launchpad-plugin/pom.xml Wed Apr 21 15:42:29 2010 @@ -23,7 +23,7 @@ groupIdorg.apache.sling/groupId artifactIdmaven-launchpad-plugin/artifactId -version2.0.6/version +version2.0.7-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Sling Launchpad Maven Plugin/name @@ -32,9 +32,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/maven-launchpad-plugin-2.0.6/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/maven-launchpad-plugin-2.0.6/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/maven-launchpad-plugin-2.0.6/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/url /scm build
[CONF] Apache Sling Website Maven Launchpad Plugin
Maven Launchpad Plugin Page edited by Justin Edelson adding pax web info adding pax web info Maven Launchpad Plugin The Maven Launchpad Plugin provides goals which facilitate the creation of OSGi applications. It supports the following runtime scenarios: A WAR file suitable for running in a JavaEE servlet container. A standalone Java application, with HTTP support from the Felix HttpService implementation Inside Apache Karaf In addition, the Maven Launchpad Plugin supports the publishing of an application descriptor, in the form of a bundle list, as a Maven artifact. This descriptor can then be used by downstream application builders as the basis for other applications. In Sling, this is embodied by two Maven projects: org.apache.sling.launchpad - produces an application descriptor. org.apache.sling.launchpad.testing - uses the application descriptor from org.apache.sling.launchpad and adds two bundles. Maven Launchpad Plugin provides the following goals: Goals Description launchpad:prepare-package Create the file system structure required by Sling's Launchpad framework. launchpad:attach-bundle-list Attach the bundle list descriptor to the current project as a Maven artifact. launchpad:create-karaf-descriptor Create an Apache Karaf Feature descriptor. launchpad:create-bundle-jar Create a JAR file containing the bundles in a Launchpad-structured JAR file. launchpad:check-bundle-list-for-snapshots Validate that the bundle list does not contain any SNAPSHOT versions. General Configuration In general, the bulk of the configuration of the Maven Launchpad Plugin is concerned with setting up the bundle list which all of the goals will use. This bundle list is created using the following steps: If includeDefaultBundles is true (the default), the default bundle list is loaded. By default, this is org.apache.sling.launchpad:org.apache.sling.launchpad:RELEASE:xml:bundlelist, but can be overridden by setting the defaultBundleList plugin parameter. If includeDefaultBundles is false, an empty list is created. If the bundle list file exists (by default, at src/main/bundles/list.xml), the bundles defined in it are added to the bundle list. If the additionalBundles plugin parameter is defined, those bundles are added to the bundle list. If the bundleExclusions plugin parameter is defined, those bundles are removed from the bundle list. When a bundle is added to the bundle list, if a bundle with the same groupId, artifactId, type, and classifier is already in the bundle list, the version of the existing bundle is modified. However, the start level of a bundle is never changed once that bundle is added to the bundle list. The plugin may also contribute bundles to (or remove bundles from) the bundle list as it sees fit. Bundle List Files The bundle list file uses a simple XML syntax representing a list of bundles organized into start levels: ?xml version="1.0"? bundles startLevel level="0" bundle groupIdcommons-io/groupId artifactIdcommons-io/artifactId version1.4/version /bundle bundle groupIdcommons-collections/groupId artifactIdcommons-collections/artifactId version3.2.1/version /bundle /startLevel startLevel level="10" bundle groupIdorg.apache.felix/groupId artifactIdorg.apache.felix.eventadmin/artifactId version1.0.0/version /bundle /startLevel startLevel level="15" bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.api/artifactId version2.0.2-incubator/version /bundle /startLevel /bundles Within each bundle element, type and classifier are also supported. Artifact Definition The defaultBundleList, jarWebSupport, additionalBundles, and bundleExclusions parameters are configured with artifact definitions. This is done using a syntax similar to Maven dependency elements: configuration ... jarWebSupport groupIdGROUP_ID/groupId artifactIdARTIFACT_ID/artifactId versionVERSION/version !-- type and classifier can also be specified if needed -- /jarWebSupport ... /configuration For example, to use Pax Web instead of Felix HttpService as the HttpService provider, use the following: configuration ... jarWebSupport groupIdorg.ops4j.pax.web/groupId artifactIdpax-web-service/artifactId versionRELEASE/version !-- type and classifier can also be specified if needed -- /jarWebSupport ... /configuration In the case of additionalBundles and bundleExclusions, these are arrays of definitions, so an intermediate bundle element is necessary: configuration ... additionalBundles bundle groupIdGROUP_ID/groupId artifactIdARTIFACT_ID/artifactId
svn commit: r936470 - /sling/trunk/maven/maven-launchpad-plugin/pom.xml
Author: justin Date: Wed Apr 21 20:00:49 2010 New Revision: 936470 URL: http://svn.apache.org/viewvc?rev=936470view=rev Log: using next snapshot until release vote is finished Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml Modified: sling/trunk/maven/maven-launchpad-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/pom.xml?rev=936470r1=936469r2=936470view=diff == --- sling/trunk/maven/maven-launchpad-plugin/pom.xml (original) +++ sling/trunk/maven/maven-launchpad-plugin/pom.xml Wed Apr 21 20:00:49 2010 @@ -129,12 +129,12 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.launchpad.base/artifactId -version2.2.0/version +version2.2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.launchpad.base/artifactId -version2.2.0/version +version2.2.1-SNAPSHOT/version classifierapp/classifier /dependency dependency
svn commit: r936617 - in /sling/trunk: ./ bundles/commons/osgi/ bundles/commons/osgi/src/main/resources/META-INF/ maven/maven-jcrocm-plugin/ maven/maven-jcrocm-plugin/src/main/resources/META-INF/ mave
Author: cziegeler Date: Thu Apr 22 05:33:02 2010 New Revision: 936617 URL: http://svn.apache.org/viewvc?rev=936617view=rev Log: Update some notice files Modified: sling/trunk/NOTICE sling/trunk/bundles/commons/osgi/NOTICE sling/trunk/bundles/commons/osgi/src/main/resources/META-INF/NOTICE sling/trunk/maven/maven-jcrocm-plugin/NOTICE sling/trunk/maven/maven-jcrocm-plugin/src/main/resources/META-INF/NOTICE sling/trunk/maven/maven-jspc-plugin/NOTICE sling/trunk/maven/maven-jspc-plugin/src/main/resources/META-INF/NOTICE sling/trunk/maven/maven-launchpad-plugin/NOTICE sling/trunk/maven/maven-launchpad-plugin/src/main/resources/META-INF/NOTICE sling/trunk/maven/maven-sling-plugin/NOTICE sling/trunk/maven/maven-sling-plugin/src/main/resources/META-INF/NOTICE sling/trunk/parent/NOTICE Modified: sling/trunk/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/NOTICE?rev=936617r1=936616r2=936617view=diff == --- sling/trunk/NOTICE (original) +++ sling/trunk/NOTICE Thu Apr 22 05:33:02 2010 @@ -1,5 +1,5 @@ Apache Sling -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). Modified: sling/trunk/bundles/commons/osgi/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi/NOTICE?rev=936617r1=936616r2=936617view=diff == --- sling/trunk/bundles/commons/osgi/NOTICE (original) +++ sling/trunk/bundles/commons/osgi/NOTICE Thu Apr 22 05:33:02 2010 @@ -1,5 +1,5 @@ Apache Sling Commons OSGi -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). Modified: sling/trunk/bundles/commons/osgi/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/osgi/src/main/resources/META-INF/NOTICE?rev=936617r1=936616r2=936617view=diff == --- sling/trunk/bundles/commons/osgi/src/main/resources/META-INF/NOTICE (original) +++ sling/trunk/bundles/commons/osgi/src/main/resources/META-INF/NOTICE Thu Apr 22 05:33:02 2010 @@ -1,5 +1,5 @@ Apache Sling Commons OSGi -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). Modified: sling/trunk/maven/maven-jcrocm-plugin/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-jcrocm-plugin/NOTICE?rev=936617r1=936616r2=936617view=diff == --- sling/trunk/maven/maven-jcrocm-plugin/NOTICE (original) +++ sling/trunk/maven/maven-jcrocm-plugin/NOTICE Thu Apr 22 05:33:02 2010 @@ -1,5 +1,5 @@ Apache Sling Maven JCROCM Plugin -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). Modified: sling/trunk/maven/maven-jcrocm-plugin/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-jcrocm-plugin/src/main/resources/META-INF/NOTICE?rev=936617r1=936616r2=936617view=diff == --- sling/trunk/maven/maven-jcrocm-plugin/src/main/resources/META-INF/NOTICE (original) +++ sling/trunk/maven/maven-jcrocm-plugin/src/main/resources/META-INF/NOTICE Thu Apr 22 05:33:02 2010 @@ -1,5 +1,5 @@ Apache Sling Maven JCROCM Plugin -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). Modified: sling/trunk/maven/maven-jspc-plugin/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-jspc-plugin/NOTICE?rev=936617r1=936616r2=936617view=diff == --- sling/trunk/maven/maven-jspc-plugin/NOTICE (original) +++ sling/trunk/maven/maven-jspc-plugin/NOTICE Thu Apr 22 05:33:02 2010 @@ -1,5 +1,5 @@ Apache Sling JSP Compiler Maven Plugin -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). Modified: sling/trunk/maven/maven-jspc-plugin/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-jspc-plugin/src/main/resources/META-INF/NOTICE?rev=936617r1=936616r2=936617view=diff
