svn commit: r1808232 - in /sling/trunk/bundles/scripting/sightly/compiler/src: main/java/org/apache/sling/scripting/sightly/compiler/util/ObjectModel.java test/java/org/apache/sling/scripting/sightly/

[radu]

Author: radu
Date: Wed Sep 13 12:22:30 2017
New Revision: 1808232

URL: http://svn.apache.org/viewvc?rev=1808232=rev
Log:
SLING-7123 - ObjectModel does not correctly analyse all super types when 
solving methods

* ignored NoSuchMethodExceptions thrown by #getClassMethod so that all super 
types can be
analysed when looking for public methods

Modified:

sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/compiler/util/ObjectModel.java

sling/trunk/bundles/scripting/sightly/compiler/src/test/java/org/apache/sling/scripting/sightly/util/ObjectModelTest.java

Modified: 
sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/compiler/util/ObjectModel.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/compiler/util/ObjectModel.java?rev=1808232=1808231=1808232=diff
==
--- 
sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/compiler/util/ObjectModel.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/compiler/util/ObjectModel.java
 Wed Sep 13 12:22:30 2017
@@ -417,7 +417,7 @@ public final class ObjectModel {
 return declaringClass != Object.class || 
TO_STRING_METHOD.equals(method.getName());
 }
 
