Author: afuchs
Date: Fri Nov 9 15:04:06 2012
New Revision: 1407480
URL: http://svn.apache.org/viewvc?rev=1407480&view=rev
Log:
ACCUMULO-364 merged to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/dist.xml
accumulo/trunk/core/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4:r1407301
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/assemble:r1407301
Merged /accumulo/branches/1.4/assemble:r1407301
Modified: accumulo/trunk/assemble/dist.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1407480&r1=1407479&r2=1407480&view=diff
==============================================================================
--- accumulo/trunk/assemble/dist.xml (original)
+++ accumulo/trunk/assemble/dist.xml Fri Nov 9 15:04:06 2012
@@ -1,97 +1,97 @@
<?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. -->
+ 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>
- <id>dist</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <baseDirectory>accumulo-${project.version}</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>../bin</directory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>../logs</directory>
- <directoryMode>0700</directoryMode>
- <excludes>
- <exclude>*</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../walogs</directory>
- <directoryMode>0700</directoryMode>
- <excludes>
- <exclude>*</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <includes>
- <include>**/*.py</include>
- <include>**/*.pl</include>
- <include>**/*.sh</include>
- <include>${so}</include>
- </includes>
- <excludes>
- <exclude>**/target</exclude>
- <exclude>conf/accumulo-env.sh</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>**bin/**</exclude>
- <exclude>logs/**</exclude>
- <exclude>walogs/**</exclude>
- <exclude>**.*</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <excludes>
- <!-- the following ignored because they were
included above -->
- <exclude>**/*.py</exclude>
- <exclude>**/*.pl</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>walogs/**</exclude>
- <exclude>logs/**</exclude>
- <exclude>bin/**</exclude>
+ <id>dist</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <baseDirectory>accumulo-${project.version}</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../bin</directory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>../logs</directory>
+ <directoryMode>0700</directoryMode>
+ <excludes>
+ <exclude>*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../walogs</directory>
+ <directoryMode>0700</directoryMode>
+ <excludes>
+ <exclude>*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>**/*.py</include>
+ <include>**/*.pl</include>
+ <include>**/*.sh</include>
+ <include>**/*.example</include>
+ <include>${so}</include>
+ </includes>
+ <excludes>
+ <exclude>**/target</exclude>
+ <exclude>conf/accumulo-env.sh</exclude>
+ <exclude>**/continuous-env.sh</exclude>
+ <exclude>**bin/**</exclude>
+ <exclude>logs/**</exclude>
+ <exclude>walogs/**</exclude>
+ <exclude>**.*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <excludes>
+ <!-- the following ignored because they were included above -->
+ <exclude>**/*.py</exclude>
+ <exclude>**/*.pl</exclude>
+ <exclude>**/*.sh</exclude>
+ <exclude>walogs/**</exclude>
+ <exclude>logs/**</exclude>
+ <exclude>bin/**</exclude>
+ <!-- the following directories ignored because they should not be in
+ the tarball -->
+ <exclude>**/.*/**</exclude>
+ <exclude>**/target/**</exclude>
- <!-- the following directories ignored because
they should not be in
- the tarball -->
- <exclude>**/.*/**</exclude>
- <exclude>**/target/**</exclude>
-
- <!-- the following files ignored because they
should not be in the tarball -->
- <exclude>**/.*</exclude>
- <exclude>conf/accumulo-site.xml</exclude>
- <exclude>conf/accumulo-metrics.xml</exclude>
- <exclude>**/test-*</exclude>
- <exclude>conf/slaves</exclude>
- <exclude>conf/masters</exclude>
- <exclude>conf/monitor</exclude>
- <exclude>conf/tracers</exclude>
- <exclude>conf/gc</exclude>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/randomwalk/conf/logger.xml</exclude>
-
<exclude>**/randomwalk/conf/randomwalk.conf</exclude>
- <exclude>**/randomwalk/conf/walkers</exclude>
- <exclude>${so}</exclude>
- <exclude>${jnilib}</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
+ <!-- the following files ignored because they should not be in the
tarball -->
+ <exclude>**/.*</exclude>
+ <exclude>conf/accumulo-site.xml</exclude>
+ <exclude>conf/accumulo-metrics.xml</exclude>
+ <exclude>**/test-*</exclude>
+ <exclude>conf/slaves</exclude>
+ <exclude>conf/masters</exclude>
+ <exclude>conf/monitor</exclude>
+ <exclude>conf/tracers</exclude>
+ <exclude>conf/gc</exclude>
+ <exclude>**/walkers.txt</exclude>
+ <exclude>**/ingesters.txt</exclude>
+ <exclude>**/*.pyc</exclude>
+ <exclude>**/randomwalk/conf/logger.xml</exclude>
+ <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
+ <exclude>**/randomwalk/conf/walkers</exclude>
+ <exclude>${so}</exclude>
+ <exclude>${jnilib}</exclude>
+ </excludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ </fileSets>
</assembly>
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1407301
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1407301
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1407301
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1407301
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1407301
