You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@shindig.apache.org by "Bastian Hofmann (JIRA)" <ji...@apache.org> on 2010/07/15 13:23:51 UTC
[jira] Created: (SHINDIG-1386) Allow additional javascript feature
directories e.g. in the extras folder
Allow additional javascript feature directories e.g. in the extras folder
-------------------------------------------------------------------------
Key: SHINDIG-1386
URL: https://issues.apache.org/jira/browse/SHINDIG-1386
Project: Shindig
Issue Type: New Feature
Components: PHP
Reporter: Bastian Hofmann
Index: php/config/container.php
===================================================================
117c117,120
< 'features_path' => realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
---
> 'features_path' => array(
> realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
> realpath(dirname(__FILE__) . '/../../extras/src/main/javascript/features-extras') . '/',
> ),
Index: php/src/gadgets/GadgetFeatureRegistry.php
===================================================================
28,30c28,29
< public $features;
< private $coreDone = false;
< private $coreFeaturs;
---
> public $features = array();
> private $coreFeatures;
33a33,37
> if (is_array($featurePath)) {
> foreach ($featurePath as $path) {
> $this->registerFeatures($path);
> }
> } else {
36a41,43
> $this->processFeatures();
> }
>
137d143
< $this->features = array();
151a158,163
> }
>
> /**
> * gets core features and sorts features
> */
> private function processFeatures() {
Also in the existing features-extras directory the features.txt has to wrong path to the feature.xml:
Index: extras/src/main/javascript/features-extras/features.txt
===================================================================
19c19
< features/org.jquery.core-1.4.2/feature.xml
---
> features-extras/org.jquery.core-1.4.2/feature.xml
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Updated: (SHINDIG-1386) Allow additional javascript feature
directories e.g. in the extras folder
Posted by "Bastian Hofmann (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/SHINDIG-1386?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Bastian Hofmann updated SHINDIG-1386:
-------------------------------------
Description:
Index: php/config/container.php
===================================================================
117c117,120
< 'features_path' => realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
---
> 'features_path' => array(
> realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
> realpath(dirname(__FILE__) . '/../../extras/src/main/javascript/features-extras') . '/',
> ),
Index: php/src/gadgets/GadgetFeatureRegistry.php
===================================================================
28,30c28,29
< public $features;
< private $coreDone = false;
< private $coreFeaturs;
---
> public $features = array();
> private $coreFeatures;
33a33,37
> if (is_array($featurePath)) {
> foreach ($featurePath as $path) {
> $this->registerFeatures($path);
> }
> } else {
36a41,43
> $this->processFeatures();
> }
>
137d143
< $this->features = array();
151a158,163
> }
>
> /**
> * gets core features and sorts features
> */
> private function processFeatures() {
Index: php/src/gadgets/GadgetContext.php
===================================================================
120c120,121
< if (! ($registry = $featureCache->get(md5(Config::get('features_path'))))) {
---
> $key = md5(implode(',', Config::get('features_path')));
> if (! ($registry = $featureCache->get($key))) {
122c123
< $featureCache->set(md5(Config::get('features_path')), $registry);
---
> $featureCache->set($key, $registry);
Also in the existing features-extras directory the features.txt has to wrong path to the feature.xml:
Index: extras/src/main/javascript/features-extras/features.txt
===================================================================
19c19
< features/org.jquery.core-1.4.2/feature.xml
---
> features-extras/org.jquery.core-1.4.2/feature.xml
was:
Index: php/config/container.php
===================================================================
117c117,120
< 'features_path' => realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
---
> 'features_path' => array(
> realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
> realpath(dirname(__FILE__) . '/../../extras/src/main/javascript/features-extras') . '/',
> ),
Index: php/src/gadgets/GadgetFeatureRegistry.php
===================================================================
28,30c28,29
< public $features;
< private $coreDone = false;
< private $coreFeaturs;
---
> public $features = array();
> private $coreFeatures;
33a33,37
> if (is_array($featurePath)) {
> foreach ($featurePath as $path) {
> $this->registerFeatures($path);
> }
> } else {
36a41,43
> $this->processFeatures();
> }
>
137d143
< $this->features = array();
151a158,163
> }
>
> /**
> * gets core features and sorts features
> */
> private function processFeatures() {
Also in the existing features-extras directory the features.txt has to wrong path to the feature.xml:
Index: extras/src/main/javascript/features-extras/features.txt
===================================================================
19c19
< features/org.jquery.core-1.4.2/feature.xml
---
> features-extras/org.jquery.core-1.4.2/feature.xml
> Allow additional javascript feature directories e.g. in the extras folder
> -------------------------------------------------------------------------
>
> Key: SHINDIG-1386
> URL: https://issues.apache.org/jira/browse/SHINDIG-1386
> Project: Shindig
> Issue Type: New Feature
> Components: PHP
> Reporter: Bastian Hofmann
>
> Index: php/config/container.php
> ===================================================================
> 117c117,120
> < 'features_path' => realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
> ---
> > 'features_path' => array(
> > realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
> > realpath(dirname(__FILE__) . '/../../extras/src/main/javascript/features-extras') . '/',
> > ),
> Index: php/src/gadgets/GadgetFeatureRegistry.php
> ===================================================================
> 28,30c28,29
> < public $features;
> < private $coreDone = false;
> < private $coreFeaturs;
> ---
> > public $features = array();
> > private $coreFeatures;
> 33a33,37
> > if (is_array($featurePath)) {
> > foreach ($featurePath as $path) {
> > $this->registerFeatures($path);
> > }
> > } else {
> 36a41,43
> > $this->processFeatures();
> > }
> >
> 137d143
> < $this->features = array();
> 151a158,163
> > }
> >
> > /**
> > * gets core features and sorts features
> > */
> > private function processFeatures() {
> Index: php/src/gadgets/GadgetContext.php
> ===================================================================
> 120c120,121
> < if (! ($registry = $featureCache->get(md5(Config::get('features_path'))))) {
> ---
> > $key = md5(implode(',', Config::get('features_path')));
> > if (! ($registry = $featureCache->get($key))) {
> 122c123
> < $featureCache->set(md5(Config::get('features_path')), $registry);
> ---
> > $featureCache->set($key, $registry);
> Also in the existing features-extras directory the features.txt has to wrong path to the feature.xml:
> Index: extras/src/main/javascript/features-extras/features.txt
> ===================================================================
> 19c19
> < features/org.jquery.core-1.4.2/feature.xml
> ---
> > features-extras/org.jquery.core-1.4.2/feature.xml
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Resolved: (SHINDIG-1386) Allow additional javascript feature
directories e.g. in the extras folder
Posted by "Paul Lindner (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/SHINDIG-1386?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Paul Lindner resolved SHINDIG-1386.
-----------------------------------
Fix Version/s: 2.0.0-RC1
Resolution: Fixed
committed
> Allow additional javascript feature directories e.g. in the extras folder
> -------------------------------------------------------------------------
>
> Key: SHINDIG-1386
> URL: https://issues.apache.org/jira/browse/SHINDIG-1386
> Project: Shindig
> Issue Type: New Feature
> Components: PHP
> Reporter: Bastian Hofmann
> Fix For: 2.0.0-RC1
>
>
> Index: php/config/container.php
> ===================================================================
> 117c117,120
> < 'features_path' => realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
> ---
> > 'features_path' => array(
> > realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
> > realpath(dirname(__FILE__) . '/../../extras/src/main/javascript/features-extras') . '/',
> > ),
> Index: php/src/gadgets/GadgetFeatureRegistry.php
> ===================================================================
> 28,30c28,29
> < public $features;
> < private $coreDone = false;
> < private $coreFeaturs;
> ---
> > public $features = array();
> > private $coreFeatures;
> 33a33,37
> > if (is_array($featurePath)) {
> > foreach ($featurePath as $path) {
> > $this->registerFeatures($path);
> > }
> > } else {
> 36a41,43
> > $this->processFeatures();
> > }
> >
> 137d143
> < $this->features = array();
> 151a158,163
> > }
> >
> > /**
> > * gets core features and sorts features
> > */
> > private function processFeatures() {
> Index: php/src/gadgets/GadgetContext.php
> ===================================================================
> 120c120,121
> < if (! ($registry = $featureCache->get(md5(Config::get('features_path'))))) {
> ---
> > $key = md5(implode(',', Config::get('features_path')));
> > if (! ($registry = $featureCache->get($key))) {
> 122c123
> < $featureCache->set(md5(Config::get('features_path')), $registry);
> ---
> > $featureCache->set($key, $registry);
> Also in the existing features-extras directory the features.txt has to wrong path to the feature.xml:
> Index: extras/src/main/javascript/features-extras/features.txt
> ===================================================================
> 19c19
> < features/org.jquery.core-1.4.2/feature.xml
> ---
> > features-extras/org.jquery.core-1.4.2/feature.xml
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.