incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1520517 - /sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
Date Fri, 06 Sep 2013 08:53:44 GMT
Author: cziegeler
Date: Fri Sep  6 08:53:44 2013
New Revision: 1520517

URL: http://svn.apache.org/r1520517
Log:
SLING-3037 : IllegalArgumentException in logback Logger. Revert

Modified:
    sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java

Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java?rev=1520517&r1=1520516&r2=1520517&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
(original)
+++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
Fri Sep  6 08:53:44 2013
@@ -558,6 +558,7 @@ class DefaultSlingScript implements Slin
             /**
              * @see java.io.Reader#close()
              */
+            @Override
             public void close() throws IOException {
                 scriptReader.close();
             }
@@ -707,8 +708,7 @@ class DefaultSlingScript implements Slin
     private String getLoggerName() {
         String name = scriptName;
         name = name.substring(1);       // cut-off leading slash
-        name = name.replace('.', '_');  // extension separator as part of name - used to
be $ but 
-                                        // logback considers that as a separator (SLING-3037)
+        name = name.replace('.', '$');  // extension separator as part of name
         name = name.replace('/', '.');  // hierarchy defined by dot
         return name;
     }
@@ -854,6 +854,7 @@ class DefaultSlingScript implements Slin
         /**
          * @see org.apache.sling.api.resource.Resource#getPath()
          */
+        @Override
         public String getPath() {
             return this.path;
         }
@@ -861,6 +862,7 @@ class DefaultSlingScript implements Slin
         /**
          * @see org.apache.sling.api.resource.Resource#getResourceType()
          */
+        @Override
         public String getResourceType() {
             return this.resourceType;
         }
@@ -868,6 +870,7 @@ class DefaultSlingScript implements Slin
         /**
          * @see org.apache.sling.api.resource.Resource#getResourceResolver()
          */
+        @Override
         public ResourceResolver getResourceResolver() {
             return this.resolver;
         }



Mime
View raw message