This repository has been archived by the owner on Nov 9, 2017. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'integration/master' into update-search
- Loading branch information
Showing
79 changed files
with
3,785 additions
and
8,672 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright 2015, Red Hat, Inc. and individual contributors | ||
| * as indicated by the @author tags. See the copyright.txt file in the | ||
| * distribution for a full listing of individual contributors. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a> | ||
| */ | ||
|
|
||
| import groovy.util.AntBuilder | ||
|
|
||
| // NB: project is a MavenProject | ||
| // http://maven.apache.org/ref/3-LATEST/maven-core/apidocs/org/apache/maven/project/MavenProject.html | ||
|
|
||
| String downloadDir = project.properties.get('download.dir') // ~/Downloads | ||
| String cargoExtractDir = project.properties.get('cargo.extract.dir') // target/cargo/installs | ||
| String url = project.properties.get('cargo.installation') // http://example.com/jbosseap6.zip | ||
|
|
||
| String filename = url.substring(url.lastIndexOf('/')+1) | ||
| String filePath = "${downloadDir}/${filename}" | ||
| String basename = filename.substring(0, filename.lastIndexOf('.')) | ||
| String extractDir = "${cargoExtractDir}/${basename}" | ||
|
|
||
| def ant = new AntBuilder() | ||
| ant.mkdir(dir: downloadDir) | ||
| ant.get(src: url, dest: filePath, skipexisting: "true") | ||
| ant.unzip(src: filePath, dest:"${extractDir}") | ||
|
|
||
| def files = new File(extractDir).listFiles() | ||
| if (files.length != 1) { | ||
| throw new Exception('zip should contain exactly one top-level dir; see ' + extractDir) | ||
| } | ||
| def topLevelDir = files[0].path | ||
|
|
||
| project.properties.put('appserver.home', topLevelDir) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| ## This is a module to build zanata frontend javascript projects | ||
|
|
||
| At the moment it only contains "user profile page" bundle. | ||
|
|
||
| To build it, just run | ||
|
|
||
| ```mvn install``` | ||
|
|
||
| It will build and deploy to local maven repository a jar file containing the javascript bundle. | ||
| The jar file can be used directly under any servlet 3 compatible container and the bundle is accessible as static resources. | ||
| See [Servlet 3 static resources](http://www.webjars.org/documentation#servlet3). | ||
|
|
||
| The following Maven properties can be overridden on the command line with ```-Dkey=value```: | ||
|
|
||
| ``` | ||
| <node.version>v0.12.2</node.version> | ||
| <npm.version>2.7.6</npm.version> | ||
| <node.install.directory>${download.dir}/zanata-frontend/node-${node.version}-npm-${npm.version}</node.install.directory> | ||
| <npm.cli.script>${node.install.directory}/node/npm/bin/npm-cli.js</npm.cli.script> | ||
| ``` | ||
|
|
||
| By default it will try to install npm modules from npm registry (default cache TTL is 10 seconds). | ||
| If you activate profile ```-DnpmOffline``` the cache-min option will become 9999999 which means it will try to install npm modules from cache first. | ||
|
|
||
| ## NPM shrinkwrap | ||
|
|
||
| Currently the user profile page module has been "shrinkwrapped" which means its npm module dependencies has been fixed to certain version. If you want to add or upgrade an individual version, you will need to consult [npm shrinkwrap documentation](https://docs.npmjs.com/cli/shrinkwrap#building-shrinkwrapped-packages) for detail instruction. | ||
|
|
||
| Since we use maven to copy our source to target/ then run npm from maven, you will need to run above commands under target/ then copy the new npm-shrinkwrap.json file back to src/. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.