Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc70a30d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc70a30d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc70a30d Branch: refs/heads/master Commit: dc70a30d6f68449708d8cae273e958c5dcd0eb98 Parents: 7eb838e 3b08c71 Author: Mike Drob <md...@cloudera.com> Authored: Thu Dec 12 10:57:44 2013 -0800 Committer: Mike Drob <md...@cloudera.com> Committed: Thu Dec 12 10:57:44 2013 -0800 ---------------------------------------------------------------------- assemble/src/main/assemblies/binary-release.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/dc70a30d/assemble/src/main/assemblies/binary-release.xml ---------------------------------------------------------------------- diff --cc assemble/src/main/assemblies/binary-release.xml index 9b2e83d,0000000..5b04388 mode 100644,000000..100644 --- a/assemble/src/main/assemblies/binary-release.xml +++ b/assemble/src/main/assemblies/binary-release.xml @@@ -1,213 -1,0 +1,213 @@@ +<?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. +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>bin</id> + <formats> + <format>tar.gz</format> + </formats> + <fileSets> + <fileSet> + <directory>../bin</directory> + <directoryMode>0755</directoryMode> + <fileMode>0755</fileMode> + </fileSet> + <fileSet> + <directory>../lib</directory> + <directoryMode>0755</directoryMode> + <fileMode>0644</fileMode> + <includes> + <include>*.jar</include> + </includes> + </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>../lib/ext</directory> ++ <directory>.</directory> + <outputDirectory>/lib/ext</outputDirectory> + <directoryMode>0755</directoryMode> + <excludes> + <exclude>*/**</exclude> + </excludes> + </fileSet> + <fileSet> - <directory>../logs</directory> ++ <directory>.</directory> + <outputDirectory>/logs</outputDirectory> + <directoryMode>0700</directoryMode> + <excludes> + <exclude>*/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../docs</directory> + <directoryMode>0755</directoryMode> + <fileMode>0644</fileMode> + <excludes> + <exclude>src/**</exclude> + </excludes> + </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> + </fileSets> + <files> + <file> + <source>../CHANGES</source> + </file> + <file> + <source>../LICENSE</source> + </file> + <file> + <source>../NOTICE</source> + </file> + <file> + <source>../README</source> + </file> + </files> +</assembly>
