Skip to content

Commit 17e504a

Browse files
symatMate Szalay-Beko
symat
authored and
Mate Szalay-Beko
committed
Merge remote-tracking branch 'apache/master' into ZOOKEEPER-2122
2 parents 317241d + 945167c commit 17e504a

86 files changed

Lines changed: 4545 additions & 5211 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README_packaging.md‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,4 @@ The compiled C client can be found here:
6464
- `zookeeper-client/zookeeper-client-c/target/c/lib` - Native libraries
6565
- `zookeeper-client/zookeeper-client-c/target/c/include/zookeeper` - Native library headers
6666

67-
68-
## Package build command (using ant)
69-
70-
**Command to build tarball package:** `ant tar`
71-
72-
`zookeeper-<version>.tar.gz` tarball file structure layout:
73-
74-
- `/bin` - User executable
75-
- `/sbin` - System executable
76-
- `/libexec` - Configuration boot trap script
77-
- `/lib` - Library dependencies
78-
- `/docs` - Documents
79-
- `/share/zookeeper` - Project files
80-
81-
82-
**Command to build tarball package with native components:** `ant package-native tar`
83-
84-
`zookeeper-<version>-lib.tar.gz` tarball file structure layout:
85-
86-
- `/bin` - User executable
87-
- `/lib` - Native libraries
88-
- `/include/zookeeper` - Native library headers
89-
67+
The same folders gets archived to the `zookeeper-assembly/target/apache-zookeeper-<version>-lib.tar.gz` file, assuming you activated the `full-build` maven profile.

‎build.xml‎

Lines changed: 0 additions & 2003 deletions
This file was deleted.

‎conf/log4j.properties‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,20 @@ log4j.appender.TRACEFILE.File=${zookeeper.tracelog.dir}/${zookeeper.tracelog.fil
6363
log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
6464
### Notice we are including log4j's NDC here (%x)
6565
log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L][%x] - %m%n
66+
#
67+
# zk audit logging
68+
#
69+
zookeeper.auditlog.file=zookeeper_audit.log
70+
zookeeper.auditlog.threshold=INFO
71+
audit.logger=INFO, RFAAUDIT
72+
log4j.logger.org.apache.zookeeper.audit.Log4jAuditLogger=${audit.logger}
73+
log4j.additivity.org.apache.zookeeper.audit.Log4jAuditLogger=false
74+
log4j.appender.RFAAUDIT=org.apache.log4j.RollingFileAppender
75+
log4j.appender.RFAAUDIT.File=${zookeeper.log.dir}/${zookeeper.auditlog.file}
76+
log4j.appender.RFAAUDIT.layout=org.apache.log4j.PatternLayout
77+
log4j.appender.RFAAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
78+
log4j.appender.RFAAUDIT.Threshold=${zookeeper.auditlog.threshold}
79+
80+
# Max log file size of 10MB
81+
log4j.appender.RFAAUDIT.MaxFileSize=10MB
82+
log4j.appender.RFAAUDIT.MaxBackupIndex=10

‎ivy.xml‎

Lines changed: 0 additions & 164 deletions
This file was deleted.

‎ivysettings.xml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎zookeeper-assembly/pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,20 @@
3333
<name>Apache ZooKeeper - Assembly</name>
3434
<description>ZooKeeper Assembly</description>
3535

36+
<profiles>
37+
<profile>
38+
<id>full-build</id>
39+
<properties>
40+
<skip.lib.artifact>false</skip.lib.artifact>
41+
</properties>
42+
</profile>
43+
</profiles>
44+
45+
3646
<properties>
3747
<rw.file.permission>0644</rw.file.permission>
3848
<rwx.file.permission>0755</rwx.file.permission>
49+
<skip.lib.artifact>true</skip.lib.artifact>
3950
</properties>
4051

