You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2014/04/04 03:30:25 UTC
svn commit: r1584500 [3/9] - in /zookeeper/branches/branch-3.4: bin/ src/c/
src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/
src/contrib/zooinspector/ src/contrib/zooinspector/lib/
src/contrib/zooinspector/src/java/org/apache/zookeeper/in...
Propchange: zookeeper/branches/branch-3.4/src/c/c-doc.Doxyfile
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js (original)
+++ zookeeper/branches/branch-3.4/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js Fri Apr 4 01:30:24 2014
@@ -1,126 +1,126 @@
-/*
- * Date Format 1.2.3
- * (c) 2007-2009 Steven Levithan <stevenlevithan.com>
- * MIT license
- *
- * Includes enhancements by Scott Trenda <scott.trenda.net>
- * and Kris Kowal <cixar.com/~kris.kowal/>
- *
- * Accepts a date, a mask, or a date and a mask.
- * Returns a formatted version of the given date.
- * The date defaults to the current date/time.
- * The mask defaults to dateFormat.masks.default.
- */
-
-var dateFormat = function () {
- var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
- timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
- timezoneClip = /[^-+\dA-Z]/g,
- pad = function (val, len) {
- val = String(val);
- len = len || 2;
- while (val.length < len) val = "0" + val;
- return val;
- };
-
- // Regexes and supporting functions are cached through closure
- return function (date, mask, utc) {
- var dF = dateFormat;
-
- // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
- if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
- mask = date;
- date = undefined;
- }
-
- // Passing date through Date applies Date.parse, if necessary
- date = date ? new Date(date) : new Date;
- if (isNaN(date)) throw SyntaxError("invalid date");
-
- mask = String(dF.masks[mask] || mask || dF.masks["default"]);
-
- // Allow setting the utc argument via the mask
- if (mask.slice(0, 4) == "UTC:") {
- mask = mask.slice(4);
- utc = true;
- }
-
- var _ = utc ? "getUTC" : "get",
- d = date[_ + "Date"](),
- D = date[_ + "Day"](),
- m = date[_ + "Month"](),
- y = date[_ + "FullYear"](),
- H = date[_ + "Hours"](),
- M = date[_ + "Minutes"](),
- s = date[_ + "Seconds"](),
- L = date[_ + "Milliseconds"](),
- o = utc ? 0 : date.getTimezoneOffset(),
- flags = {
- d: d,
- dd: pad(d),
- ddd: dF.i18n.dayNames[D],
- dddd: dF.i18n.dayNames[D + 7],
- m: m + 1,
- mm: pad(m + 1),
- mmm: dF.i18n.monthNames[m],
- mmmm: dF.i18n.monthNames[m + 12],
- yy: String(y).slice(2),
- yyyy: y,
- h: H % 12 || 12,
- hh: pad(H % 12 || 12),
- H: H,
- HH: pad(H),
- M: M,
- MM: pad(M),
- s: s,
- ss: pad(s),
- l: pad(L, 3),
- L: pad(L > 99 ? Math.round(L / 10) : L),
- t: H < 12 ? "a" : "p",
- tt: H < 12 ? "am" : "pm",
- T: H < 12 ? "A" : "P",
- TT: H < 12 ? "AM" : "PM",
- Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
- o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
- S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
- };
-
- return mask.replace(token, function ($0) {
- return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
- });
- };
-}();
-
-// Some common format strings
-dateFormat.masks = {
- "default": "ddd mmm dd yyyy HH:MM:ss",
- shortDate: "m/d/yy",
- mediumDate: "mmm d, yyyy",
- longDate: "mmmm d, yyyy",
- fullDate: "dddd, mmmm d, yyyy",
- shortTime: "h:MM TT",
- mediumTime: "h:MM:ss TT",
- longTime: "h:MM:ss TT Z",
- isoDate: "yyyy-mm-dd",
- isoTime: "HH:MM:ss",
- isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
- isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
-};
-
-// Internationalization strings
-dateFormat.i18n = {
- dayNames: [
- "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
- "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
- ],
- monthNames: [
- "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
- "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
- ]
-};
-
-// For convenience...
-Date.prototype.format = function (mask, utc) {
- return dateFormat(this, mask, utc);
-};
-
+/*
+ * Date Format 1.2.3
+ * (c) 2007-2009 Steven Levithan <stevenlevithan.com>
+ * MIT license
+ *
+ * Includes enhancements by Scott Trenda <scott.trenda.net>
+ * and Kris Kowal <cixar.com/~kris.kowal/>
+ *
+ * Accepts a date, a mask, or a date and a mask.
+ * Returns a formatted version of the given date.
+ * The date defaults to the current date/time.
+ * The mask defaults to dateFormat.masks.default.
+ */
+
+var dateFormat = function () {
+ var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
+ timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
+ timezoneClip = /[^-+\dA-Z]/g,
+ pad = function (val, len) {
+ val = String(val);
+ len = len || 2;
+ while (val.length < len) val = "0" + val;
+ return val;
+ };
+
+ // Regexes and supporting functions are cached through closure
+ return function (date, mask, utc) {
+ var dF = dateFormat;
+
+ // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
+ if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
+ mask = date;
+ date = undefined;
+ }
+
+ // Passing date through Date applies Date.parse, if necessary
+ date = date ? new Date(date) : new Date;
+ if (isNaN(date)) throw SyntaxError("invalid date");
+
+ mask = String(dF.masks[mask] || mask || dF.masks["default"]);
+
+ // Allow setting the utc argument via the mask
+ if (mask.slice(0, 4) == "UTC:") {
+ mask = mask.slice(4);
+ utc = true;
+ }
+
+ var _ = utc ? "getUTC" : "get",
+ d = date[_ + "Date"](),
+ D = date[_ + "Day"](),
+ m = date[_ + "Month"](),
+ y = date[_ + "FullYear"](),
+ H = date[_ + "Hours"](),
+ M = date[_ + "Minutes"](),
+ s = date[_ + "Seconds"](),
+ L = date[_ + "Milliseconds"](),
+ o = utc ? 0 : date.getTimezoneOffset(),
+ flags = {
+ d: d,
+ dd: pad(d),
+ ddd: dF.i18n.dayNames[D],
+ dddd: dF.i18n.dayNames[D + 7],
+ m: m + 1,
+ mm: pad(m + 1),
+ mmm: dF.i18n.monthNames[m],
+ mmmm: dF.i18n.monthNames[m + 12],
+ yy: String(y).slice(2),
+ yyyy: y,
+ h: H % 12 || 12,
+ hh: pad(H % 12 || 12),
+ H: H,
+ HH: pad(H),
+ M: M,
+ MM: pad(M),
+ s: s,
+ ss: pad(s),
+ l: pad(L, 3),
+ L: pad(L > 99 ? Math.round(L / 10) : L),
+ t: H < 12 ? "a" : "p",
+ tt: H < 12 ? "am" : "pm",
+ T: H < 12 ? "A" : "P",
+ TT: H < 12 ? "AM" : "PM",
+ Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
+ o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
+ S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
+ };
+
+ return mask.replace(token, function ($0) {
+ return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
+ });
+ };
+}();
+
+// Some common format strings
+dateFormat.masks = {
+ "default": "ddd mmm dd yyyy HH:MM:ss",
+ shortDate: "m/d/yy",
+ mediumDate: "mmm d, yyyy",
+ longDate: "mmmm d, yyyy",
+ fullDate: "dddd, mmmm d, yyyy",
+ shortTime: "h:MM TT",
+ mediumTime: "h:MM:ss TT",
+ longTime: "h:MM:ss TT Z",
+ isoDate: "yyyy-mm-dd",
+ isoTime: "HH:MM:ss",
+ isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
+ isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
+};
+
+// Internationalization strings
+dateFormat.i18n = {
+ dayNames: [
+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+ ],
+ monthNames: [
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+ ]
+};
+
+// For convenience...
+Date.prototype.format = function (mask, utc) {
+ return dateFormat(this, mask, utc);
+};
+
Propchange: zookeeper/branches/branch-3.4/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/README.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/README.txt?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/README.txt (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/README.txt Fri Apr 4 01:30:24 2014
@@ -1,94 +1,94 @@
-==========================================
-ZooInspector - Browser and Editor for ZooKeeper Instances
-Author: Colin Goodheart-Smithe
-Date: February 2010
-==========================================
-
-ZooInspector is a Java Swing based application for browsing and editing ZooKeeper instances.
-
-Contents
---------
- - Features
- - Pre-requisites
- - Build Instructions
- - Using ZooInspector
- - Creating and Using Plugins
-
-Features
---------
- Below is a list of features in the current release of ZooInspector.
- - Load connection settings from a zookeeper properties file
- - Plugable DataEncryptionManagers to specify how data should be encrypted and decrypted in the Zookeeper instance
- - Browseable tree view of the ZooKeeper instance
- - View the data in a node
- - View the ACL's currently applied to a node
- - View the metadata for a node (Version, Number of Children, Last modified Tiem, etc.)
- - Plugable NodeViewers interface
- - Ability to save/load and set default Node Viewers
-
-Pre-requisites
---------------
- - The main zookeeper build script must have been run before building this module
-
-Build Instructions
-------------------
- 1. Open a command line.
- 2. cd into this directory
- 3. Run command: ant
- 4. ZooInspector will be built to ../../../build/contrib/ZooInspector
- 5. Copy zookeeper-3.x.x.jar into the lib sub-directory (if you are using zookeeper-3.3.0.jar it will have been
- copied to this directory during the build
- 6. By default the zookeeper.cmd and zookeeper.sh files expect zookeeper-3.3.0.jar. If you are using another version
- you will need to change these files to point to the zookeeper-3.x.x.jar you copied to the lib directory
- 7. To run ZooInspector run zooInspector.cmd (on Windows) or zooInspector.sh (on Linux). If you are using
- zookeeper-3.3.0.jar and do not require any classpath changes you can run the zookeeper-dev-ZooInspector.jar
- directly
-
-Using ZooInspector
-------------------
- To start ZooInspector run zooInspector.cmd (on Windows) or zooInspector.sh (on Linux). If you are using
- zookeeper-3.3.0.jar and do not require any classpath changes you can run the zookeeper-dev-ZooInspector.jar
- directly.
-
- Click the play button on the toolbar to bring up the connection dialog. From here you can enter connection
- information for your zookeeper instance. You can also load the connection properties from a file. This file can
- have the format as a normal zookeeper properties file (i.e. hosts and timeout key-value pairs) and van optional have
- an encryptionManager key-value pair to specify the DataEncryptionManager to use for this connection
- (DataEncryptionManagers are explained in further detail in the 'Creating and Using Plugins' section below). You can
- also set the entered information as the defaults so that when you first start ZooInspector these settings are
- automatically loaded into this dialog. Pressing the OK button with connect to your ZooKeeper instance and show the
- current node tree on the left of the main panel.
-
- Clicking a node in the node tree will load the data for that node into the node viewers. Three node viewers are
- currently distributed with ZooInspector:
- 1. Node Data - This enables you to see the data current stored on that node. This data can be modified and
- saved. The data is decrypted and encrypted using the DataEncryptionManager specified on the connection
- dialog.
- 2. Node Metadata - This enables you to see the metadata associiated with this node. This is Essentially the data
- obtained from the Stat object for this node.
- 3. Node ACLs - This allows you to see the ACLs currently applied to this node. Currently there is no ability
- to change the ACLs on a node, but it is a feature I would like to add.
- Other custom Node Viewers can be added, this is explained in the 'Creating and Using Plugins' section below.
-
-
-Creating and Using Plugins
---------------------------
- There are two types of plugin which can be used with ZooInspector:
- 1. DataEncryptionManager - This specifies how data should be encrypted and decrypted when working with a
- zookeeper instance.
- 2. ZooInspectorNodeViewer - This is a GUI panel which provides a view of visualisation on a node.
- More information on these interfaces can be found in the javadocs for this module.
-
- To use a plugin in ZooInspector, build the plugin to a jar and copy the jar to the lib sub-directory. Edit the
- zooInspector.cmd and/or zooInspector.sh files to include your new jar on the classpath and run ZooInspector.
-
- For DataEncryptionManagers, click the play button to open the connection dialog and enter the full class name of
- your DataEncryptionManager in the 'Data Encryption Manager' field. You can make this Data Encryption Manager the
- default by clicking 'Set As Default'. Click the 'OK' button to instantiate and use your plugin.
-
- For ZooInspectorNodeViewers, Click the 'Change Node Viewers' button on the toolbar (looks like a tree with a pencil)
- and enter the full classname for your Node Viewer in the field left of the 'Add' button, then click the 'Add'
- button. The Node Viewer will be instantiated and should appear in the list. You can change the order of the Node
- viewers by clicking the up and dpwn buttons and delete a Node Viewer by clicking the delete button. You can save
- to configuration to a file or set it as the default if necessary. Then click the 'OK' button and your Node Viewer
+==========================================
+ZooInspector - Browser and Editor for ZooKeeper Instances
+Author: Colin Goodheart-Smithe
+Date: February 2010
+==========================================
+
+ZooInspector is a Java Swing based application for browsing and editing ZooKeeper instances.
+
+Contents
+--------
+ - Features
+ - Pre-requisites
+ - Build Instructions
+ - Using ZooInspector
+ - Creating and Using Plugins
+
+Features
+--------
+ Below is a list of features in the current release of ZooInspector.
+ - Load connection settings from a zookeeper properties file
+ - Plugable DataEncryptionManagers to specify how data should be encrypted and decrypted in the Zookeeper instance
+ - Browseable tree view of the ZooKeeper instance
+ - View the data in a node
+ - View the ACL's currently applied to a node
+ - View the metadata for a node (Version, Number of Children, Last modified Tiem, etc.)
+ - Plugable NodeViewers interface
+ - Ability to save/load and set default Node Viewers
+
+Pre-requisites
+--------------
+ - The main zookeeper build script must have been run before building this module
+
+Build Instructions
+------------------
+ 1. Open a command line.
+ 2. cd into this directory
+ 3. Run command: ant
+ 4. ZooInspector will be built to ../../../build/contrib/ZooInspector
+ 5. Copy zookeeper-3.x.x.jar into the lib sub-directory (if you are using zookeeper-3.3.0.jar it will have been
+ copied to this directory during the build
+ 6. By default the zookeeper.cmd and zookeeper.sh files expect zookeeper-3.3.0.jar. If you are using another version
+ you will need to change these files to point to the zookeeper-3.x.x.jar you copied to the lib directory
+ 7. To run ZooInspector run zooInspector.cmd (on Windows) or zooInspector.sh (on Linux). If you are using
+ zookeeper-3.3.0.jar and do not require any classpath changes you can run the zookeeper-dev-ZooInspector.jar
+ directly
+
+Using ZooInspector
+------------------
+ To start ZooInspector run zooInspector.cmd (on Windows) or zooInspector.sh (on Linux). If you are using
+ zookeeper-3.3.0.jar and do not require any classpath changes you can run the zookeeper-dev-ZooInspector.jar
+ directly.
+
+ Click the play button on the toolbar to bring up the connection dialog. From here you can enter connection
+ information for your zookeeper instance. You can also load the connection properties from a file. This file can
+ have the format as a normal zookeeper properties file (i.e. hosts and timeout key-value pairs) and van optional have
+ an encryptionManager key-value pair to specify the DataEncryptionManager to use for this connection
+ (DataEncryptionManagers are explained in further detail in the 'Creating and Using Plugins' section below). You can
+ also set the entered information as the defaults so that when you first start ZooInspector these settings are
+ automatically loaded into this dialog. Pressing the OK button with connect to your ZooKeeper instance and show the
+ current node tree on the left of the main panel.
+
+ Clicking a node in the node tree will load the data for that node into the node viewers. Three node viewers are
+ currently distributed with ZooInspector:
+ 1. Node Data - This enables you to see the data current stored on that node. This data can be modified and
+ saved. The data is decrypted and encrypted using the DataEncryptionManager specified on the connection
+ dialog.
+ 2. Node Metadata - This enables you to see the metadata associiated with this node. This is Essentially the data
+ obtained from the Stat object for this node.
+ 3. Node ACLs - This allows you to see the ACLs currently applied to this node. Currently there is no ability
+ to change the ACLs on a node, but it is a feature I would like to add.
+ Other custom Node Viewers can be added, this is explained in the 'Creating and Using Plugins' section below.
+
+
+Creating and Using Plugins
+--------------------------
+ There are two types of plugin which can be used with ZooInspector:
+ 1. DataEncryptionManager - This specifies how data should be encrypted and decrypted when working with a
+ zookeeper instance.
+ 2. ZooInspectorNodeViewer - This is a GUI panel which provides a view of visualisation on a node.
+ More information on these interfaces can be found in the javadocs for this module.
+
+ To use a plugin in ZooInspector, build the plugin to a jar and copy the jar to the lib sub-directory. Edit the
+ zooInspector.cmd and/or zooInspector.sh files to include your new jar on the classpath and run ZooInspector.
+
+ For DataEncryptionManagers, click the play button to open the connection dialog and enter the full class name of
+ your DataEncryptionManager in the 'Data Encryption Manager' field. You can make this Data Encryption Manager the
+ default by clicking 'Set As Default'. Click the 'OK' button to instantiate and use your plugin.
+
+ For ZooInspectorNodeViewers, Click the 'Change Node Viewers' button on the toolbar (looks like a tree with a pencil)
+ and enter the full classname for your Node Viewer in the field left of the 'Add' button, then click the 'Add'
+ button. The Node Viewer will be instantiated and should appear in the list. You can change the order of the Node
+ viewers by clicking the up and dpwn buttons and delete a Node Viewer by clicking the delete button. You can save
+ to configuration to a file or set it as the default if necessary. Then click the 'OK' button and your Node Viewer
should appear in the tabs on the right of the main panel.
\ No newline at end of file
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/build.xml?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/build.xml (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/build.xml Fri Apr 4 01:30:24 2014
@@ -1,152 +1,152 @@
-<!--
- 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.
--->
-
-<project name="ZooInspector" default="jar">
- <import file="../build-contrib.xml" />
-
-
- <target name="setjarname">
- <property name="jarname" value="${build.dir}/zookeeper-${version}-${name}.jar" />
- </target>
-
- <target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init">
- <mkdir dir="${build.dir}/licences" />
- <copy todir="${build.dir}/licences">
- <fileset dir="${basedir}/licences" />
- </copy>
- <mkdir dir="${build.dir}/icons" />
- <copy todir="${build.dir}/icons">
- <fileset dir="${basedir}/icons" />
- </copy>
- <mkdir dir="${build.dir}/config" />
- <copy todir="${build.dir}/config">
- <fileset dir="${basedir}/config" />
- </copy>
- <copy todir="${build.dir}/lib">
- <fileset file="${basedir}/lib/jtoaster-1.0.4.jar" />
- <fileset file="${basedir}/lib/log4j.properties" />
- </copy>
- <copy todir="${build.dir}/lib">
- <fileset file="../../../build/zookeeper-3.3.0.jar" />
- </copy>
- <copy todir="${build.dir}">
- <fileset dir="${basedir}" includes="*.*" excludes="build.xml,ivy.xml" />
- </copy>
- </target>
-
- <!-- Override jar target to specify main class -->
- <target name="jar" depends="setjarname, compile">
- <echo message="contrib: ${name}" />
-
- <jar jarfile="${jarname}">
- <manifest>
- <attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
- <attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.0.jar lib/jToaster-1.0.4.jar lib" />
- <attribute name="Built-By" value="${user.name}" />
- <attribute name="Built-At" value="${build.time}" />
- <attribute name="Built-On" value="${host.name}" />
- <attribute name="Implementation-Title" value="org.apache.zookeeper" />
- <attribute name="Implementation-Version" value="${revision}" />
- <attribute name="Implementation-Vendor" value="The Apache Software Foundation" />
- </manifest>
- <fileset file="${zk.root}/LICENSE.txt" />
- <fileset dir="${build.classes}" />
- <fileset dir="${basedir}/src/java" excludes="**/*.jar, **/*.java"/>
- </jar>
- </target>
-
- <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile" />
-
- <target name="test" depends="checkMainTestCompiled,compile-test,test-init,test-category,junit.run" />
-
- <target name="compile-test" depends="ivy-retrieve-test,compile">
- <property name="target.jdk" value="${ant.java.version}" />
- <property name="src.test.local" location="${basedir}/test" />
- <mkdir dir="${build.test}" />
- <javac srcdir="${src.test.local}" destdir="${build.test}" target="${target.jdk}" debug="on">
- <classpath refid="classpath" />
- <classpath>
- <pathelement location="${zk.root}/build/test/classes" />
- </classpath>
- </javac>
- </target>
-
- <target name="test-init" depends="jar,compile-test">
- <delete dir="${test.log.dir}" />
- <delete dir="${test.tmp.dir}" />
- <delete dir="${test.data.dir}" />
- <mkdir dir="${test.log.dir}" />
- <mkdir dir="${test.tmp.dir}" />
- <mkdir dir="${test.data.dir}" />
- </target>
-
- <target name="test-category">
- <property name="test.category" value="" />
- </target>
-
- <target name="junit.run">
- <echo message="${test.src.dir}" />
- <junit showoutput="${test.output}" printsummary="${test.junit.printsummary}" haltonfailure="${test.junit.haltonfailure}" fork="yes" forkmode="${test.junit.fork.mode}" maxmemory="${test.junit.maxmem}" dir="${basedir}" timeout="${test.timeout}" errorProperty="tests.failed" failureProperty="tests.failed">
- <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
- <sysproperty key="test.data.dir" value="${test.data.dir}" />
- <sysproperty key="log4j.configuration" value="file:${basedir}/conf/log4j.properties" />
- <classpath refid="classpath" />
- <classpath>
- <pathelement path="${build.test}" />
- <pathelement location="${zk.root}/build/test/classes" />
- </classpath>
- <formatter type="${test.junit.output.format}" />
- <batchtest todir="${test.log.dir}" unless="testcase">
- <fileset dir="${test.src.dir}" includes="**/*${test.category}Test.java" />
- </batchtest>
- <batchtest todir="${test.log.dir}" if="testcase">
- <fileset dir="${test.src.dir}" includes="**/${testcase}.java" />
- </batchtest>
- </junit>
- <fail if="tests.failed">Tests failed!</fail>
- </target>
-
- <target name="package" depends="jar, zookeeperbuildcontrib.package" unless="skip.contrib">
-
- <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}" />
-
- <mkdir dir="${dist.dir}/contrib/${name}/src" />
- <copy todir="${dist.dir}/contrib/${name}/src">
- <fileset dir="${basedir}/src" />
- </copy>
- <mkdir dir="${dist.dir}/contrib/${name}/licences" />
- <copy todir="${dist.dir}/contrib/${name}/licences">
- <fileset dir="${basedir}/licences" />
- </copy>
- <mkdir dir="${dist.dir}/contrib/${name}/icons" />
- <copy todir="${dist.dir}/contrib/${name}/icons">
- <fileset dir="${basedir}/icons" />
- </copy>
- <mkdir dir="${dist.dir}/contrib/${name}/config" />
- <copy todir="${dist.dir}/contrib/${name}/config">
- <fileset dir="${basedir}/config" />
- </copy>
- <copy todir="${dist.dir}/contrib/${name}/lib">
- <fileset file="${basedir}/lib/jtoaster-1.0.4.jar" />
- </copy>
- <copy todir="${dist.dir}/contrib/${name}/lib">
- <fileset file="../../../build/zookeeper-3.3.0.jar" />
- </copy>
- </target>
-
-</project>
-
+<!--
+ 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.
+-->
+
+<project name="ZooInspector" default="jar">
+ <import file="../build-contrib.xml" />
+
+
+ <target name="setjarname">
+ <property name="jarname" value="${build.dir}/zookeeper-${version}-${name}.jar" />
+ </target>
+
+ <target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init">
+ <mkdir dir="${build.dir}/licences" />
+ <copy todir="${build.dir}/licences">
+ <fileset dir="${basedir}/licences" />
+ </copy>
+ <mkdir dir="${build.dir}/icons" />
+ <copy todir="${build.dir}/icons">
+ <fileset dir="${basedir}/icons" />
+ </copy>
+ <mkdir dir="${build.dir}/config" />
+ <copy todir="${build.dir}/config">
+ <fileset dir="${basedir}/config" />
+ </copy>
+ <copy todir="${build.dir}/lib">
+ <fileset file="${basedir}/lib/jtoaster-1.0.4.jar" />
+ <fileset file="${basedir}/lib/log4j.properties" />
+ </copy>
+ <copy todir="${build.dir}/lib">
+ <fileset file="../../../build/zookeeper-3.3.0.jar" />
+ </copy>
+ <copy todir="${build.dir}">
+ <fileset dir="${basedir}" includes="*.*" excludes="build.xml,ivy.xml" />
+ </copy>
+ </target>
+
+ <!-- Override jar target to specify main class -->
+ <target name="jar" depends="setjarname, compile">
+ <echo message="contrib: ${name}" />
+
+ <jar jarfile="${jarname}">
+ <manifest>
+ <attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
+ <attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.0.jar lib/jToaster-1.0.4.jar lib" />
+ <attribute name="Built-By" value="${user.name}" />
+ <attribute name="Built-At" value="${build.time}" />
+ <attribute name="Built-On" value="${host.name}" />
+ <attribute name="Implementation-Title" value="org.apache.zookeeper" />
+ <attribute name="Implementation-Version" value="${revision}" />
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation" />
+ </manifest>
+ <fileset file="${zk.root}/LICENSE.txt" />
+ <fileset dir="${build.classes}" />
+ <fileset dir="${basedir}/src/java" excludes="**/*.jar, **/*.java"/>
+ </jar>
+ </target>
+
+ <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile" />
+
+ <target name="test" depends="checkMainTestCompiled,compile-test,test-init,test-category,junit.run" />
+
+ <target name="compile-test" depends="ivy-retrieve-test,compile">
+ <property name="target.jdk" value="${ant.java.version}" />
+ <property name="src.test.local" location="${basedir}/test" />
+ <mkdir dir="${build.test}" />
+ <javac srcdir="${src.test.local}" destdir="${build.test}" target="${target.jdk}" debug="on">
+ <classpath refid="classpath" />
+ <classpath>
+ <pathelement location="${zk.root}/build/test/classes" />
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="test-init" depends="jar,compile-test">
+ <delete dir="${test.log.dir}" />
+ <delete dir="${test.tmp.dir}" />
+ <delete dir="${test.data.dir}" />
+ <mkdir dir="${test.log.dir}" />
+ <mkdir dir="${test.tmp.dir}" />
+ <mkdir dir="${test.data.dir}" />
+ </target>
+
+ <target name="test-category">
+ <property name="test.category" value="" />
+ </target>
+
+ <target name="junit.run">
+ <echo message="${test.src.dir}" />
+ <junit showoutput="${test.output}" printsummary="${test.junit.printsummary}" haltonfailure="${test.junit.haltonfailure}" fork="yes" forkmode="${test.junit.fork.mode}" maxmemory="${test.junit.maxmem}" dir="${basedir}" timeout="${test.timeout}" errorProperty="tests.failed" failureProperty="tests.failed">
+ <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
+ <sysproperty key="test.data.dir" value="${test.data.dir}" />
+ <sysproperty key="log4j.configuration" value="file:${basedir}/conf/log4j.properties" />
+ <classpath refid="classpath" />
+ <classpath>
+ <pathelement path="${build.test}" />
+ <pathelement location="${zk.root}/build/test/classes" />
+ </classpath>
+ <formatter type="${test.junit.output.format}" />
+ <batchtest todir="${test.log.dir}" unless="testcase">
+ <fileset dir="${test.src.dir}" includes="**/*${test.category}Test.java" />
+ </batchtest>
+ <batchtest todir="${test.log.dir}" if="testcase">
+ <fileset dir="${test.src.dir}" includes="**/${testcase}.java" />
+ </batchtest>
+ </junit>
+ <fail if="tests.failed">Tests failed!</fail>
+ </target>
+
+ <target name="package" depends="jar, zookeeperbuildcontrib.package" unless="skip.contrib">
+
+ <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}" />
+
+ <mkdir dir="${dist.dir}/contrib/${name}/src" />
+ <copy todir="${dist.dir}/contrib/${name}/src">
+ <fileset dir="${basedir}/src" />
+ </copy>
+ <mkdir dir="${dist.dir}/contrib/${name}/licences" />
+ <copy todir="${dist.dir}/contrib/${name}/licences">
+ <fileset dir="${basedir}/licences" />
+ </copy>
+ <mkdir dir="${dist.dir}/contrib/${name}/icons" />
+ <copy todir="${dist.dir}/contrib/${name}/icons">
+ <fileset dir="${basedir}/icons" />
+ </copy>
+ <mkdir dir="${dist.dir}/contrib/${name}/config" />
+ <copy todir="${dist.dir}/contrib/${name}/config">
+ <fileset dir="${basedir}/config" />
+ </copy>
+ <copy todir="${dist.dir}/contrib/${name}/lib">
+ <fileset file="${basedir}/lib/jtoaster-1.0.4.jar" />
+ </copy>
+ <copy todir="${dist.dir}/contrib/${name}/lib">
+ <fileset file="../../../build/zookeeper-3.3.0.jar" />
+ </copy>
+ </target>
+
+</project>
+
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/ivy.xml?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/ivy.xml (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/ivy.xml Fri Apr 4 01:30:24 2014
@@ -1,48 +1,48 @@
-<!--
- 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.
--->
-
-<ivy-module version="2.0"
- xmlns:e="http://ant.apache.org/ivy/extra">
-
- <info organisation="org.apache.zookeeper"
- module="${name}" revision="${version}">
- <license name="Apache 2.0"/>
- <ivyauthor name="Apache Hadoop" url="http://hadoop.apache.org"/>
- <description>ZooInspector</description>
- </info>
-
- <configurations defaultconfmapping="default">
- <conf name="default"/>
- <conf name="test"/>
- <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
- </configurations>
-
- <dependencies>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
-
- <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
- <dependency org="junit" name="junit" rev="4.7" conf="test->default"/>
- <dependency org="org.apache.rat" name="apache-rat-tasks"
- rev="0.6" conf="releaseaudit->default"/>
- <dependency org="commons-lang" name="commons-lang"
- rev="2.4" conf="releaseaudit->default"/>
- <dependency org="commons-collections" name="commons-collections"
- rev="3.1" conf="releaseaudit->default"/>
- </dependencies>
-
+<!--
+ 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.
+-->
+
+<ivy-module version="2.0"
+ xmlns:e="http://ant.apache.org/ivy/extra">
+
+ <info organisation="org.apache.zookeeper"
+ module="${name}" revision="${version}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Hadoop" url="http://hadoop.apache.org"/>
+ <description>ZooInspector</description>
+ </info>
+
+ <configurations defaultconfmapping="default">
+ <conf name="default"/>
+ <conf name="test"/>
+ <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
+ </configurations>
+
+ <dependencies>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+
+ <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
+ <dependency org="junit" name="junit" rev="4.7" conf="test->default"/>
+ <dependency org="org.apache.rat" name="apache-rat-tasks"
+ rev="0.6" conf="releaseaudit->default"/>
+ <dependency org="commons-lang" name="commons-lang"
+ rev="2.4" conf="releaseaudit->default"/>
+ <dependency org="commons-collections" name="commons-collections"
+ rev="3.1" conf="releaseaudit->default"/>
+ </dependencies>
+
</ivy-module>
\ No newline at end of file
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/lib/log4j.properties
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/lib/log4j.properties?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/lib/log4j.properties (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/lib/log4j.properties Fri Apr 4 01:30:24 2014
@@ -1,9 +1,9 @@
-# ***** Set root logger level to INFO and it appender to stdout.
-log4j.rootLogger=info, stdout
-
-# ***** stdout is set to be a ConsoleAppender.
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-# ***** stdout uses PatternLayout.
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-# ***** Pattern to output the caller's file name and line number.
+# ***** Set root logger level to INFO and it appender to stdout.
+log4j.rootLogger=info, stdout
+
+# ***** stdout is set to be a ConsoleAppender.
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+# ***** stdout uses PatternLayout.
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+# ***** Pattern to output the caller's file name and line number.
log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
\ No newline at end of file
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/lib/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java Fri Apr 4 01:30:24 2014
@@ -1,66 +1,66 @@
-/**
- * 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.zookeeper.inspector;
-
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-
-import org.apache.zookeeper.inspector.gui.ZooInspectorPanel;
-import org.apache.zookeeper.inspector.logger.LoggerFactory;
-import org.apache.zookeeper.inspector.manager.ZooInspectorManagerImpl;
-
-/**
- *
- */
-public class ZooInspector {
- /**
- * @param args
- * - not used. The value of these parameters will have no effect
- * on the application
- */
- public static void main(String[] args) {
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- JFrame frame = new JFrame("ZooInspector");
- frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- final ZooInspectorPanel zooInspectorPanel = new ZooInspectorPanel(
- new ZooInspectorManagerImpl());
- frame.addWindowListener(new WindowAdapter() {
- @Override
- public void windowClosed(WindowEvent e) {
- super.windowClosed(e);
- zooInspectorPanel.disconnect(true);
- }
- });
-
- frame.setContentPane(zooInspectorPanel);
- frame.setSize(1024, 768);
- frame.setVisible(true);
- } catch (Exception e) {
- LoggerFactory.getLogger().error(
- "Error occurred loading ZooInspector", e);
- JOptionPane.showMessageDialog(null,
- "ZooInspector failed to start: " + e.getMessage(), "Error",
- JOptionPane.ERROR_MESSAGE);
- }
- }
-}
+/**
+ * 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.zookeeper.inspector;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.UIManager;
+
+import org.apache.zookeeper.inspector.gui.ZooInspectorPanel;
+import org.apache.zookeeper.inspector.logger.LoggerFactory;
+import org.apache.zookeeper.inspector.manager.ZooInspectorManagerImpl;
+
+/**
+ *
+ */
+public class ZooInspector {
+ /**
+ * @param args
+ * - not used. The value of these parameters will have no effect
+ * on the application
+ */
+ public static void main(String[] args) {
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ JFrame frame = new JFrame("ZooInspector");
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ final ZooInspectorPanel zooInspectorPanel = new ZooInspectorPanel(
+ new ZooInspectorManagerImpl());
+ frame.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosed(WindowEvent e) {
+ super.windowClosed(e);
+ zooInspectorPanel.disconnect(true);
+ }
+ });
+
+ frame.setContentPane(zooInspectorPanel);
+ frame.setSize(1024, 768);
+ frame.setVisible(true);
+ } catch (Exception e) {
+ LoggerFactory.getLogger().error(
+ "Error occurred loading ZooInspector", e);
+ JOptionPane.showMessageDialog(null,
+ "ZooInspector failed to start: " + e.getMessage(), "Error",
+ JOptionPane.ERROR_MESSAGE);
+ }
+ }
+}
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java Fri Apr 4 01:30:24 2014
@@ -1,50 +1,50 @@
-/**
- * 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.zookeeper.inspector.encryption;
-
-/**
- *
- */
-public class BasicDataEncryptionManager implements DataEncryptionManager {
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.zookeeper.inspector.encryption.DataEncryptionManager#decryptData
- * (byte[])
- */
- public String decryptData(byte[] encrypted) throws Exception {
- return new String(encrypted);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.zookeeper.inspector.encryption.DataEncryptionManager#encryptData
- * (java.lang.String)
- */
- public byte[] encryptData(String data) throws Exception {
- if (data == null) {
- return new byte[0];
- }
- return data.getBytes();
- }
-
-}
+/**
+ * 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.zookeeper.inspector.encryption;
+
+/**
+ *
+ */
+public class BasicDataEncryptionManager implements DataEncryptionManager {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.zookeeper.inspector.encryption.DataEncryptionManager#decryptData
+ * (byte[])
+ */
+ public String decryptData(byte[] encrypted) throws Exception {
+ return new String(encrypted);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.zookeeper.inspector.encryption.DataEncryptionManager#encryptData
+ * (java.lang.String)
+ */
+ public byte[] encryptData(String data) throws Exception {
+ if (data == null) {
+ return new byte[0];
+ }
+ return data.getBytes();
+ }
+
+}
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java Fri Apr 4 01:30:24 2014
@@ -1,39 +1,39 @@
-/**
- * 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.zookeeper.inspector.encryption;
-
-/**
- * A class which describes how data should be encrypted and decrypted
- */
-public interface DataEncryptionManager {
- /**
- * @param data
- * - the data to be encrypted
- * @return the encrypted data
- * @throws Exception
- */
- public byte[] encryptData(String data) throws Exception;
-
- /**
- * @param encrypted
- * - the data to be decrypted
- * @return the decrypted data
- * @throws Exception
- */
- public String decryptData(byte[] encrypted) throws Exception;
-}
+/**
+ * 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.zookeeper.inspector.encryption;
+
+/**
+ * A class which describes how data should be encrypted and decrypted
+ */
+public interface DataEncryptionManager {
+ /**
+ * @param data
+ * - the data to be encrypted
+ * @return the encrypted data
+ * @throws Exception
+ */
+ public byte[] encryptData(String data) throws Exception;
+
+ /**
+ * @param encrypted
+ * - the data to be decrypted
+ * @return the decrypted data
+ * @throws Exception
+ */
+ public String decryptData(byte[] encrypted) throws Exception;
+}
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java Fri Apr 4 01:30:24 2014
@@ -1,37 +1,37 @@
-/**
- * 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.zookeeper.inspector.gui;
-
-import java.util.List;
-
-import org.apache.zookeeper.inspector.gui.nodeviewer.ZooInspectorNodeViewer;
-
-/**
- * A Listener for changes to the configuration of which node viewers are shown
- */
-public interface NodeViewersChangeListener {
- /**
- * Called when the node viewers configuration is changed (i.e node viewers
- * are added, removed or the order of the node viewers is changed)
- *
- * @param newViewers
- * - a {@link List} of {@link ZooInspectorNodeViewer}s which are
- * to be shown
- */
- public void nodeViewersChanged(List<ZooInspectorNodeViewer> newViewers);
-}
+/**
+ * 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.zookeeper.inspector.gui;
+
+import java.util.List;
+
+import org.apache.zookeeper.inspector.gui.nodeviewer.ZooInspectorNodeViewer;
+
+/**
+ * A Listener for changes to the configuration of which node viewers are shown
+ */
+public interface NodeViewersChangeListener {
+ /**
+ * Called when the node viewers configuration is changed (i.e node viewers
+ * are added, removed or the order of the node viewers is changed)
+ *
+ * @param newViewers
+ * - a {@link List} of {@link ZooInspectorNodeViewer}s which are
+ * to be shown
+ */
+ public void nodeViewersChanged(List<ZooInspectorNodeViewer> newViewers);
+}
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java?rev=1584500&r1=1584499&r2=1584500&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java Fri Apr 4 01:30:24 2014
@@ -1,80 +1,80 @@
-/**
- * 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.zookeeper.inspector.gui;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JEditorPane;
-import javax.swing.JPanel;
-
-import org.apache.zookeeper.inspector.logger.LoggerFactory;
-
-/**
- * The About Dialog for the application
- */
-public class ZooInspectorAboutDialog extends JDialog {
- /**
- * @param frame
- * - the Frame from which the dialog is displayed
- */
- public ZooInspectorAboutDialog(Frame frame) {
- super(frame);
- this.setLayout(new BorderLayout());
- this.setIconImage(ZooInspectorIconResources.getInformationIcon()
- .getImage());
- this.setTitle("About ZooInspector");
- this.setModal(true);
- this.setAlwaysOnTop(true);
- this.setResizable(false);
- JPanel panel = new JPanel();
- panel.setLayout(new BorderLayout());
- JEditorPane aboutPane = new JEditorPane();
- aboutPane.setEditable(false);
- aboutPane.setOpaque(false);
- java.net.URL aboutURL = ZooInspectorAboutDialog.class
- .getResource("about.html");
- try {
- aboutPane.setPage(aboutURL);
- } catch (IOException e) {
- LoggerFactory.getLogger().error(
- "Error loading about.html, file may be corrupt", e);
- }
- panel.add(aboutPane, BorderLayout.CENTER);
- panel.setPreferredSize(new Dimension(600, 200));
- JPanel buttonsPanel = new JPanel();
- buttonsPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 10, 10));
- JButton okButton = new JButton("OK");
- okButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- ZooInspectorAboutDialog.this.dispose();
- }
- });
- buttonsPanel.add(okButton);
- this.add(panel, BorderLayout.CENTER);
- this.add(buttonsPanel, BorderLayout.SOUTH);
- this.pack();
- }
-}
+/**
+ * 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.zookeeper.inspector.gui;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JPanel;
+
+import org.apache.zookeeper.inspector.logger.LoggerFactory;
+
+/**
+ * The About Dialog for the application
+ */
+public class ZooInspectorAboutDialog extends JDialog {
+ /**
+ * @param frame
+ * - the Frame from which the dialog is displayed
+ */
+ public ZooInspectorAboutDialog(Frame frame) {
+ super(frame);
+ this.setLayout(new BorderLayout());
+ this.setIconImage(ZooInspectorIconResources.getInformationIcon()
+ .getImage());
+ this.setTitle("About ZooInspector");
+ this.setModal(true);
+ this.setAlwaysOnTop(true);
+ this.setResizable(false);
+ JPanel panel = new JPanel();
+ panel.setLayout(new BorderLayout());
+ JEditorPane aboutPane = new JEditorPane();
+ aboutPane.setEditable(false);
+ aboutPane.setOpaque(false);
+ java.net.URL aboutURL = ZooInspectorAboutDialog.class
+ .getResource("about.html");
+ try {
+ aboutPane.setPage(aboutURL);
+ } catch (IOException e) {
+ LoggerFactory.getLogger().error(
+ "Error loading about.html, file may be corrupt", e);
+ }
+ panel.add(aboutPane, BorderLayout.CENTER);
+ panel.setPreferredSize(new Dimension(600, 200));
+ JPanel buttonsPanel = new JPanel();
+ buttonsPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 10, 10));
+ JButton okButton = new JButton("OK");
+ okButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ ZooInspectorAboutDialog.this.dispose();
+ }
+ });
+ buttonsPanel.add(okButton);
+ this.add(panel, BorderLayout.CENTER);
+ this.add(buttonsPanel, BorderLayout.SOUTH);
+ this.pack();
+ }
+}
Propchange: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java
------------------------------------------------------------------------------
svn:eol-style = native