Author: lindner
Date: Tue Feb 24 06:38:38 2009
New Revision: 747288
URL: http://svn.apache.org/viewvc?rev=747288&view=rev
Log:
SHINDIG-806 | Patch from Henning Schmiedehausen | Move Javascript in the
features directory in a better location
Added:
incubator/shindig/trunk/features/src/
incubator/shindig/trunk/features/src/main/
incubator/shindig/trunk/features/src/main/javascript/
incubator/shindig/trunk/features/src/main/javascript/features/
incubator/shindig/trunk/features/src/main/javascript/features/analytics/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/analytics/
incubator/shindig/trunk/features/src/main/javascript/features/auth-refresh/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/auth-refresh/
incubator/shindig/trunk/features/src/main/javascript/features/caja/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/caja/
incubator/shindig/trunk/features/src/main/javascript/features/core/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/core/
incubator/shindig/trunk/features/src/main/javascript/features/core.io/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/core.io/
incubator/shindig/trunk/features/src/main/javascript/features/dynamic-height/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/dynamic-height/
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/features.txt
incubator/shindig/trunk/features/src/main/javascript/features/flash/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/flash/
incubator/shindig/trunk/features/src/main/javascript/features/locked-domain/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/locked-domain/
incubator/shindig/trunk/features/src/main/javascript/features/minimessage/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/minimessage/
incubator/shindig/trunk/features/src/main/javascript/features/oauthpopup/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/oauthpopup/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.6/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/opensocial-0.6/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.7/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/opensocial-0.7/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.8/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/opensocial-0.8/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-base/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/opensocial-base/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-current/
(props changed)
- copied from r747281,
incubator/shindig/trunk/features/opensocial-current/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/opensocial-data/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/
(props changed)
- copied from r747281,
incubator/shindig/trunk/features/opensocial-data-context/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/
(props changed)
- copied from r747281,
incubator/shindig/trunk/features/opensocial-jsonrpc/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-reference/
(props changed)
- copied from r747281,
incubator/shindig/trunk/features/opensocial-reference/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-rest/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/opensocial-rest/
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/
(props changed)
- copied from r747281,
incubator/shindig/trunk/features/opensocial-templates/
incubator/shindig/trunk/features/src/main/javascript/features/pubsub/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/pubsub/
incubator/shindig/trunk/features/src/main/javascript/features/rpc/ (props
changed)
- copied from r747281, incubator/shindig/trunk/features/rpc/
incubator/shindig/trunk/features/src/main/javascript/features/setprefs/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/setprefs/
incubator/shindig/trunk/features/src/main/javascript/features/settitle/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/settitle/
incubator/shindig/trunk/features/src/main/javascript/features/skins/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/skins/
incubator/shindig/trunk/features/src/main/javascript/features/tabs/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/tabs/
incubator/shindig/trunk/features/src/main/javascript/features/views/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/views/
incubator/shindig/trunk/features/src/main/javascript/features/xmlutil/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/xmlutil/
incubator/shindig/trunk/features/src/test/
incubator/shindig/trunk/features/src/test/javascript/
incubator/shindig/trunk/features/src/test/javascript/features/
incubator/shindig/trunk/features/src/test/javascript/features/core/
incubator/shindig/trunk/features/src/test/javascript/features/core.io/
incubator/shindig/trunk/features/src/test/javascript/features/core.io/iotest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/core.io/iotest.js
incubator/shindig/trunk/features/src/test/javascript/features/core/authtest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/core/authtest.js
incubator/shindig/trunk/features/src/test/javascript/features/core/config-test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/core/config-test.js
incubator/shindig/trunk/features/src/test/javascript/features/core/prefstest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/core/prefstest.js
incubator/shindig/trunk/features/src/test/javascript/features/core/utiltest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/core/utiltest.js
incubator/shindig/trunk/features/src/test/javascript/features/mocks/
(props changed)
- copied from r747281, incubator/shindig/trunk/features/mocks/
incubator/shindig/trunk/features/src/test/javascript/features/oauthpopup/
incubator/shindig/trunk/features/src/test/javascript/features/oauthpopup/oauthpopup-test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/oauthpopup/oauthpopup-test.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-base/
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-base/jsonactivitytest.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-data-context/
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-data-context/datacontexttest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-data-context/datacontexttest.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-reference/
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-reference/activitytest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-reference/activitytest.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/compiler_test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-templates/compiler_test.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/container_test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-templates/container_test.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/loader_test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-templates/loader_test.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/os_test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-templates/os_test.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-templates/template_test.js
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/util_test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/opensocial-templates/util_test.js
incubator/shindig/trunk/features/src/test/javascript/features/setprefs/
incubator/shindig/trunk/features/src/test/javascript/features/setprefs/setprefstest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/setprefs/setprefstest.js
incubator/shindig/trunk/features/src/test/javascript/features/views/
incubator/shindig/trunk/features/src/test/javascript/features/views/requestnavigateto-test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/views/requestnavigateto-test.js
incubator/shindig/trunk/features/src/test/javascript/features/views/urltemplatetest.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/views/urltemplatetest.js
incubator/shindig/trunk/features/src/test/javascript/features/views/views-init-test.js
(props changed)
- copied unchanged from r747281,
incubator/shindig/trunk/features/views/views-init-test.js
Removed:
incubator/shindig/trunk/features/analytics/
incubator/shindig/trunk/features/auth-refresh/
incubator/shindig/trunk/features/caja/
incubator/shindig/trunk/features/core/
incubator/shindig/trunk/features/core.io/
incubator/shindig/trunk/features/dynamic-height/
incubator/shindig/trunk/features/features.txt
incubator/shindig/trunk/features/flash/
incubator/shindig/trunk/features/locked-domain/
incubator/shindig/trunk/features/minimessage/
incubator/shindig/trunk/features/mocks/
incubator/shindig/trunk/features/oauthpopup/
incubator/shindig/trunk/features/opensocial-0.6/
incubator/shindig/trunk/features/opensocial-0.7/
incubator/shindig/trunk/features/opensocial-0.8/
incubator/shindig/trunk/features/opensocial-base/
incubator/shindig/trunk/features/opensocial-current/
incubator/shindig/trunk/features/opensocial-data/
incubator/shindig/trunk/features/opensocial-data-context/
incubator/shindig/trunk/features/opensocial-jsonrpc/
incubator/shindig/trunk/features/opensocial-reference/
incubator/shindig/trunk/features/opensocial-rest/
incubator/shindig/trunk/features/opensocial-templates/
incubator/shindig/trunk/features/pubsub/
incubator/shindig/trunk/features/rpc/
incubator/shindig/trunk/features/setprefs/
incubator/shindig/trunk/features/settitle/
incubator/shindig/trunk/features/skins/
incubator/shindig/trunk/features/src/main/javascript/features/core.io/iotest.js
incubator/shindig/trunk/features/src/main/javascript/features/core/authtest.js
incubator/shindig/trunk/features/src/main/javascript/features/core/config-test.js
incubator/shindig/trunk/features/src/main/javascript/features/core/prefstest.js
incubator/shindig/trunk/features/src/main/javascript/features/core/utiltest.js
incubator/shindig/trunk/features/src/main/javascript/features/oauthpopup/oauthpopup-test.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-base/jsonactivitytest.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/datacontexttest.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-reference/activitytest.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/compiler_test.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/container_test.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/loader_test.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/os_test.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/template_test.js
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/util_test.js
incubator/shindig/trunk/features/src/main/javascript/features/setprefs/setprefstest.js
incubator/shindig/trunk/features/src/main/javascript/features/views/requestnavigateto-test.js
incubator/shindig/trunk/features/src/main/javascript/features/views/urltemplatetest.js
incubator/shindig/trunk/features/src/main/javascript/features/views/views-init-test.js
incubator/shindig/trunk/features/tabs/
incubator/shindig/trunk/features/views/
incubator/shindig/trunk/features/xmlutil/
Modified:
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/php/config/container.php
Modified: incubator/shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=747288&r1=747287&r2=747288&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Tue Feb 24 06:38:38 2009
@@ -67,11 +67,11 @@
<executions>
<execution>
<configuration>
- <sourceDirectory>${basedir}</sourceDirectory>
+
<sourceDirectory>${basedir}/src/main/javascript/features</sourceDirectory>
<sources>
- <source>mocks/env.js</source>
- <source>mocks/window.js</source>
- <source>mocks/xhr.js</source>
+
<source>../../../../src/test/javascript/features/mocks/env.js</source>
+
<source>../../../../src/test/javascript/features/mocks/window.js</source>
+
<source>../../../../src/test/javascript/features/mocks/xhr.js</source>
<source>core/config.js</source>
<source>core/json.js</source>
<source>core/auth.js</source>
@@ -108,12 +108,13 @@
<source>opensocial-jsonrpc/jsonrpccontainer.js</source>
<source>oauthpopup/oauthpopup.js</source>
</sources>
- <testSourceDirectory>${basedir}</testSourceDirectory>
+
<testSourceDirectory>${basedir}/src/test/javascript/features</testSourceDirectory>
<testSuites>
<testSuite>
<name>FeatureTests</name>
<type>TESTCASES</type>
<includes>
+ <include>mocks/*.js</include>
<include>*/*test.js</include>
</includes>
</testSuite>
@@ -144,13 +145,7 @@
<configuration>
<suffix>.opt</suffix>
<excludes>
- <exclude>target/**</exclude>
- <!-- don't bother with other file types. -->
<exclude>**/*.xml</exclude>
- <exclude>**/*.html</exclude>
- <exclude>**/*.gif</exclude>
- <exclude>**/*.jpeg</exclude>
- <exclude>**/*.png</exclude>
<!-- Caja is already minified -->
<exclude>**/caja/*.js</exclude>
</excludes>
@@ -162,7 +157,7 @@
<resources>
<resource>
<targetPath>features</targetPath>
- <directory>${basedir}</directory>
+ <directory>${basedir}/src/main/javascript/features</directory>
<excludes>
<exclude>pom.xml</exclude>
<!-- SVN ignore -->
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/analytics/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/auth-refresh/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/shindig/trunk/features/src/main/javascript/features/caja/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/shindig/trunk/features/src/main/javascript/features/core/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/core.io/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/dynamic-height/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: incubator/shindig/trunk/features/src/main/javascript/features/flash/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/locked-domain/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/minimessage/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/oauthpopup/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.6/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.7/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-0.8/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-base/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-current/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-data-context/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-reference/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-rest/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/pubsub/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/shindig/trunk/features/src/main/javascript/features/rpc/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/setprefs/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/settitle/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/shindig/trunk/features/src/main/javascript/features/skins/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/shindig/trunk/features/src/main/javascript/features/tabs/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/shindig/trunk/features/src/main/javascript/features/views/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/main/javascript/features/xmlutil/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/core.io/iotest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/core/authtest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/core/config-test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/core/prefstest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/core/utiltest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/shindig/trunk/features/src/test/javascript/features/mocks/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/oauthpopup/oauthpopup-test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-data-context/datacontexttest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-reference/activitytest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/compiler_test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/container_test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/loader_test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/os_test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/util_test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/setprefs/setprefstest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/views/requestnavigateto-test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/views/urltemplatetest.js
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/shindig/trunk/features/src/test/javascript/features/views/views-init-test.js
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/shindig/trunk/php/config/container.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/config/container.php?rev=747288&r1=747287&r2=747288&view=diff
==============================================================================
--- incubator/shindig/trunk/php/config/container.php (original)
+++ incubator/shindig/trunk/php/config/container.php Tue Feb 24 06:38:38 2009
@@ -95,7 +95,7 @@
// The locations of the various required components on disk. If you did a
normal svn checkout there's no need to change these
'base_path' => realpath(dirname(__FILE__) . '/..') . '/',
- 'features_path' => realpath(dirname(__FILE__) . '/../../features') . '/',
+ 'features_path' => realpath(dirname(__FILE__) .
'/../../features/src/main/javascript/features') . '/',
'container_path' => realpath(dirname(__FILE__) . '/../../config') . '/',
'javascript_path' => realpath(dirname(__FILE__) . '/../../javascript') . '/',
