Author: rande
Date: 2010-01-12 14:44:04 +0100 (Tue, 12 Jan 2010)
New Revision: 26532
Modified:
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/actions.class.php
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/components.class.php
plugins/sfSolrPlugin/branches/sf1.2/lib/filter/sfLuceneHighlightFilter.class.php
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneCreateSolrTask.class.php
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneServiceTask.class.php
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumI18nMapBuilder.php
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumMapBuilder.php
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumI18nPeer.php
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumPeer.php
plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/ProjectConfiguration.class.php
Log:
[sfSolrPlugin] update path
Modified:
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/actions.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/actions.class.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/actions.class.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -7,7 +7,7 @@
* file that was distributed with this source code.
*/
-require_once sfConfig::get('sf_plugins_dir').
'/sfLucenePlugin/modules/sfLucene/lib/BasesfLuceneActions.class.php';
+require_once sfConfig::get('sf_plugins_dir').
'/sfSolrPlugin/modules/sfLucene/lib/BasesfLuceneActions.class.php';
/**
* @package sfLucenePlugin
Modified:
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/components.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/components.class.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/data/skeleton/module/actions/components.class.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -7,7 +7,7 @@
* file that was distributed with this source code.
*/
-require_once sfConfig::get('sf_plugins_dir').
'/sfLucenePlugin/modules/sfLucene/lib/BasesfLuceneComponents.class.php';
+require_once sfConfig::get('sf_plugins_dir').
'/sfSolrPlugin/modules/sfLucene/lib/BasesfLuceneComponents.class.php';
/**
* @package sfLucenePlugin
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/filter/sfLuceneHighlightFilter.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/lib/filter/sfLuceneHighlightFilter.class.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/lib/filter/sfLuceneHighlightFilter.class.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -50,7 +50,7 @@
'notice_referer_string' => '<div>Welcome from
<strong>%from%</strong>! The following keywords were automatically
highlighted: %keywords% %remove%</div>',
'notice_string' => '<div>The following keywords were
automatically highlighted: %keywords% %remove%</div>',
'remove_string' => '[<a href="%url%">remove
highlighting</a>]',
- 'css' => '../sfLucenePlugin/css/search.css',
+ 'css' => '../sfSolrPlugin/css/search.css',
'possible_refers' => array(
'google' => array('qs' => 'q',
'name' => 'Google'),
'yahoo' => array('qs' => 'p',
'name' => 'Yahoo!'),
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneCreateSolrTask.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneCreateSolrTask.class.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneCreateSolrTask.class.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -382,7 +382,7 @@
</types>
<fields>
- <!-- general, field use by sfLucenePlugin -->
+ <!-- general, field use by sfSolrPlugin -->
<field name="sfl_guid" type="string" indexed="true" stored="true"
multiValued="false" required="true"/>
<field name="sfl_title" type="string" indexed="true" stored="true"
multiValued="false" required="false"/>
<field name="sfl_description" type="string" indexed="true"
stored="true" multiValued="false" required="false"/>
@@ -556,7 +556,7 @@
'stopwords.txt'
);
- $solr_example_path =
sfConfig::get('sf_plugins_dir').'/sfLucenePlugin/lib/vendor/Solr/example/solr/conf';
+ $solr_example_path =
sfConfig::get('sf_plugins_dir').'/sfSolrPlugin/lib/vendor/Solr/example/solr/conf';
foreach($files as $file)
{
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneServiceTask.class.php
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneServiceTask.class.php
2010-01-12 13:43:26 UTC (rev 26531)
+++ plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneServiceTask.class.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -138,7 +138,7 @@
}
// start the jetty built in server
- $command = sprintf('cd %s/plugins/sfLucenePlugin/lib/vendor/Solr/example;
%s %s -Dsolr.solr.home=%s/config/solr/ -Dsolr.data.dir=%s/data/solr_index -jar
start.jar > %s/solr_server_%s_%s.log 2>&1 & echo $!',
+ $command = sprintf('cd %s/plugins/sfSolrPlugin/lib/vendor/Solr/example; %s
%s -Dsolr.solr.home=%s/config/solr/ -Dsolr.data.dir=%s/data/solr_index -jar
start.jar > %s/solr_server_%s_%s.log 2>&1 & echo $!',
sfConfig::get('sf_root_dir'),
$this->nohup,
$this->java,
Modified:
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumI18nMapBuilder.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumI18nMapBuilder.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumI18nMapBuilder.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -5,7 +5,7 @@
class FakeForumI18nMapBuilder {
- const CLASS_NAME =
'plugins.sfLucenePlugin.test.bin.model.map.FakeForumI18nMapBuilder';
+ const CLASS_NAME =
'plugins.sfSolrPlugin.test.bin.model.map.FakeForumI18nMapBuilder';
private $dbMap;
Modified:
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumMapBuilder.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumMapBuilder.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/map/FakeForumMapBuilder.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -5,7 +5,7 @@
class FakeForumMapBuilder {
- const CLASS_NAME =
'plugins.sfLucenePlugin.test.bin.model.map.FakeForumMapBuilder';
+ const CLASS_NAME =
'plugins.sfSolrPlugin.test.bin.model.map.FakeForumMapBuilder';
private $dbMap;
Modified:
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumI18nPeer.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumI18nPeer.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumI18nPeer.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -10,7 +10,7 @@
const TABLE_NAME = 'fake_forum_i18n';
- const CLASS_DEFAULT =
'plugins.sfLucenePlugin.test.bin.model.FakeForumI18n';
+ const CLASS_DEFAULT =
'plugins.sfSolrPlugin.test.bin.model.FakeForumI18n';
const NUM_COLUMNS = 4;
@@ -54,7 +54,7 @@
public static function getMapBuilder()
{
- return
BasePeer::getMapBuilder('plugins.sfLucenePlugin.test.bin.model.map.FakeForumI18nMapBuilder');
+ return
BasePeer::getMapBuilder('plugins.sfSolrPlugin.test.bin.model.map.FakeForumI18nMapBuilder');
}
public static function getPhpNameMap()
@@ -582,5 +582,5 @@
Propel::log('Could not initialize Peer: ' . $e->getMessage(),
Propel::LOG_ERR);
}
} else {
-
Propel::registerMapBuilder('plugins.sfLucenePlugin.test.bin.model.map.FakeForumI18nMapBuilder');
+
Propel::registerMapBuilder('plugins.sfSolrPlugin.test.bin.model.map.FakeForumI18nMapBuilder');
}
Modified:
plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumPeer.php
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumPeer.php
2010-01-12 13:43:26 UTC (rev 26531)
+++ plugins/sfSolrPlugin/branches/sf1.2/test/bin/model/om/BaseFakeForumPeer.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -10,7 +10,7 @@
const TABLE_NAME = 'fake_forum';
- const CLASS_DEFAULT = 'plugins.sfLucenePlugin.test.bin.model.FakeForum';
+ const CLASS_DEFAULT = 'plugins.sfSolrPlugin.test.bin.model.FakeForum';
const NUM_COLUMNS = 2;
@@ -48,7 +48,7 @@
public static function getMapBuilder()
{
- return
BasePeer::getMapBuilder('plugins.sfLucenePlugin.test.bin.model.map.FakeForumMapBuilder');
+ return
BasePeer::getMapBuilder('plugins.sfSolrPlugin.test.bin.model.map.FakeForumMapBuilder');
}
public static function getPhpNameMap()
@@ -399,7 +399,7 @@
foreach($objects as $obj) {
- include_once
'plugins/sfLucenePlugin/test/bin/model/FakeForumI18n.php';
+ include_once
'plugins/sfSolrPlugin/test/bin/model/FakeForumI18n.php';
$c = new Criteria();
@@ -487,5 +487,5 @@
Propel::log('Could not initialize Peer: ' . $e->getMessage(),
Propel::LOG_ERR);
}
} else {
-
Propel::registerMapBuilder('plugins.sfLucenePlugin.test.bin.model.map.FakeForumMapBuilder');
+
Propel::registerMapBuilder('plugins.sfSolrPlugin.test.bin.model.map.FakeForumMapBuilder');
}
Modified:
plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/ProjectConfiguration.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/ProjectConfiguration.class.php
2010-01-12 13:43:26 UTC (rev 26531)
+++
plugins/sfSolrPlugin/branches/sf1.2/test/sandbox/config/ProjectConfiguration.class.php
2010-01-12 13:44:04 UTC (rev 26532)
@@ -12,7 +12,7 @@
// for compatibility / remove and enable only the plugins you want
$this->enablePlugins(array(
'sfDoctrinePlugin',
- 'sfLucenePlugin',
+ 'sfSolrPlugin',
));
}
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
