You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/03/04 09:58:29 UTC
svn commit: r633395 -
/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
Author: cziegeler
Date: Tue Mar 4 00:58:27 2008
New Revision: 633395
URL: http://svn.apache.org/viewvc?rev=633395&view=rev
Log:
Enable again as this is required to register namespaces from already loaded bundles. Otherwise sling is not running anymore.
Modified:
incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
Modified: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java?rev=633395&r1=633394&r2=633395&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java Tue Mar 4 00:58:27 2008
@@ -169,7 +169,7 @@
/**
* @see org.apache.sling.jcr.api.SlingRepository#getDefaultWorkspace()
- * Declared final to make sure the SLING-256 rule is enforced.
+ * Declared final to make sure the SLING-256 rule is enforced.
*/
public final String getDefaultWorkspace() {
if(defaultWorkspace == null || defaultWorkspace.trim().length() == 0) {
@@ -243,7 +243,7 @@
}
try {
- getLog().log(LogService.LOG_DEBUG,
+ getLog().log(LogService.LOG_DEBUG,
"Logging in to workspace '" + workspace + "'");
return this.getPoolManager().login(credentials, workspace);
} catch (NoSuchWorkspaceException nswe) {
@@ -339,14 +339,14 @@
// TODO: Consider running this in the background !!
// FIXME: Commented while SLING-132 is still unfixed
-// Bundle[] bundles = componentContext.getBundleContext().getBundles();
-// for (int i = 0; i < bundles.length; i++) {
-// if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-// // load content for bundles which are neither INSTALLED nor
-// // UNINSTALLED
-// this.loader.registerBundle(bundles[i]);
-// }
-// }
+ Bundle[] bundles = componentContext.getBundleContext().getBundles();
+ for (int i = 0; i < bundles.length; i++) {
+ if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+ // load content for bundles which are neither INSTALLED nor
+ // UNINSTALLED
+ this.loader.registerBundle(bundles[i]);
+ }
+ }
}
/**