Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java (working copy) @@ -350,8 +350,8 @@ getAttribute(root, NAME_ATTRIBUTE, new File(home).getName()); // Clustered attribute - boolean clustered = Boolean.valueOf( - getAttribute(root, CLUSTERED_ATTRIBUTE, "true")).booleanValue(); + boolean clustered = Boolean.parseBoolean( + getAttribute(root, CLUSTERED_ATTRIBUTE, "true")); // Create a temporary parser that contains the ${wsp.name} variable Properties tmpVariables = (Properties) getVariables().clone(); Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java (working copy) @@ -78,7 +78,7 @@ * @param enable */ public void setEnableHandleMonitor(String enable) { - setEnableHandleMonitor(Boolean.valueOf(enable).booleanValue()); + setEnableHandleMonitor(Boolean.parseBoolean(enable)); } /** Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java (working copy) @@ -139,12 +139,10 @@ type.setName(resolver.getQName( walker.getAttribute(Constants.NAME_ATTRIBUTE))); - type.setMixin(Boolean.valueOf( - walker.getAttribute(Constants.ISMIXIN_ATTRIBUTE)) - .booleanValue()); - type.setOrderableChildNodes(Boolean.valueOf( - walker.getAttribute(Constants.HASORDERABLECHILDNODES_ATTRIBUTE)) - .booleanValue()); + type.setMixin(Boolean.parseBoolean( + walker.getAttribute(Constants.ISMIXIN_ATTRIBUTE))); + type.setOrderableChildNodes(Boolean.parseBoolean( + walker.getAttribute(Constants.HASORDERABLECHILDNODES_ATTRIBUTE))); String primaryItemName = walker.getAttribute(Constants.PRIMARYITEMNAME_ATTRIBUTE); if (primaryItemName != null && primaryItemName.length() > 0) { @@ -206,20 +204,16 @@ } // simple attributes - def.setAutoCreated(Boolean.valueOf( - walker.getAttribute(Constants.AUTOCREATED_ATTRIBUTE)) - .booleanValue()); - def.setMandatory(Boolean.valueOf( - walker.getAttribute(Constants.MANDATORY_ATTRIBUTE)) - .booleanValue()); - def.setProtected(Boolean.valueOf( - walker.getAttribute(Constants.PROTECTED_ATTRIBUTE)) - .booleanValue()); + def.setAutoCreated(Boolean.parseBoolean( + walker.getAttribute(Constants.AUTOCREATED_ATTRIBUTE))); + def.setMandatory(Boolean.parseBoolean( + walker.getAttribute(Constants.MANDATORY_ATTRIBUTE))); + def.setProtected(Boolean.parseBoolean( + walker.getAttribute(Constants.PROTECTED_ATTRIBUTE))); def.setOnParentVersion(OnParentVersionAction.valueFromName( walker.getAttribute(Constants.ONPARENTVERSION_ATTRIBUTE))); - def.setMultiple(Boolean.valueOf( - walker.getAttribute(Constants.MULTIPLE_ATTRIBUTE)) - .booleanValue()); + def.setMultiple(Boolean.parseBoolean( + walker.getAttribute(Constants.MULTIPLE_ATTRIBUTE))); def.setRequiredType(PropertyType.valueFromName( walker.getAttribute(Constants.REQUIREDTYPE_ATTRIBUTE))); @@ -283,20 +277,16 @@ } // simple attributes - def.setAutoCreated(Boolean.valueOf( - walker.getAttribute(Constants.AUTOCREATED_ATTRIBUTE)) - .booleanValue()); - def.setMandatory(Boolean.valueOf( - walker.getAttribute(Constants.MANDATORY_ATTRIBUTE)) - .booleanValue()); - def.setProtected(Boolean.valueOf( - walker.getAttribute(Constants.PROTECTED_ATTRIBUTE)) - .booleanValue()); + def.setAutoCreated(Boolean.parseBoolean( + walker.getAttribute(Constants.AUTOCREATED_ATTRIBUTE))); + def.setMandatory(Boolean.parseBoolean( + walker.getAttribute(Constants.MANDATORY_ATTRIBUTE))); + def.setProtected(Boolean.parseBoolean( + walker.getAttribute(Constants.PROTECTED_ATTRIBUTE))); def.setOnParentVersion(OnParentVersionAction.valueFromName( walker.getAttribute(Constants.ONPARENTVERSION_ATTRIBUTE))); - def.setAllowsSameNameSiblings(Boolean.valueOf( - walker.getAttribute(Constants.SAMENAMESIBLINGS_ATTRIBUTE)) - .booleanValue()); + def.setAllowsSameNameSiblings(Boolean.parseBoolean( + walker.getAttribute(Constants.SAMENAMESIBLINGS_ATTRIBUTE))); // default primary type String type = Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (working copy) @@ -326,7 +326,7 @@ * @param consistencyCheck the consistency check flag. */ public void setConsistencyCheck(String consistencyCheck) { - this.consistencyCheck = Boolean.valueOf(consistencyCheck).booleanValue(); + this.consistencyCheck = Boolean.parseBoolean(consistencyCheck); } /** @@ -344,7 +344,7 @@ * @param consistencyFix the consistency fix flag. */ public void setConsistencyFix(String consistencyFix) { - this.consistencyFix = Boolean.valueOf(consistencyFix).booleanValue(); + this.consistencyFix = Boolean.parseBoolean(consistencyFix); } /** @@ -384,7 +384,7 @@ } public void setBlockOnConnectionLoss(String block) { - this.blockOnConnectionLoss = Boolean.valueOf(block).booleanValue(); + this.blockOnConnectionLoss = Boolean.parseBoolean(block); } public String getBlockOnConnectionLoss() { Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java (working copy) @@ -180,7 +180,7 @@ } public void setExternalBLOBs(String externalBLOBs) { - this.externalBLOBs = Boolean.valueOf(externalBLOBs).booleanValue(); + this.externalBLOBs = Boolean.parseBoolean(externalBLOBs); } //---------------------------------------------------< PersistenceManager > Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/mem/InMemPersistenceManager.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/mem/InMemPersistenceManager.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/mem/InMemPersistenceManager.java (working copy) @@ -116,7 +116,7 @@ } public void setInitialCapacity(String initialCapacity) { - this.initialCapacity = Integer.valueOf(initialCapacity).intValue(); + this.initialCapacity = Integer.parseInt(initialCapacity); } public String getInitialCapacity() { @@ -128,7 +128,7 @@ } public void setLoadFactor(String loadFactor) { - this.loadFactor = Float.valueOf(loadFactor).floatValue(); + this.loadFactor = Float.parseFloat(loadFactor); } public String getLoadFactor() { @@ -144,7 +144,7 @@ } public void setPersistent(String persistent) { - this.persistent = Boolean.valueOf(persistent).booleanValue(); + this.persistent = Boolean.parseBoolean(persistent); } protected static String buildBlobFilePath(String parentUUID, Name propName, int index) { Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java (working copy) @@ -379,8 +379,8 @@ boolean nodeScopeIndex = true; Node nsIndex = attributes.getNamedItem("nodeScopeIndex"); if (nsIndex != null) { - nodeScopeIndex = Boolean.valueOf( - nsIndex.getNodeValue()).booleanValue(); + nodeScopeIndex = Boolean.parseBoolean( + nsIndex.getNodeValue()); } // get property name Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java (revision 631472) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java (working copy) @@ -80,7 +80,7 @@ * If set to 'true', the data store is used when configured in repository.xml */ public static final boolean USE_DATA_STORE = - Boolean.valueOf(System.getProperty("org.jackrabbit.useDataStore", "true")).booleanValue(); + Boolean.parseBoolean(System.getProperty("org.jackrabbit.useDataStore", "true")); /** * Temporary binary values smaller or equal this size are kept in memory @@ -497,13 +497,13 @@ public static InternalValue valueOf(String s, int type) { switch (type) { case PropertyType.BOOLEAN: - return create(Boolean.valueOf(s).booleanValue()); + return create(Boolean.parseBoolean(s)); case PropertyType.DATE: return create(ISO8601.parse(s)); case PropertyType.DOUBLE: - return create(Double.valueOf(s).doubleValue()); + return create(Double.parseDouble(s)); case PropertyType.LONG: - return create(Long.valueOf(s).longValue()); + return create(Long.parseLong(s)); case PropertyType.REFERENCE: return create(new UUID(s)); case PropertyType.PATH: Index: jackrabbit-core/src/main/javacc/fulltext/QueryParser.jjt =================================================================== --- jackrabbit-core/src/main/javacc/fulltext/QueryParser.jjt (revision 631472) +++ jackrabbit-core/src/main/javacc/fulltext/QueryParser.jjt (working copy) @@ -795,7 +795,7 @@ if (boost != null) { float f = (float)1.0; try { - f = Float.valueOf(boost.image).floatValue(); + f = Float.parseFloat(boost.image); q.setBoost(f); } catch (Exception ignored) { } } @@ -838,7 +838,7 @@ } else if (fuzzy) { float fms = fuzzyMinSim; try { - fms = Float.valueOf(fuzzySlop.image.substring(1)).floatValue(); + fms = Float.parseFloat(fuzzySlop.image.substring(1)); } catch (Exception ignored) { } if(fms < 0.0f || fms > 1.0f){ throw new ParseException("Minimum similarity for a FuzzyQuery has to be between 0.0f and 1.0f !");