Skip to content
Permalink
Browse files
Merge remote-tracking branch 'remotes/origin/trunk' into branch-3.0-perf
  • Loading branch information
aonishuk committed Sep 28, 2017
2 parents 5c8bb40 + 5875aff commit 029ee3995cefb7795bd07885a674767e28fc6896
Showing 81 changed files with 6,500 additions and 176 deletions.
@@ -0,0 +1,6 @@
target
.settings
.classpath
.project
/bin/
job-repository.db
@@ -38,6 +38,10 @@
<solr.client.mapping.path>${mapping.base.path}/${solr.client.package.name}</solr.client.mapping.path>
<solr.client.dir>${project.basedir}/../ambari-infra-solr-client</solr.client.dir>
<infra.solr.plugin.dir>${project.basedir}/../ambari-infra-solr-plugin</infra.solr.plugin.dir>
<infra-manager.package.name>ambari-infra-manager</infra-manager.package.name>
<infra-manager.dir>${project.basedir}/../ambari-infra-manager</infra-manager.dir>
<infra-manager.mapping.path>${mapping.base.path}/${infra-manager.package.name}</infra-manager.mapping.path>
<infra-manager.conf.mapping.path>/etc/${infra-manager.package.name}/conf</infra-manager.conf.mapping.path>
</properties>

<profiles>
@@ -118,6 +122,45 @@
</mappings>
</configuration>
</execution>
<execution>
<id>infra-manager</id>
<phase>package</phase>
<goals>
<goal>rpm</goal>
</goals>
<configuration>
<group>Development</group>
<name>${infra-manager.package.name}</name>
<mappings>
<mapping>
<directory>${infra-manager.mapping.path}</directory>
<sources>
<source>
<location>${infra-manager.dir}/target/package</location>
<excludes>
<exclude>log4j.xml</exclude>
<exclude>infra-manager.properties</exclude>
<exclude>infra-manager-env.sh</exclude>
</excludes>
</source>
</sources>
</mapping>
<mapping>
<directory>${infra-manager.conf.mapping.path}</directory>
<sources>
<source>
<location>${infra-manager.dir}/target/package</location>
<includes>
<include>log4j.xml</include>
<include>infra-manager.properties</include>
<include>infra-manager-env.sh</include>
</includes>
</source>
</sources>
</mapping>
</mappings>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
@@ -277,6 +320,49 @@
</dataSet>
</configuration>
</execution>

<execution>
<phase>package</phase>
<id>jdeb-infra-manager</id>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<controlDir>${basedir}/src/main/package/deb/manager</controlDir>
<deb>${basedir}/target/${infra-manager.package.name}_${package-version}-${package-release}.deb</deb>
<skip>false</skip>
<skipPOMs>false</skipPOMs>
<dataSet>
<data>
<src>${infra-manager.dir}/target/ambari-infra-manager.tar.gz</src>
<type>archive</type>
<mapper>
<type>perm</type>
<user>root</user>
<group>root</group>
<prefix>${infra-manager.mapping.path}</prefix>
</mapper>
<excludes>
log4j.xml,infra-manager.properties,infra-manager-env.sh
</excludes>
</data>
<data>
<src>${infra-manager.dir}/target/package</src>
<type>directory</type>
<mapper>
<prefix>${infra-manager.conf.mapping.path}</prefix>
<type>perm</type>
<user>root</user>
<group>root</group>
<filemode>644</filemode>
</mapper>
<includes>
log4j.xml,infra-manager.properties,infra-manager-env.sh
</includes>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
@@ -330,6 +416,11 @@
<artifactId>ambari-infra-solr-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-infra-manager</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>


@@ -0,0 +1,22 @@
# 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
Package: [[infra-manager.package.name]]
Version: [[package-version]]-[[package-release]]
Section: [[deb.section]]
Priority: [[deb.priority]]
Depends: [[deb.dependency.list]]
Architecture: [[deb.architecture]]
Description: [[description]]
Maintainer: [[deb.publisher]]
@@ -0,0 +1,15 @@
#!/bin/bash
# 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
@@ -0,0 +1,15 @@
#!/bin/bash
# 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
@@ -0,0 +1,15 @@
#!/bin/bash
# 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
@@ -0,0 +1,15 @@
#!/bin/bash
# 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

0 comments on commit 029ee39

Please sign in to comment.