jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1793622 - in /jackrabbit/branches/2.6: ./ jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ j...
Date Wed, 03 May 2017 08:05:06 GMT
Author: reschke
Date: Wed May  3 08:05:06 2017
New Revision: 1793622

URL: http://svn.apache.org/viewvc?rev=1793622&view=rev
Log:
JCR-4133: fix javadoc problems that are errors with JDK8 (ported to 2.6)

Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
    jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java
    jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
    jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  3 08:05:06 2017
@@ -1,4 +1,4 @@
 /jackrabbit/branches/2.8:1643783
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1437334,1437374,1437384,1437618,1437928,1437933,1437963,1438158,1438541,1439296,1439312,1439346,1439768,1439797,1439927,1440059,1440336,1440456,1440908,1440917,1442061,1443652,1443876,1443885,1443943,1444501,1444515,1444654,1444666,1444683,1444755,1445122,1445134,1453907,1460995,1461064,1461137,1461613,1461646,1462115,1462153,1462205,1462211,1465974,1466060,1466085,1466938,1467255,1467363,1468965,1469312,1469799,1469892,1469940,1470573,1470957,1471286,1475718,1478684,1478719,1478757,1479518,1479527,1479533,1479536,1479691,1479809,1479908,1480574,1481964,1483276,1483286,1484440,1484442,1484444,1484727,1487803,1497243,1497492,1497787,1498840,1498850,1499285,1505795,1505907,1505942,1506594,1506877,1508053,1509101,1513144,1516281,1517602,1517627,1519376,1525629,1525633,1526928,1526945,1530005,1535539,1537027,1539030,1539045,1539050,1555885,1556248,1566668-1566669,1582373,1587619,1590030,1590733,1598035,1598058,1603934,1609712,1634584,1680757,1709811,1729382,1732436,175
 8600,1759865,1761679,1761909,1762422,1763558,1766398,1771741,1773591,1773745,1779166,1779460,1780208,1786325,1787043,1792193
+/jackrabbit/trunk:1437334,1437374,1437384,1437618,1437928,1437933,1437963,1438158,1438541,1439296,1439312,1439346,1439768,1439797,1439927,1440059,1440336,1440456,1440908,1440917,1442061,1443652,1443876,1443885,1443943,1444501,1444515,1444654,1444666,1444683,1444755,1445122,1445134,1453907,1460995,1461064,1461137,1461613,1461646,1462115,1462153,1462205,1462211,1465974,1466060,1466085,1466938,1467255,1467363,1468965,1469312,1469799,1469892,1469940,1470573,1470957,1471286,1475718,1478684,1478719,1478757,1479518,1479527,1479533,1479536,1479691,1479809,1479908,1480574,1481964,1483276,1483286,1484440,1484442,1484444,1484727,1487803,1497243,1497492,1497787,1498840,1498850,1499285,1505795,1505907,1505942,1506594,1506877,1508053,1509101,1513144,1516281,1517602,1517627,1519376,1525629,1525633,1526928,1526945,1530005,1535539,1537027,1539030,1539045,1539050,1555885,1556248,1566668-1566669,1582373,1587619,1590030,1590733,1598035,1598058,1603934,1609712,1634584,1680757,1709811,1729382,1732436,175
 8600,1759865,1761679,1761909,1762422,1763558,1766398,1771741,1773591,1773745,1779166,1779460,1780208,1786325,1787043,1792193,1793315,1793323,1793327,1793332

Modified: jackrabbit/branches/2.6/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java?rev=1793622&r1=1793621&r2=1793622&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
Wed May  3 08:05:06 2017
@@ -27,19 +27,19 @@ import javax.jcr.RepositoryFactory;
  * repository which is covered by the Apache Jackrabbit project. It does so by
  * delegating back to secondary RepositoryFactory implementations. The
  * parameters passed to the {@link #getRepository(Map)} method determine which
- * secondare RepositoryFactory this factory delegates to.
+ * secondary RepositoryFactory this factory delegates to.
  */
 public class RepositoryFactoryImpl implements RepositoryFactory {
 
     /**
      * When this key parameter is present, this factory delegates to
-     * {@link org.apache.jackrabbit.jcr2spi.Jcr2spiRepositoryFactory}
+     * {@code org.apache.jackrabbit.jcr2spi.Jcr2spiRepositoryFactory}
      */
     public static final String PARAM_REPOSITORY_SERVICE_FACTORY = "org.apache.jackrabbit.spi.RepositoryServiceFactory";
 
     /**
      * When this key parameter is present, this factory delegates to
-     * {@link org.apache.jackrabbit.jcr2spi.Jcr2spiRepositoryFactory}
+     * {@code org.apache.jackrabbit.jcr2spi.Jcr2spiRepositoryFactory}
      */
     public static final String PARAM_REPOSITORY_CONFIG = "org.apache.jackrabbit.jcr2spi.RepositoryConfig";
 
@@ -49,7 +49,7 @@ public class RepositoryFactoryImpl imple
      * {@link #PARAM_REPOSITORY_CONFIG} is present, this factory delegates
      * to {@link org.apache.jackrabbit.jcr2spi.Jcr2spiRepositoryFactory}.
      * Otherwise it delegates to
-     * {@link org.apache.jackrabbit.core.RepositoryFactoryImpl}.
+     * {@code org.apache.jackrabbit.core.RepositoryFactoryImpl}.
      *
      * @see RepositoryFactory#getRepository(java.util.Map)
      */

Modified: jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java?rev=1793622&r1=1793621&r2=1793622&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java
Wed May  3 08:05:06 2017
@@ -42,8 +42,6 @@ public class Spi2davRepositoryServiceFac
     /**
      * Mandatory configuration parameter: It's value is expected to specify the
      * URI of the JCR server implementation.
-     *
-     * @see org.apache.jackrabbit.webdav.jcr.JCRWebdavServerServlet
      */
     public static final String PARAM_REPOSITORY_URI = "org.apache.jackrabbit.spi2dav.uri";
 

Modified: jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java?rev=1793622&r1=1793621&r2=1793622&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
Wed May  3 08:05:06 2017
@@ -36,8 +36,6 @@ public class Spi2davexRepositoryServiceF
      * URI of the JCR server implementation. {@link #DEFAULT_REPOSITORY_URI} is used as
      * fallback if no parameters or uri has been specified and the uri could not
      * been retrieved from system props either.
-     *
-     * @see org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet
      */
     public static final String PARAM_REPOSITORY_URI = "org.apache.jackrabbit.spi2davex.uri";
 

Modified: jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java?rev=1793622&r1=1793621&r2=1793622&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
Wed May  3 08:05:06 2017
@@ -696,10 +696,9 @@ public class DomUtil {
     }
 
     /**
-     * Builds a 'DAV:href' Xml element from the given href. Please note, that
-     * the path present in the given String should be properly
-     * {@link org.apache.jackrabbit.util.Text#escapePath(String) escaped} in order to prevent
problems with
-     * WebDAV clients.
+     * Builds a 'DAV:href' Xml element from the given href.
+     * <p>
+     * Note that the path present needs to be a valid URI or URI reference.
      *
      * @param href String representing the text of the 'href' Xml element
      * @param factory the Document used as factory



Mime
View raw message