02/02: get lib by bower

13 Jun 2014

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/addBuilder in repository pollen.

See http://git.chorem.org/pollen.git

commit f9964d75b743e3d7c7ebe0c7df25ffb319fb4dfd
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Fri Jun 13 17:02:26 2014 +0200

    get lib by bower
---
 pollen-ui-angular/.bowerrc                   |  4 ++++
 pollen-ui-angular/.gitignore                 |  4 +++-
 pollen-ui-angular/bower.json                 | 20 ++++++++++++++++++++
 pollen-ui-angular/pom.xml                    | 24 ++++++++++++++++++++++++
 pollen-ui-angular/src/main/webapp/index.html | 18 ++++++++----------
 pollen-ui-angular/src/main/webapp/js/app.js  |  2 +-
 6 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/pollen-ui-angular/.bowerrc b/pollen-ui-angular/.bowerrc
new file mode 100644
index 0000000..20d69e9
--- /dev/null
+++ b/pollen-ui-angular/.bowerrc
@@ -0,0 +1,4 @@
+{
+   "directory" : "./src/main/webapp/bower"
+}
+
diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore
index 797b705..9b808b5 100644
--- a/pollen-ui-angular/.gitignore
+++ b/pollen-ui-angular/.gitignore
@@ -1 +1,3 @@
-*.iml
\ No newline at end of file
+*.iml
+src/main/webapp/bower
+
diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json
new file mode 100644
index 0000000..b1d655f
--- /dev/null
+++ b/pollen-ui-angular/bower.json
@@ -0,0 +1,20 @@
+{
+  "name": "pollen-ui-angular",
+  "version": "2.0",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "angular-route": "1.2.16",
+    "angular": "1.2.16",
+    "angular-resource": "1.2.16",
+    "angular-translate": "2.0.0",
+    "angular-bootstrap": "0.11.0",
+    "lodash": "2.4.1",
+    "bootstrap": "~3.1.1"
+  }
+}
diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml
index b0b6b99..957e34c 100644
--- a/pollen-ui-angular/pom.xml
+++ b/pollen-ui-angular/pom.xml
@@ -21,6 +21,30 @@
     <skipPostRelease>false</skipPostRelease>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <executable>bower</executable>
+          <arguments>
+            <argument>install</argument>
+          </arguments>
+          <workingDirectory>${basedir}</workingDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
 
     <profile>
diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html
index 0d0106a..2720c63 100644
--- a/pollen-ui-angular/src/main/webapp/index.html
+++ b/pollen-ui-angular/src/main/webapp/index.html
@@ -19,22 +19,20 @@
   #L%
   -->
 
-<html lang="en" ng-app="pollen">
+<html ng-app="pollen">
 <head>
   <title>Pollen</title>
   <meta charset="utf-8" />
-  <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet"/>
+  <link href="bower/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
   <link rel="stylesheet" href="css/style.css"/>
 
   <script src="js/conf.js"></script>
-
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.min.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-resource.min.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-cookies.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/bower-angular-translate/2.0.1/angular-translate.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.min.js"></script>
+  <script src="bower/lodash/dist/lodash.min.js"></script>
+  <script src="bower/angular/angular.min.js"></script>
+  <script src="bower/angular-route/angular-route.min.js"></script>
+  <script src="bower/angular-resource/angular-resource.min.js"></script>
+  <script src="bower/angular-translate/angular-translate.min.js"></script>
+  <script src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
   <script src="js/libs/ckeditor/ckeditor.js"></script>
 
   <script src="js/app.js"></script>
diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js
index e2e148f..66707ed 100644
--- a/pollen-ui-angular/src/main/webapp/js/app.js
+++ b/pollen-ui-angular/src/main/webapp/js/app.js
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'ngCookies', 'pascalprecht.translate'])
+angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate'])
 .config(['$httpProvider', function($httpProvider) {
   // edit header for locale and sessionToken
   $httpProvider.interceptors.push('httpInterceptor');

-- 
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

    

chorem.org scm

tags

participants (1)