You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2012/09/05 07:22:24 UTC
svn commit: r1380995 - in /incubator/ambari/branches/AMBARI-666: ./
ambari-agent/ ambari-project/ ambari-project/src/ ambari-server/
ambari-server/src/main/assemblies/
ambari-server/src/main/java/org/apache/ambari/controller/
ambari-server/src/main/jav...
Author: mahadev
Date: Wed Sep 5 05:22:24 2012
New Revision: 1380995
URL: http://svn.apache.org/viewvc?rev=1380995&view=rev
Log:
Reverting AMBARI-698 for now
Removed:
incubator/ambari/branches/AMBARI-666/ambari-project/src/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/assemblies/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/controller/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
Modified:
incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml
incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml
incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml
incubator/ambari/branches/AMBARI-666/pom.xml
Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1380995&r1=1380994&r2=1380995&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Wed Sep 5 05:22:24 2012
@@ -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)
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml?rev=1380995&r1=1380994&r2=1380995&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml Wed Sep 5 05:22:24 2012
@@ -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.
@@ -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>
Modified: incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml?rev=1380995&r1=1380994&r2=1380995&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml Wed Sep 5 05:22:24 2012
@@ -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>
@@ -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>
@@ -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>
@@ -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>
Modified: incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml?rev=1380995&r1=1380994&r2=1380995&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml Wed Sep 5 05:22:24 2012
@@ -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>
@@ -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>
Modified: incubator/ambari/branches/AMBARI-666/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/pom.xml?rev=1380995&r1=1380994&r2=1380995&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/pom.xml Wed Sep 5 05:22:24 2012
@@ -23,6 +23,7 @@
<name>ambari</name>
<version>0.10.0-SNAPSHOT</version>
<description>Ambari</description>
+
<pluginRepositories>
<pluginRepository>
<id>maven2-repository.dev.java.net</id>
@@ -36,21 +37,11 @@
<url>http://download.java.net/maven/glassfish/</url>
</pluginRepository>
</pluginRepositories>
+
<modules>
<module>ambari-project</module>
<module>ambari-server</module>
<module>ambari-agent</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>ambari-project/src/main/assemblies/empty.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>