You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/05/07 12:02:49 UTC
svn commit: r942046 - in /jackrabbit/branches/1.6: ./ jackrabbit-core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/que...
Author: jukka
Date: Fri May 7 10:02:48 2010
New Revision: 942046
URL: http://svn.apache.org/viewvc?rev=942046&view=rev
Log:
1.6: Merged revision 811001 (JCR-2170)
Modified:
jackrabbit/branches/1.6/ (props changed)
jackrabbit/branches/1.6/jackrabbit-core/pom.xml
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/PropertyValueOperand.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/LocalAuthContext.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/TraversingNodeResolver.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java
jackrabbit/branches/1.6/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/PropertyInfoImpl.java
Propchange: jackrabbit/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 7 10:02:48 2010
@@ -1,4 +1,4 @@
/jackrabbit/branches/1.5:794012,794100,794102
/jackrabbit/branches/1.x:801262-801983,812129,812371
/jackrabbit/branches/2.0:899183,900703
-/jackrabbit/trunk:770143-773197,773483,773525-773555,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737,776757,776776-776777,777024,777029,777034,777478,777509,777541,777548,777936,778445,778613,778616,778621,778645,778720,778802,779032,779040,779068-779071,779074,779076,779081,779084,779086-779088,779090-779092,779094-779096,779101,779223,779225,779227-779228,779230,779233-779234,779460,779475-779476,779504,779550,779552,779555,779561,779563,779583,779590,779618,779621-779622,779624,779642,779654,779657-779659,779661,779936,780006,780010,780025,780085,780985,780989,780993,781017,781051,781054,781294-781300,781305-781311,781318,781328,781338,781344,781347,781369,781372,781377,781416-781417,781423,782621-782622,782644,782646,782652,782669,782675,782677,782683,782694,782921,782925,782930,782936,783002,783004-783005,783042-783043,783239,783243,783245,78327
8,783304,783319-783321,783324,783326-783327,783330-783333,783337-783338,783340-783341,783343,783345-783347,783356,783359,783383,783386,783412,783435,783444,783447,783523,783688,783703,783708,783710,783719,783757,783759,783761,783786,783809,784011,784013,784039,784058,784060-784061,784090-784091,784106,784108-784109,784111,784117-784120,784124,784163,784261,784680,784691,784696,784760,784824,785112,785116,785157,785169,785209,785492,785517,785519,785529,785533,785535,785539-785540,785545,785580,785589-785590,785592,785594,785597,785602,785627,785629,785631,785635,785645,785668,785711,785725,785777,785863,785981,786003,786019,786028,786062,786075,786089-786090,786093-786094,786144,786146-786147,786149,786167,786280,786295,786319,786329-786330,786336,786409,786419,786423,786480,786485,786492,786513,786562,786565,786680,786685,787183,787219,787241,787942,787952,787964,787996,788002,788012-788013,788350-788351,788443,788446,788450,789245,789257,789269-789270,789279,789307,789312,
789324,789338,789347,789485,789629,789809,789986,790054,790056,790065-790066,790068,790070-790071,790118,790127,790153,790235-790236,790528,790537,790541,790557-790558,790568,790590,790600,790603,790629,790814,790826,790834,790887,790892,790901,790930,790939,791180,791253,791255,791438-791439,791441,791452,791457,791475,791492,791505,791520,791527,791737,791832,791884,791906,792102,792109,792118,792138,792152,792155-792156,792160,792162,792167-792168,792175,792180-792181,792211,792214,792218,792437,792453,792464,792467,792469,792485,792488,792496,792498,792508-792509,792547-792548,792588-792589,792849,792894-792895,792912,792932,792934,792968,793012-793013,793015-793016,793018,793046-793047,793072,793180,793238,793240,793243,793283,793484-793485,793507,793559,793571,793830,793836,793840,794162,794190,794193,794253,794278,794293-794294,794302,794304,794323,794329,794600,794617,794633,794641,794644,794652,794674,794702,794718,794743,794783,794994,795046,795049,795082,795096,79
5136,795138,795841-795842,795854,795866,796584,796586,796757,796845,796855,796876,796899,796955,796957,797094,797139,797158,797386,797399,797410,797414,797416-797417,797424,797470,797484,797488-797489,797539,797549,797634,797662,797836,798141,798183,798196,798209,798306,798834,798844,798847-798848,798889-798890,798940,798958,799188,799284,799550,799595,799599,799610,800269,800464,800466,800478,800483,800715,800807,800829,800854,800862-800863,801104,801125-801126,801128,801135,801169,801210,801213,801226,801241,801968,801973,802691,802754,812102,812369,815233,816124,818482,819491,820925,825772,829015,830575,830665,881283,889133,892253,899181,900702,923277,923597,925982,927393,933646,935557,936668
+/jackrabbit/trunk:770143-773197,773483,773525-773555,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737,776757,776776-776777,777024,777029,777034,777478,777509,777541,777548,777936,778445,778613,778616,778621,778645,778720,778802,779032,779040,779068-779071,779074,779076,779081,779084,779086-779088,779090-779092,779094-779096,779101,779223,779225,779227-779228,779230,779233-779234,779460,779475-779476,779504,779550,779552,779555,779561,779563,779583,779590,779618,779621-779622,779624,779642,779654,779657-779659,779661,779936,780006,780010,780025,780085,780985,780989,780993,781017,781051,781054,781294-781300,781305-781311,781318,781328,781338,781344,781347,781369,781372,781377,781416-781417,781423,782621-782622,782644,782646,782652,782669,782675,782677,782683,782694,782921,782925,782930,782936,783002,783004-783005,783042-783043,783239,783243,783245,78327
8,783304,783319-783321,783324,783326-783327,783330-783333,783337-783338,783340-783341,783343,783345-783347,783356,783359,783383,783386,783412,783435,783444,783447,783523,783688,783703,783708,783710,783719,783757,783759,783761,783786,783809,784011,784013,784039,784058,784060-784061,784090-784091,784106,784108-784109,784111,784117-784120,784124,784163,784261,784680,784691,784696,784760,784824,785112,785116,785157,785169,785209,785492,785517,785519,785529,785533,785535,785539-785540,785545,785580,785589-785590,785592,785594,785597,785602,785627,785629,785631,785635,785645,785668,785711,785725,785777,785863,785981,786003,786019,786028,786062,786075,786089-786090,786093-786094,786144,786146-786147,786149,786167,786280,786295,786319,786329-786330,786336,786409,786419,786423,786480,786485,786492,786513,786562,786565,786680,786685,787183,787219,787241,787942,787952,787964,787996,788002,788012-788013,788350-788351,788443,788446,788450,789245,789257,789269-789270,789279,789307,789312,
789324,789338,789347,789485,789629,789809,789986,790054,790056,790065-790066,790068,790070-790071,790118,790127,790153,790235-790236,790528,790537,790541,790557-790558,790568,790590,790600,790603,790629,790814,790826,790834,790887,790892,790901,790930,790939,791180,791253,791255,791438-791439,791441,791452,791457,791475,791492,791505,791520,791527,791737,791832,791884,791906,792102,792109,792118,792138,792152,792155-792156,792160,792162,792167-792168,792175,792180-792181,792211,792214,792218,792437,792453,792464,792467,792469,792485,792488,792496,792498,792508-792509,792547-792548,792588-792589,792849,792894-792895,792912,792932,792934,792968,793012-793013,793015-793016,793018,793046-793047,793072,793180,793238,793240,793243,793283,793484-793485,793507,793559,793571,793830,793836,793840,794162,794190,794193,794253,794278,794293-794294,794302,794304,794323,794329,794600,794617,794633,794641,794644,794652,794674,794702,794718,794743,794783,794994,795046,795049,795082,795096,79
5136,795138,795841-795842,795854,795866,796584,796586,796757,796845,796855,796876,796899,796955,796957,797094,797139,797158,797386,797399,797410,797414,797416-797417,797424,797470,797484,797488-797489,797539,797549,797634,797662,797836,798141,798183,798196,798209,798306,798834,798844,798847-798848,798889-798890,798940,798958,799188,799284,799550,799595,799599,799610,800269,800464,800466,800478,800483,800715,800807,800829,800854,800862-800863,801104,801125-801126,801128,801135,801169,801210,801213,801226,801241,801968,801973,802691,802754,811001,812102,812369,815233,816124,818482,819491,820925,825772,829015,830575,830665,881283,889133,892253,899181,900702,923277,923597,925982,927393,933646,935557,936668
Modified: jackrabbit/branches/1.6/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/pom.xml?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/pom.xml Fri May 7 10:02:48 2010
@@ -189,6 +189,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>10.4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java Fri May 7 10:02:48 2010
@@ -235,12 +235,11 @@ public class PropertyImpl extends ItemIm
LockException, ConstraintViolationException,
RepositoryException {
NodeImpl parent = (NodeImpl) getParent();
- PropertyDefinition definition = data.getPropertyDefinition();
// check multi-value flag
- if (multipleValues != definition.isMultiple()) {
+ if (multipleValues != isMultiple()) {
String msg = (multipleValues) ?
"Single-valued property can not be set to an array of values:" :
- "Multivalued property can not be set to a single value (an array of lenght one is OK): ";
+ "Multivalued property can not be set to a single value (an array of length one is OK): ";
throw new ValueFormatException(msg + this);
}
@@ -423,7 +422,7 @@ public class PropertyImpl extends ItemIm
*/
public InternalValue[] internalGetValues() throws RepositoryException {
final PropertyDefinition definition = data.getPropertyDefinition();
- if (definition.isMultiple()) {
+ if (isMultiple()) {
return getPropertyState().getValues();
} else {
throw new ValueFormatException(
@@ -442,7 +441,7 @@ public class PropertyImpl extends ItemIm
*/
public InternalValue internalGetValue() throws RepositoryException {
final PropertyDefinition definition = data.getPropertyDefinition();
- if (definition.isMultiple()) {
+ if (isMultiple()) {
throw new ValueFormatException(
this + " is a multi-valued property,"
+ " so it's values can only be retrieved as an array");
@@ -721,6 +720,13 @@ public class PropertyImpl extends ItemIm
return getPropertyState().getType();
}
+ public boolean isMultiple() throws RepositoryException {
+ // check state of this instance
+ sanityCheck();
+
+ return getPropertyState().isMultiValued();
+ }
+
//-----------------------------------------------------------------< Item >
/**
* {@inheritDoc}
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java Fri May 7 10:02:48 2010
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.core.data;
import org.apache.jackrabbit.core.NodeId;
import org.apache.jackrabbit.core.PropertyId;
+import org.apache.jackrabbit.core.PropertyImpl;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.SessionListener;
@@ -40,7 +41,6 @@ import javax.jcr.Item;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
import javax.jcr.PropertyIterator;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -312,14 +312,14 @@ public class GarbageCollector {
callback.beforeScanning(n);
}
for (PropertyIterator it = n.getProperties(); it.hasNext();) {
- Property p = it.nextProperty();
+ PropertyImpl p = (PropertyImpl) it.nextProperty();
if (p.getType() == PropertyType.BINARY) {
if (n.hasProperty("jcr:uuid")) {
rememberNode(n.getProperty("jcr:uuid").getString());
} else {
rememberNode(n.getPath());
}
- if (p.getDefinition().isMultiple()) {
+ if (p.isMultiple()) {
p.getLengths();
} else {
p.getLength();
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java Fri May 7 10:02:48 2010
@@ -365,8 +365,12 @@ class RowIteratorImpl implements RowIter
QValue p = QVALUE_FACTORY.create(hmgr.getPath(sn[0].getNodeId()));
return valueFactory.createValue(p);
} else if (getNodeImpl().hasProperty(prop)) {
- Property p = getNodeImpl().getProperty(prop);
- if (p.getDefinition().getRequiredType() == PropertyType.UNDEFINED) {
+ PropertyImpl p = (PropertyImpl)
+ getNodeImpl().getProperty(prop);
+ if (p.isMultiple()) {
+ // mvp values cannot be returned
+ return null;
+ } else if (p.getDefinition().getRequiredType() == PropertyType.UNDEFINED) {
return valueFactory.createValue(p.getString());
} else {
return p.getValue();
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/PropertyValueOperand.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/PropertyValueOperand.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/PropertyValueOperand.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/PropertyValueOperand.java Fri May 7 10:02:48 2010
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.core.state.
import org.apache.jackrabbit.core.state.ItemStateException;
import org.apache.jackrabbit.core.state.NoSuchItemStateException;
import org.apache.jackrabbit.core.PropertyId;
+import org.apache.jackrabbit.core.PropertyImpl;
import org.apache.jackrabbit.core.SessionImpl;
/**
@@ -105,12 +106,12 @@ public class PropertyValueOperand extend
*/
public Value[] getValues(ScoreNode sn, EvaluationContext context)
throws IOException {
- Property prop = getProperty(sn, context);
+ PropertyImpl prop = (PropertyImpl) getProperty(sn, context);
if (prop == null) {
return EMPTY;
} else {
try {
- if (prop.getDefinition().isMultiple()) {
+ if (prop.isMultiple()) {
return prop.getValues();
} else {
return new Value[]{prop.getValue()};
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/LocalAuthContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/LocalAuthContext.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/LocalAuthContext.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/LocalAuthContext.java Fri May 7 10:02:48 2010
@@ -27,6 +27,7 @@ import javax.security.auth.login.FailedL
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import java.util.HashMap;
+import java.util.Map;
/**
* Provide AuthContext interface, for a JAAS-LoginModule not running in
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java Fri May 7 10:02:48 2010
@@ -189,9 +189,9 @@ abstract class AuthorizableImpl implemen
*/
public Value[] getProperty(String name) throws RepositoryException {
if (hasProperty(name)) {
- Property prop = node.getProperty(name);
+ PropertyImpl prop = (PropertyImpl) node.getProperty(name);
if (isAuthorizableProperty(prop)) {
- if (prop.getDefinition().isMultiple()) {
+ if (prop.isMultiple()) {
return prop.getValues();
} else {
return new Value[] {prop.getValue()};
@@ -254,8 +254,8 @@ abstract class AuthorizableImpl implemen
try {
if (node.hasProperty(name)) {
// 'node' is protected -> use setValue instead of Property.remove()
- Property p = node.getProperty(name);
- if (p.getDefinition().isMultiple()) {
+ PropertyImpl p = (PropertyImpl) node.getProperty(name);
+ if (p.isMultiple()) {
p.setValue((Value[]) null);
} else {
p.setValue((Value) null);
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/TraversingNodeResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/TraversingNodeResolver.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/TraversingNodeResolver.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/TraversingNodeResolver.java Fri May 7 10:02:48 2010
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.core.secur
import org.apache.jackrabbit.commons.iterator.NodeIteratorAdapter;
import org.apache.jackrabbit.core.NodeImpl;
+import org.apache.jackrabbit.core.PropertyImpl;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
@@ -28,7 +29,6 @@ import org.slf4j.LoggerFactory;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.Value;
@@ -227,8 +227,9 @@ class TraversingNodeResolver extends Nod
while (!match && pItr.hasNext()) {
Name propertyName = (Name) pItr.next();
if (node.hasProperty(propertyName)) {
- Property prop = node.getProperty(propertyName);
- if (prop.getDefinition().isMultiple()) {
+ PropertyImpl prop = (PropertyImpl)
+ node.getProperty(propertyName);
+ if (prop.isMultiple()) {
Value[] values = prop.getValues();
for (int i = 0; i < values.length && !match; i++) {
match = matches(value, values[i].getString(), exact);
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java Fri May 7 10:02:48 2010
@@ -585,7 +585,7 @@ public class NodeStateEx {
* @throws RepositoryException
*/
public void copyFrom(PropertyImpl prop) throws RepositoryException {
- if (prop.getDefinition().isMultiple()) {
+ if (prop.isMultiple()) {
InternalValue[] values = prop.internalGetValues();
InternalValue[] copiedValues = new InternalValue[values.length];
for (int i = 0; i < values.length; i++) {
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java Fri May 7 10:02:48 2010
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.core.xml;
import org.apache.jackrabbit.core.NodeId;
import org.apache.jackrabbit.core.NodeImpl;
+import org.apache.jackrabbit.core.PropertyImpl;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.security.authorization.Permission;
import org.apache.jackrabbit.core.util.ReferenceChangeTracker;
@@ -32,7 +33,6 @@ import javax.jcr.AccessDeniedException;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.ItemExistsException;
import javax.jcr.ItemNotFoundException;
-import javax.jcr.Property;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -280,12 +280,12 @@ public class SessionImporter implements
*/
Iterator iter = refTracker.getProcessedReferences();
while (iter.hasNext()) {
- Property prop = (Property) iter.next();
+ PropertyImpl prop = (PropertyImpl) iter.next();
// being paranoid...
if (prop.getType() != PropertyType.REFERENCE) {
continue;
}
- if (prop.getDefinition().isMultiple()) {
+ if (prop.isMultiple()) {
Value[] values = prop.getValues();
Value[] newVals = new Value[values.length];
for (int i = 0; i < values.length; i++) {
Modified: jackrabbit/branches/1.6/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/PropertyInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/PropertyInfoImpl.java?rev=942046&r1=942045&r2=942046&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/PropertyInfoImpl.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/PropertyInfoImpl.java Fri May 7 10:02:48 2010
@@ -50,7 +50,7 @@ class PropertyInfoImpl
throws RepositoryException, NameException {
super(resolver.getQPath(property.getPath()),
idFactory.createPropertyId(property, resolver),
- property.getType(), property.getDefinition().isMultiple(),
+ property.getType(), property.isMultiple(),
getValues(property, resolver, qValueFactory));
}
@@ -67,7 +67,7 @@ class PropertyInfoImpl
NamePathResolver resolver,
QValueFactory factory)
throws RepositoryException {
- boolean isMultiValued = property.getDefinition().isMultiple();
+ boolean isMultiValued = property.isMultiple();
QValue[] values;
if (isMultiValued) {
Value[] jcrValues = property.getValues();