jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1793621 - in /jackrabbit/branches/2.8: ./ jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/stats/ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ j...
Date Wed, 03 May 2017 07:57:28 GMT
Author: reschke
Date: Wed May  3 07:57:28 2017
New Revision: 1793621

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

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

Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  3 07:57:28 2017
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772444,1772457,1772530,1772544,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772444,1772457,1772530,1772544,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332

Modified: jackrabbit/branches/2.8/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java?rev=1793621&r1=1793620&r2=1793621&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
Wed May  3 07:57:28 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.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/stats/QueryStatCore.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/stats/QueryStatCore.java?rev=1793621&r1=1793620&r2=1793621&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/stats/QueryStatCore.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/stats/QueryStatCore.java
Wed May  3 07:57:28 2017
@@ -19,8 +19,7 @@ package org.apache.jackrabbit.stats;
 import org.apache.jackrabbit.api.stats.QueryStat;
 
 /**
- * Extends external facing {@link QueryStat} with some internal operations
- * 
+ * Extends external facing {@link QueryStat} with some internal operations.
  */
 public interface QueryStatCore extends QueryStat {
 
@@ -29,12 +28,11 @@ public interface QueryStatCore extends Q
      * 
      * @param language
      *            the query language, see
-     *            {@link org.apache.jackrabbit.spi.commons.name.NameConstants#JCR_LANGUAGE}
+     *            {@link javax.jcr.query.QueryManager#getSupportedQueryLanguages()}
      * @param statement
      *            the query
      * @param durationMs
      *            time in ms
      */
     void logQuery(final String language, final String statement, long durationMs);
-
 }

Modified: jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java?rev=1793621&r1=1793620&r2=1793621&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/Spi2davRepositoryServiceFactory.java
Wed May  3 07:57:28 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.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java?rev=1793621&r1=1793620&r2=1793621&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
Wed May  3 07:57:28 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.8/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java?rev=1793621&r1=1793620&r2=1793621&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
Wed May  3 07:57:28 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