Skip to content

Commit

Permalink
Reverting AMBARI-698 for now
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1380995 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Mahadev Konar committed Sep 5, 2012
1 parent 6a3917e commit de1e216
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 513 deletions.
3 changes: 0 additions & 3 deletions AMBARI-666-CHANGES.txt
View file
Expand Up @@ -12,9 +12,6 @@ AMBARI-666 branch (unreleased changes)

NEW FEATURES

AMBARI-698. Add a simple server and artifact generation to run a server with
a simple api check (mahadev)

AMBARI-697. Ambari Web (browser-based UI) skeleton. (Jaimin Jetly and yusaku)

AMBARI-695. More basic class restructuring for new design. (hitesh)
Expand Down
171 changes: 17 additions & 154 deletions ambari-agent/pom.xml
View file
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<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">
<!--
<!--
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.
Expand All @@ -16,164 +15,28 @@
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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-agent</artifactId>
<packaging>pom</packaging>
<version>0.1.0</version>
<version>0.10.0-SNAPSHOT</version>
<name>ambari-agent</name>
<description>Ambari Agent</description>
<properties>
<final.name>${project.artifactId}-${project.version}</final.name>
<package.release>1</package.release>
<package.prefix>/usr</package.prefix>
<package.conf.dir>/etc/ambari</package.conf.dir>
<package.log.dir>/var/log/ambari</package.log.dir>
<package.pid.dir>/var/run/ambari</package.pid.dir>
</properties>
<url>http://maven.apache.org</url>
<parent>
<groupId>org.apache.ambari</groupId>
<version>0.10.0-SNAPSHOT</version>
<artifactId>ambari-project</artifactId>
<relativePath>../ambari-project</relativePath>
</parent>
<dependencies>
<!-- TEST SCOPE DEPENDENCIES -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>src/packages/tarball/all.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>build-tarball</id>
<phase>prepare-package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<configuration>
<executable>python</executable>
<workingDirectory>src/test/python</workingDirectory>
<arguments>
<argument>unitTests.py</argument>
</arguments>
<skip>true</skip>
<environmentVariables>
<PYTHONPATH>../../main/python:$PYTHONPATH</PYTHONPATH>
</environmentVariables>
</configuration>
<id>python-test</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
<execution>
<configuration>
<executable>python</executable>
<workingDirectory>target/ambari-agent-${project.version}</workingDirectory>
<arguments>
<argument>${project.basedir}/src/main/python/setup.py</argument>
<argument>clean</argument>
<argument>bdist_dumb</argument>
</arguments>
<environmentVariables>
<PYTHONPATH>target/ambari-agent-${project.version}:$PYTHONPATH</PYTHONPATH>
</environmentVariables>
</configuration>
<id>python-package</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
</extension>
</extensions>
</build>
<profiles>
<profile>
<id>rpm</id>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>build-rpm</id>
<phase>package</phase>
<configuration>
<target>
<ant antfile="${basedir}/src/packages/build.xml">
<target name="move-tarball"/>
<target name="package-rpm"/>
</ant>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>deb</id>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>build-deb</id>
<phase>package</phase>
<configuration>
<target>
<property name="artifactId" value="${project.artifactId}"/>
<ant antfile="${basedir}/src/packages/build.xml">
<target name="move-tarball"/>
<target name="package-deb"/>
</ant>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
<version>0.8</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<distributionManagement>
<site>
<id>apache-website</id>
<name>Apache website</name>
<url>scpexe://people.apache.org/www/incubator.apache.org/ambari/ambari-agent</url>
</site>
</distributionManagement>
</project>
47 changes: 7 additions & 40 deletions ambari-project/pom.xml
View file
Expand Up @@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<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/xsd/maven-4.0.0.xsd">
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ambari</groupId>
Expand All @@ -25,6 +28,7 @@
<description>Apache Ambari Project POM</description>
<name>Apache Ambari Project POM</name>
<packaging>pom</packaging>

<pluginRepositories>
<pluginRepository>
<id>maven2-repository.dev.java.net</id>
Expand All @@ -38,44 +42,7 @@
<url>http://download.java.net/maven/glassfish/</url>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>
<id>dist</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>module-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<destDir>${project.build.directory}</destDir>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>ambari-java-sources</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -153,7 +120,7 @@
<artifactId>jersey-test-framework-external</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
Expand Down
21 changes: 0 additions & 21 deletions ambari-project/src/main/assemblies/empty.xml
View file

This file was deleted.

78 changes: 16 additions & 62 deletions ambari-server/pom.xml
View file
@@ -1,15 +1,16 @@
<?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
<!-- 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">
<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>
Expand All @@ -24,62 +25,15 @@
<version>0.10.0-SNAPSHOT</version>
<description>Ambari Server</description>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/server.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>build-tarball</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.6</version>
<configuration>
<createDependencyReducedPom>true
</createDependencyReducedPom>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.ambari.server.controller.AmbariController
</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>
<profiles>
Expand Down

0 comments on commit de1e216

Please sign in to comment.