Author: justin
Date: Tue Nov 1 15:49:41 2016
New Revision: 1767512
URL: http://svn.apache.org/viewvc?rev=1767512&view=rev
Log:
SLING-6225 - fixing metatype in JavaScriptEngineFactory
Modified:
sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/JavaScriptEngineFactory.java
sling/trunk/contrib/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/JavaScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/JavaScriptEngineFactory.java?rev=1767512&r1=1767511&r2=1767512&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/JavaScriptEngineFactory.java
(original)
+++
sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/JavaScriptEngineFactory.java
Tue Nov 1 15:49:41 2016
@@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
@Property(name=JavaScriptEngineFactory.PROPERTY_COMPILER_TARGET_V_M,
value=JavaScriptEngineFactory.VERSION_AUTO),
@Property(name=JavaScriptEngineFactory.PROPERTY_CLASSDEBUGINFO,
boolValue=true),
@Property(name=JavaScriptEngineFactory.PROPERTY_ENCODING, value="UTF-8"),
- @Property(name = ResourceChangeListener.CHANGES, value = {"CHANGED",
"REMOVED"}),
+ @Property(name = ResourceChangeListener.CHANGES, value = {"CHANGED",
"REMOVED"}, propertyPrivate = true),
@Property(name = ResourceChangeListener.PATHS, value = {"."},
propertyPrivate = true)
})
public class JavaScriptEngineFactory
Modified:
sling/trunk/contrib/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1767512&r1=1767511&r2=1767512&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
sling/trunk/contrib/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties
Tue Nov 1 15:49:41 2016
@@ -36,11 +36,10 @@ java.javaEncoding.description = Encoding
java.compilerSourceVM.name = Source VM
java.compilerSourceVM.description = Java Specification to be used to read \
- the source files. If left empty, the default version, 1.6., is used. If the \
- value "auto" is used, the current vm version will be used.
+ the source files. If left empty or the value "auto" is specified, the \
+ current vm version will be used.
java.compilerTargetVM.name = Target VM
-java.compilerTargetVM.description = Target Java version for compilation. If
left \
- empty, the default version, 1.6., is used. If the value "auto" is used, the
current \
- vm version will be used.
+java.compilerTargetVM.description = Target Java version for compilation. If
left \
+ empty or the value "auto" is specified, the current vm version will be used.
\ No newline at end of file
