You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/09/14 13:46:01 UTC
svn commit: r1840927 - in /jackrabbit/branches/2.12: ./
jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNodeTest.java
jackrabbit-parent/pom.xml
Author: reschke
Date: Fri Sep 14 13:46:01 2018
New Revision: 1840927
URL: http://svn.apache.org/viewvc?rev=1840927&view=rev
Log:
JCR-4254: Update Logback version to >= 1.2.0, SLF4J accordingly (ported to 2.12)
Modified:
jackrabbit/branches/2.12/ (props changed)
jackrabbit/branches/2.12/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNodeTest.java
jackrabbit/branches/2.12/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 14 13:46:01 2018
@@ -1,4 +1,4 @@
/jackrabbit/branches/2.14:1813154,1813337
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1730696,1732436,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1759933,1761679,1761909,1762422,1763558,1766398,1768684,1771078,1771741,1771939,1771999,1772049,1772299,1772343,1772444,1772457,1772530,1772544,1772597,1772822,1773579,1773591,1773745,1774021,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779632,1780208,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817097-1817098,1817100,1817201,1817213,1817377,1818586,1819269,1820119,1820133,1821597,1821705,1822863,1822947,1822950,1824756,182
4763-1824764,1824771,1826178,1826230,1826647,1826940,1826964,1828213,1830540,1830753,1830878,1831854,1832058,1832090,1833374,1833891,1834308,1834315,1834401,1834424,1834673,1835459,1836349
+/jackrabbit/trunk:1730696,1732436,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1759933,1761679,1761909,1762422,1763558,1766398,1768684,1771078,1771741,1771939,1771999,1772049,1772299,1772343,1772444,1772457,1772530,1772544,1772597,1772822,1773579,1773591,1773745,1774021,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779632,1780208,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817097-1817098,1817100,1817201,1817213,1817377,1818586,1819269,1820119,1820133,1821597,1821705,1822643,1822863,1822947,1822950,182
4756,1824763-1824764,1824771,1826178,1826230,1826647,1826940,1826964,1828213,1830540,1830753,1830878,1831854,1832058,1832090,1833374,1833891,1834308,1834315,1834401,1834424,1834673,1835459,1836349
Modified: jackrabbit/branches/2.12/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNodeTest.java?rev=1840927&r1=1840926&r2=1840927&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNodeTest.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNodeTest.java Fri Sep 14 13:46:01 2018
@@ -16,26 +16,20 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.ByteArrayInputStream;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.lock.LockException;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
/**
* <code>AddNodeTest</code>...
*/
public class AddNodeTest extends AbstractJCRTest {
/**
- * logger instance
- */
- private static final Logger log = LoggerFactory.getLogger(AddNodeTest.class);
-
- /**
* Writing to a locked node must throw LockException even if the lock
* isn't detected withing Jcr2Spi.
*
@@ -48,7 +42,7 @@ public class AddNodeTest extends Abstrac
Node node = s.getNode(testRootNode.getPath());
Node n = node.addNode(nodeName1);
n.setProperty(propertyName1, "value");
-
+
testRootNode.lock(true, true);
s.save();
@@ -58,4 +52,26 @@ public class AddNodeTest extends Abstrac
s.logout();
}
}
+
+ public void testAddNodeNonASCII() throws Exception {
+ String testName = "test - \u20ac";
+ Session s = getHelper().getSuperuserSession();
+ try {
+ Node node = s.getNode(testRootNode.getPath());
+ Node n = node.addNode(testName, "nt:file");
+ Node c = n.addNode("jcr:content", "nt:resource");
+ c.setProperty("jcr:data", s.getValueFactory().createBinary(new ByteArrayInputStream("hello world".getBytes("UTF-8"))));
+ s.save();
+ } finally {
+ s.logout();
+ }
+
+ Session s2 = getHelper().getReadOnlySession();
+ try {
+ Node node = s2.getNode(testRootNode.getPath()).getNode(testName);
+ assertEquals(testName, node.getName());
+ } finally {
+ s2.logout();
+ }
+ }
}
\ No newline at end of file
Modified: jackrabbit/branches/2.12/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-parent/pom.xml?rev=1840927&r1=1840926&r2=1840927&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.12/jackrabbit-parent/pom.xml Fri Sep 14 13:46:01 2018
@@ -50,15 +50,9 @@
<tika.version>1.7</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<clirr.baseline.version>2.2.0</clirr.baseline.version>
- <!-- Note that we're using SLF4J API version 1.6 when compiling -->
- <!-- core Oak components but more recent SLF4J and Logback versions -->
- <!-- when compiling and running test cases and the oak-run jar. -->
- <!-- This way it's possible to use Oak also in environments that -->
- <!-- only provide SLF4J version 1.6, while still using a more -->
- <!-- recent version when we are in control the runtime environment. -->
- <slf4j.api.version>1.6.6</slf4j.api.version>
- <slf4j.version>1.7.4</slf4j.version> <!-- sync with logback version -->
- <logback.version>1.0.12</logback.version>
+ <slf4j.api.version>1.7.25</slf4j.api.version>
+ <slf4j.version>1.7.25</slf4j.version> <!-- sync with logback version -->
+ <logback.version>1.2.3</logback.version>
<java.version>1.6</java.version>
<java.version.signature>java16</java.version.signature>
<skip.coverage>true</skip.coverage>