brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [5/8] git commit: remove the dev/ files (since we run require.js optimize we don't need that copy of original JS source), and fix some broken usages of old path to brooklyn files
Date Thu, 18 Sep 2014 10:32:32 GMT
remove the dev/ files (since we run require.js optimize we don't need that copy of original
JS source), and fix some broken usages of old path to brooklyn files


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b601f3ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b601f3ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b601f3ab

Branch: refs/heads/master
Commit: b601f3ab5b2ce1e54fc5b2501d16bb43c4f7cc2e
Parents: f39b2df
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Sep 17 13:22:11 2014 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Sep 17 14:56:07 2014 +0100

----------------------------------------------------------------------
 usage/jsgui/pom.xml                             |     2 -
 usage/jsgui/src/main/dev/info.txt               |    15 -
 .../src/main/dev/js/libs/jquery.dataTables.js   | 12099 -----------------
 usage/jsgui/src/main/dev/js/libs/jquery.js      |  9404 -------------
 usage/jsgui/src/main/dev/js/libs/moment.js      |  1662 ---
 usage/jsgui/src/main/webapp/assets/js/config.js |     2 +-
 .../src/main/webapp/assets/js/libs/moment.js    |  1662 +++
 .../main/webapp/assets/js/libs/moment.min.js    |     6 -
 usage/jsgui/src/test/javascript/config.txt      |     8 +-
 9 files changed, 1667 insertions(+), 23193 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b601f3ab/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index a768298..36685d9 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -234,8 +234,6 @@
                     <configuration>
                         <excludes combine.children="append">
                             <exclude>**/src/main/webapp/assets/js/libs/*</exclude>
-                            <exclude>**/src/main/dev/info.txt</exclude>
-                            <exclude>**/src/main/dev/js/libs/*</exclude>
                             <exclude>**/src/build/requirejs-maven-plugin/r.js</exclude>
                             <exclude>**/src/test/javascript/config.txt</exclude>
                         </excludes>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b601f3ab/usage/jsgui/src/main/dev/info.txt
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/dev/info.txt b/usage/jsgui/src/main/dev/info.txt
deleted file mode 100644
index b8b4af9..0000000
--- a/usage/jsgui/src/main/dev/info.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-This dir contains resources which can be useful at dev time.
-Specifically:
-
-
-# Non-minimised Javascript
-
-Where appropriate we use minimised javascript in the WAR to cut down the file size.
-To use non-minimised JS during dev/test/debug install the non-minimised versions kept here
-(and not put in the WAR) by doing:
-
-    cp src/main/dev/js/libs/*.js src/main/webapp/assets/js/libs/
-
-But be careful not to git commit the non-minimised js!
-


Mime
View raw message