svn commit: r920229 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java
Author: fmeschbe Date: Mon Mar 8 08:32:24 2010 New Revision: 920229 URL: http://svn.apache.org/viewvc?rev=920229view=rev Log: SLING-1427 reconfigure RequestLoggerService to be a regular component, taking factory configurations and requiring configuration for SCR to create instances Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java?rev=920229r1=920228r2=920229view=diff == --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java Mon Mar 8 08:32:24 2010 @@ -33,7 +33,7 @@ * * @scr.component label=%request.log.service.name *description=%request.log.service.description - * factory=org.apache.sling.engine.impl.log.RequestLoggerService + *configurationFactory=true policy=require * @scr.property name=service.vendor value=The Apache Software Foundation * @scr.property name=service.description value=Factory for configuration * based request/access loggers
[CONF] Apache Sling Status Report (March 2010)
Status Report (March 2010) Page edited by Bertrand Delacretaz Copied releases info from http://sling.apache.org/site/news.html Copied releases info from http://sling.apache.org/site/news.html To be submitted to board@ March, 10th 2010 Sling is an OSGI-based scriptable web framework that uses a Java Content Repository, such as Apache Jackrabbit, to store and manage content. Sling graduated as a TLP on June 17th, 2009. There are no issues which require board attention at the moment. Community New committer: Eric Norman (17. Feb 2010) Releases Apache Sling Sample Path Based Resource Type Provider 2.0.4 (February 22, 2010) Apache Sling Event 2.2.0, Apache Sling Scripting API 2.1.0, and Apache Sling Thread Dumper 0.2.0 (Feburary 19, 2010) Apache Sling JCR WebDav 2.0.8, Apache Sling JCR ContentLoader 2.0.6, Apache Sling JCR UserManager 2.0.4, Apache Sling JCR Server 2.0.6, Apache Sling JCR AccessManager 2.0.4, Apache Sling JCR Base 2.0.6 (February 17, 2010) Apache Sling Commons ClassLoader 1.1.4, and Apache Sling JCR ClassLoader 3.1.0 (February 8, 2010) Apache Sling JCR API 2.0.6 (January 29, 2010) Apache Sling Commons ClassLoader 1.1.2, Apache Sling Commons Scheduler 2.2.0, Apache Sling Commons Threads 3.0.0, Apache Sling Event 2.1.0, and Apache Sling Servlets Get 2.0.8 (December 21, 2009) Apache Sling MIME type mapping support, Version 2.1.2 (December 15, 2009) Documentation Website documentation is steadily improving. Licensing and other issues none Change Notification Preferences View Online | View Change | Add Comment
[CONF] Apache Sling Website News
News Page edited by Felix Meschberger News New releases: Apache Sling Event 2.3.0, Apache Sling Scripting Core 2.1.0, Apache Commons MIME 2.1.4, and Apache Sling FileResource Provider 1.0.0 (March 1, 2010) Eric Norman added as a committer (February 17, 2010) New release: Apache Sling Sample Path Based Resource Type Provider 2.0.4 (February 22, 2010) New releases: Apache Sling Event 2.2.0, Apache Sling Scripting API 2.1.0, and Apache Sling Thread Dumper 0.2.0 (Feburary 19, 2010) New releases: Apache Sling JCR WebDav 2.0.8, Apache Sling JCR ContentLoader 2.0.6, Apache Sling JCR UserManager 2.0.4, Apache Sling JCR Server 2.0.6, Apache Sling JCR AccessManager 2.0.4, Apache Sling JCR Base 2.0.6 (February 17, 2010) New releases: Apache Sling Commons ClassLoader 1.1.4, and Apache Sling JCR ClassLoader 3.1.0 (February 8, 2010) New release: Apache Sling JCR API 2.0.6 (January 29, 2010) New releases: Apache Sling Commons ClassLoader 1.1.2, Apache Sling Commons Scheduler 2.2.0, Apache Sling Commons Threads 3.0.0, Apache Sling Event 2.1.0, and Apache Sling Servlets Get 2.0.8 (December 21, 2009) Apache Sling MIME type mapping support, Version 2.1.2, is released (December 15, 2009) Justin Edelson added as a committer (December 7, 2009) New releases: Apache Sling Commons HTML 1.0.0, Apache Sling Commons Compiler 1.0.0, Apache Sling JCR Compiler 1.0.0, Apache Sling JCR Prefs 1.0.0, and Apache Sling Scripting Java 1.0.0 (December 2, 2009) New releases: Apache Sling Parent POM 8, Apache Sling Launchpad Base 2.1.0, Apache Sling Commons ClassLoader 1.1.0, Apache Sling JCR ClassLoader 3.0.0, Apache Sling Scripting Core 2.0.8, Apache Sling Scripting JSP 2.0.8, Apache Sling Scripting JSP Taglib 2.0.6, and Apache Sling Scripting _javascript_ 2.0.6 (November 28, 2009) New releases: Apache Sling Engine 2.0.6, Apache Sling Adapter 2.0.4, Apache Sling JCR Resource 2.0.6, Apache Sling Commons ClassLoader 1.0.0, Apache Sling Event 2.0.6, Apache Sling JCR ClassLoader 2.0.6, Apache Sling Scripting Core 2.0.6, Apache Sling Servlets Resolver 2.0.8 (October 13, 2009) New releases: Apache Sling API 2.0.8, Apache Sling Commons HTML 0.9.0, Apache Sling Commons ClassLoader 0.9.0, Apache Sling Commons Scheduler 2.1.0, and Apache Sling Servlets Get 2.0.6 (October 02, 2009) New releases: Apache Sling API 2.0.6 and Apache Sling JCR API 2.0.4 (August 17, 2009) Apache Sling OSGi LogService Implementation, Version 2.0.6, is released (August 5, 2009) Ian Boston added as a member of the PMC (July 25, 2009) Ian Boston added as a committer (July 9, 2009) Sling site at http://sling.apache.org live (June 29, 2009) Mailing lists moved to dev(a)sling.apache.org and commits(a)sling.apache.org (June 29, 2009) SVN moved to http://svn.apache.org/repos/asf/sling (June 18, 2009) Apache Sling has graduated into a top level project! (June 17, 2009) Change Notification Preferences View Online | View Change | Add Comment
[CONF] Apache Sling Website Documentation
Documentation File removed by Felix Meschberger sling.sh (0.8 kB application/x-sh) - Site Synchronization Script Change Notification Preferences View Attachments
[CONF] Apache Sling Website Documentation
Documentation File attached by Felix Meschberger sling.sh (1 kB application/x-sh) - Site Synchronization Script Change Notification Preferences View Attachments
svn commit: r920391 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
Author: cziegeler
Date: Mon Mar 8 16:31:31 2010
New Revision: 920391
URL: http://svn.apache.org/viewvc?rev=920391view=rev
Log:
Minor code cleanup
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java?rev=920391r1=920390r2=920391view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
Mon Mar 8 16:31:31 2010
@@ -214,7 +214,7 @@
if ( foundNode != null ) {
try {
foundNode.remove();
-parentNode.save();
+writerSession.save();
} catch (LockException le) {
// if someone else has the lock this is fine
}
@@ -226,7 +226,7 @@
if ( foundNode != null ) {
try {
foundNode.remove();
-parentNode.save();
+writerSession.save();
} catch (LockException le) {
// if someone else has the lock this is fine
}
@@ -333,7 +333,6 @@
// we create an own session here
Session s = null;
try {
-s = this.createSession();
while ( iter.hasNext() ) {
final javax.jcr.observation.Event event = iter.nextEvent();
if ( event.getType() ==
javax.jcr.observation.Event.PROPERTY_CHANGED
@@ -346,6 +345,9 @@
// we are only interested in unlocks
if ( jcr:lockOwner.equals(propertyName) ) {
try {
+if ( s == null ) {
+s = this.createSession();
+}
final Node eventNode = (Node) s.getItem(nodePath);
if ( !eventNode.isLocked() ) {
try {
@@ -490,7 +492,7 @@
if ( eventNode != null ) {
try {
eventNode.remove();
-parentNode.save();
+s.save();
} catch (RepositoryException re) {
// we ignore the exception if removing fails
ignoreException(re);
@@ -761,10 +763,9 @@
// we should remove the node from the repository
// if there is no node someone else was faster and we can
ignore this
if ( foundNode != null ) {
-final Node parentNode = foundNode.getParent();
try {
foundNode.remove();
-parentNode.save();
+writerSession.save();
} catch (LockException le) {
// if someone else has the lock this is fine
}
svn commit: r920397 - in /sling/trunk/contrib: launchpad/jcrapp/ pom.xml
Author: cziegeler Date: Mon Mar 8 16:59:06 2010 New Revision: 920397 URL: http://svn.apache.org/viewvc?rev=920397view=rev Log: Remove jcrapp module as discussed a while ago. Removed: sling/trunk/contrib/launchpad/jcrapp/ Modified: sling/trunk/contrib/pom.xml Modified: sling/trunk/contrib/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=920397r1=920396r2=920397view=diff == --- sling/trunk/contrib/pom.xml (original) +++ sling/trunk/contrib/pom.xml Mon Mar 8 16:59:06 2010 @@ -105,7 +105,6 @@ modulescripting/scala/samples/forum/module modulescripting/velocity/module modulescripting/xproc/module - modulelaunchpad/jcrapp/module modulelaunchpad/smx-kernel/module /modules profiles
svn commit: r920721 - in /sling/trunk/bundles/engine: pom.xml src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
Author: cziegeler
Date: Tue Mar 9 07:42:51 2010
New Revision: 920721
URL: http://svn.apache.org/viewvc?rev=920721view=rev
Log:
SLING-1270 : Use new close method to close the session.
Modified:
sling/trunk/bundles/engine/pom.xml
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
Modified: sling/trunk/bundles/engine/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=920721r1=920720r2=920721view=diff
==
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Tue Mar 9 07:42:51 2010
@@ -95,16 +95,10 @@
/plugins
/reporting
dependencies
-!-- Temporary dependency for SLING-1270--
-dependency
-groupIdjavax.jcr/groupId
-artifactIdjcr/artifactId
-/dependency
-!-- END Temporary dependency for SLING-1270--
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.api/artifactId
-version2.0.8/version
+version2.0.9-SNAPSHOT/version
scopeprovided/scope
/dependency
dependency
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=920721r1=920720r2=920721view=diff
==
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
Tue Mar 9 07:42:51 2010
@@ -33,7 +33,6 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import javax.jcr.Session;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -370,14 +369,7 @@ public class SlingMainServlet extends Ge
// FIXME: This must be removed
// SLING-1270 Temporary solution to ensure session is logged out
if (resolver != null) {
-Session session = resolver.adaptTo(Session.class);
-if (session != null session.isLive()) {
-try {
-session.logout();
-} catch (Throwable t) {
-// ignore
-}
-}
+resolver.close();
}
// END SLING-1270 Temporary solution to ensure session is logged
out
}
