[maven-release-plugin] prepare release broadleaf-2.0.5-GA
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release broadleaf-2.1.1-GA
[maven-release-plugin] prepare for next development iteration
Replace tabs with spaces
Replace tabs with spaces
Replace tabs with spaces
Solr cherry-picks from develop stream.

Refactor the Solr search service
- Upgrade to Solr 4.0.0
- Paginate the index building
- Split out SolrSearchServiceImpl into various files

Clone the list of search facet ranges so that modules do not accidentally delete data.

Aggressively fetch the defaultSku entity when fetching products for Solr.

fix a FileNotFoundException related to solr-default.xml in SolrSearchService
Merge branch 'BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x

Conflicts:
	admin/broadleaf-admin-module/pom.xml
	admin/broadleaf-contentmanagement-module/pom.xml
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/web/processor/ContentProcessor.java
	admin/broadleaf-open-admin-platform/pom.xml
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/security/service/AdminSecurityServiceImpl.java
	admin/pom.xml
	common/pom.xml
	common/src/main/java/org/broadleafcommerce/common/config/RuntimeEnvironmentPropertiesConfigurer.java
	common/src/main/java/org/broadleafcommerce/common/util/sql/JPAConfigurationTask.java
	common/src/main/java/org/broadleafcommerce/common/web/BroadleafThymeleafViewResolver.java
	common/src/main/resources/bl-fake-applicationContext-ant.xml
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/controller/catalog/BroadleafCategoryController.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/controller/catalog/BroadleafSearchController.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/AddSortLinkProcessor.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/HeadProcessor.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/PaginationPageLinkProcessor.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/RemoveFacetValuesLinkProcessor.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/ToggleFacetLinkProcessor.java
	core/broadleaf-framework-web/src/main/resources/bl-framework-web-applicationContext-servlet.xml
	core/broadleaf-framework-web/src/main/resources/bl-framework-web-applicationContext.xml
	core/broadleaf-framework/pom.xml
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/dao/ProductDao.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/dao/ProductDaoImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/domain/SearchFacet.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/domain/SearchFacetImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/service/SearchService.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/service/solr/SolrSearchServiceImpl.java
	core/broadleaf-framework/src/main/resources/META-INF/persistence-framework.xml
	core/broadleaf-instrument/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/broadleaf-profile/src/main/resources/META-INF/persistence-profile.xml
	core/broadleaf-profile/src/main/resources/bl-profile-applicationContext-entity.xml
	core/pom.xml
	integration/pom.xml
	pom.xml
[maven-release-plugin] prepare release broadleaf-2.1.2-GA
Merge commit 'b9486fced4db8e1c605a54c1ea9c3e882a58c082'

Conflicts:
	admin/broadleaf-admin-module/pom.xml
	admin/broadleaf-contentmanagement-module/pom.xml
	admin/broadleaf-open-admin-platform/pom.xml
	admin/pom.xml
	common/src/main/java/org/broadleafcommerce/common/config/RuntimeEnvironmentPropertiesConfigurer.java
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework/pom.xml
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/dao/ProductDao.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/dao/ProductDaoImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/service/SearchService.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/service/solr/SolrSearchServiceImpl.java
	core/broadleaf-instrument/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
Merge branch 'master' into develop