atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suma...@apache.org
Subject incubator-atlas git commit: ATLAS-159 UI generated files should be target(sanjapy via sumasai)
Date Sat, 10 Oct 2015 15:20:43 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 4f61fff2b -> e39c59598


ATLAS-159 UI generated files should be target(sanjapy via sumasai)


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

Branch: refs/heads/master
Commit: e39c595988d52e44f847d7ab661cbc8f20b44646
Parents: 4f61fff
Author: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Authored: Sat Oct 10 20:50:28 2015 +0530
Committer: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Committed: Sat Oct 10 20:50:28 2015 +0530

----------------------------------------------------------------------
 dashboard/.bowerrc                              |   2 +-
 dashboard/gruntfile.js                          |  18 +-
 dashboard/pom.xml                               | 213 +++++++++++++++++++
 .../modules/tags/instance/views/createTag.html  |  17 ++
 pom.xml                                         |  20 +-
 release-log.txt                                 |   2 +
 webapp/pom.xml                                  | 141 ++----------
 7 files changed, 260 insertions(+), 153 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e39c5959/dashboard/.bowerrc
----------------------------------------------------------------------
diff --git a/dashboard/.bowerrc b/dashboard/.bowerrc
index 010bb05..1d30a36 100644
--- a/dashboard/.bowerrc
+++ b/dashboard/.bowerrc
@@ -1,5 +1,5 @@
 {
-  "directory": "../webapp/target/dist/lib/",
+  "directory": "dist/lib/",
   "storage": {
           "packages": ".bower-cache",
           "registry": ".bower-registry"

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e39c5959/dashboard/gruntfile.js
----------------------------------------------------------------------
diff --git a/dashboard/gruntfile.js b/dashboard/gruntfile.js
index 07a5bf8..e84893e 100644
--- a/dashboard/gruntfile.js
+++ b/dashboard/gruntfile.js
@@ -24,7 +24,11 @@ module.exports = function(grunt) {
     var classPathSep = (process.platform === "win32") ? ';' : ':',
         gitHash = '',
         pkg = grunt.file.readJSON('package.json'),
-        distPath = '../webapp/target/dist';
+        distPath = 'dist',
+        isDashboardDirectory = grunt.file.isDir('public'),
+        modulesPath = 'public/';
+    if (!isDashboardDirectory)
+        modulesPath = '../public/'
 
     grunt.initConfig({
         watch: {
@@ -90,11 +94,11 @@ module.exports = function(grunt) {
         },
         dist: distPath + '/js/app.min.js',
         modules: grunt.file.expand(
-            'public/js/app.js',
-            'public/js/routes.js',
-            'public/modules/**/*Module.js',
-            'public/modules/**/*.js',
-            'public/js/init.js'
+            modulesPath + 'js/app.js',
+            modulesPath + 'js/routes.js',
+            modulesPath + 'modules/**/*Module.js',
+            modulesPath + 'modules/**/*.js',
+            modulesPath + 'js/init.js'
         ).join(' '),
         shell: {
             min: {
@@ -131,7 +135,7 @@ module.exports = function(grunt) {
         copy: {
             dist: {
                 expand: true,
-                cwd: 'public/',
+                cwd: modulesPath,
                 src: ['**', '!js/**/*.js', '!modules/**/*.js'],
                 dest: distPath
             }

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e39c5959/dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/dashboard/pom.xml b/dashboard/pom.xml
new file mode 100644
index 0000000..9ed8baf
--- /dev/null
+++ b/dashboard/pom.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.atlas</groupId>
+        <artifactId>apache-atlas</artifactId>
+        <version>0.6-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dashboard</artifactId>
+    <description>Apache Atlas UI Application</description>
+    <name>Apache Atlas UI</name>
+    <packaging>war</packaging>
+    <url>http://atlas.incubator.apache.org</url>
+
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.github.eirslett</groupId>
+                    <artifactId>frontend-maven-plugin</artifactId>
+                    <configuration>
+                        <workingDirectory>${project.build.directory}</workingDirectory>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.directory}/dist</directory>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>install-node</id>
+            <activation>
+                <file>
+                    <missing>${project.build.directory}/node</missing>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>install node and npm</id>
+                                <goals>
+                                    <goal>install-node-and-npm</goal>
+                                </goals>
+                                <configuration>
+                                    <nodeVersion>${node.version}</nodeVersion>
+                                    <npmVersion>1.4.3</npmVersion>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>2.7</version>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <phase>validate</phase>
+                                <configuration>
+                                    <outputDirectory>${basedir}/target/</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${basedir}</directory>
+                                            <includes>
+                                                <include>package.json</include>
+                                                <include>.bowerrc</include>
+                                                <include>bower.json</include>
+                                                <include>gruntfile.js</include>
+                                            </includes>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>install-node_modules</id>
+            <activation>
+                <file>
+                    <missing>${project.build.directory}/node_modules</missing>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>npm install</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>install</arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>bower-install</id>
+            <activation>
+                <file>
+                    <missing>${project.build.directory}/dist/lib</missing>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>install bower</id>
+                                <goals>
+                                    <goal>grunt</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>bower</arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>grunt-task</id>
+            <activation>
+                <property>
+                    <name>!disableGrunt</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>npm remaining</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>install --ignore-scripts</arguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>grunt dist</id>
+                                <goals>
+                                    <goal>grunt</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>build</arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e39c5959/dashboard/public/modules/tags/instance/views/createTag.html
----------------------------------------------------------------------
diff --git a/dashboard/public/modules/tags/instance/views/createTag.html b/dashboard/public/modules/tags/instance/views/createTag.html
index f4db1ce..c67ed38 100644
--- a/dashboard/public/modules/tags/instance/views/createTag.html
+++ b/dashboard/public/modules/tags/instance/views/createTag.html
@@ -1,3 +1,20 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
 <div class="modal-header">
 	<h4 class="modal-title">Add tag</h4>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e39c5959/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 46a0383..7e6f80f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -410,6 +410,7 @@
         <module>notification</module>
         <module>client</module>
         <module>repository</module>
+        <module>dashboard</module>
         <module>webapp</module>
         <module>docs</module>
         <module>addons/hive-bridge</module>
@@ -1215,9 +1216,6 @@
                     <groupId>com.github.eirslett</groupId>
                     <artifactId>frontend-maven-plugin</artifactId>
                     <version>0.0.23</version>
-                    <configuration>
-                        <workingDirectory>../dashboard/</workingDirectory>
-                    </configuration>
                 </plugin>
 
                 <plugin>
@@ -1505,20 +1503,8 @@
                         <exclude>**/maven-eclipse.xml</exclude>
                         <exclude>**/.externalToolBuilders/**</exclude>
                         <exclude>**/build.log</exclude>
-                        <!-- temp libs -->
-                        <exclude>dashboard/.bower-*/**</exclude>
-                        <!-- json file -->
-                        <exclude>dashboard/.bowerrc</exclude>
-                        <!-- temp libs -->
-                        <exclude>dashboard/lib/**</exclude>
-                        <!-- temp libs -->
-                        <exclude>dashboard/node*/**</exclude>
-                        <!-- package -->
-                        <exclude>dashboard/dist/**</exclude>
-                        <!-- lib files -->
-                        <exclude>dashboard/public/lib/**</exclude>
-                        <!-- minified JS -->
-                        <exclude>dashboard/**/*.min.js*</exclude>
+                        <exclude>.bowerrc</exclude>
+                        <exclude>*.json</exclude>
                     </excludes>
                 </configuration>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e39c5959/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 85031b3..7a4353f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,8 @@ ATLAS-54 Rename configs in hive hook (shwethags)
 ATLAS-3 Mixed Index creation fails with Date types (sumasai via shwethags)
 
 ALL CHANGES:
+ATLAS-159 UI generated files should be target (sanjayp via sumasai)
+ATLAS-188 Provide Ability to Add Tag to Entity (sanjayp via sumasai)
 ATLAS-209 Use testng and delete junit and scalatest (ltfxyz via shwethags)
 ATLAS-163 New Trait UI (Tag) ( darshankumar89 via sumasai)
 ATLAS-199 webapp build fails (grunt + tests) ( darshankumar89 via sumasai)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e39c5959/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 8992d42..dd1174f 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -66,124 +66,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>install-node</id>
-            <activation>
-                <file>
-                    <missing>../dashboard/node</missing>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install node and npm</id>
-                                <goals>
-                                    <goal>install-node-and-npm</goal>
-                                </goals>
-                                <configuration>
-                                    <nodeVersion>${node.version}</nodeVersion>
-                                    <npmVersion>1.4.3</npmVersion>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>install-node_modules</id>
-            <activation>
-                <file>
-                    <missing>../dashboard/node_modules</missing>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>npm install</id>
-                                <goals>
-                                    <goal>npm</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>install</arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>bower-install</id>
-            <activation>
-                <file>
-                    <missing>target/dist/lib</missing>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install bower</id>
-                                <goals>
-                                    <goal>grunt</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>bower</arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>grunt-task</id>
-            <activation>
-                <property>
-                    <name>!disableGrunt</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>npm remaining</id>
-                                <goals>
-                                    <goal>npm</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>install --ignore-scripts</arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>grunt dist</id>
-                                <goals>
-                                    <goal>grunt</goal>
-                                </goals>
-                                <configuration>
-                                    <arguments>build</arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <dependencies>
@@ -347,6 +229,13 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>dashboard</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -356,16 +245,12 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <attachClasses>true</attachClasses>
-                    <webResources>
-                        <resource>
-                            <directory>target/dist</directory>
-                            <targetPath>/</targetPath>
-                        </resource>
-                        <resource>
-                            <directory>src/main/webapp/WEB-INF</directory>
-                            <targetPath>WEB-INF</targetPath>
-                        </resource>
-                    </webResources>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.apache.atlas</groupId>
+                            <artifactId>dashboard</artifactId>
+                        </overlay>
+                    </overlays>
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>


Mime
View raw message