Author: cziegeler
Date: Fri Jan 4 02:17:34 2008
New Revision: 608792
URL: http://svn.apache.org/viewvc?rev=608792&view=rev
Log:
Minor changes to logging statements.
Modified:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
Modified:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java?rev=608792&r1=608791&r2=608792&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
(original)
+++
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
Fri Jan 4 02:17:34 2008
@@ -86,6 +86,7 @@
}
public void registerBundle(Session session, Bundle bundle) {
+ log.debug("Registering bundle {} for content loading.",
bundle.getSymbolicName());
if (this.registerBundleInternal(session, bundle, false)) {
// handle delayed bundles, might help now
int currentSize = -1;
@@ -142,7 +143,7 @@
}
try {
- log.debug("Installing Initial Content of Bundle {}",
bundle.getSymbolicName());
+ log.debug("Installing initial content from bundle {}",
bundle.getSymbolicName());
StringTokenizer tokener = new StringTokenizer(root, ",");
while (tokener.hasMoreTokens()) {
String path = tokener.nextToken().trim();
@@ -166,16 +167,16 @@
}
private void install(Bundle bundle, String path, javax.jcr.Node parent)
throws RepositoryException {
- Set<URL> ignoreEntry = new HashSet<URL>();
-
- Enumeration<?> entries = bundle.getEntryPaths(path);
+ @SuppressWarnings("unchecked")
+ Enumeration<String> entries = bundle.getEntryPaths(path);
if (entries == null) {
log.info("install: No entries at {}", path);
return;
}
+ Set<URL> ignoreEntry = new HashSet<URL>();
while (entries.hasMoreElements()) {
- String entry = (String) entries.nextElement();
+ final String entry = entries.nextElement();
if (entry.endsWith("/")) {
// dir, check for node descriptor , else create dir
String base = entry.substring(0, entry.length()-1);