You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/07/11 06:14:45 UTC
git commit: AMBARI-6465. Create admin view.
Repository: ambari
Updated Branches:
refs/heads/trunk ada7f1eb6 -> e82561dc4
AMBARI-6465. Create admin view.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e82561dc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e82561dc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e82561dc
Branch: refs/heads/trunk
Commit: e82561dc4ff84b22e4e503ac4bf5b1432777555e
Parents: ada7f1e
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Jul 10 21:14:08 2014 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Jul 10 21:14:22 2014 -0700
----------------------------------------------------------------------
ambari-admin/pom.xml | 75 +++++++++++++++++++++++++
ambari-admin/src/main/assemblies/empty.xml | 21 +++++++
ambari-admin/src/main/resources/view.xml | 24 ++++++++
ambari-server/pom.xml | 18 ++++++
pom.xml | 2 +
5 files changed, 140 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e82561dc/ambari-admin/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
new file mode 100644
index 0000000..453dceb
--- /dev/null
+++ b/ambari-admin/pom.xml
@@ -0,0 +1,75 @@
+<!--
+ 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="http://maven.apache.org/POM/4.0.0" 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">
+ <parent>
+ <groupId>org.apache.ambari</groupId>
+ <artifactId>ambari-project</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <relativePath>../ambari-project</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ambari</groupId>
+ <artifactId>ambari-admin</artifactId>
+ <packaging>jar</packaging>
+ <name>Ambari Admin View</name>
+ <version>1.3.0-SNAPSHOT</version>
+ <description>Admin control panel</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>regex-property</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>ambariVersion</name>
+ <value>${project.version}</value>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assemblies/empty.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/e82561dc/ambari-admin/src/main/assemblies/empty.xml
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/assemblies/empty.xml b/ambari-admin/src/main/assemblies/empty.xml
new file mode 100644
index 0000000..35738b1
--- /dev/null
+++ b/ambari-admin/src/main/assemblies/empty.xml
@@ -0,0 +1,21 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>empty</id>
+ <formats/>
+</assembly>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e82561dc/ambari-admin/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/view.xml b/ambari-admin/src/main/resources/view.xml
new file mode 100644
index 0000000..57d09e9
--- /dev/null
+++ b/ambari-admin/src/main/resources/view.xml
@@ -0,0 +1,24 @@
+<!--
+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. Kerberos, LDAP, Custom. Binary/Htt
+-->
+<view>
+ <name>ADMIN_VIEW</name>
+ <label>Ambari Admin View</label>
+ <version>1.0.0</version>
+ <instance>
+ <name>INSTANCE</name>
+ </instance>
+</view>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/e82561dc/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index a0dc0a7..789de18 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -33,6 +33,7 @@
<hdpLatestUrl>http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json</hdpLatestUrl>
<ambari_commons.install.dir>/usr/lib/ambari-server/lib/ambari_commons</ambari_commons.install.dir>
<ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir>
+ <ambari-admin-dir>${basedir}/../ambari-admin</ambari-admin-dir>
</properties>
<build>
<plugins>
@@ -401,6 +402,15 @@
</sources>
</mapping>
<mapping>
+ <directory>/var/lib/ambari-server/resources/views</directory>
+ <filemode>755</filemode>
+ <sources>
+ <source>
+ <location>${ambari-admin-dir}/target/ambari-admin-${project.version}.jar</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
<directory>/var/lib/ambari-server/resources/upgrade</directory>
</mapping>
<mapping>
@@ -726,6 +736,14 @@
</mapper>
</data>
<data>
+ <src>${ambari-admin-dir}/target/ambari-admin-${project.version}.jar</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/var/lib/ambari-server/resources/views</prefix>
+ </mapper>
+ </data>
+ <data>
<src>src/main/python/UpgradeHelper_HDP2.py</src>
<type>file</type>
<mapper>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e82561dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 67415b1..218bbfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,6 +267,7 @@
<module>ambari-web</module>
<module>ambari-project</module>
<module>ambari-views</module>
+ <module>ambari-admin</module>
<module>ambari-server</module>
<module>ambari-agent</module>
<module>ambari-client</module>
@@ -278,6 +279,7 @@
<modules>
<module>ambari-project</module>
<module>ambari-views</module>
+ <module>ambari-admin</module>
<module>ambari-server</module>
<module>ambari-agent</module>
<module>ambari-client</module>