You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by sb...@apache.org on 2016/02/26 19:28:25 UTC
svn commit: r1732531 - in /sling/trunk/contrib: commons/js/ jcr/js/
jcr/js/nodetypes/ jcr/js/nodetypes/src/main/java/org/apache/sling/commons/
jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/
jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/ ...
Author: sboehme
Date: Fri Feb 26 18:28:25 2016
New Revision: 1732531
URL: http://svn.apache.org/viewvc?rev=1732531&view=rev
Log:
fixed SLING-5541 for the JavaScript node types
Added:
sling/trunk/contrib/jcr/js/
- copied from r1731254, sling/trunk/contrib/commons/js/
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONItemDefinition.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeDefinition.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeType.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONPropertyDefinition.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONValue.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/
- copied from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/ChildNodeDefGenerationTest.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/ChildNodeDefGenerationTest.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/DefaultNodeTypeTest.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/DefaultNodeTypeTest.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/GenerationConstants.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/NodeTypeGenerationTest.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/NodeTypeGenerationTest.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/PropertyDefGenerationTest.java
- copied, changed from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/PropertyDefGenerationTest.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/
- copied from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/downloaddefaultbinary/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/
- copied from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/mock/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/test/
- copied from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/test/
Removed:
sling/trunk/contrib/commons/js/
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/commons/
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/de/
Modified:
sling/trunk/contrib/jcr/js/nodetypes/pom.xml
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp
sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/js/jsnodetypes.js
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockNodeTypeGenerator.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockPropertyDefGenerator.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/test/JSONAssert.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/javascript/NodeTypesSpec.js
Modified: sling/trunk/contrib/jcr/js/nodetypes/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/pom.xml?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/pom.xml (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/pom.xml Fri Feb 26 18:28:25 2016
@@ -20,7 +20,7 @@
<relativePath/>
</parent>
- <artifactId>org.apache.sling.commons.js.nodetypes</artifactId>
+ <artifactId>org.apache.sling.jcr.js.nodetypes</artifactId>
<packaging>bundle</packaging>
<version>0.1.0-SNAPSHOT</version>
@@ -77,7 +77,7 @@
<configuration>
<instructions>
<Sling-Initial-Content>SLING-INF/libs/jsnodetypes;overwrite:=true;path:=/libs/jsnodetypes;uninstall:=true,SLING-INF/libs/jsnodetypes/documentation;overwrite:=true;path:=/libs/jsnodetypes/documentation;ignoreImportProviders:=json;uninstall:=true,SLING-INF/libs/jsnodetypes/js;overwrite:=true;path:=/libs/jsnodetypes/js;ignoreImportProviders:=json;uninstall:=true</Sling-Initial-Content>
- <Export-Package>org.apache.sling.commons.js.nodetypes.javascript</Export-Package>
+ <Export-Package>org.apache.sling.jcr.js.nodetypes.javascript</Export-Package>
<Provide-Capability>${project.artifactId}; version:Version=0.1.0</Provide-Capability>
</instructions>
</configuration>
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONItemDefinition.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONItemDefinition.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONItemDefinition.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONItemDefinition.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import javax.jcr.nodetype.ItemDefinition;
import javax.jcr.version.OnParentVersionAction;
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeDefinition.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeDefinition.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeDefinition.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeDefinition.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import java.util.ArrayList;
import java.util.List;
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeType.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeType.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeType.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONNodeType.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import java.util.ArrayList;
import java.util.List;
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONPropertyDefinition.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONPropertyDefinition.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONPropertyDefinition.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONPropertyDefinition.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import java.util.Arrays;
import java.util.List;
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONValue.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONValue.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONValue.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/JSONValue.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/NodeTypesJSONServlet.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import java.io.IOException;
import java.io.PrintWriter;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
/**
* Makes it possible to specify the array and index but retrieving it on demand lazily.
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import java.io.BufferedReader;
import java.io.IOException;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
import javax.jcr.version.OnParentVersionAction;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import javax.jcr.PropertyType;
import javax.jcr.nodetype.PropertyDefinition;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp Fri Feb 26 18:28:25 2016
@@ -79,7 +79,7 @@ input {
<script type="text/javascript">
var settings = {"contextPath": "${pageContext.request.contextPath}"};
-var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
function getNTNames(){
var ntNames = ntManager.getNodeTypeNames();
@@ -148,7 +148,7 @@ function canAddProperty(){
<body>
<div id="main">
<h1><em>JSNodeTypes</em> - A JavaScript Node Types library for Apache Sling</h1>
- <p>It uses Apache Sling to generate JavaScript object literals for JCR node types. Default binary values are converted to paths where they can be downloaded.</p>
+ <p>It uses Apache Sling to generate JavaScript object literals for JCR node types and calculates applicable child nodes and properties. Default binary values are converted to paths where they can be downloaded.</p>
<h2>Live Demo of the API</h2>
<p>Have a look at the simple source code of this page to see how it's done.</p>
<h3>Methods of the node type manager:</h3>
@@ -208,13 +208,13 @@ function canAddProperty(){
<p>Instantiate the NodeTypeManager:</p>
<div class="code">
<pre class="JavaScript">// this works if your WAR is deployed under the root context '/'
-var ntManager = new de.sandroboehme.NodeTypeManager();
+var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager();
</pre>
</div>
<p>If your WAR is not deployed under the root context you have to specify it:</p>
<div class="code">
<pre class="JavaScript">var settings = {"contextPath": "/yourContextPath"};
-var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
</pre>
</div>
</li>
@@ -230,15 +230,24 @@ var canAddChildNode = firstNodeType.canA
</div>
</li>
</ol>
- <h2>Installation</h2>
- <ol>
- <li>Add <pre>http://www.jcrbrowser.org/sling/obr/repository.xml</pre> to your OSGi Bundle repository in the Sling web console (/system/console/obr)</li>
- <li>In the resource 'J' navigate to 'jsNodeTypes' and 'Deploy and Start' the bundle</li>
- <li>At <pre>/libs/jsnodetypes/content/documentation.html</pre> you should be able to see and use this page.</li>
- <li>If you see the page: Congrats you successfully installed the jsNodeTypes library! In case you don't see it, please have a look at the next section to get it installed.</li>
- </ol>
<h2>Version History</h2>
<ul>
+ <li><strong>0.1.0 (org.apache.sling.jcr.js.nodetypes)</strong>
+ <ul>
+ <li><strong>Non backwards compatible changes from SLING-5541:</strong>
+ <ul>
+ <li>New artifact name 'org.apache.sling.jcr.js.nodetypes'</li>
+ <li>Moved Java and JavaScript packages from org.apache.sling.commons and from de.sandroboehme to org.apache.sling.jcr.</li>
+ </ul>
+ </li>
+ <li>Other fixes for SLING-5541.
+ <ul>
+ <li>Moved out of contrib/commons.</li>
+ <li>Changed this documentation page to reflect begin hosted at Apache Sling.</li>
+ </ul>
+ </li>
+ </ul>
+ </li>
<li><strong>4.0.1</strong>
<ul>
<li><strong>Non backwards compatible change:</strong>Renamed getApplicableChildNodeTypes() to getApplicableCnTypesPerCnDef() to allow other similar methods and still have no overlapping meanings.</li>
@@ -287,13 +296,9 @@ var canAddChildNode = firstNodeType.canA
</ul>
</li>
</ul>
- <h2>Support</h2>
- <p>
- Bugs can be opened at the <a href="https://github.com/sandroboehme/jsNodeTypes/issues">GitHub issue tracker for the project</a>. For questions I will be monitoring the Sling users mailing list (users@sling.apache.org).
- I'm always looking forward to your feedback. Even if it's critique :-)</p>
<h2>Architecture</h2>
<p>The JavaScript NodeTypeManager is developed in an object oriented way. It is instantiated in its own namespace and then loads <a href="${pageContext.request.contextPath}/libs/jsnodetypes/content/nodetypes.json">all available node types from the server in the JSON format</a>.</p>
- <p>This is handled by the <code>org.apache.sling.commons.js.nodetypes.NodeTypesJSONServlet</code> at the server side. It</p>
+ <p>This is handled by the <code>org.apache.sling.jcr.js.nodetypes.NodeTypesJSONServlet</code> at the server side. It</p>
<ul>
<li>reads the node types from the repository</li>
<li>converts them to JSON</li>
@@ -310,16 +315,12 @@ var canAddChildNode = firstNodeType.canA
<h3>JavaScript</h3>
<p>The JavaScript tests are implemented in <code>src/test/javascript/NodeTypesSpec.js</code> using <a href="http://pivotal.github.com/jasmine/">Jasmine</a>. When you call <code>mvn jasmine:bdd</code> you can edit the tests and refresh the browser at <code>http://localhost:8234</code> to rerun the tests.
<h3>Java</h3>
- <p>The Java tests can be found in <code>src/test/java/de/sandroboehme/jsnodetypes</code>. They query the <code>org.apache.sling.commons.js.nodetypes.NodeTypesJSONServlet</code> while mocking the <code>javax.jcr.nodetype.NodeTypeManager</code> using <a href="http://docs.mockito.googlecode.com/hg/latest/org/mockito/Mockito.html">Mockito</a>.
- The result is then compared to the expected values in the <code>src/test/resources/expectedNTJSON/*.json</code> files using <code>org.apache.sling.commons.js.nodetypes.testJSONAssert</code>. This class is actually copied from
+ <p>The Java tests can be found in <code>src/test/java/org/apache/sling/jcr/js/nodetypes</code>. They query the <code>org.apache.sling.jcr.js.nodetypes.NodeTypesJSONServlet</code> while mocking the <code>javax.jcr.nodetype.NodeTypeManager</code> using <a href="http://docs.mockito.googlecode.com/hg/latest/org/mockito/Mockito.html">Mockito</a>.
+ The result is then compared to the expected values in the <code>src/test/resources/expectedNTJSON/*.json</code> files using <code>org.apache.sling.jcr.js.nodetypes.testJSONAssert</code>. This class is actually copied from
<code>org.apache.sling.commons.json.test.JSONAssert</code>. If somebody knows a better way to reuse this class please open an bug and let me know.
</p>
<h2>Build</h2>
- <p>You can check out the sources from <a href="https://github.com/sandroboehme/jsNodeTypes">https://github.com/sandroboehme/jsNodeTypes</a> and build them with Maven. Use<br>
- <code>mvn install, mvn sling:install, mvn deploy -DremoteOBR=http://admin:admin@localhost:8080/obr/repository.xml -DaltDeploymentRepository=local8080::default::dav:http://admin:admin@localhost:8080/obr
- </code><br>
- to install the library to your local Maven repo, mount the library sources to your running sling repo for a quicker development or deploy it to your local OSGi bundle repository to test the OSGi installation.
- </p>
+ <p>Please read the instructions in the README.txt file for instructions on how to build the project.</p>
<h2>License</h2>
<p>This library is licensed under the terms of the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2 license</a>.</p>
<h2>Compatibility</h2>
@@ -331,4 +332,4 @@ var canAddChildNode = firstNodeType.canA
</div>
</div>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/js/jsnodetypes.js
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/js/jsnodetypes.js?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/js/jsnodetypes.js (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/js/jsnodetypes.js Fri Feb 26 18:28:25 2016
@@ -18,9 +18,13 @@
*/
// creating the namespace
-var de = de || {};
-de.sandroboehme = de.sandroboehme || {};
-var sandroboehme = de.sandroboehme;
+var org = org || {};
+org.apache = org.apache || {};
+org.apache.sling = org.apache.sling || {};
+org.apache.sling.jcr = org.apache.sling.jcr || {};
+org.apache.sling.jcr.js = org.apache.sling.jcr.js || {};
+org.apache.sling.jcr.js.nodetypes = org.apache.sling.jcr.js.nodetypes || {};
+
/*
JSNodeTypes - The JavaScript Node Types library for Apache Sling
@@ -30,7 +34,7 @@ var sandroboehme = de.sandroboehme;
*/
//defining the module
-de.sandroboehme.NodeTypeManager = (function() {
+org.apache.sling.jcr.js.nodetypes.NodeTypeManager = (function() {
function NodeTypeManager(settingsParameter){
// copies the setting parameters to the object scope and configures the defaults
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/ChildNodeDefGenerationTest.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/ChildNodeDefGenerationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/ChildNodeDefGenerationTest.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/ChildNodeDefGenerationTest.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/ChildNodeDefGenerationTest.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/ChildNodeDefGenerationTest.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/ChildNodeDefGenerationTest.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import static org.mockito.Mockito.when;
@@ -28,11 +28,10 @@ import javax.jcr.nodetype.NodeType;
import javax.servlet.ServletException;
import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.jcr.js.nodetypes.mock.MockNodeTypeGenerator;
import org.junit.Before;
import org.junit.Test;
-import de.sandroboehme.jsnodetypes.mock.MockNodeTypeGenerator;
-
/**
* Tests if the servlet generates the combinations child node definitions in the correct JSON format.
*/
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/DefaultNodeTypeTest.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/DefaultNodeTypeTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/DefaultNodeTypeTest.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/DefaultNodeTypeTest.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/DefaultNodeTypeTest.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/DefaultNodeTypeTest.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/DefaultNodeTypeTest.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,11 +35,10 @@ import javax.jcr.nodetype.PropertyDefini
import javax.servlet.ServletException;
import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.jcr.js.nodetypes.mock.MockNodeTypeGenerator;
import org.junit.Before;
import org.junit.Test;
-import de.sandroboehme.jsnodetypes.mock.MockNodeTypeGenerator;
-
/**
* Tests if the JSON is generated with the default values omitted.
*/
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/GenerationConstants.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/GenerationConstants.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/GenerationConstants.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/NodeTypeGenerationTest.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/NodeTypeGenerationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/NodeTypeGenerationTest.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/NodeTypeGenerationTest.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/NodeTypeGenerationTest.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/NodeTypeGenerationTest.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/NodeTypeGenerationTest.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.jcr.js.nodetypes;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -34,11 +34,10 @@ import javax.jcr.version.OnParentVersion
import javax.servlet.ServletException;
import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.jcr.js.nodetypes.mock.MockNodeTypeGenerator;
import org.junit.Before;
import org.junit.Test;
-import de.sandroboehme.jsnodetypes.mock.MockNodeTypeGenerator;
-
/**
* Tests if the servlet generates the combinations node type definitions in the correct JSON format.
*/
Copied: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/PropertyDefGenerationTest.java (from r1731254, sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/PropertyDefGenerationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/PropertyDefGenerationTest.java?p2=sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/PropertyDefGenerationTest.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/PropertyDefGenerationTest.java&r1=1731254&r2=1732531&rev=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/PropertyDefGenerationTest.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/PropertyDefGenerationTest.java Fri Feb 26 18:28:25 2016
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.jcr.js.nodetypes;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_STRING;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_STRING;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_STRING;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_STRING;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -34,11 +34,10 @@ import javax.jcr.nodetype.PropertyDefini
import javax.servlet.ServletException;
import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.jcr.js.nodetypes.mock.MockNodeTypeGenerator;
import org.junit.Before;
import org.junit.Test;
-import de.sandroboehme.jsnodetypes.mock.MockNodeTypeGenerator;
-
/**
* Tests if the servlet generates the combinations property definitions in the correct JSON format.
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -45,14 +45,13 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.HttpConstants;
-import org.apache.sling.commons.js.nodetypes.downloaddefaultbinary.DownloadDefaultBinaryValueServlet;
+import org.apache.sling.jcr.js.nodetypes.GenerationConstants;
+import org.apache.sling.jcr.js.nodetypes.downloaddefaultbinary.DownloadDefaultBinaryValueServlet;
+import org.apache.sling.jcr.js.nodetypes.mock.MockPropertyDefGenerator;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import de.sandroboehme.jsnodetypes.GenerationConstants;
-import de.sandroboehme.jsnodetypes.mock.MockPropertyDefGenerator;
-
/**
* Tests the DownloadDefaultBinaryValueServlet
*
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockNodeTypeGenerator.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockNodeTypeGenerator.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockNodeTypeGenerator.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockNodeTypeGenerator.java Fri Feb 26 18:28:25 2016
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.mock;
+package org.apache.sling.jcr.js.nodetypes.mock;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.NODETYPE_REQ_PRIMARY_TYPE_NAME1;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.NODETYPE_REQ_PRIMARY_TYPE_NAME2;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.NODETYPE_REQ_PRIMARY_TYPE_NAME1;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.NODETYPE_REQ_PRIMARY_TYPE_NAME2;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -48,12 +48,11 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.HttpConstants;
-import org.apache.sling.commons.js.nodetypes.NodeTypesJSONServlet;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.commons.json.JSONTokener;
-
-import de.sandroboehme.jsnodetypes.test.JSONAssert;
+import org.apache.sling.jcr.js.nodetypes.NodeTypesJSONServlet;
+import org.apache.sling.jcr.js.nodetypes.test.JSONAssert;
/**
* Generates NodeType mocks that will be returned when the servlet calles
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockPropertyDefGenerator.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockPropertyDefGenerator.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockPropertyDefGenerator.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/mock/MockPropertyDefGenerator.java Fri Feb 26 18:28:25 2016
@@ -16,25 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.mock;
+package org.apache.sling.jcr.js.nodetypes.mock;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_BINARY;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_BOOLEAN;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_DATE;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_DOUBLE;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_LONG;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_NAME;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_PATH;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_REFERENCE;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.CONSTRAINT_STRING;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_BOOLEAN;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_CALENDAR;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_DOUBLE;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_LONG;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_NAME;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_PATH;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_REFERENCE;
-import static de.sandroboehme.jsnodetypes.GenerationConstants.DEFAULT_VALUE_STRING;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_BINARY;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_BOOLEAN;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_DATE;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_DOUBLE;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_LONG;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_NAME;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_PATH;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_REFERENCE;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.CONSTRAINT_STRING;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_BOOLEAN;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_CALENDAR;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_DOUBLE;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_LONG;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_NAME;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_PATH;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_REFERENCE;
+import static org.apache.sling.jcr.js.nodetypes.GenerationConstants.DEFAULT_VALUE_STRING;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -57,8 +57,7 @@ import javax.jcr.version.OnParentVersion
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
-
-import de.sandroboehme.jsnodetypes.GenerationConstants;
+import org.apache.sling.jcr.js.nodetypes.GenerationConstants;
/**
* Generates the PropertyDefinition mocks to simulate the property definitions that the servlet gets
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/test/JSONAssert.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/test/JSONAssert.java?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/test/JSONAssert.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/test/JSONAssert.java Fri Feb 26 18:28:25 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.test;
+package org.apache.sling.jcr.js.nodetypes.test;
import java.util.Iterator;
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/javascript/NodeTypesSpec.js
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/javascript/NodeTypesSpec.js?rev=1732531&r1=1731254&r2=1732531&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/javascript/NodeTypesSpec.js (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/javascript/NodeTypesSpec.js Fri Feb 26 18:28:25 2016
@@ -61,7 +61,7 @@ describe('The Node Type Manager', functi
},"n4" : {
}}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
expect(ntManager.getNodeTypeNames()).toEqual(["nt:base","n1","n2","n3","n4"]);
});
@@ -74,7 +74,7 @@ describe('The Node Type Manager', functi
"aNodeType" : {
}}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
expect(ntManager.getNodeType("aNodeType")).toEqual(settings.nodeTypesJson["aNodeType"]);
});
@@ -124,7 +124,7 @@ describe('The Node Type Manager', functi
"declaredSupertypes" : []
}}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingChildNodeDefs = ntManager.getNodeType("aNodeType").getAllChildNodeDefinitions();
expect(resultingChildNodeDefs.length).toBe(8);
expect(arrayContainsCnDefWithName(resultingChildNodeDefs, "childNodeDef1")).toBe(true);
@@ -157,7 +157,7 @@ describe('The Node Type Manager', functi
}
}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingChildNodeDefs = ntManager.getNodeType("aNodeType").getAllChildNodeDefinitions();
expect(resultingChildNodeDefs.length).toBe(2);
expect(arrayContainsCnDefWithName(resultingChildNodeDefs, "childNodeDef1")).toBe(true);
@@ -195,7 +195,7 @@ describe('The Node Type Manager', functi
"declaredSupertypes" : []
}}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingChildNodeDefs = ntManager.getNodeType("aNodeType").getAllChildNodeDefinitions();
expect(resultingChildNodeDefs.length).toBe(3);
@@ -232,7 +232,7 @@ describe('The Node Type Manager', functi
"declaredSupertypes" : []
}}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingChildNodeDefs = ntManager.getNodeType("aNodeType").getAllChildNodeDefinitions();
expect(resultingChildNodeDefs.length).toBe(6);
@@ -288,7 +288,7 @@ describe('The Node Type Manager', functi
"declaredSupertypes" : []
}}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingPropertyDefs = ntManager.getNodeType("aNodeType").getAllPropertyDefinitions();
expect(resultingPropertyDefs.length).toBe(8);
expect(arrayContainsPropDefWithName(resultingPropertyDefs, "propertyDef1")).toBe(true);
@@ -328,7 +328,7 @@ describe('The Node Type Manager', functi
"declaredSupertypes" : []
}}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingPropertyDefs = ntManager.getNodeType("aNodeType").getAllPropertyDefinitions();
expect(resultingPropertyDefs.length).toBe(2);
expect(arrayContainsPropDefWithName(resultingPropertyDefs, "propertyDef1")).toBe(true);
@@ -385,7 +385,7 @@ describe('The Node Type Manager', functi
"declaredSupertypes" : []
}}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingPropertyDefs = ntManager.getNodeType("aNodeType").getAllPropertyDefinitions();
expect(resultingPropertyDefs.length).toBe(5);
expect(arrayContainsPropDefWithName(resultingPropertyDefs, "propertyDef1")).toBe(true);
@@ -420,7 +420,7 @@ describe('The Node Type Manager', functi
"declaredSupertypes" : []
}}
};
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var resultingPropertyDefs = ntManager.getNodeType("aNodeType").getAllPropertyDefinitions();
expect(resultingPropertyDefs.length).toBe(6);
expect(arrayContainsPropDefWithName(resultingPropertyDefs, "propertyDef1")).toBe(true);
@@ -446,7 +446,7 @@ describe('The Node Type Manager', functi
}
}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
it('for the properties at the node type level', function() {
compareNodeTypeProperties(ntManager.getNodeType("nt"), ntManager.internalGetDefaultNodeType())
@@ -462,7 +462,7 @@ describe('The Node Type Manager', functi
});
describe('for the properties at the child node definition level', function() {
- ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
it('that do inherit from item definition', function() {
compareChildNodeDefProperties(ntManager.getNodeType("nt").getAllChildNodeDefinitions(), ntManager.internalGetDefaultNodeType().declaredChildNodeDefinitions);
});
@@ -521,7 +521,7 @@ describe('The Node Type Manager', functi
}
}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
it('for the properties at the node type level', function() {
compareNodeTypeProperties(ntManager.getNodeType("nt"), settings.nodeTypesJson.nt)
@@ -739,7 +739,7 @@ describe('The Node Type Manager', functi
// see "/src/test/resources/applicableChildNodeTypesDatastructure.jpg" for a
// visualization of the test datastructure
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var applicableCnTypes = ntManager.getNodeType("aNodeType").getApplicableCnTypesPerCnDef();
it('generally', function() {
@@ -818,7 +818,7 @@ describe('The Node Type Manager', functi
}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var applicableCnTypes = ntManager.getNodeType("aNodeType").getApplicableCnTypesPerCnDef();
it('if required primary types is \'nt:base\'', function() {
@@ -858,7 +858,7 @@ describe('The Node Type Manager', functi
}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var applicableCnTypes = ntManager.getNodeType("aNodeType").getApplicableCnTypesPerCnDef();
expect(applicableCnTypes!=null).toBe(true);
@@ -906,7 +906,7 @@ describe('The Node Type Manager', functi
}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var applicableCnTypesWithMixin = ntManager.getNodeType("aNodeType").getApplicableCnTypesPerCnDef(true);
expect(applicableCnTypesWithMixin!=null).toBe(true);
@@ -1011,7 +1011,7 @@ describe('The Node Type Manager', functi
}
}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
var ntBase = ntManager.getNodeType("nt:base");
var ntResidualChild = ntManager.getNodeType("ntResidualChild");
@@ -1083,7 +1083,7 @@ describe('The Node Type Manager', functi
}
};
- var ntManager = new de.sandroboehme.NodeTypeManager(settings);
+ var ntManager = new org.apache.sling.jcr.js.nodetypes.NodeTypeManager(settings);
describe('if the name and type is applicable', function() {
it('for residual property names', function() {