Return-Path: 
 <jackrabbit-commits-return-814-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org
Received: (qmail 16044 invoked from network); 19 Apr 2005 16:34:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Apr 2005 16:34:20 -0000
Received: (qmail 84331 invoked by uid 500); 19 Apr 2005 16:34:07 -0000
Mailing-List: contact jackrabbit-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:jackrabbit-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jackrabbit-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jackrabbit-commits@incubator.apache.org>
List-Id: <jackrabbit-commits.incubator.apache.org>
Reply-To: jackrabbit-dev@incubator.apache.org
Delivered-To: mailing list jackrabbit-commits@incubator.apache.org
Received: (qmail 84278 invoked by uid 500); 19 Apr 2005 16:34:07 -0000
Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org
Received: (qmail 84258 invoked by uid 99); 19 Apr 2005 16:34:07 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 19 Apr 2005 09:34:04 -0700
Received: (qmail 15951 invoked by uid 65534); 19 Apr 2005 16:34:03 -0000
Message-ID: <20050419163403.15950.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Tue, 19 Apr 2005 16:34:03 -0000
Subject: svn commit: r161915 - in
 incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: ./ fs/
 nodetype/ state/ version/ version/persistence/
To: jackrabbit-cvs@incubator.apache.org
From: stefan@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: stefan
Date: Tue Apr 19 09:33:59 2005
New Revision: 161915

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161915
Log:
renamed InternalValue.EMPTY & ValueConstraint.EMPTY to EMPTY_ARRAY plus var=
ious minor inline & javadoc corrections

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Internal=
Value.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl=
.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Reposito=
ryImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileS=
ystemResource.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeManagerImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/PropDefImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ValueConstraint.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Pr=
opertyState.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/=
VersionItemStateProvider.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/=
persistence/InternalVersionHistoryImpl.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/In=
ternalValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/InternalValue.java?view=3Ddiff&r1=3D161914&r2=3D1619=
15
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Internal=
Value.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Internal=
Value.java Tue Apr 19 09:33:59 2005
@@ -60,7 +60,7 @@
  */
 public class InternalValue {
=20
-    public static final InternalValue[] EMPTY =3D new InternalValue[0];
+    public static final InternalValue[] EMPTY_ARRAY =3D new InternalValue[=
0];
=20
     private final Object val;
     private final int type;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/No=
deImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/NodeImpl.java?view=3Ddiff&r1=3D161914&r2=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl=
.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl=
.java Tue Apr 19 09:33:59 2005
@@ -2669,7 +2669,7 @@
         prop.save();
         prop =3D internalSetProperty(JCR_BASEVERSION, InternalValue.create=
(new UUID(v.getUUID())));
         prop.save();
-        prop =3D internalSetProperty(JCR_PREDECESSORS, InternalValue.EMPTY=
, PropertyType.REFERENCE);
+        prop =3D internalSetProperty(JCR_PREDECESSORS, InternalValue.EMPTY=
_ARRAY, PropertyType.REFERENCE);
         prop.save();
         return v;
     }
@@ -3478,7 +3478,7 @@
         internalSetProperty(JCR_BASEVERSION, InternalValue.create(new UUID=
(version.getId())));
=20
         // 4. N's jcr:predecessor property is set to null
-        internalSetProperty(JCR_PREDECESSORS, InternalValue.EMPTY, Propert=
yType.REFERENCE);
+        internalSetProperty(JCR_PREDECESSORS, InternalValue.EMPTY_ARRAY, P=
ropertyType.REFERENCE);
=20
         // also clear mergeFailed
         internalSetProperty(JCR_MERGEFAILED, (InternalValue[]) null);

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Re=
positoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/RepositoryImpl.java?view=3Ddiff&r1=3D161914&r2=3D161=
915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Reposito=
ryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Reposito=
ryImpl.java Tue Apr 19 09:33:59 2005
@@ -923,7 +923,7 @@
         }
     }
=20
-    //-----------------------------------------< overrideable factory meth=
ods >
+    //------------------------------------------< overridable factory meth=
ods >
     /**
      * Creates an instance of the {@link SessionImpl} class representing a
      * user authenticated by the <code>loginContext</code> instance attach=
ed

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs=
/FileSystemResource.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/fs/FileSystemResource.java?view=3Ddiff&r1=3D161914&r=
2=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileS=
ystemResource.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileS=
ystemResource.java Tue Apr 19 09:33:59 2005
@@ -155,7 +155,7 @@
         InputStream in =3D fs.getInputStream(path);
         try {
             byte[] buffer =3D new byte[8192];
-            int read =3D 0;
+            int read;
             while ((read =3D in.read(buffer)) > 0) {
                 out.write(buffer, 0, read);
             }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?view=3Ddiff&r1=3D1=
61914&r2=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeManagerImpl.java Tue Apr 19 09:33:59 2005
@@ -87,7 +87,7 @@
         this.ntReg =3D ntReg;
         this.ntReg.addListener(this);
=20
-        // setup item cache with soft references to node type instances
+        // setup caches with soft references to node type & item definitio=
n instances
         ntCache =3D new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT);
         pdCache =3D new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT);
         ndCache =3D new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT);
@@ -180,6 +180,7 @@
         // flush cache
         ntCache.remove(ntName);
         // just clear all definitions from cache
+        // @todo do smart/selective flush of definition caches
         pdCache.clear();
         ndCache.clear();
     }
@@ -191,6 +192,7 @@
         // sync cache
         ntCache.remove(ntName);
         // just clear all definitions from cache
+        // @todo do smart/selective flush of definition caches
         pdCache.clear();
         ndCache.clear();
     }
@@ -296,4 +298,3 @@
         }
     }
 }
-

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/PropDefImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/PropDefImpl.java?view=3Ddiff&r1=3D161914&r2=
=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/PropDefImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/PropDefImpl.java Tue Apr 19 09:33:59 2005
@@ -36,12 +36,12 @@
     /**
      * The value constrsints.
      */
