ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [2/7] ambari git commit: AMBARI-20566. Create ambari-infra module in Ambari (move solr modules from ambari-logsearch) (oleewere)
Date Fri, 24 Mar 2017 21:07:17 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java
b/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java
deleted file mode 100644
index ee84969..0000000
--- a/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java
+++ /dev/null
@@ -1,247 +0,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.
- */
-package org.apache.ambari.infra.security;
-
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.hadoop.security.authentication.server.AuthenticationToken;
-import org.apache.solr.common.params.MapSolrParams;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.Utils;
-import org.apache.solr.security.AuthorizationContext;
-import org.apache.solr.security.AuthorizationContext.RequestType;
-import org.apache.solr.security.AuthorizationResponse;
-import org.junit.Test;
-
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static org.apache.solr.common.util.Utils.makeMap;
-import static org.junit.Assert.assertEquals;
-
-public class InfraRuleBasedAuthorizationPluginTest {
-
-  private static final String PERMISSIONS = "{" +
-    "  user-host : {" +
-    "    'infra-solr@EXAMPLE.COM': [hostname, hostname2]" +
-    "  }," +
-    "  user-role : {" +
-    "    'infra-solr@EXAMPLE.COM': [admin]," +
-    "    'logsearch@EXAMPLE.COM': [logsearch_role,dev]," +
-    "    'logfeeder@EXAMPLE.COM': [logsearch_role,dev]," +
-    "    'atlas@EXAMPLE.COM': [atlas_role, audit_role, dev]," +
-    "    'knox@EXAMPLE.COM': [audit_role,dev]," +
-    "    'hdfs@EXAMPLE.COM': [audit_role,dev]," +
-    "    'hbase@EXAMPLE.COM': [audit_role,dev]," +
-    "    'yarn@EXAMPLE.COM': [audit_role,dev]," +
-    "    'knox@EXAMPLE.COM': [audit_role,dev]," +
-    "    'kafka@EXAMPLE.COM': [audit_role,dev]," +
-    "    'kms@EXAMPLE.COM': [audit_role,dev]," +
-    "    'storm@EXAMPLE.COM': [audit_role,dev]," +
-    "    'rangeradmin@EXAMPLE.COM':[ranger_role, audit_role, dev]" +
-    "  }," +
-    "  permissions : [" +
-    "    {name:'collection-admin-read'," +
-    "    role:null}," +
-    "    {name:collection-admin-edit ," +
-    "    role:[logsearch_role, atlas_role, ranger_role, admin]}," +
-    "    {name:mycoll_update," +
-    "      collection:mycoll," +
-    "      path:'/*'," +
-    "      role:[logsearch_role,admin]" +
-    "    }," +
-    "    {name:mycoll2_update," +
-    "      collection:mycoll2," +
-    "      path:'/*'," +
-    "      role:[ranger_role, audit_role, admin]" +
-    "    }," +
-    "{name:read , role:dev }]}";
-
-  @Test
-  public void testPermissions() {
-    int STATUS_OK = 200;
-    int FORBIDDEN = 403;
-    int PROMPT_FOR_CREDENTIALS = 401;
-
-    checkRules(makeMap("resource", "/#",
-      "httpMethod", "POST",
-      "userPrincipal", "unknownuser",
-      "collectionRequests", "freeforall" )
-      , STATUS_OK);
-
-    checkRules(makeMap("resource", "/update/json/docs",
-      "httpMethod", "POST",
-      "userPrincipal", "tim",
-      "collectionRequests", "mycoll")
-      , FORBIDDEN);
-
-    checkRules(makeMap("resource", "/update/json/docs",
-      "httpMethod", "POST",
-      "userPrincipal", "logsearch",
-      "collectionRequests", "mycoll")
-      , STATUS_OK);
-
-    checkRules(makeMap("resource", "/update/json/docs",
-      "httpMethod", "GET",
-      "userPrincipal", "rangeradmin",
-      "collectionRequests", "mycoll")
-      , FORBIDDEN);
-
-    checkRules(makeMap("resource", "/update/json/docs",
-      "httpMethod", "GET",
-      "userPrincipal", "rangeradmin",
-      "collectionRequests", "mycoll2")
-      , STATUS_OK);
-
-    checkRules(makeMap("resource", "/update/json/docs",
-      "httpMethod", "GET",
-      "userPrincipal", "logsearch",
-      "collectionRequests", "mycoll2")
-      , FORBIDDEN);
-
-    checkRules(makeMap("resource", "/update/json/docs",
-      "httpMethod", "POST",
-      "userPrincipal", "kms",
-      "collectionRequests", "mycoll2")
-      , STATUS_OK);
-
-    checkRules(makeMap("resource", "/admin/collections",
-      "userPrincipal", "tim",
-      "requestType", RequestType.ADMIN,
-      "collectionRequests", null,
-      "params", new MapSolrParams(singletonMap("action", "CREATE")))
-      , FORBIDDEN);
-
-    checkRules(makeMap("resource", "/admin/collections",
-      "userPrincipal", null,
-      "requestType", RequestType.ADMIN,
-      "collectionRequests", null,
-      "params", new MapSolrParams(singletonMap("action", "CREATE")))
-      , PROMPT_FOR_CREDENTIALS);
-
-    checkRules(makeMap("resource", "/admin/collections",
-      "userPrincipal", "rangeradmin",
-      "requestType", RequestType.ADMIN,
-      "collectionRequests", null,
-      "params", new MapSolrParams(singletonMap("action", "CREATE")))
-      , STATUS_OK);
-
-    checkRules(makeMap("resource", "/admin/collections",
-      "userPrincipal", "kms",
-      "requestType", RequestType.ADMIN,
-      "collectionRequests", null,
-      "params", new MapSolrParams(singletonMap("action", "CREATE")))
-      , FORBIDDEN);
-
-    checkRules(makeMap("resource", "/admin/collections",
-      "userPrincipal", "kms",
-      "requestType", RequestType.ADMIN,
-      "collectionRequests", null,
-      "params", new MapSolrParams(singletonMap("action", "LIST")))
-      , STATUS_OK);
-
-    checkRules(makeMap("resource", "/admin/collections",
-      "userPrincipal", "rangeradmin",
-      "requestType", RequestType.ADMIN,
-      "collectionRequests", null,
-      "params", new MapSolrParams(singletonMap("action", "LIST")))
-      , STATUS_OK);
-  }
-
-  private void checkRules(Map<String, Object> values, int expected) {
-    checkRules(values,expected,(Map) Utils.fromJSONString(PERMISSIONS));
-  }
-
-  private void checkRules(Map<String, Object> values, int expected, Map<String ,Object>
permissions) {
-    AuthorizationContext context = new MockAuthorizationContext(values);
-    InfraRuleBasedAuthorizationPlugin plugin = new InfraRuleBasedAuthorizationPlugin();
-    plugin.init(permissions);
-    AuthorizationResponse authResp = plugin.authorize(context);
-    assertEquals(expected, authResp.statusCode);
-  }
-
-  private static class MockAuthorizationContext extends AuthorizationContext {
-    private final Map<String,Object> values;
-
-    private MockAuthorizationContext(Map<String, Object> values) {
-      this.values = values;
-    }
-
-    @Override
-    public SolrParams getParams() {
-      SolrParams params = (SolrParams) values.get("params");
-      return params == null ?  new MapSolrParams(new HashMap<String, String>()) : params;
-    }
-
-    @Override
-    public Principal getUserPrincipal() {
-      Object userPrincipal = values.get("userPrincipal");
-      return userPrincipal == null ? null :
-        new AuthenticationToken(String.valueOf(userPrincipal), String.format("%s%s", String.valueOf(userPrincipal),
"/hostname@EXAMPLE.COM"), "kerberos");
-    }
-
-    @Override
-    public String getHttpHeader(String header) {
-      return null;
-    }
-
-    @Override
-    public Enumeration getHeaderNames() {
-      return null;
-    }
-
-    @Override
-    public String getRemoteAddr() {
-      return null;
-    }
-
-    @Override
-    public String getRemoteHost() {
-      return null;
-    }
-
-    @Override
-    public List<CollectionRequest> getCollectionRequests() {
-      Object collectionRequests = values.get("collectionRequests");
-      if (collectionRequests instanceof String) {
-        return singletonList(new CollectionRequest((String)collectionRequests));
-      }
-      return (List<CollectionRequest>) collectionRequests;
-    }
-
-    @Override
-    public RequestType getRequestType() {
-      return (RequestType) values.get("requestType");
-    }
-
-    @Override
-    public String getHttpMethod() {
-      return (String) values.get("httpMethod");
-    }
-
-    @Override
-    public String getResource() {
-      return (String) values.get("resource");
-    }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraUserRolesLookupStrategyTest.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraUserRolesLookupStrategyTest.java
b/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraUserRolesLookupStrategyTest.java
deleted file mode 100644
index c1a47d1..0000000
--- a/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraUserRolesLookupStrategyTest.java
+++ /dev/null
@@ -1,83 +0,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.
- */
-package org.apache.ambari.infra.security;
-
-import com.google.common.collect.Sets;
-import org.apache.hadoop.security.authentication.server.AuthenticationToken;
-import org.apache.http.auth.BasicUserPrincipal;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class InfraUserRolesLookupStrategyTest {
-
-  private InfraUserRolesLookupStrategy underTest = new InfraUserRolesLookupStrategy();
-
-  @Test
-  public void testLookupRolesForPrincipalName() {
-    // GIVEN
-    Map<String, Set<String>> usersVsRoles = generateUserRolesMap();
-    AuthenticationToken principal = new AuthenticationToken(
-      "logsearch", "logsearch/c6401.ambari.apache.org@EXAMPLE.COM", "kerberos");
-    // WHEN
-    Set<String> result = underTest.getUserRolesFromPrincipal(usersVsRoles, principal);
-    // THEN
-    assertTrue(result.contains("logsearch_user"));
-    assertTrue(result.contains("ranger_user"));
-    assertFalse(result.contains("admin"));
-  }
-
-  @Test
-  public void testLookupRolesForNonKerberosPrincipalName() {
-    // GIVEN
-    Map<String, Set<String>> usersVsRoles = generateUserRolesMap();
-    BasicUserPrincipal principal = new BasicUserPrincipal("infra-solr");
-    // WHEN
-    Set<String> result = underTest.getUserRolesFromPrincipal(usersVsRoles, principal);
-    // THEN
-    assertTrue(result.contains("admin"));
-    assertTrue(result.contains("logsearch_user"));
-  }
-
-  @Test
-  public void testLookupRolesWithNonKerberosPrincipalWithoutRoles() {
-    // GIVEN
-    Map<String, Set<String>> usersVsRoles = generateUserRolesMap();
-    BasicUserPrincipal principal = new BasicUserPrincipal("unknownuser");
-    // WHEN
-    Set<String> result = underTest.getUserRolesFromPrincipal(usersVsRoles, principal);
-    // THEN
-    assertTrue(result.isEmpty());
-  }
-
-  private Map<String, Set<String>> generateUserRolesMap() {
-    Map<String, Set<String>> usersVsRoles = new HashMap<>();
-    usersVsRoles.put("logsearch@EXAMPLE.COM", Sets.newHashSet("logsearch_user", "ranger_user"));
-    usersVsRoles.put("infra-solr@EXAMPLE.COM", Sets.newHashSet("admin"));
-    usersVsRoles.put("infra-solr", Sets.newHashSet("admin", "logsearch_user"));
-    usersVsRoles.put("unknownuser", new HashSet<String>());
-    return usersVsRoles;
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/pom.xml b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
index d286993..5d15b7c 100644
--- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
@@ -28,12 +28,6 @@
   <modelVersion>4.0.0</modelVersion>
   <properties>
     <mapping.base.path>/usr/lib</mapping.base.path>
-    <solr.tar>http://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
-    <solr.mapping.path>${mapping.base.path}/ambari-infra-solr</solr.mapping.path>
-    <solr.package.name>ambari-infra-solr</solr.package.name>
-    <solr.client.package.name>ambari-infra-solr-client</solr.client.package.name>
-    <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>
     <logsearch.portal.package.name>ambari-logsearch-portal</logsearch.portal.package.name>
     <logsearch.portal.mapping.path>${mapping.base.path}/ambari-logsearch-portal</logsearch.portal.mapping.path>
     <logsearch.server.dir>${project.basedir}/../ambari-logsearch-server</logsearch.server.dir>
@@ -43,7 +37,6 @@
     <logsearch.portal.conf.mapping.path>/etc/${logsearch.portal.package.name}/conf</logsearch.portal.conf.mapping.path>
     <logsearch.logfeeder.conf.mapping.path>/etc/${logsearch.logfeeder.package.name}/conf
     </logsearch.logfeeder.conf.mapping.path>
-    <infra.solr.plugin.dir>${project.basedir}/../ambari-infra-solr-plugin</infra.solr.plugin.dir>
   </properties>
   <artifactId>ambari-logsearch-assembly</artifactId>
   <profiles>
@@ -81,50 +74,6 @@
             </configuration>
             <executions>
               <execution>
-                <id>logsearch-solr</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>rpm</goal>
-                </goals>
-                <configuration>
-                  <group>Development</group>
-                  <name>${solr.package.name}</name>
-                  <mappings>
-                    <mapping>
-                      <directory>${solr.mapping.path}</directory>
-                      <sources>
-                        <source>
-                          <location>${project.build.directory}/solr</location>
-                        </source>
-                      </sources>
-                    </mapping>
-                  </mappings>
-                </configuration>
-              </execution>
-              <execution>
-                <id>logsearch-solr-client</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>rpm</goal>
-                </goals>
-                <configuration>
-                  <group>Development</group>
-                  <name>${solr.client.package.name}</name>
-                  <needarch>noarch</needarch>
-                  <targetOS>linux</targetOS>
-                  <mappings>
-                    <mapping>
-                      <directory>${solr.client.mapping.path}</directory>
-                      <sources>
-                        <source>
-                          <location>${solr.client.dir}/target/package</location>
-                        </source>
-                      </sources>
-                    </mapping>
-                  </mappings>
-                </configuration>
-              </execution>
-              <execution>
                 <id>logsearch-portal</id>
                 <phase>package</phase>
                 <goals>
@@ -214,41 +163,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target name="Download Solr">
-                    <get
-                      src="${solr.tar}"
-                      dest="${project.build.directory}/solr.tgz"
-                      usetimestamp="true"
-                    />
-                    <untar
-                      src="${project.build.directory}/solr.tgz"
-                      dest="${project.build.directory}/"
-                      compression="gzip"
-                    />
-                    <move todir="${project.build.directory}/solr">
-                      <fileset dir="${project.build.directory}/solr-${solr.version}"/>
-                    </move>
-                    <copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/"
/>
-                    <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
-                          toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
-                    <chmod file="${project.build.directory}/solr/bin/**" perm="755"/>
-                    <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -280,8 +194,6 @@
                     <resource>
                       <directory>${project.basedir}/src/main/package/deb</directory>
                       <excludes>
-                        <exclude>solr/postinst</exclude>
-                        <exclude>solr-client/postinst</exclude>
                         <exclude>portal/postinst</exclude>
                         <exclude>logfeeder/postinst</exclude>
                       </excludes>
@@ -290,8 +202,6 @@
                     <resource>
                       <directory>${project.basedir}/src/main/package/deb</directory>
                       <includes>
-                        <include>solr/postinst</include>
-                        <include>solr-client/postinst</include>
                         <include>portal/postinst</include>
                         <include>logfeeder/postinst</include>
                       </includes>
@@ -308,75 +218,6 @@
             <version>1.4</version>
             <executions>
               <execution>
-                <phase>package</phase>
-                <id>jdeb-solr</id>
-                <goals>
-                  <goal>jdeb</goal>
-                </goals>
-                <configuration>
-                  <controlDir>${basedir}/src/main/package/deb/solr</controlDir>
-                  <deb>${basedir}/target/${solr.package.name}_${package-version}-${package-release}.deb</deb>
-                  <skip>false</skip>
-                  <skipPOMs>false</skipPOMs>
-                  <dataSet>
-                    <data>
-                      <src>${project.build.directory}/solr</src>
-                      <type>directory</type>
-                      <mapper>
-                        <type>perm</type>
-                        <user>root</user>
-                        <group>root</group>
-                        <prefix>${solr.mapping.path}</prefix>
-                      </mapper>
-                      <excludes>
-                        bin/**,server/scripts/**
-                      </excludes>
-                    </data>
-                    <data>
-                      <src>${project.build.directory}/solr</src>
-                      <type>directory</type>
-                      <mapper>
-                        <type>perm</type>
-                        <user>root</user>
-                        <group>root</group>
-                        <filemode>755</filemode>
-                        <prefix>${solr.mapping.path}</prefix>
-                      </mapper>
-                      <includes>
-                        bin/**,server/scripts/**
-                      </includes>
-                    </data>
-                  </dataSet>
-                </configuration>
-              </execution>
-
-              <execution>
-                <phase>package</phase>
-                <id>jdeb-solr-client</id>
-                <goals>
-                  <goal>jdeb</goal>
-                </goals>
-                <configuration>
-                  <controlDir>${basedir}/src/main/package/deb/solr-client</controlDir>
-                  <deb>${basedir}/target/${solr.client.package.name}_${package-version}-${package-release}.deb</deb>
-                  <skip>false</skip>
-                  <skipPOMs>false</skipPOMs>
-                  <dataSet>
-                    <data>
-                      <src>${solr.client.dir}/target/ambari-infra-solr-client.tar.gz</src>
-                      <type>archive</type>
-                      <mapper>
-                        <type>perm</type>
-                        <user>root</user>
-                        <group>root</group>
-                        <prefix>${solr.client.mapping.path}</prefix>
-                      </mapper>
-                    </data>
-                  </dataSet>
-                </configuration>
-              </execution>
-
-              <execution>
                 <id>jdeb-portal</id>
                 <phase>package</phase>
                 <goals>
@@ -475,41 +316,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target name="Download Solr">
-                    <get
-                      src="${solr.tar}"
-                      dest="${project.build.directory}/solr.tgz"
-                      usetimestamp="true"
-                    />
-                    <untar
-                      src="${project.build.directory}/solr.tgz"
-                      dest="${project.build.directory}/"
-                      compression="gzip"
-                    />
-                    <move todir="${project.build.directory}/solr">
-                      <fileset dir="${project.build.directory}/solr-${solr.version}"/>
-                    </move>
-                    <copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/"
/>
-                    <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
-                          toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
-                    <chmod file="${project.build.directory}/solr/bin/**" perm="755"/>
-                    <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -531,16 +337,6 @@
       <artifactId>ambari-logsearch-logfeeder</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-infra-solr-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-infra-solr-plugin</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/control
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/control
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/control
deleted file mode 100644
index 88bafcb..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/control
+++ /dev/null
@@ -1,22 +0,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
-Package: [[solr.client.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]]

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postinst
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postinst
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postinst
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postrm
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postrm
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postrm
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/postrm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/preinst
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/preinst
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/preinst
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/preinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/prerm
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/prerm
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/prerm
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr-client/prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/control
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/control
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/control
deleted file mode 100644
index 5087cd0..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/control
+++ /dev/null
@@ -1,22 +0,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
-Package: [[solr.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]]

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postinst
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postinst
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postinst
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postrm
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postrm b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postrm
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/postrm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/preinst
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/preinst
b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/preinst
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/preinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f1aed5/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/prerm
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/prerm b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/prerm
deleted file mode 100644
index 21a01fa..0000000
--- a/ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/solr/prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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


Mime
View raw message