incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r602050 - in /incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api: AbstractSlingRepository.java NodeTypeLoader.java SlingRepository.java internal/SessionPool.java
Date Fri, 07 Dec 2007 09:49:15 GMT
Author: cziegeler
Date: Fri Dec  7 01:49:15 2007
New Revision: 602050

URL: http://svn.apache.org/viewvc?rev=602050&view=rev
Log:
Cleanup javadocs.

Modified:
    incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java
    incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java
    incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
    incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java

Modified: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java?rev=602050&r1=602049&r2=602050&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java
Fri Dec  7 01:49:15 2007
@@ -126,7 +126,8 @@
     protected final SessionPoolManager getPoolManager()
             throws RepositoryException {
         if (this.poolManager == null) {
-            Dictionary properties = this.componentContext.getProperties();
+            @SuppressWarnings("unchecked")
+            Dictionary<String, Object> properties = this.componentContext.getProperties();
             int maxActiveSessions = this.getIntProperty(properties,
                 PARAM_MAX_ACTIVE_SESSIONS);
             int maxIdleSessions = this.getIntProperty(properties,
@@ -142,7 +143,7 @@
     }
 
     /**
-     * @see org.apache.sling.jcr.SlingRepository#getDefaultWorkspace()
+     * @see org.apache.sling.jcr.api.SlingRepository#getDefaultWorkspace()
      */
     public String getDefaultWorkspace() {
         return this.defaultWorkspace;
@@ -284,7 +285,8 @@
     protected void activate(ComponentContext componentContext) throws Exception {
         this.componentContext = componentContext;
 
-        Dictionary properties = componentContext.getProperties();
+        @SuppressWarnings("unchecked")
+        Dictionary<String, Object> properties = componentContext.getProperties();
         this.defaultWorkspace = this.getProperty(properties, PROPERTY_DEFAULT_WORKSPACE,
             DEFAULT_WORKSPACE);
 
@@ -361,13 +363,13 @@
 
     // ---------- internal -----------------------------------------------------
 
-    private String getProperty(Dictionary properties, String name,
+    private String getProperty(Dictionary<String, Object> properties, String name,
             String defaultValue) {
         Object prop = properties.get(name);
         return (prop instanceof String) ? (String) prop : defaultValue;
     }
 
-    private int getIntProperty(Dictionary properties, String name) {
+    private int getIntProperty(Dictionary<String, Object> properties, String name)
{
         Object prop = properties.get(name);
         if (prop instanceof Number) {
             return ((Number) prop).intValue();

Modified: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java?rev=602050&r1=602049&r2=602050&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java
Fri Dec  7 01:49:15 2007
@@ -56,7 +56,7 @@
      *
      * @param session The <code>Session</code> providing the node type manager
      *            through which the node type is to be registered.
-     * @param URL The URL from which to read the CND file
+     * @param source The URL from which to read the CND file
      * @return <code>true</code> if registration of all node types succeeded.
      */
     public static boolean registerNodeType(Session session, URL source) {

Modified: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java?rev=602050&r1=602049&r2=602050&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
Fri Dec  7 01:49:15 2007
@@ -49,8 +49,7 @@
      * <b><i>NOTE: This method is intended for use by infrastructure bundles
to
      * access the repository and provide general services. This method MUST not
      * be used to handle client requests of whatever kinds. To handle client
-     * requests, either an anonymous session retrieved by
-     * {@link #loginAnonymous()} or a regular authenticated session retrieved
+     * requests a regular authenticated session retrieved
      * through {@link #login(javax.jcr.Credentials, String)} or
      * {@link Session#impersonate(javax.jcr.Credentials)} must be used.</i></b>
      *

Modified: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java?rev=602050&r1=602049&r2=602050&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java
Fri Dec  7 01:49:15 2007
@@ -55,7 +55,6 @@
      * The default upper limit of simultaneously active sessions created by this
      * instance (value is Integer.MAX_VALUE).
      *
-     * @see #PARAM_MAX_ACTIVE_SESSIONS
      * @see #setMaxActiveSessions(int)
      * @see #getMaxActiveSessions()
      */
@@ -65,9 +64,8 @@
      * The default maximum time in seconds to wait for the number of active
      * sessions to drop below the maximum.
      *
-     * @see #PARAM_MAX_ACTIVE_SESSIONS_WAIT
      * @see #getMaxActiveSessionsWait()
-     * @see #setMaxActiveSessionsWait(long)
+     * @see #setMaxActiveSessionsWait(int)
      */
     public static final int DEFAULT_MAX_ACTIVE_SESSIONS_WAIT = 10;
 
@@ -75,7 +73,6 @@
      * The default upper limit for the number of idle sessions to keep in the
      * pool (valie is "10").
      *
-     * @see #PARAM_MAX_IDLE_SESSIONS
      * @see #setMaxIdleSessions(int)
      * @see #getMaxIdleSessions()
      */
@@ -351,7 +348,6 @@
      * This method is not part of the public API of this class and is present
      * solely for the purposes of JMX support.
      *
-     * @see #PARAM_MAX_ACTIVE_SESSIONS
      * @see #DEFAULT_MAX_ACTIVE_SESSIONS
      * @see #setMaxActiveSessions(int)
      */
@@ -369,7 +365,6 @@
      *          less than or equal to zero, the default value (Integer.MAX_VALUE)
      *          is assumed.
      *
-     * @see #PARAM_MAX_ACTIVE_SESSIONS
      * @see #DEFAULT_MAX_ACTIVE_SESSIONS
      * @see #getMaxActiveSessions()
      */
@@ -385,7 +380,6 @@
      * This method is not part of the public API of this class and is present
      * solely for the purposes of JMX support.
      *
-     * @see #PARAM_MAX_IDLE_SESSIONS
      * @see #DEFAULT_MAX_IDLE_SESSIONS
      * @see #getMaxIdleSessions()
      */
@@ -403,7 +397,6 @@
      *          than zero, the default value of 10 is assumed. If zero, session
      *          pooling will actually be disabled.
      *
-     * @see #PARAM_MAX_IDLE_SESSIONS
      * @see #DEFAULT_MAX_IDLE_SESSIONS
      * @see #getMaxIdleSessions()
      */



Mime
View raw message