Author: justin Date: Fri Feb 19 01:03:51 2010 New Revision: 911667 URL: http://svn.apache.org/viewvc?rev=911667&view=rev Log: SLING-1333 - removing dependency from servlets.post to jcr 2; hardcoding int value for WEAKREFERENCE
Modified: sling/trunk/bundles/servlets/post/pom.xml sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java Modified: sling/trunk/bundles/servlets/post/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/pom.xml?rev=911667&r1=911666&r2=911667&view=diff ============================================================================== --- sling/trunk/bundles/servlets/post/pom.xml (original) +++ sling/trunk/bundles/servlets/post/pom.xml Fri Feb 19 01:03:51 2010 @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -55,7 +55,7 @@ <configuration> <instructions> <Export-Package> - org.apache.sling.servlets.post;version=2.0.4.incubator + org.apache.sling.servlets.post;version=2.0.4.incubator </Export-Package> <Private-Package> org.apache.sling.servlets.post.impl.* @@ -122,7 +122,6 @@ <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java?rev=911667&r1=911666&r2=911667&view=diff ============================================================================== --- sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java (original) +++ sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java Fri Feb 19 01:03:51 2010 @@ -67,6 +67,10 @@ */ private final Calendar now = Calendar.getInstance(); + // hard-coding WEAKREFERENCE as propertyType = 10 because we don' + // want to depend upon jcr 2 api just for the constant. + private static final int PROPERTY_TYPE_WEAKREFERENCE = 10; + /** * Constructs a propert value handler */ @@ -243,7 +247,7 @@ } return; } - } else if (type == PropertyType.REFERENCE || type == PropertyType.WEAKREFERENCE) { + } else if (isReferencePropertyType(type)) { Node n = referenceParser.parse(values[0]); if (n != null) { if ( prop.hasMultiValueTypeHint() ) { @@ -290,7 +294,7 @@ )); return; } - } else if (type == PropertyType.REFERENCE || type == PropertyType.WEAKREFERENCE) { + } else if (isReferencePropertyType(type)) { // try conversion ValueFactory valFac = parent.getSession().getValueFactory(); Value[] n = referenceParser.parse(values, valFac); @@ -312,6 +316,10 @@ } } + private boolean isReferencePropertyType(int propertyType) { + return propertyType == PropertyType.REFERENCE || propertyType == PROPERTY_TYPE_WEAKREFERENCE; + } + /** * Defines an auto property behavior */