-private static Method extractMethodInheritanceChain(Class type, Method 
method) throws NoSuchMethodException {
+private static Method extractMethodInheritanceChain(Class type, Method 
method) {
 if (method == null || Modifier.isPublic(type.getModifiers())) {
 return method;
 }
@@ -432,11 +432,15 @@ public final class ObjectModel {
 return getClassMethod(type.getSuperclass(), method);
 }
 
-private static Method getClassMethod(Class type, Method method) throws 
NoSuchMethodException {
-Method parentMethod = type.getMethod(method.getName(), 
method.getParameterTypes());
-parentMethod = 
extractMethodInheritanceChain(parentMethod.getDeclaringClass(), parentMethod);
-if (parentMethod != null) {
-return parentMethod;
+private static Method getClassMethod(Class type, Method method) {
+try {
+Method parentMethod = type.getMethod(method.getName(), 
method.getParameterTypes());
+parentMethod = 
extractMethodInheritanceChain(parentMethod.getDeclaringClass(), parentMethod);
+if (parentMethod != null) {
+return parentMethod;
+}
+} catch (NoSuchMethodException e) {
+// ignore - maybe we don't have access to that method or the 
method does not belong to the current type
 }
 return null;
 }

Modified: 
sling/trunk/bundles/scripting/sightly/compiler/src/test/java/org/apache/sling/scripting/sightly/util/ObjectModelTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/compiler/src/test/java/org/apache/sling/scripting/sightly/util/ObjectModelTest.java?rev=1808232=1808231=1808232=diff
==
--- 
sling/trunk/bundles/scripting/sightly/compiler/src/test/java/org/apache/sling/scripting/sightly/util/ObjectModelTest.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/compiler/src/test/java/org/apache/sling/scripting/sightly/util/ObjectModelTest.java
 Wed Sep 13 12:22:30 2017
@@ -19,7 +19,6 @@
 package org.apache.sling.scripting.sightly.util;
 
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -130,6 +129,7 @@ public class ObjectModelTest {
 
 @Test
 public void testResolveProperty() {
+assertEquals(0, ObjectModel.resolveProperty(Collections.EMPTY_LIST, 
"size"));
 assertNull(ObjectModel.resolveProperty(null, null));
 Integer[] testArray = new Integer[] {1, 2, 3};
 assertEquals(2, ObjectModel.resolveProperty(testArray, 1));

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Scheduler 2.7.2Deployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.7.0_80; Mac OS X 10.10.5)""userId" = "stefanegli""ip" = "193.104.215.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2.pom(SHA1: 9cd1df73de06ba05736a8a9fbaf79695036a0f13)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2-sources.jar(SHA1: adbafb02e1aaf806394d1a4355b05701f0b15139)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2.jar(SHA1: 4aa5fd4de24685ad18ec086561a90699c45c4fdb)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2.pom.asc(SHA1: db2bfbc3b82902ebd43b0f7f4ad392125f4717ea)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2.jar.asc(SHA1: 58df31927da681bf744705df5b37cb6493bb7a45)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2-source-release.zip.asc(SHA1: 6b2127f4c240cdf3f4169f4e9123d5f241c24100)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2-source-release.zip(SHA1: ccc10562e60891f1904fc7cdd6dedaa3ab14b676)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2-javadoc.jar.asc(SHA1: c0e4f404eff169a9c9944c7c183d4a9067a64c79)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2-javadoc.jar(SHA1: 2d97a457d3d61ec77154950c7af0b5c5912fa748)/org/apache/sling/org.apache.sling.commons.scheduler/2.7.2/org.apache.sling.commons.scheduler-2.7.2-sources.jar.asc(SHA1: 4209ee84485ca9a5aa438c3597888a8968736bc9)Action performed by Stefan Egli (stefanegli)

svn commit: r1808229 - /sling/trunk/bundles/commons/scheduler/pom.xml

[stefanegli]

Author: stefanegli
Date: Wed Sep 13 10:59:43 2017
New Revision: 1808229

URL: http://svn.apache.org/viewvc?rev=1808229=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/commons/scheduler/pom.xml

Modified: sling/trunk/bundles/commons/scheduler/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1808229=1808228=1808229=diff
==
--- sling/trunk/bundles/commons/scheduler/pom.xml (original)
+++ sling/trunk/bundles/commons/scheduler/pom.xml Wed Sep 13 10:59:43 2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.commons.scheduler
 bundle
-2.7.2
+2.7.3-SNAPSHOT
 
 Apache Sling Scheduler Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.7.2
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.7.2
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.scheduler-2.7.2
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
+
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler
 
 
 

svn commit: r1808228 - /sling/tags/org.apache.sling.commons.scheduler-2.7.2/

[stefanegli]

Author: stefanegli
Date: Wed Sep 13 10:59:40 2017
New Revision: 1808228

URL: http://svn.apache.org/viewvc?rev=1808228=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.commons.scheduler-2.7.2

Added:
sling/tags/org.apache.sling.commons.scheduler-2.7.2/
  - copied from r1808227, sling/trunk/bundles/commons/scheduler/

svn commit: r1808227 - /sling/trunk/bundles/commons/scheduler/pom.xml

[stefanegli]

Author: stefanegli
Date: Wed Sep 13 10:59:26 2017
New Revision: 1808227

URL: http://svn.apache.org/viewvc?rev=1808227=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.commons.scheduler-2.7.2

Modified:
sling/trunk/bundles/commons/scheduler/pom.xml

Modified: sling/trunk/bundles/commons/scheduler/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1808227=1808226=1808227=diff
==
--- sling/trunk/bundles/commons/scheduler/pom.xml (original)
+++ sling/trunk/bundles/commons/scheduler/pom.xml Wed Sep 13 10:59:26 2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.commons.scheduler
 bundle
-2.7.1-SNAPSHOT
+2.7.2
 
 Apache Sling Scheduler Support
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/scheduler
-
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.7.2
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.scheduler-2.7.2
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.scheduler-2.7.2
 
 
 

svn commit: r1808221 - /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java

[pauls]

Author: pauls
Date: Wed Sep 13 08:53:12 2017
New Revision: 1808221

URL: http://svn.apache.org/viewvc?rev=1808221=rev
Log:
Update to Felix Framework 5.6.8

Modified:

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java

Modified: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1808221=1808220=1808221=diff
==
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
 Wed Sep 13 08:53:12 2017
@@ -44,7 +44,7 @@ public class FeatureUtil {
 public static ArtifactId getFelixFrameworkId(final String version) {
 return new ArtifactId("org.apache.felix",
 "org.apache.felix.framework",
-version != null ? version : "5.6.6", null, null);
+version != null ? version : "5.6.8", null, null);
 }
 
 static final Comparator FEATURE_PATH_COMP = new 
Comparator() {

svn commit: r1808220 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

[pauls]

Author: pauls
Date: Wed Sep 13 08:52:49 2017
New Revision: 1808220

URL: http://svn.apache.org/viewvc?rev=1808220=rev
Log:
Add run mode option.

Modified:

sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

Modified: 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1808220=1808219=1808220=diff
==
--- 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 Wed Sep 13 08:52:49 2017
@@ -114,6 +114,7 @@ public class Main {
 options.addOption(outputOption);
 options.addOption(includeModelOption);
 options.addOption(propsOption);
+options.addOption(runModeOption);
 
 final CommandLineParser parser = new DefaultParser();
 try {