-    private ValueConstraint[] valueConstraints =3D ValueConstraint.EMPTY;
+    private ValueConstraint[] valueConstraints =3D ValueConstraint.EMPTY_A=
RRAY;
=20
     /**
      * The default values.
      */
-    private InternalValue[] defaultValues =3D InternalValue.EMPTY;
+    private InternalValue[] defaultValues =3D InternalValue.EMPTY_ARRAY;
=20
     /**
      * The 'multiple' flag
@@ -75,7 +75,7 @@
             throw new IllegalStateException("Unable to set attribute. Prop=
erty definition already compiled.");
         }
         this.valueConstraints =3D
-                (valueConstraints =3D=3D null) ? ValueConstraint.EMPTY : v=
alueConstraints;
+                (valueConstraints =3D=3D null) ? ValueConstraint.EMPTY_ARR=
AY : valueConstraints;
     }
=20
     /**
@@ -88,7 +88,7 @@
             throw new IllegalStateException("Unable to set attribute. Prop=
erty definition already compiled.");
         }
         this.defaultValues =3D
-                (defaultValues =3D=3D null) ? InternalValue.EMPTY : defaul=
tValues;
+                (defaultValues =3D=3D null) ? InternalValue.EMPTY_ARRAY : =
defaultValues;
     }
=20
     /**

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/ValueConstraint.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/ValueConstraint.java?view=3Ddiff&r1=3D16191=
4&r2=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ValueConstraint.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ValueConstraint.java Tue Apr 19 09:33:59 2005
@@ -43,9 +43,10 @@
  * it.
  */
 public abstract class ValueConstraint {
+
     protected static Logger log =3D Logger.getLogger(ValueConstraint.class=
);
=20
-    public static final ValueConstraint[] EMPTY =3D new ValueConstraint[0];
+    public static final ValueConstraint[] EMPTY_ARRAY =3D new ValueConstra=
int[0];
=20
     final String definition;
=20

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/st=
ate/PropertyState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/state/PropertyState.java?view=3Ddiff&r1=3D161914&r2=
=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Pr=
opertyState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Pr=
opertyState.java Tue Apr 19 09:33:59 2005
@@ -74,7 +74,7 @@
         super(parentUUID, new PropertyId(parentUUID, name), initialStatus,=
 isTransient);
         this.name =3D name;
         type =3D PropertyType.UNDEFINED;
-        values =3D InternalValue.EMPTY;
+        values =3D InternalValue.EMPTY_ARRAY;
         multiValued =3D false;
     }
=20

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ve=
rsion/VersionItemStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/version/VersionItemStateProvider.java?view=3Ddiff&r1=
=3D161914&r2=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/=
VersionItemStateProvider.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/=
VersionItemStateProvider.java Tue Apr 19 09:33:59 2005
@@ -193,8 +193,8 @@
                 state =3D new VersionNodeState(this, v, vi.getParent().get=
Id());
                 state.setDefinitionId(NDEF_VERSION);
                 state.setPropertyValue(JCR_CREATED, InternalValue.create(v=
.getCreated()));
-                state.setPropertyValues(JCR_PREDECESSORS, PropertyType.REF=
ERENCE, InternalValue.EMPTY);
-                state.setPropertyValues(JCR_SUCCESSORS, PropertyType.REFER=
ENCE, InternalValue.EMPTY);
+                state.setPropertyValues(JCR_PREDECESSORS, PropertyType.REF=
ERENCE, InternalValue.EMPTY_ARRAY);
+                state.setPropertyValues(JCR_SUCCESSORS, PropertyType.REFER=
ENCE, InternalValue.EMPTY_ARRAY);
=20
             } else if (vi instanceof InternalFrozenNode) {
                 InternalFrozenNode fn =3D (InternalFrozenNode) vi;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ve=
rsion/persistence/InternalVersionHistoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java?=
view=3Ddiff&r1=3D161914&r2=3D161915
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/=
persistence/InternalVersionHistoryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/=
persistence/InternalVersionHistoryImpl.java Tue Apr 19 09:33:59 2005
@@ -470,7 +470,7 @@
=20
         // initialize 'created' and 'predecessors'
         vNode.setPropertyValue(JCR_CREATED, InternalValue.create(Calendar.=
getInstance()));
-        vNode.setPropertyValues(JCR_PREDECESSORS, PropertyType.REFERENCE, =
InternalValue.EMPTY);
+        vNode.setPropertyValues(JCR_PREDECESSORS, PropertyType.REFERENCE, =
InternalValue.EMPTY_ARRAY);
=20
         // add also an empty frozen node to the root version
         InternalFrozenNodeImpl.checkin(vNode, JCR_FROZENNODE, src, true, f=
alse);