svn commit: r1062186 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: OsgiInstallerImpl.java RegisteredResourceImpl.java tasks/BundleTaskCreator.java

[cziegeler]

Author: cziegeler
Date: Sat Jan 22 16:08:34 2011
New Revision: 1062186

URL: http://svn.apache.org/viewvc?rev=1062186&view=rev
Log:
Improve logging

Modified:
    
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
    
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
    
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java

Modified: 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1062186&r1=1062185&r2=1062186&view=diff
==============================================================================
--- 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
 (original)
+++ 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
 Sat Jan 22 16:08:34 2011
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -553,6 +554,10 @@ public class OsgiInstallerImpl
                 for(final ResourceTransformer transformer : services) {
                     try {
                         final TransformationResult[] result = 
transformer.transform(resource);
+                        if ( logger.isDebugEnabled() ) {
+                            logger.debug("Invoked transformer {} on {} : {}",
+                                    new Object[] {transformer, resource, 
Arrays.toString(result)});
+                        }
                         if ( result != null && result.length > 0 ) {
                             this.persistentList.transform(resource, result);
                             changed = true;

Modified: 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java?rev=1062186&r1=1062185&r2=1062186&view=diff
==============================================================================
--- 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
 (original)
+++ 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
 Sat Jan 22 16:08:34 2011
@@ -165,10 +165,39 @@ public class RegisteredResourceImpl
 
        @Override
        public String toString() {
-           return "RegisteredResource(url=" + this.getURL() +
-               ", entity=" + this.getEntityId() +
-               ", state=" + this.state +
-               ", digest=" + this.getDigest() + ")";
+           final StringBuilder sb = new StringBuilder();
+           if ( this.getEntityId() == null ) {
+               sb.append("RegisteredResource");
+           } else {
+               sb.append("TaskResource");
+           }
+           sb.append("(url=");
+           sb.append(this.getURL());
+
+           if ( this.getEntityId() != null ) {
+               sb.append(", entity=");
+               sb.append(this.getEntityId());
+               sb.append(", state=");
+               sb.append(this.state);
+            if ( this.attributes.size() > 0 ) {
+                sb.append(", attributes=[");
+                boolean first = true;
+                for(final Map.Entry<String, Object> entry : 
this.attributes.entrySet()) {
+                    if ( !first ) {
+                        sb.append(", ");
+                    }
+                    first = false;
+                    sb.append(entry.getKey());
+                    sb.append("=");
+                    sb.append(entry.getValue());
+                }
+                sb.append("]");
+            }
+           }
+           sb.append(", digest=");
+           sb.append(this.getDigest());
+           sb.append(')');
+           return sb.toString();
        }
 
        /**

Modified: 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java?rev=1062186&r1=1062185&r2=1062186&view=diff
==============================================================================
--- 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
 (original)
+++ 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
 Sat Jan 22 16:08:34 2011
@@ -140,6 +140,7 @@ public class BundleTaskCreator implement
         * @see 
org.apache.sling.installer.api.tasks.InstallTaskFactory#createTask(org.apache.sling.installer.api.tasks.TaskResourceGroup)
         */
        public InstallTask createTask(final TaskResourceGroup resourceList) {
+           // quick check of the resource type.
            final TaskResource toActivate = resourceList.getActiveResource();
            if ( !toActivate.getType().equals(InstallableResource.TYPE_BUNDLE) 
) {
                return null;