Author: sboehme
Date: Mon Feb 16 21:43:46 2015
New Revision: 1660209
URL: http://svn.apache.org/r1660209
Log:
SLING-4364 :: Integrate new JavaScript node type library :: renamed
'de.sandroboehme.jsnodetypes' package to 'org.apache.sling.commons.js.nodetypes'
Added:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java
- copied, changed from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONItemDefinition.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java
- copied, changed from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeDefinition.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java
- copied, changed from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeType.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java
- copied, changed from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONPropertyDefinition.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java
- copied, changed from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONValue.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java
- copied, changed from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/NodeTypesJSONServlet.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/
- copied from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/downloaddefaultbinary/
Removed:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/
Modified:
sling/trunk/contrib/commons/js/nodetypes/pom.xml
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
sling/trunk/contrib/commons/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/mock/MockNodeTypeGenerator.java
Modified: sling/trunk/contrib/commons/js/nodetypes/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/pom.xml?rev=1660209&r1=1660208&r2=1660209&view=diff
==============================================================================
--- sling/trunk/contrib/commons/js/nodetypes/pom.xml (original)
+++ sling/trunk/contrib/commons/js/nodetypes/pom.xml Mon Feb 16 21:43:46 2015
@@ -77,8 +77,8 @@
<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>de.sandroboehme.jsnodetypes.javascript</Export-Package>
-
<Provide-Capability>${project.artifactId};
version:Version=1.0.7</Provide-Capability>
+
<Export-Package>org.apache.sling.commons.js.nodetypes.javascript</Export-Package>
+
<Provide-Capability>${project.artifactId};
version:Version=0.1.0</Provide-Capability>
</instructions>
</configuration>
</plugin>
Copied:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java
(from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONItemDefinition.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java?p2=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONItemDefinition.java&r1=1660179&r2=1660209&rev=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONItemDefinition.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONItemDefinition.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.commons.js.nodetypes;
import javax.jcr.nodetype.ItemDefinition;
import javax.jcr.version.OnParentVersionAction;
Copied:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java
(from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeDefinition.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java?p2=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeDefinition.java&r1=1660179&r2=1660209&rev=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeDefinition.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeDefinition.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.commons.js.nodetypes;
import java.util.ArrayList;
import java.util.List;
Copied:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java
(from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeType.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java?p2=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeType.java&r1=1660179&r2=1660209&rev=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONNodeType.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONNodeType.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.commons.js.nodetypes;
import java.util.ArrayList;
import java.util.List;
Copied:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java
(from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONPropertyDefinition.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java?p2=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONPropertyDefinition.java&r1=1660179&r2=1660209&rev=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONPropertyDefinition.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONPropertyDefinition.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.commons.js.nodetypes;
import java.util.Arrays;
import java.util.List;
Copied:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java
(from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONValue.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java?p2=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONValue.java&r1=1660179&r2=1660209&rev=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/JSONValue.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/JSONValue.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.commons.js.nodetypes;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
Copied:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java
(from r1660179,
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/NodeTypesJSONServlet.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java?p2=sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java&p1=sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/NodeTypesJSONServlet.java&r1=1660179&r2=1660209&rev=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/de/sandroboehme/jsnodetypes/NodeTypesJSONServlet.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/NodeTypesJSONServlet.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes;
+package org.apache.sling.commons.js.nodetypes;
import java.io.IOException;
import java.io.PrintWriter;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AbstractPropertyMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
/**
* Makes it possible to specify the array and index but retrieving it on
demand lazily.
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueServlet.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import java.io.BufferedReader;
import java.io.IOException;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
import javax.jcr.version.OnParentVersionAction;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.nodetype.PropertyDefinition;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java?rev=1660209&r1=1660179&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/java/org/apache/sling/commons/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
Mon Feb 16 21:43:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package de.sandroboehme.jsnodetypes.downloaddefaultbinary;
+package org.apache.sling.commons.js.nodetypes.downloaddefaultbinary;
import javax.jcr.PropertyType;
import javax.jcr.nodetype.PropertyDefinition;
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp?rev=1660209&r1=1660208&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/main/resources/SLING-INF/libs/jsnodetypes/documentation/html.jsp
Mon Feb 16 21:43:46 2015
@@ -293,7 +293,7 @@ var canAddChildNode = firstNodeType.canA
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>de.sandroboehme.jsnodetypes.NodeTypesJSONServlet</code> at the server
side. It</p>
+ <p>This is handled by the
<code>org.apache.sling.commons.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,8 +310,8 @@ 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>de.sandroboehme.jsnodetypes.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>de.sandroboehme.jsnodetypes.testJSONAssert</code>. This class is actually
copied from
+ <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
<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>
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java?rev=1660209&r1=1660208&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/downloaddefaultbinary/DownloadDefaultBinaryValueTest.java
Mon Feb 16 21:43:46 2015
@@ -45,12 +45,12 @@ 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.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import de.sandroboehme.jsnodetypes.GenerationConstants;
-import
de.sandroboehme.jsnodetypes.downloaddefaultbinary.DownloadDefaultBinaryValueServlet;
import de.sandroboehme.jsnodetypes.mock.MockPropertyDefGenerator;
/**
Modified:
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/mock/MockNodeTypeGenerator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/mock/MockNodeTypeGenerator.java?rev=1660209&r1=1660208&r2=1660209&view=diff
==============================================================================
---
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/mock/MockNodeTypeGenerator.java
(original)
+++
sling/trunk/contrib/commons/js/nodetypes/src/test/java/de/sandroboehme/jsnodetypes/mock/MockNodeTypeGenerator.java
Mon Feb 16 21:43:46 2015
@@ -48,11 +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.NodeTypesJSONServlet;
import de.sandroboehme.jsnodetypes.test.JSONAssert;
/**