Index: src/main/src/org/compass/core/compass-core-config-2.1.xsd
===================================================================
--- src/main/src/org/compass/core/compass-core-config-2.1.xsd	(revision 3229)
+++ src/main/src/org/compass/core/compass-core-config-2.1.xsd	Fri Jul 11 12:41:39 CDT 2008
@@ -136,6 +136,14 @@
                             </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
+                    <xsd:attribute name="includeUnmappedProperties" type="booleanType" use="optional">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Should unmapped properties be included in the all property.
+                                Defaults to true.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
                 </xsd:complexType>
             </xsd:element>
             <xsd:element name="highlighter" minOccurs="0" maxOccurs="unbounded">
Index: src/main/src/org/compass/core/config/builder/SchemaConfigurationBuilder.java
===================================================================
--- src/main/src/org/compass/core/config/builder/SchemaConfigurationBuilder.java	(revision 3229)
+++ src/main/src/org/compass/core/config/builder/SchemaConfigurationBuilder.java	Thu Jun 19 11:45:27 CDT 2008
@@ -169,6 +169,7 @@
             settings.setSetting(CompassEnvironment.All.TERM_VECTOR, getElementAttribute(allPropertyEle, "termVector"));
             settings.setSetting(CompassEnvironment.All.ENABLED, getElementAttribute(allPropertyEle, "enabled"));
             settings.setSetting(CompassEnvironment.All.BOOST_SUPPORT, getElementAttribute(allPropertyEle, "boostSupport"));
+            settings.setSetting(CompassEnvironment.All.INCLUDE_UNMAPPED_PROPERTIES, getElementAttribute(allPropertyEle, "includeUnmappedProperties"));
         }
         child = DomUtils.getChildElementsByTagName(ele, "optimizer", true);
         if (child.size() == 1) {
Index: src/main/src/org/compass/core/mapping/internal/InternalAllMapping.java
===================================================================
--- src/main/src/org/compass/core/mapping/internal/InternalAllMapping.java	(revision 3229)
+++ src/main/src/org/compass/core/mapping/internal/InternalAllMapping.java	Fri Jul 11 10:10:35 CDT 2008
@@ -36,4 +36,6 @@
     void setTermVector(Property.TermVector termVector);
 
     void setSpellCheck(SpellCheckType spellCheck);
+
+    void setIncludePropertiesWithNoMappings(boolean includeUnmapped);
 }
Index: src/main/src/org/compass/core/config/CompassEnvironment.java
===================================================================
--- src/main/src/org/compass/core/config/CompassEnvironment.java	(revision 3229)
+++ src/main/src/org/compass/core/config/CompassEnvironment.java	Thu Jun 19 11:43:26 CDT 2008
@@ -626,6 +626,12 @@
          * specific boost value, but searching experiance will be much improved.
          */
         public static final String BOOST_SUPPORT = "compass.property.all.boostSupport";
+
+        /**
+         * Should the all property include data from properties that do not have an explicit mapping.
+         * Defaults to <code>true</code>. 
+         */
+        public static final String INCLUDE_UNMAPPED_PROPERTIES = "compass.property.all.includeUnmappedProperties";
     }
 
     /**