accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [2/2] git commit: Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Fri, 21 Mar 2014 19:24:02 GMT
Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	assemble/src/main/assemblies/binary-release.xml


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0010b94e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0010b94e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0010b94e

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0010b94e8597b4c4763ac111e6f99c41a1b0cd1f
Parents: 2bf27ad fe5697a
Author: John Vines <vines@apache.org>
Authored: Fri Mar 21 15:23:56 2014 -0400
Committer: John Vines <vines@apache.org>
Committed: Fri Mar 21 15:23:56 2014 -0400

----------------------------------------------------------------------
 assemble/src/main/assemblies/component.xml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0010b94e/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --cc assemble/src/main/assemblies/component.xml
index fa53d5e,0000000..ccd2653
mode 100644,000000..100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@@ -1,260 -1,0 +1,256 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +  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.
 +-->
 +<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 +  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd">
 +  <dependencySets>
 +    <dependencySet>
 +      <outputDirectory>lib</outputDirectory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <useProjectArtifact>false</useProjectArtifact>
 +      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
 +      <useTransitiveDependencies>false</useTransitiveDependencies>
 +      <includes>
 +        <include>${groupId}:${artifactId}-*</include>
 +        <include>org.apache.commons:commons-vfs2</include>
 +        <include>com.beust:jcommander</include>
 +        <include>com.google.code.gson:gson</include>
 +        <include>com.google.guava:guava</include>
 +        <include>jline:jline</include>
 +        <include>org.apache.thrift:libthrift</include>
 +      </includes>
 +      <excludes>
 +        <exclude>${groupId}:${artifactId}-docs</exclude>
 +      </excludes>
 +    </dependencySet>
 +    <dependencySet>
 +      <outputDirectory>docs</outputDirectory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <useProjectArtifact>false</useProjectArtifact>
 +      <outputFileNameMapping>${artifactId}_user_manual.${artifact.extension}</outputFileNameMapping>
 +      <useTransitiveDependencies>false</useTransitiveDependencies>
 +      <includes>
 +        <include>${groupId}:${artifactId}-docs</include>
 +      </includes>
 +    </dependencySet>
 +  </dependencySets>
 +  <fileSets>
 +    <fileSet>
 +      <directory>../bin</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0755</fileMode>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../examples/simple</directory>
 +      <outputDirectory>/examples/simple</outputDirectory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>src/main/**</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../lib/native</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>**/*.so</include>
 +        <include>**/*.jnilib</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../server/src/main/c++</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <excludes>
 +        <exclude>**/*.so</exclude>
 +        <exclude>**/*.jnilib</exclude>
 +      </excludes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>./</directory>
 +      <outputDirectory>/lib/ext</outputDirectory>
 +      <directoryMode>0755</directoryMode>
 +      <excludes>
 +        <exclude>*/**</exclude>
 +      </excludes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>./</directory>
 +      <outputDirectory>/logs</outputDirectory>
 +      <directoryMode>0700</directoryMode>
 +      <excludes>
 +        <exclude>*/**</exclude>
 +      </excludes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../docs</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>*.html</include>
 +        <include>examples/*</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../conf</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0755</fileMode>
 +      <includes>
 +        <include>examples/**/*.sh</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../conf</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>accumulo.policy.example</include>
 +        <include>examples/**</include>
 +      </includes>
 +      <excludes>
 +        <exclude>examples/**/*.sh</exclude>
 +      </excludes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../test</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0755</fileMode>
 +      <includes>
 +        <include>**/*.sh</include>
 +        <include>**/*.py</include>
 +        <include>**/*.pl</include>
 +      </includes>
 +      <excludes>
 +        <exclude>src/**</exclude>
 +        <exclude>target/**</exclude>
 +        <exclude>**/continuous-env.sh</exclude>
 +      </excludes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../test</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <excludes>
 +        <exclude>**/.*/**</exclude>
 +        <exclude>pom.xml</exclude>
 +        <exclude>src/**</exclude>
 +        <exclude>target/**</exclude>
 +        <exclude>**/*.sh</exclude>
 +        <exclude>**/*.py</exclude>
 +        <exclude>**/*.pl</exclude>
 +        <exclude>**/*.pyc</exclude>
 +        <exclude>**/*.pyo</exclude>
 +        <exclude>**/walkers.txt</exclude>
 +        <exclude>**/ingesters.txt</exclude>
 +        <exclude>**/randomwalk/conf/logger.xml</exclude>
 +        <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
 +        <exclude>**/randomwalk/conf/walkers</exclude>
 +      </excludes>
 +    </fileSet>
 +    <!-- Lift generated thrift proxy code into its own directory -->
 +    <fileSet>
 +      <directory>../proxy/target</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <outputDirectory>proxy/thrift</outputDirectory>
 +      <includes>
 +        <include>gen-cpp/**</include>
 +        <include>gen-py/**</include>
 +        <include>gen-rb/**</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../proxy</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>README</include>
 +        <include>proxy.properties</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../proxy/examples</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0755</fileMode>
 +      <includes>
 +        <include>**/*.py</include>
 +        <include>**/*.rb</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../proxy/examples</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <excludes>
 +        <exclude>**/*.py</exclude>
 +        <exclude>**/*.rb</exclude>
 +      </excludes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../proxy/src/main/thrift</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0644</fileMode>
 +      <outputDirectory>proxy/thrift</outputDirectory>
 +      <includes>
 +        <include>*.thrift</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>scripts</directory>
 +      <directoryMode>0755</directoryMode>
 +      <fileMode>0755</fileMode>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../server/gc/src/main/packaging/etc/init.d</directory>
 +      <outputDirectory>scripts/init.d</outputDirectory>
 +      <fileMode>0755</fileMode>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../server/master/src/main/packaging/etc/init.d</directory>
 +      <outputDirectory>scripts/init.d</outputDirectory>
 +      <fileMode>0755</fileMode>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../server/monitor/src/main/packaging/etc/init.d</directory>
 +      <outputDirectory>scripts/init.d</outputDirectory>
 +      <fileMode>0755</fileMode>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../server/tracer/src/main/packaging/etc/init.d</directory>
 +      <outputDirectory>scripts/init.d</outputDirectory>
 +      <fileMode>0755</fileMode>
 +    </fileSet>
 +    <fileSet>
 +      <directory>../server/tserver/src/main/packaging/etc/init.d</directory>
 +      <outputDirectory>scripts/init.d</outputDirectory>
 +      <fileMode>0755</fileMode>
 +    </fileSet>
++    <fileSet>
++      <directory>../</directory>
++      <fileMode>0644</fileMode>
++      <includes>
++        <include>CHANGES</include>
++        <include>LICENSE</include>
++        <include>NOTICE</include>
++        <include>README</include>
++      </includes>
++    </fileSet>
 +  </fileSets>
-   <files>
-     <file>
-       <source>../CHANGES</source>
-     </file>
-     <file>
-       <source>../LICENSE</source>
-     </file>
-     <file>
-       <source>../NOTICE</source>
-     </file>
-     <file>
-       <source>../README</source>
-     </file>
-   </files>
 +</component>


Mime
View raw message