Skip to content

A
atlas
Commit e39c5959 by Suma Shivaprasad
Options

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

parent 4f61fff2
Showing with 261 additions and 153 deletions
dashboard/.bowerrc
{ {
"directory": "../webapp/target/dist/lib/", "directory": "dist/lib/",
"storage": { "storage": {
"packages": ".bower-cache", "packages": ".bower-cache",
"registry": ".bower-registry" "registry": ".bower-registry"
......
dashboard/gruntfile.js
...@@ -24,7 +24,11 @@ module.exports = function(grunt) { ...@@ -24,7 +24,11 @@ module.exports = function(grunt) {
var classPathSep = (process.platform === "win32") ? ';' : ':', var classPathSep = (process.platform === "win32") ? ';' : ':',
gitHash = '', gitHash = '',
pkg = grunt.file.readJSON('package.json'), 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({ grunt.initConfig({
watch: { watch: {
...@@ -90,11 +94,11 @@ module.exports = function(grunt) { ...@@ -90,11 +94,11 @@ module.exports = function(grunt) {
}, },
dist: distPath + '/js/app.min.js', dist: distPath + '/js/app.min.js',
modules: grunt.file.expand( modules: grunt.file.expand(
'public/js/app.js', modulesPath + 'js/app.js',
'public/js/routes.js', modulesPath + 'js/routes.js',
'public/modules/**/*Module.js', modulesPath + 'modules/**/*Module.js',
'public/modules/**/*.js', modulesPath + 'modules/**/*.js',
'public/js/init.js' modulesPath + 'js/init.js'
).join(' '), ).join(' '),
shell: { shell: {
min: { min: {
...@@ -131,7 +135,7 @@ module.exports = function(grunt) { ...@@ -131,7 +135,7 @@ module.exports = function(grunt) {
copy: { copy: {
dist: { dist: {
expand: true, expand: true,
cwd: 'public/', cwd: modulesPath,
src: ['**', '!js/**/*.js', '!modules/**/*.js'], src: ['**', '!js/**/*.js', '!modules/**/*.js'],
dest: distPath dest: distPath
} }
......
dashboard/pom.xml 0 → 100644
<?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
dashboard/public/modules/tags/instance/views/createTag.html
<!--
~ 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"> <div class="modal-header">
<h4 class="modal-title">Add tag</h4> <h4 class="modal-title">Add tag</h4>
</div> </div>
......
pom.xml
...@@ -410,6 +410,7 @@ ...@@ -410,6 +410,7 @@
<module>notification</module> <module>notification</module>
<module>client</module> <module>client</module>
<module>repository</module> <module>repository</module>
<module>dashboard</module>
<module>webapp</module> <module>webapp</module>
<module>docs</module> <module>docs</module>
<module>addons/hive-bridge</module> <module>addons/hive-bridge</module>
...@@ -1215,9 +1216,6 @@ ...@@ -1215,9 +1216,6 @@
<groupId>com.github.eirslett</groupId> <groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<version>0.0.23</version> <version>0.0.23</version>
<configuration>
<workingDirectory>../dashboard/</workingDirectory>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -1505,20 +1503,8 @@ ...@@ -1505,20 +1503,8 @@
<exclude>**/maven-eclipse.xml</exclude> <exclude>**/maven-eclipse.xml</exclude>
<exclude>**/.externalToolBuilders/**</exclude> <exclude>**/.externalToolBuilders/**</exclude>
<exclude>**/build.log</exclude> <exclude>**/build.log</exclude>
<!-- temp libs --> <exclude>.bowerrc</exclude>
<exclude>dashboard/.bower-*/**</exclude> <exclude>*.json</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>
</excludes> </excludes>
</configuration> </configuration>
<executions> <executions>
......
release-log.txt
...@@ -9,6 +9,8 @@ ATLAS-54 Rename configs in hive hook (shwethags) ...@@ -9,6 +9,8 @@ ATLAS-54 Rename configs in hive hook (shwethags)
ATLAS-3 Mixed Index creation fails with Date types (sumasai via shwethags) ATLAS-3 Mixed Index creation fails with Date types (sumasai via shwethags)
ALL CHANGES: 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-209 Use testng and delete junit and scalatest (ltfxyz via shwethags)
ATLAS-163 New Trait UI (Tag) ( darshankumar89 via sumasai) ATLAS-163 New Trait UI (Tag) ( darshankumar89 via sumasai)
ATLAS-199 webapp build fails (grunt + tests) ( darshankumar89 via sumasai) ATLAS-199 webapp build fails (grunt + tests) ( darshankumar89 via sumasai)
......
webapp/pom.xml
...@@ -66,124 +66,6 @@ ...@@ -66,124 +66,6 @@
</plugins> </plugins>
</build> </build>
</profile> </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> </profiles>
<dependencies> <dependencies>
...@@ -347,6 +229,13 @@ ...@@ -347,6 +229,13 @@
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>dashboard</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -356,16 +245,12 @@ ...@@ -356,16 +245,12 @@
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<attachClasses>true</attachClasses> <attachClasses>true</attachClasses>
<webResources> <overlays>
<resource> <overlay>
<directory>target/dist</directory> <groupId>org.apache.atlas</groupId>
<targetPath>/</targetPath> <artifactId>dashboard</artifactId>
</resource> </overlay>
<resource> </overlays>
<directory>src/main/webapp/WEB-INF</directory>
<targetPath>WEB-INF</targetPath>
</resource>
</webResources>
<archive> <archive>
<manifest> <manifest>
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment