Move Sunspot project into subdirectory

Preparing to merge sunspot and sunspot_rails repos
Lujaw · Jan 18, 2010 · 8e06116 · 8e06116
1 parent 129a4ae
commit 8e06116
Show file tree

Hide file tree

Showing 205 changed files with 0 additions and 0 deletions.
diff --git a/.gitignore → sunspot/.gitignore b/.gitignore → sunspot/.gitignore
diff --git a/History.txt → sunspot/History.txt b/History.txt → sunspot/History.txt
diff --git a/LICENSE → sunspot/LICENSE b/LICENSE → sunspot/LICENSE
diff --git a/Rakefile → sunspot/Rakefile b/Rakefile → sunspot/Rakefile
diff --git a/TODO → sunspot/TODO b/TODO → sunspot/TODO
diff --git a/VERSION.yml → sunspot/VERSION.yml b/VERSION.yml → sunspot/VERSION.yml
diff --git a/bin/sunspot-configure-solr → sunspot/bin/sunspot-configure-solr b/bin/sunspot-configure-solr → sunspot/bin/sunspot-configure-solr
diff --git a/bin/sunspot-installer → sunspot/bin/sunspot-installer b/bin/sunspot-installer → sunspot/bin/sunspot-installer
diff --git a/bin/sunspot-solr → sunspot/bin/sunspot-solr b/bin/sunspot-solr → sunspot/bin/sunspot-solr
diff --git a/installer/config/schema.yml → sunspot/installer/config/schema.yml b/installer/config/schema.yml → sunspot/installer/config/schema.yml
diff --git a/lib/light_config.rb → sunspot/lib/light_config.rb b/lib/light_config.rb → sunspot/lib/light_config.rb
diff --git a/lib/sunspot.rb → sunspot/lib/sunspot.rb b/lib/sunspot.rb → sunspot/lib/sunspot.rb
diff --git a/lib/sunspot/adapters.rb → sunspot/lib/sunspot/adapters.rb b/lib/sunspot/adapters.rb → sunspot/lib/sunspot/adapters.rb
diff --git a/lib/sunspot/composite_setup.rb → sunspot/lib/sunspot/composite_setup.rb b/lib/sunspot/composite_setup.rb → sunspot/lib/sunspot/composite_setup.rb
diff --git a/lib/sunspot/configuration.rb → sunspot/lib/sunspot/configuration.rb b/lib/sunspot/configuration.rb → sunspot/lib/sunspot/configuration.rb
diff --git a/lib/sunspot/data_extractor.rb → sunspot/lib/sunspot/data_extractor.rb b/lib/sunspot/data_extractor.rb → sunspot/lib/sunspot/data_extractor.rb
diff --git a/lib/sunspot/dsl.rb → sunspot/lib/sunspot/dsl.rb b/lib/sunspot/dsl.rb → sunspot/lib/sunspot/dsl.rb
diff --git a/lib/sunspot/dsl/field_query.rb → sunspot/lib/sunspot/dsl/field_query.rb b/lib/sunspot/dsl/field_query.rb → sunspot/lib/sunspot/dsl/field_query.rb
diff --git a/lib/sunspot/dsl/fields.rb → sunspot/lib/sunspot/dsl/fields.rb b/lib/sunspot/dsl/fields.rb → sunspot/lib/sunspot/dsl/fields.rb
diff --git a/lib/sunspot/dsl/fulltext.rb → sunspot/lib/sunspot/dsl/fulltext.rb b/lib/sunspot/dsl/fulltext.rb → sunspot/lib/sunspot/dsl/fulltext.rb
diff --git a/lib/sunspot/dsl/query.rb → sunspot/lib/sunspot/dsl/query.rb b/lib/sunspot/dsl/query.rb → sunspot/lib/sunspot/dsl/query.rb
diff --git a/lib/sunspot/dsl/query_facet.rb → sunspot/lib/sunspot/dsl/query_facet.rb b/lib/sunspot/dsl/query_facet.rb → sunspot/lib/sunspot/dsl/query_facet.rb
diff --git a/lib/sunspot/dsl/restriction.rb → sunspot/lib/sunspot/dsl/restriction.rb b/lib/sunspot/dsl/restriction.rb → sunspot/lib/sunspot/dsl/restriction.rb
diff --git a/lib/sunspot/dsl/scope.rb → sunspot/lib/sunspot/dsl/scope.rb b/lib/sunspot/dsl/scope.rb → sunspot/lib/sunspot/dsl/scope.rb
diff --git a/lib/sunspot/dsl/search.rb → sunspot/lib/sunspot/dsl/search.rb b/lib/sunspot/dsl/search.rb → sunspot/lib/sunspot/dsl/search.rb
diff --git a/lib/sunspot/field.rb → sunspot/lib/sunspot/field.rb b/lib/sunspot/field.rb → sunspot/lib/sunspot/field.rb
diff --git a/lib/sunspot/field_factory.rb → sunspot/lib/sunspot/field_factory.rb b/lib/sunspot/field_factory.rb → sunspot/lib/sunspot/field_factory.rb
diff --git a/lib/sunspot/gem_tasks.rb → sunspot/lib/sunspot/gem_tasks.rb b/lib/sunspot/gem_tasks.rb → sunspot/lib/sunspot/gem_tasks.rb
diff --git a/lib/sunspot/indexer.rb → sunspot/lib/sunspot/indexer.rb b/lib/sunspot/indexer.rb → sunspot/lib/sunspot/indexer.rb
diff --git a/lib/sunspot/installer.rb → sunspot/lib/sunspot/installer.rb b/lib/sunspot/installer.rb → sunspot/lib/sunspot/installer.rb
diff --git a/lib/sunspot/installer/library_installer.rb → ...ib/sunspot/installer/library_installer.rb b/lib/sunspot/installer/library_installer.rb → ...ib/sunspot/installer/library_installer.rb
diff --git a/lib/sunspot/installer/schema_builder.rb → ...t/lib/sunspot/installer/schema_builder.rb b/lib/sunspot/installer/schema_builder.rb → ...t/lib/sunspot/installer/schema_builder.rb
diff --git a/lib/sunspot/installer/solrconfig_updater.rb → ...b/sunspot/installer/solrconfig_updater.rb b/lib/sunspot/installer/solrconfig_updater.rb → ...b/sunspot/installer/solrconfig_updater.rb
diff --git a/lib/sunspot/installer/task_helper.rb → sunspot/lib/sunspot/installer/task_helper.rb b/lib/sunspot/installer/task_helper.rb → sunspot/lib/sunspot/installer/task_helper.rb
diff --git a/lib/sunspot/query.rb → sunspot/lib/sunspot/query.rb b/lib/sunspot/query.rb → sunspot/lib/sunspot/query.rb
diff --git a/lib/sunspot/query/abstract_field_facet.rb → ...lib/sunspot/query/abstract_field_facet.rb b/lib/sunspot/query/abstract_field_facet.rb → ...lib/sunspot/query/abstract_field_facet.rb
diff --git a/lib/sunspot/query/boost_query.rb → sunspot/lib/sunspot/query/boost_query.rb b/lib/sunspot/query/boost_query.rb → sunspot/lib/sunspot/query/boost_query.rb
diff --git a/lib/sunspot/query/connective.rb → sunspot/lib/sunspot/query/connective.rb b/lib/sunspot/query/connective.rb → sunspot/lib/sunspot/query/connective.rb
diff --git a/lib/sunspot/query/date_field_facet.rb → ...pot/lib/sunspot/query/date_field_facet.rb b/lib/sunspot/query/date_field_facet.rb → ...pot/lib/sunspot/query/date_field_facet.rb
diff --git a/lib/sunspot/query/dismax.rb → sunspot/lib/sunspot/query/dismax.rb b/lib/sunspot/query/dismax.rb → sunspot/lib/sunspot/query/dismax.rb
diff --git a/lib/sunspot/query/field_facet.rb → sunspot/lib/sunspot/query/field_facet.rb b/lib/sunspot/query/field_facet.rb → sunspot/lib/sunspot/query/field_facet.rb
diff --git a/lib/sunspot/query/filter.rb → sunspot/lib/sunspot/query/filter.rb b/lib/sunspot/query/filter.rb → sunspot/lib/sunspot/query/filter.rb
diff --git a/lib/sunspot/query/highlighting.rb → sunspot/lib/sunspot/query/highlighting.rb b/lib/sunspot/query/highlighting.rb → sunspot/lib/sunspot/query/highlighting.rb
diff --git a/lib/sunspot/query/local.rb → sunspot/lib/sunspot/query/local.rb b/lib/sunspot/query/local.rb → sunspot/lib/sunspot/query/local.rb
diff --git a/lib/sunspot/query/pagination.rb → sunspot/lib/sunspot/query/pagination.rb b/lib/sunspot/query/pagination.rb → sunspot/lib/sunspot/query/pagination.rb
diff --git a/lib/sunspot/query/query.rb → sunspot/lib/sunspot/query/query.rb b/lib/sunspot/query/query.rb → sunspot/lib/sunspot/query/query.rb
diff --git a/lib/sunspot/query/query_facet.rb → sunspot/lib/sunspot/query/query_facet.rb b/lib/sunspot/query/query_facet.rb → sunspot/lib/sunspot/query/query_facet.rb
diff --git a/lib/sunspot/query/restriction.rb → sunspot/lib/sunspot/query/restriction.rb b/lib/sunspot/query/restriction.rb → sunspot/lib/sunspot/query/restriction.rb
diff --git a/lib/sunspot/query/scope.rb → sunspot/lib/sunspot/query/scope.rb b/lib/sunspot/query/scope.rb → sunspot/lib/sunspot/query/scope.rb
diff --git a/lib/sunspot/query/sort.rb → sunspot/lib/sunspot/query/sort.rb b/lib/sunspot/query/sort.rb → sunspot/lib/sunspot/query/sort.rb
diff --git a/lib/sunspot/query/sort_composite.rb → sunspot/lib/sunspot/query/sort_composite.rb b/lib/sunspot/query/sort_composite.rb → sunspot/lib/sunspot/query/sort_composite.rb
diff --git a/lib/sunspot/query/text_field_boost.rb → ...pot/lib/sunspot/query/text_field_boost.rb b/lib/sunspot/query/text_field_boost.rb → ...pot/lib/sunspot/query/text_field_boost.rb
diff --git a/lib/sunspot/request.rb → sunspot/lib/sunspot/request.rb b/lib/sunspot/request.rb → sunspot/lib/sunspot/request.rb
diff --git a/lib/sunspot/schema.rb → sunspot/lib/sunspot/schema.rb b/lib/sunspot/schema.rb → sunspot/lib/sunspot/schema.rb
diff --git a/lib/sunspot/search.rb → sunspot/lib/sunspot/search.rb b/lib/sunspot/search.rb → sunspot/lib/sunspot/search.rb
diff --git a/lib/sunspot/search/date_facet.rb → sunspot/lib/sunspot/search/date_facet.rb b/lib/sunspot/search/date_facet.rb → sunspot/lib/sunspot/search/date_facet.rb
diff --git a/lib/sunspot/search/facet_row.rb → sunspot/lib/sunspot/search/facet_row.rb b/lib/sunspot/search/facet_row.rb → sunspot/lib/sunspot/search/facet_row.rb
diff --git a/lib/sunspot/search/field_facet.rb → sunspot/lib/sunspot/search/field_facet.rb b/lib/sunspot/search/field_facet.rb → sunspot/lib/sunspot/search/field_facet.rb
diff --git a/lib/sunspot/search/highlight.rb → sunspot/lib/sunspot/search/highlight.rb b/lib/sunspot/search/highlight.rb → sunspot/lib/sunspot/search/highlight.rb
diff --git a/lib/sunspot/search/hit.rb → sunspot/lib/sunspot/search/hit.rb b/lib/sunspot/search/hit.rb → sunspot/lib/sunspot/search/hit.rb
diff --git a/lib/sunspot/search/query_facet.rb → sunspot/lib/sunspot/search/query_facet.rb b/lib/sunspot/search/query_facet.rb → sunspot/lib/sunspot/search/query_facet.rb
diff --git a/lib/sunspot/session.rb → sunspot/lib/sunspot/session.rb b/lib/sunspot/session.rb → sunspot/lib/sunspot/session.rb
diff --git a/lib/sunspot/session_proxy.rb → sunspot/lib/sunspot/session_proxy.rb b/lib/sunspot/session_proxy.rb → sunspot/lib/sunspot/session_proxy.rb
diff --git a/...t/session_proxy/abstract_session_proxy.rb → ...t/session_proxy/abstract_session_proxy.rb b/...t/session_proxy/abstract_session_proxy.rb → ...t/session_proxy/abstract_session_proxy.rb
diff --git a/...ion_proxy/class_sharding_session_proxy.rb → ...ion_proxy/class_sharding_session_proxy.rb b/...ion_proxy/class_sharding_session_proxy.rb → ...ion_proxy/class_sharding_session_proxy.rb
diff --git a/...ession_proxy/id_sharding_session_proxy.rb → ...ession_proxy/id_sharding_session_proxy.rb b/...ession_proxy/id_sharding_session_proxy.rb → ...ession_proxy/id_sharding_session_proxy.rb
diff --git a/...ssion_proxy/master_slave_session_proxy.rb → ...ssion_proxy/master_slave_session_proxy.rb b/...ssion_proxy/master_slave_session_proxy.rb → ...ssion_proxy/master_slave_session_proxy.rb
diff --git a/...t/session_proxy/sharding_session_proxy.rb → ...t/session_proxy/sharding_session_proxy.rb b/...t/session_proxy/sharding_session_proxy.rb → ...t/session_proxy/sharding_session_proxy.rb
diff --git a/...ssion_proxy/thread_local_session_proxy.rb → ...ssion_proxy/thread_local_session_proxy.rb b/...ssion_proxy/thread_local_session_proxy.rb → ...ssion_proxy/thread_local_session_proxy.rb
diff --git a/lib/sunspot/setup.rb → sunspot/lib/sunspot/setup.rb b/lib/sunspot/setup.rb → sunspot/lib/sunspot/setup.rb
diff --git a/lib/sunspot/text_field_setup.rb → sunspot/lib/sunspot/text_field_setup.rb b/lib/sunspot/text_field_setup.rb → sunspot/lib/sunspot/text_field_setup.rb
diff --git a/lib/sunspot/type.rb → sunspot/lib/sunspot/type.rb b/lib/sunspot/type.rb → sunspot/lib/sunspot/type.rb
diff --git a/lib/sunspot/util.rb → sunspot/lib/sunspot/util.rb b/lib/sunspot/util.rb → sunspot/lib/sunspot/util.rb
diff --git a/lib/sunspot/version.rb → sunspot/lib/sunspot/version.rb b/lib/sunspot/version.rb → sunspot/lib/sunspot/version.rb
diff --git a/solr/logs/.gitignore → sunspot/log/.gitignore b/solr/logs/.gitignore → sunspot/log/.gitignore
diff --git a/script/console → sunspot/script/console b/script/console → sunspot/script/console
diff --git a/solr-1.3/etc/jetty.xml → sunspot/solr-1.3/etc/jetty.xml b/solr-1.3/etc/jetty.xml → sunspot/solr-1.3/etc/jetty.xml
diff --git a/solr/etc/webdefault.xml → sunspot/solr-1.3/etc/webdefault.xml b/solr/etc/webdefault.xml → sunspot/solr-1.3/etc/webdefault.xml
diff --git a/solr/lib/jetty-6.1.3.jar → sunspot/solr-1.3/lib/jetty-6.1.3.jar b/solr/lib/jetty-6.1.3.jar → sunspot/solr-1.3/lib/jetty-6.1.3.jar
diff --git a/solr/lib/jetty-util-6.1.3.jar → sunspot/solr-1.3/lib/jetty-util-6.1.3.jar b/solr/lib/jetty-util-6.1.3.jar → sunspot/solr-1.3/lib/jetty-util-6.1.3.jar
diff --git a/solr/lib/jsp-2.1/ant-1.6.5.jar → sunspot/solr-1.3/lib/jsp-2.1/ant-1.6.5.jar b/solr/lib/jsp-2.1/ant-1.6.5.jar → sunspot/solr-1.3/lib/jsp-2.1/ant-1.6.5.jar
diff --git a/solr/lib/jsp-2.1/core-3.1.1.jar → sunspot/solr-1.3/lib/jsp-2.1/core-3.1.1.jar b/solr/lib/jsp-2.1/core-3.1.1.jar → sunspot/solr-1.3/lib/jsp-2.1/core-3.1.1.jar
diff --git a/solr/lib/jsp-2.1/jsp-2.1.jar → sunspot/solr-1.3/lib/jsp-2.1/jsp-2.1.jar b/solr/lib/jsp-2.1/jsp-2.1.jar → sunspot/solr-1.3/lib/jsp-2.1/jsp-2.1.jar
diff --git a/solr/lib/jsp-2.1/jsp-api-2.1.jar → sunspot/solr-1.3/lib/jsp-2.1/jsp-api-2.1.jar b/solr/lib/jsp-2.1/jsp-api-2.1.jar → sunspot/solr-1.3/lib/jsp-2.1/jsp-api-2.1.jar
diff --git a/solr/lib/servlet-api-2.5-6.1.3.jar → ...ot/solr-1.3/lib/servlet-api-2.5-6.1.3.jar b/solr/lib/servlet-api-2.5-6.1.3.jar → ...ot/solr-1.3/lib/servlet-api-2.5-6.1.3.jar
diff --git a/solr/solr/conf/elevate.xml → sunspot/solr-1.3/solr/conf/elevate.xml b/solr/solr/conf/elevate.xml → sunspot/solr-1.3/solr/conf/elevate.xml
diff --git a/solr/solr/conf/protwords.txt → sunspot/solr-1.3/solr/conf/protwords.txt b/solr/solr/conf/protwords.txt → sunspot/solr-1.3/solr/conf/protwords.txt
diff --git a/solr-1.3/solr/conf/schema.xml → sunspot/solr-1.3/solr/conf/schema.xml b/solr-1.3/solr/conf/schema.xml → sunspot/solr-1.3/solr/conf/schema.xml
diff --git a/solr-1.3/solr/conf/solrconfig.xml → sunspot/solr-1.3/solr/conf/solrconfig.xml b/solr-1.3/solr/conf/solrconfig.xml → sunspot/solr-1.3/solr/conf/solrconfig.xml
diff --git a/solr-1.3/solr/conf/stopwords.txt → sunspot/solr-1.3/solr/conf/stopwords.txt b/solr-1.3/solr/conf/stopwords.txt → sunspot/solr-1.3/solr/conf/stopwords.txt
diff --git a/solr/solr/conf/synonyms.txt → sunspot/solr-1.3/solr/conf/synonyms.txt b/solr/solr/conf/synonyms.txt → sunspot/solr-1.3/solr/conf/synonyms.txt
diff --git a/...1.3/solr/lib/geoapi-nogenerics-2.1-M2.jar → ...1.3/solr/lib/geoapi-nogenerics-2.1-M2.jar b/...1.3/solr/lib/geoapi-nogenerics-2.1-M2.jar → ...1.3/solr/lib/geoapi-nogenerics-2.1-M2.jar
diff --git a/solr-1.3/solr/lib/gt2-referencing-2.3.1.jar → ...lr-1.3/solr/lib/gt2-referencing-2.3.1.jar b/solr-1.3/solr/lib/gt2-referencing-2.3.1.jar → ...lr-1.3/solr/lib/gt2-referencing-2.3.1.jar
diff --git a/solr-1.3/solr/lib/jsr108-0.01.jar → sunspot/solr-1.3/solr/lib/jsr108-0.01.jar b/solr-1.3/solr/lib/jsr108-0.01.jar → sunspot/solr-1.3/solr/lib/jsr108-0.01.jar
diff --git a/solr-1.3/solr/lib/locallucene.jar → sunspot/solr-1.3/solr/lib/locallucene.jar b/solr-1.3/solr/lib/locallucene.jar → sunspot/solr-1.3/solr/lib/locallucene.jar
diff --git a/solr-1.3/solr/lib/localsolr.jar → sunspot/solr-1.3/solr/lib/localsolr.jar b/solr-1.3/solr/lib/localsolr.jar → sunspot/solr-1.3/solr/lib/localsolr.jar
diff --git a/solr/start.jar → sunspot/solr-1.3/start.jar b/solr/start.jar → sunspot/solr-1.3/start.jar
diff --git a/solr-1.3/webapps/solr.war → sunspot/solr-1.3/webapps/solr.war b/solr-1.3/webapps/solr.war → sunspot/solr-1.3/webapps/solr.war
diff --git a/solr/README.txt → sunspot/solr/README.txt b/solr/README.txt → sunspot/solr/README.txt
diff --git a/solr/etc/jetty.xml → sunspot/solr/etc/jetty.xml b/solr/etc/jetty.xml → sunspot/solr/etc/jetty.xml
diff --git a/solr-1.3/etc/webdefault.xml → sunspot/solr/etc/webdefault.xml b/solr-1.3/etc/webdefault.xml → sunspot/solr/etc/webdefault.xml
diff --git a/solr-1.3/lib/jetty-6.1.3.jar → sunspot/solr/lib/jetty-6.1.3.jar b/solr-1.3/lib/jetty-6.1.3.jar → sunspot/solr/lib/jetty-6.1.3.jar
diff --git a/solr-1.3/lib/jetty-util-6.1.3.jar → sunspot/solr/lib/jetty-util-6.1.3.jar b/solr-1.3/lib/jetty-util-6.1.3.jar → sunspot/solr/lib/jetty-util-6.1.3.jar
diff --git a/solr-1.3/lib/jsp-2.1/ant-1.6.5.jar → sunspot/solr/lib/jsp-2.1/ant-1.6.5.jar b/solr-1.3/lib/jsp-2.1/ant-1.6.5.jar → sunspot/solr/lib/jsp-2.1/ant-1.6.5.jar
diff --git a/solr-1.3/lib/jsp-2.1/core-3.1.1.jar → sunspot/solr/lib/jsp-2.1/core-3.1.1.jar b/solr-1.3/lib/jsp-2.1/core-3.1.1.jar → sunspot/solr/lib/jsp-2.1/core-3.1.1.jar
diff --git a/solr-1.3/lib/jsp-2.1/jsp-2.1.jar → sunspot/solr/lib/jsp-2.1/jsp-2.1.jar b/solr-1.3/lib/jsp-2.1/jsp-2.1.jar → sunspot/solr/lib/jsp-2.1/jsp-2.1.jar
diff --git a/solr-1.3/lib/jsp-2.1/jsp-api-2.1.jar → sunspot/solr/lib/jsp-2.1/jsp-api-2.1.jar b/solr-1.3/lib/jsp-2.1/jsp-api-2.1.jar → sunspot/solr/lib/jsp-2.1/jsp-api-2.1.jar
diff --git a/solr-1.3/lib/servlet-api-2.5-6.1.3.jar → sunspot/solr/lib/servlet-api-2.5-6.1.3.jar b/solr-1.3/lib/servlet-api-2.5-6.1.3.jar → sunspot/solr/lib/servlet-api-2.5-6.1.3.jar
diff --git a/log/.gitignore → sunspot/solr/logs/.gitignore b/log/.gitignore → sunspot/solr/logs/.gitignore
diff --git a/solr/solr/README.txt → sunspot/solr/solr/README.txt b/solr/solr/README.txt → sunspot/solr/solr/README.txt
diff --git a/solr/solr/conf/admin-extra.html → sunspot/solr/solr/conf/admin-extra.html b/solr/solr/conf/admin-extra.html → sunspot/solr/solr/conf/admin-extra.html
diff --git a/solr-1.3/solr/conf/elevate.xml → sunspot/solr/solr/conf/elevate.xml b/solr-1.3/solr/conf/elevate.xml → sunspot/solr/solr/conf/elevate.xml
diff --git a/solr/solr/conf/mapping-ISOLatin1Accent.txt → ...olr/solr/conf/mapping-ISOLatin1Accent.txt b/solr/solr/conf/mapping-ISOLatin1Accent.txt → ...olr/solr/conf/mapping-ISOLatin1Accent.txt
diff --git a/solr-1.3/solr/conf/protwords.txt → sunspot/solr/solr/conf/protwords.txt b/solr-1.3/solr/conf/protwords.txt → sunspot/solr/solr/conf/protwords.txt
diff --git a/solr/solr/conf/schema.xml → sunspot/solr/solr/conf/schema.xml b/solr/solr/conf/schema.xml → sunspot/solr/solr/conf/schema.xml
diff --git a/solr/solr/conf/scripts.conf → sunspot/solr/solr/conf/scripts.conf b/solr/solr/conf/scripts.conf → sunspot/solr/solr/conf/scripts.conf
diff --git a/solr/solr/conf/solrconfig.xml → sunspot/solr/solr/conf/solrconfig.xml b/solr/solr/conf/solrconfig.xml → sunspot/solr/solr/conf/solrconfig.xml
diff --git a/solr/solr/conf/spellings.txt → sunspot/solr/solr/conf/spellings.txt b/solr/solr/conf/spellings.txt → sunspot/solr/solr/conf/spellings.txt
diff --git a/solr/solr/conf/stopwords.txt → sunspot/solr/solr/conf/stopwords.txt b/solr/solr/conf/stopwords.txt → sunspot/solr/solr/conf/stopwords.txt
diff --git a/solr-1.3/solr/conf/synonyms.txt → sunspot/solr/solr/conf/synonyms.txt b/solr-1.3/solr/conf/synonyms.txt → sunspot/solr/solr/conf/synonyms.txt
diff --git a/solr/solr/conf/xslt/example.xsl → sunspot/solr/solr/conf/xslt/example.xsl b/solr/solr/conf/xslt/example.xsl → sunspot/solr/solr/conf/xslt/example.xsl
diff --git a/solr/solr/conf/xslt/example_atom.xsl → sunspot/solr/solr/conf/xslt/example_atom.xsl b/solr/solr/conf/xslt/example_atom.xsl → sunspot/solr/solr/conf/xslt/example_atom.xsl
diff --git a/solr/solr/conf/xslt/example_rss.xsl → sunspot/solr/solr/conf/xslt/example_rss.xsl b/solr/solr/conf/xslt/example_rss.xsl → sunspot/solr/solr/conf/xslt/example_rss.xsl
diff --git a/solr/solr/conf/xslt/luke.xsl → sunspot/solr/solr/conf/xslt/luke.xsl b/solr/solr/conf/xslt/luke.xsl → sunspot/solr/solr/conf/xslt/luke.xsl
diff --git a/solr/solr/data/spellchecker/segments.gen → sunspot/solr/solr/data/index/segments.gen b/solr/solr/data/spellchecker/segments.gen → sunspot/solr/solr/data/index/segments.gen
diff --git a/solr/solr/data/index/segments_1 → sunspot/solr/solr/data/index/segments_1 b/solr/solr/data/index/segments_1 → sunspot/solr/solr/data/index/segments_1
diff --git a/solr/solr/data/index/segments.gen → .../solr/solr/data/spellchecker/segments.gen b/solr/solr/data/index/segments.gen → .../solr/solr/data/spellchecker/segments.gen
diff --git a/solr/solr/data/spellchecker/segments_1 → ...ot/solr/solr/data/spellchecker/segments_1 b/solr/solr/data/spellchecker/segments_1 → ...ot/solr/solr/data/spellchecker/segments_1
diff --git a/solr/solr/lib/lucene-spatial-2.9.1.jar → ...ot/solr/solr/lib/lucene-spatial-2.9.1.jar b/solr/solr/lib/lucene-spatial-2.9.1.jar → ...ot/solr/solr/lib/lucene-spatial-2.9.1.jar
diff --git a/solr/solr/lib/solr-spatial-light-0.0.1.jar → ...olr/solr/lib/solr-spatial-light-0.0.1.jar b/solr/solr/lib/solr-spatial-light-0.0.1.jar → ...olr/solr/lib/solr-spatial-light-0.0.1.jar
diff --git a/solr-1.3/start.jar → sunspot/solr/start.jar b/solr-1.3/start.jar → sunspot/solr/start.jar
diff --git a/solr/webapps/solr.war → sunspot/solr/webapps/solr.war b/solr/webapps/solr.war → sunspot/solr/webapps/solr.war
diff --git a/spec/api/adapters_spec.rb → sunspot/spec/api/adapters_spec.rb b/spec/api/adapters_spec.rb → sunspot/spec/api/adapters_spec.rb
diff --git a/spec/api/binding_spec.rb → sunspot/spec/api/binding_spec.rb b/spec/api/binding_spec.rb → sunspot/spec/api/binding_spec.rb
diff --git a/spec/api/indexer/attributes_spec.rb → sunspot/spec/api/indexer/attributes_spec.rb b/spec/api/indexer/attributes_spec.rb → sunspot/spec/api/indexer/attributes_spec.rb
diff --git a/spec/api/indexer/batch_spec.rb → sunspot/spec/api/indexer/batch_spec.rb b/spec/api/indexer/batch_spec.rb → sunspot/spec/api/indexer/batch_spec.rb
diff --git a/spec/api/indexer/dynamic_fields_spec.rb → ...t/spec/api/indexer/dynamic_fields_spec.rb b/spec/api/indexer/dynamic_fields_spec.rb → ...t/spec/api/indexer/dynamic_fields_spec.rb
diff --git a/spec/api/indexer/fixed_fields_spec.rb → ...pot/spec/api/indexer/fixed_fields_spec.rb b/spec/api/indexer/fixed_fields_spec.rb → ...pot/spec/api/indexer/fixed_fields_spec.rb
diff --git a/spec/api/indexer/fulltext_spec.rb → sunspot/spec/api/indexer/fulltext_spec.rb b/spec/api/indexer/fulltext_spec.rb → sunspot/spec/api/indexer/fulltext_spec.rb
diff --git a/spec/api/indexer/removal_spec.rb → sunspot/spec/api/indexer/removal_spec.rb b/spec/api/indexer/removal_spec.rb → sunspot/spec/api/indexer/removal_spec.rb
diff --git a/spec/api/spec_helper.rb → sunspot/spec/api/indexer/spec_helper.rb b/spec/api/spec_helper.rb → sunspot/spec/api/indexer/spec_helper.rb
diff --git a/spec/api/indexer_spec.rb → sunspot/spec/api/indexer_spec.rb b/spec/api/indexer_spec.rb → sunspot/spec/api/indexer_spec.rb
diff --git a/spec/api/query/adjust_params_spec.rb → sunspot/spec/api/query/adjust_params_spec.rb b/spec/api/query/adjust_params_spec.rb → sunspot/spec/api/query/adjust_params_spec.rb
diff --git a/spec/api/query/connectives_spec.rb → sunspot/spec/api/query/connectives_spec.rb b/spec/api/query/connectives_spec.rb → sunspot/spec/api/query/connectives_spec.rb
diff --git a/spec/api/query/dsl_spec.rb → sunspot/spec/api/query/dsl_spec.rb b/spec/api/query/dsl_spec.rb → sunspot/spec/api/query/dsl_spec.rb
diff --git a/spec/api/query/dynamic_fields_spec.rb → ...pot/spec/api/query/dynamic_fields_spec.rb b/spec/api/query/dynamic_fields_spec.rb → ...pot/spec/api/query/dynamic_fields_spec.rb
diff --git a/spec/api/query/facet_local_params_spec.rb → ...spec/api/query/facet_local_params_spec.rb b/spec/api/query/facet_local_params_spec.rb → ...spec/api/query/facet_local_params_spec.rb
diff --git a/spec/api/query/faceting_spec.rb → sunspot/spec/api/query/faceting_spec.rb b/spec/api/query/faceting_spec.rb → sunspot/spec/api/query/faceting_spec.rb
diff --git a/spec/api/query/fulltext_spec.rb → sunspot/spec/api/query/fulltext_spec.rb b/spec/api/query/fulltext_spec.rb → sunspot/spec/api/query/fulltext_spec.rb
diff --git a/spec/api/query/highlighting_spec.rb → sunspot/spec/api/query/highlighting_spec.rb b/spec/api/query/highlighting_spec.rb → sunspot/spec/api/query/highlighting_spec.rb
diff --git a/spec/api/query/local_spec.rb → sunspot/spec/api/query/local_spec.rb b/spec/api/query/local_spec.rb → sunspot/spec/api/query/local_spec.rb
diff --git a/spec/api/query/ordering_pagination_spec.rb → ...pec/api/query/ordering_pagination_spec.rb b/spec/api/query/ordering_pagination_spec.rb → ...pec/api/query/ordering_pagination_spec.rb
diff --git a/spec/api/query/scope_spec.rb → sunspot/spec/api/query/scope_spec.rb b/spec/api/query/scope_spec.rb → sunspot/spec/api/query/scope_spec.rb
diff --git a/spec/api/search/spec_helper.rb → sunspot/spec/api/query/spec_helper.rb b/spec/api/search/spec_helper.rb → sunspot/spec/api/query/spec_helper.rb
diff --git a/spec/api/query/text_field_scoping_spec.rb → ...spec/api/query/text_field_scoping_spec.rb b/spec/api/query/text_field_scoping_spec.rb → ...spec/api/query/text_field_scoping_spec.rb
diff --git a/spec/api/query/types_spec.rb → sunspot/spec/api/query/types_spec.rb b/spec/api/query/types_spec.rb → sunspot/spec/api/query/types_spec.rb
diff --git a/spec/api/search/dynamic_fields_spec.rb → ...ot/spec/api/search/dynamic_fields_spec.rb b/spec/api/search/dynamic_fields_spec.rb → ...ot/spec/api/search/dynamic_fields_spec.rb
diff --git a/spec/api/search/faceting_spec.rb → sunspot/spec/api/search/faceting_spec.rb b/spec/api/search/faceting_spec.rb → sunspot/spec/api/search/faceting_spec.rb
diff --git a/spec/api/search/highlighting_spec.rb → sunspot/spec/api/search/highlighting_spec.rb b/spec/api/search/highlighting_spec.rb → sunspot/spec/api/search/highlighting_spec.rb
diff --git a/spec/api/search/hits_spec.rb → sunspot/spec/api/search/hits_spec.rb b/spec/api/search/hits_spec.rb → sunspot/spec/api/search/hits_spec.rb
diff --git a/spec/api/search/results_spec.rb → sunspot/spec/api/search/results_spec.rb b/spec/api/search/results_spec.rb → sunspot/spec/api/search/results_spec.rb
diff --git a/spec/api/search/search_spec.rb → sunspot/spec/api/search/search_spec.rb b/spec/api/search/search_spec.rb → sunspot/spec/api/search/search_spec.rb
diff --git a/spec/api/query/spec_helper.rb → sunspot/spec/api/search/spec_helper.rb b/spec/api/query/spec_helper.rb → sunspot/spec/api/search/spec_helper.rb
diff --git a/...roxy/class_sharding_session_proxy_spec.rb → ...roxy/class_sharding_session_proxy_spec.rb b/...roxy/class_sharding_session_proxy_spec.rb → ...roxy/class_sharding_session_proxy_spec.rb
diff --git a/...n_proxy/id_sharding_session_proxy_spec.rb → ...n_proxy/id_sharding_session_proxy_spec.rb b/...n_proxy/id_sharding_session_proxy_spec.rb → ...n_proxy/id_sharding_session_proxy_spec.rb
diff --git a/..._proxy/master_slave_session_proxy_spec.rb → ..._proxy/master_slave_session_proxy_spec.rb b/..._proxy/master_slave_session_proxy_spec.rb → ..._proxy/master_slave_session_proxy_spec.rb
diff --git a/...sion_proxy/sharding_session_proxy_spec.rb → ...sion_proxy/sharding_session_proxy_spec.rb b/...sion_proxy/sharding_session_proxy_spec.rb → ...sion_proxy/sharding_session_proxy_spec.rb
diff --git a/spec/api/session_proxy/spec_helper.rb → ...pot/spec/api/session_proxy/spec_helper.rb b/spec/api/session_proxy/spec_helper.rb → ...pot/spec/api/session_proxy/spec_helper.rb
diff --git a/..._proxy/thread_local_session_proxy_spec.rb → ..._proxy/thread_local_session_proxy_spec.rb b/..._proxy/thread_local_session_proxy_spec.rb → ..._proxy/thread_local_session_proxy_spec.rb
diff --git a/spec/api/session_spec.rb → sunspot/spec/api/session_spec.rb b/spec/api/session_spec.rb → sunspot/spec/api/session_spec.rb
diff --git a/spec/api/indexer/spec_helper.rb → sunspot/spec/api/spec_helper.rb b/spec/api/indexer/spec_helper.rb → sunspot/spec/api/spec_helper.rb
diff --git a/spec/api/sunspot_spec.rb → sunspot/spec/api/sunspot_spec.rb b/spec/api/sunspot_spec.rb → sunspot/spec/api/sunspot_spec.rb
diff --git a/spec/ext.rb → sunspot/spec/ext.rb b/spec/ext.rb → sunspot/spec/ext.rb
diff --git a/spec/helpers/indexer_helper.rb → sunspot/spec/helpers/indexer_helper.rb b/spec/helpers/indexer_helper.rb → sunspot/spec/helpers/indexer_helper.rb
diff --git a/spec/helpers/query_helper.rb → sunspot/spec/helpers/query_helper.rb b/spec/helpers/query_helper.rb → sunspot/spec/helpers/query_helper.rb
diff --git a/spec/helpers/search_helper.rb → sunspot/spec/helpers/search_helper.rb b/spec/helpers/search_helper.rb → sunspot/spec/helpers/search_helper.rb
diff --git a/spec/integration/dynamic_fields_spec.rb → ...t/spec/integration/dynamic_fields_spec.rb b/spec/integration/dynamic_fields_spec.rb → ...t/spec/integration/dynamic_fields_spec.rb
diff --git a/spec/integration/faceting_spec.rb → sunspot/spec/integration/faceting_spec.rb b/spec/integration/faceting_spec.rb → sunspot/spec/integration/faceting_spec.rb
diff --git a/spec/integration/highlighting_spec.rb → ...pot/spec/integration/highlighting_spec.rb b/spec/integration/highlighting_spec.rb → ...pot/spec/integration/highlighting_spec.rb
diff --git a/spec/integration/indexing_spec.rb → sunspot/spec/integration/indexing_spec.rb b/spec/integration/indexing_spec.rb → sunspot/spec/integration/indexing_spec.rb
diff --git a/spec/integration/keyword_search_spec.rb → ...t/spec/integration/keyword_search_spec.rb b/spec/integration/keyword_search_spec.rb → ...t/spec/integration/keyword_search_spec.rb
diff --git a/spec/integration/local_search_spec.rb → ...pot/spec/integration/local_search_spec.rb b/spec/integration/local_search_spec.rb → ...pot/spec/integration/local_search_spec.rb
diff --git a/spec/integration/scoped_search_spec.rb → ...ot/spec/integration/scoped_search_spec.rb b/spec/integration/scoped_search_spec.rb → ...ot/spec/integration/scoped_search_spec.rb
diff --git a/spec/integration/spec_helper.rb → sunspot/spec/integration/spec_helper.rb b/spec/integration/spec_helper.rb → sunspot/spec/integration/spec_helper.rb
diff --git a/spec/integration/stored_fields_spec.rb → ...ot/spec/integration/stored_fields_spec.rb b/spec/integration/stored_fields_spec.rb → ...ot/spec/integration/stored_fields_spec.rb
diff --git a/spec/integration/test_pagination.rb → sunspot/spec/integration/test_pagination.rb b/spec/integration/test_pagination.rb → sunspot/spec/integration/test_pagination.rb
diff --git a/spec/mocks/adapters.rb → sunspot/spec/mocks/adapters.rb b/spec/mocks/adapters.rb → sunspot/spec/mocks/adapters.rb
diff --git a/spec/mocks/blog.rb → sunspot/spec/mocks/blog.rb b/spec/mocks/blog.rb → sunspot/spec/mocks/blog.rb
diff --git a/spec/mocks/comment.rb → sunspot/spec/mocks/comment.rb b/spec/mocks/comment.rb → sunspot/spec/mocks/comment.rb
diff --git a/spec/mocks/connection.rb → sunspot/spec/mocks/connection.rb b/spec/mocks/connection.rb → sunspot/spec/mocks/connection.rb
diff --git a/spec/mocks/mock_adapter.rb → sunspot/spec/mocks/mock_adapter.rb b/spec/mocks/mock_adapter.rb → sunspot/spec/mocks/mock_adapter.rb
diff --git a/...ocks/mock_class_sharding_session_proxy.rb → ...ocks/mock_class_sharding_session_proxy.rb b/...ocks/mock_class_sharding_session_proxy.rb → ...ocks/mock_class_sharding_session_proxy.rb
diff --git a/spec/mocks/mock_record.rb → sunspot/spec/mocks/mock_record.rb b/spec/mocks/mock_record.rb → sunspot/spec/mocks/mock_record.rb
diff --git a/spec/mocks/mock_sharding_session_proxy.rb → ...spec/mocks/mock_sharding_session_proxy.rb b/spec/mocks/mock_sharding_session_proxy.rb → ...spec/mocks/mock_sharding_session_proxy.rb
diff --git a/spec/mocks/photo.rb → sunspot/spec/mocks/photo.rb b/spec/mocks/photo.rb → sunspot/spec/mocks/photo.rb
diff --git a/spec/mocks/post.rb → sunspot/spec/mocks/post.rb b/spec/mocks/post.rb → sunspot/spec/mocks/post.rb
diff --git a/spec/mocks/super_class.rb → sunspot/spec/mocks/super_class.rb b/spec/mocks/super_class.rb → sunspot/spec/mocks/super_class.rb
diff --git a/spec/mocks/user.rb → sunspot/spec/mocks/user.rb b/spec/mocks/user.rb → sunspot/spec/mocks/user.rb
diff --git a/spec/spec_helper.rb → sunspot/spec/spec_helper.rb b/spec/spec_helper.rb → sunspot/spec/spec_helper.rb
diff --git a/tasks/gemspec.rake → sunspot/tasks/gemspec.rake b/tasks/gemspec.rake → sunspot/tasks/gemspec.rake
diff --git a/tasks/rcov.rake → sunspot/tasks/rcov.rake b/tasks/rcov.rake → sunspot/tasks/rcov.rake
diff --git a/tasks/rdoc.rake → sunspot/tasks/rdoc.rake b/tasks/rdoc.rake → sunspot/tasks/rdoc.rake
diff --git a/tasks/schema.rake → sunspot/tasks/schema.rake b/tasks/schema.rake → sunspot/tasks/schema.rake
diff --git a/tasks/spec.rake → sunspot/tasks/spec.rake b/tasks/spec.rake → sunspot/tasks/spec.rake
diff --git a/tasks/todo.rake → sunspot/tasks/todo.rake b/tasks/todo.rake → sunspot/tasks/todo.rake