4152
<dependencies>
@@ -143,6 +154,22 @@
143154
<tarLongFileMode>posix</tarLongFileMode>
144155
</configuration>
145156
</execution>
157+
<execution>
158+
<id>lib-assembly</id>
159+
<phase>package</phase>
160+
<goals>
161+
<goal>single</goal>
162+
</goals>
163+
<configuration>
164+
<descriptors>
165+
<descriptor>${project.basedir}/src/main/assembly/lib-package.xml</descriptor>
166+
</descriptors>
167+
<finalName>apache-zookeeper-${project.version}-lib</finalName>
168+
<appendAssemblyId>false</appendAssemblyId>
169+
<tarLongFileMode>posix</tarLongFileMode>
170+
<skipAssembly>${skip.lib.artifact}</skipAssembly>
171+
</configuration>
172+
</execution>
146173
</executions>
147174
</plugin>
148175

‎zookeeper-assembly/src/main/assembly/lib-package.xml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
4+
<!--
5+
/**
6+
* Licensed to the Apache Software Foundation (ASF) under one
7+
* or more contributor license agreements. See the NOTICE file
8+
* distributed with this work for additional information
9+
* regarding copyright ownership. The ASF licenses this file
10+
* to you under the Apache License, Version 2.0 (the
11+
* "License"); you may not use this file except in compliance
12+
* with the License. You may obtain a copy of the License at
13+
*
14+
* http://www.apache.org/licenses/LICENSE-2.0
15+
*
16+
* Unless required by applicable law or agreed to in writing, software
17+
* distributed under the License is distributed on an "AS IS" BASIS,
18+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19+
* See the License for the specific language governing permissions and
20+
* limitations under the License.
21+
*/
22+
-->
23+
<id>lib-package</id>
24+
<formats>
25+
<format>tar.gz</format>
26+
</formats>
27+
<includeBaseDirectory>true</includeBaseDirectory>
28+
29+
<fileSets>
30+
<fileSet>
31+
<!-- ZooKeeper C client lib and include files -->
32+
<directory>${project.basedir}/../zookeeper-client/zookeeper-client-c/target/c</directory>
33+
<outputDirectory>usr</outputDirectory>
34+
<includes>
35+
<include>include/**/*</include>
36+
<include>lib/*</include>
37+
</includes>
38+
<fileMode>${rw.file.permission}</fileMode>
39+
<directoryMode>${rwx.file.permission}</directoryMode>
40+
</fileSet>
41+
<fileSet>
42+
<!-- ZooKeeper C client binaries-->
43+
<directory>${project.basedir}/../zookeeper-client/zookeeper-client-c/target/c</directory>
44+
<outputDirectory>usr</outputDirectory>
45+
<includes>
46+
<include>bin/*</include>
47+
</includes>
48+
<fileMode>${rwx.file.permission}</fileMode>
49+
<directoryMode>${rwx.file.permission}</directoryMode>
50+
</fileSet>
51+
<fileSet>
52+
<!-- ZooKeeper license -->
53+
<directory>${project.basedir}/..</directory>
54+
<includes>
55+
<include>LICENSE.txt</include>
56+
</includes>
57+
<fileMode>${rw.file.permission}</fileMode>
58+
<directoryMode>${rwx.file.permission}</directoryMode>
59+
</fileSet>
60+
61+
</fileSets>
62+
63+
</assembly>

‎zookeeper-assembly/src/main/assembly/source-package.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@
107107
<outputDirectory>.</outputDirectory>
108108
<includes>
109109
<include>pom.xml</include>
110-
<include>build.xml</include>
111-
<include>ivy.xml</include>
112-
<include>ivysettings.xml</include>
113110
<include>excludeFindBugsFilter.xml</include>
114111
<include>owaspSuppressions.xml</include>
115112
<include>checktyle.xml</include>

‎zookeeper-docs/src/main/resources/markdown/html/header.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@
104104
</div>
105105
<div class="menuitem">
106106
<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
107+
</div>
108+
<div class="menuitem">
109+
<a href="zookeeperAuditLogs.html">Audit Logs</a>
107110
</div>
108111
</div>
109112
<div onclick="SwitchMenu('menu_4', 'skin/')" id="menu_4Title" class="menutitle">Contributor</div>

‎zookeeper-docs/src/main/resources/markdown/images/zkAuditLogs.jpg‎

27.8 KB
Loading

0 commit comments

Comments
 (0)