Skip to content

Commit 505e931

Browse files
author
arnett, stu
committed
v2.1.1
1 parent cbae9d6 commit 505e931

File tree

23 files changed

+866
-79
lines changed

23 files changed

+866
-79
lines changed

‎build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,17 @@ description = 'EMC Object Client for Java - provides REST access to object data
2929
ext.githubProjectName = 'ecs-object-client-java'
3030

3131
buildscript {
32-
ext.commonBuildVersion = '1.3.3'
32+
ext.commonBuildVersion = '1.4'
3333
ext.commonBuildDir = "https://raw.githubusercontent.com/emcvipr/ecs-common-build/v$commonBuildVersion"
3434
apply from: "$commonBuildDir/ecs-publish.buildscript.gradle", to: buildscript
3535
}
3636

37-
apply from: "$commonBuildDir/ecs-publish.gradle"
37+
allprojects {
38+
apply from: "$commonBuildDir/ecs-publish.gradle"
39+
}
3840

3941
dependencies {
40-
compile 'com.emc.ecs:smart-client:2.0.6',
42+
compile 'com.emc.ecs:smart-client:2.0.7',
4143
'com.emc.ecs:object-transform:1.0.2',
4244
'org.jdom:jdom2:2.0.6'
4345
testCompile 'junit:junit:4.12'

‎geo-pin-cli/3rd-party-licenses/LICENSE-commons-cli.txt‎

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
Library: commons-cli
2+
Copyright 2001-2015 The Apache Software Foundation
3+
License: Apache 2.0
4+
Full License Text:
5+
-----------------------------------------------------------------------------------------------------------------------
6+
7+
Apache License
8+
Version 2.0, January 2004
9+
http://www.apache.org/licenses/
10+
11+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
12+
13+
1. Definitions.
14+
15+
"License" shall mean the terms and conditions for use, reproduction,
16+
and distribution as defined by Sections 1 through 9 of this document.
17+
18+
"Licensor" shall mean the copyright owner or entity authorized by
19+
the copyright owner that is granting the License.
20+
21+
"Legal Entity" shall mean the union of the acting entity and all
22+
other entities that control, are controlled by, or are under common
23+
control with that entity. For the purposes of this definition,
24+
"control" means (i) the power, direct or indirect, to cause the
25+
direction or management of such entity, whether by contract or
26+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
27+
outstanding shares, or (iii) beneficial ownership of such entity.
28+
29+
"You" (or "Your") shall mean an individual or Legal Entity
30+
exercising permissions granted by this License.
31+
32+
"Source" form shall mean the preferred form for making modifications,
33+
including but not limited to software source code, documentation
34+
source, and configuration files.
35+
36+
"Object" form shall mean any form resulting from mechanical
37+
transformation or translation of a Source form, including but
38+
not limited to compiled object code, generated documentation,
39+
and conversions to other media types.
40+
41+
"Work" shall mean the work of authorship, whether in Source or
42+
Object form, made available under the License, as indicated by a
43+
copyright notice that is included in or attached to the work
44+
(an example is provided in the Appendix below).
45+
46+
"Derivative Works" shall mean any work, whether in Source or Object
47+
form, that is based on (or derived from) the Work and for which the
48+
editorial revisions, annotations, elaborations, or other modifications
49+
represent, as a whole, an original work of authorship. For the purposes
50+
of this License, Derivative Works shall not include works that remain
51+
separable from, or merely link (or bind by name) to the interfaces of,
52+
the Work and Derivative Works thereof.
53+
54+
"Contribution" shall mean any work of authorship, including
55+
the original version of the Work and any modifications or additions
56+
to that Work or Derivative Works thereof, that is intentionally
57+
submitted to Licensor for inclusion in the Work by the copyright owner
58+
or by an individual or Legal Entity authorized to submit on behalf of
59+
the copyright owner. For the purposes of this definition, "submitted"
60+
means any form of electronic, verbal, or written communication sent
61+
to the Licensor or its representatives, including but not limited to
62+
communication on electronic mailing lists, source code control systems,
63+
and issue tracking systems that are managed by, or on behalf of, the
64+
Licensor for the purpose of discussing and improving the Work, but
65+
excluding communication that is conspicuously marked or otherwise
66+
designated in writing by the copyright owner as "Not a Contribution."
67+
68+
"Contributor" shall mean Licensor and any individual or Legal Entity
69+
on behalf of whom a Contribution has been received by Licensor and
70+
subsequently incorporated within the Work.
71+
72+
2. Grant of Copyright License. Subject to the terms and conditions of
73+
this License, each Contributor hereby grants to You a perpetual,
74+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
75+
copyright license to reproduce, prepare Derivative Works of,
76+
publicly display, publicly perform, sublicense, and distribute the
77+
Work and such Derivative Works in Source or Object form.
78+
79+
3. Grant of Patent License. Subject to the terms and conditions of
80+
this License, each Contributor hereby grants to You a perpetual,
81+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
82+
(except as stated in this section) patent license to make, have made,
83+
use, offer to sell, sell, import, and otherwise transfer the Work,
84+
where such license applies only to those patent claims licensable
85+
by such Contributor that are necessarily infringed by their
86+
Contribution(s) alone or by combination of their Contribution(s)
87+
with the Work to which such Contribution(s) was submitted. If You
88+
institute patent litigation against any entity (including a
89+
cross-claim or counterclaim in a lawsuit) alleging that the Work
90+
or a Contribution incorporated within the Work constitutes direct
91+
or contributory patent infringement, then any patent licenses
92+
granted to You under this License for that Work shall terminate
93+
as of the date such litigation is filed.
94+
95+
4. Redistribution. You may reproduce and distribute copies of the
96+
Work or Derivative Works thereof in any medium, with or without
97+
modifications, and in Source or Object form, provided that You
98+
meet the following conditions:
99+
100+
(a) You must give any other recipients of the Work or
101+
Derivative Works a copy of this License; and
102+
103+
(b) You must cause any modified files to carry prominent notices
104+
stating that You changed the files; and
105+
106+
(c) You must retain, in the Source form of any Derivative Works
107+
that You distribute, all copyright, patent, trademark, and
108+
attribution notices from the Source form of the Work,
109+
excluding those notices that do not pertain to any part of
110+
the Derivative Works; and
111+
112+
(d) If the Work includes a "NOTICE" text file as part of its
113+
distribution, then any Derivative Works that You distribute must
114+
include a readable copy of the attribution notices contained
115+
within such NOTICE file, excluding those notices that do not
116+
pertain to any part of the Derivative Works, in at least one
117+
of the following places: within a NOTICE text file distributed
118+
as part of the Derivative Works; within the Source form or
119+
documentation, if provided along with the Derivative Works; or,
120+
within a display generated by the Derivative Works, if and
121+
wherever such third-party notices normally appear. The contents
122+
of the NOTICE file are for informational purposes only and
123+
do not modify the License. You may add Your own attribution
124+
notices within Derivative Works that You distribute, alongside
125+
or as an addendum to the NOTICE text from the Work, provided
126+
that such additional attribution notices cannot be construed
127+
as modifying the License.
128+
129+
You may add Your own copyright statement to Your modifications and
130+
may provide additional or different license terms and conditions
131+
for use, reproduction, or distribution of Your modifications, or
132+
for any such Derivative Works as a whole, provided Your use,
133+
reproduction, and distribution of the Work otherwise complies with
134+
the conditions stated in this License.
135+
136+
5. Submission of Contributions. Unless You explicitly state otherwise,
137+
any Contribution intentionally submitted for inclusion in the Work
138+
by You to the Licensor shall be under the terms and conditions of
139+
this License, without any additional terms or conditions.
140+
Notwithstanding the above, nothing herein shall supersede or modify
141+
the terms of any separate license agreement you may have executed
142+
with Licensor regarding such Contributions.
143+
144+
6. Trademarks. This License does not grant permission to use the trade
145+
names, trademarks, service marks, or product names of the Licensor,
146+
except as required for reasonable and customary use in describing the
147+
origin of the Work and reproducing the content of the NOTICE file.
148+
149+
7. Disclaimer of Warranty. Unless required by applicable law or
150+
agreed to in writing, Licensor provides the Work (and each
151+
Contributor provides its Contributions) on an "AS IS" BASIS,
152+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
153+
implied, including, without limitation, any warranties or conditions
154+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
155+
PARTICULAR PURPOSE. You are solely responsible for determining the
156+
appropriateness of using or redistributing the Work and assume any
157+
risks associated with Your exercise of permissions under this License.
158+
159+
8. Limitation of Liability. In no event and under no legal theory,
160+
whether in tort (including negligence), contract, or otherwise,
161+
unless required by applicable law (such as deliberate and grossly
162+
negligent acts) or agreed to in writing, shall any Contributor be
163+
liable to You for damages, including any direct, indirect, special,
164+
incidental, or consequential damages of any character arising as a
165+
result of this License or out of the use or inability to use the
166+
Work (including but not limited to damages for loss of goodwill,
167+
work stoppage, computer failure or malfunction, or any and all
168+
other commercial damages or losses), even if such Contributor
169+
has been advised of the possibility of such damages.
170+
171+
9. Accepting Warranty or Additional Liability. While redistributing
172+
the Work or Derivative Works thereof, You may choose to offer,
173+
and charge a fee for, acceptance of support, warranty, indemnity,
174+
or other liability obligations and/or rights consistent with this
175+
License. However, in accepting such obligations, You may act only
176+
on Your own behalf and on Your sole responsibility, not on behalf
177+
of any other Contributor, and only if You agree to indemnify,
178+
defend, and hold each Contributor harmless for any liability
179+
incurred by, or claims asserted against, such Contributor by reason
180+
of your accepting any such warranty or additional liability.
181+
182+
END OF TERMS AND CONDITIONS
183+
184+
APPENDIX: How to apply the Apache License to your work.
185+
186+
To apply the Apache License to your work, attach the following
187+
boilerplate notice, with the fields enclosed by brackets "[]"
188+
replaced with your own identifying information. (Don't include
189+
the brackets!) The text should be enclosed in the appropriate
190+
comment syntax for the file format. We also recommend that a
191+
file or class name and description of purpose be included on the
192+
same "printed page" as the copyright notice for easier
193+
identification within third-party archives.
194+
195+
Copyright [yyyy] [name of copyright owner]
196+
197+
Licensed under the Apache License, Version 2.0 (the "License");
198+
you may not use this file except in compliance with the License.
199+
You may obtain a copy of the License at
200+
201+
http://www.apache.org/licenses/LICENSE-2.0
202+
203+
Unless required by applicable law or agreed to in writing, software
204+
distributed under the License is distributed on an "AS IS" BASIS,
205+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
206+
See the License for the specific language governing permissions and
207+
limitations under the License.

‎geo-pin-cli/build.gradle‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright (c) 2015, EMC Corporation.
3+
* Redistribution and use in source and binary forms, with or without modification,
4+
* are permitted provided that the following conditions are met:
5+
*
6+
* + Redistributions of source code must retain the above copyright notice,
7+
* this list of conditions and the following disclaimer.
8+
* + Redistributions in binary form must reproduce the above copyright
9+
* notice, this list of conditions and the following disclaimer in the
10+
* documentation and/or other materials provided with the distribution.
11+
* + The name of EMC Corporation may not be used to endorse or promote
12+
* products derived from this software without specific prior written
13+
* permission.
14+
*
15+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
16+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
17+
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
19+
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
20+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
21+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
24+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25+
* POSSIBILITY OF SUCH DAMAGE.
26+
*/
27+
description = 'Geo-pin CLI Tool - provides utility commands to work with geo-pinned objects.'
28+
29+
ext.mainClass = 'com.emc.object.s3.GeoPinCli'
30+
31+
buildscript {
32+
apply from: "$commonBuildDir/ecs-tool.buildscript.gradle", to: buildscript
33+
}
34+
35+
apply from: "$commonBuildDir/ecs-tool.subproject.gradle"
36+
37+
dependencies {
38+
compile 'commons-cli:commons-cli:1.3.1',
39+
project(':')
40+
testCompile group: 'junit', name: 'junit', version: '4.11'
41+
}

‎geo-pin-cli/src/main/java/com/emc/object/s3/GeoPinCli.java‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/*
2+
* Copyright (c) 2015, EMC Corporation.
3+
* Redistribution and use in source and binary forms, with or without modification,
4+
* are permitted provided that the following conditions are met:
5+
*
6+
* + Redistributions of source code must retain the above copyright notice,
7+
* this list of conditions and the following disclaimer.
8+
* + Redistributions in binary form must reproduce the above copyright
9+
* notice, this list of conditions and the following disclaimer in the
10+
* documentation and/or other materials provided with the distribution.
11+
* + The name of EMC Corporation may not be used to endorse or promote
12+
* products derived from this software without specific prior written
13+
* permission.
14+
*
15+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
16+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
17+
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
19+
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
20+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
21+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
24+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25+
* POSSIBILITY OF SUCH DAMAGE.
26+
*/
27+
package com.emc.object.s3;
28+
29+
import com.emc.object.s3.jersey.GeoPinningFilter;
30+
import org.apache.commons.cli.*;
31+
32+
public class GeoPinCli {
33+
public static final String JAR_NAME = "geo-pin-cli-{version}.jar";
34+
public static final String VERSION = GeoPinCli.class.getPackage().getImplementationVersion();
35+
36+
public static void main(String[] args) throws Exception {
37+
CommandLine line = null;
38+
try {
39+
System.out.println(versionLine());
40+
41+
line = new DefaultParser().parse(options(), args);
42+
43+
int vdcCount = Integer.parseInt(line.getOptionValue('v'));
44+
String bucketName = line.getOptionValue('b');
45+
String keyName = line.getOptionValue('k');
46+
if (keyName == null) keyName = "";
47+
48+
int geoPinnedVdc = GeoPinningFilter.getGeoPinIndex(GeoPinningFilter.getGeoId(bucketName, keyName), vdcCount);
49+
50+
geoPinnedVdc++; // print 1-based number, not 0-based
51+
52+
System.out.println(String.format("VDC Count: %d", vdcCount));
53+
System.out.println(String.format("Bucket Name: %s", bucketName));
54+
System.out.println(String.format("Key Name: %s", keyName));
55+
System.out.println(String.format("** Geo-Pinned VDC: %d", geoPinnedVdc));
56+
} catch (Exception e) {
57+
System.out.println("Error: " + e.getMessage());
58+
help();
59+
if (line != null && line.hasOption("stacktrace")) e.printStackTrace();
60+
System.exit(1);
61+
}
62+
}
63+
64+
public static Options options() {
65+
OptionGroup guid = new OptionGroup();
66+
guid.addOption(Option.builder("b").longOpt("bucket").desc("Name of the S3 bucket")
67+
.required().hasArg().argName("bucket-name").build());
68+
guid.addOption(Option.builder("k").longOpt("key").desc("Object key (name)")
69+
.hasArg().argName("object-key").build());
70+
guid.setRequired(true);
71+
Options options = new Options();
72+
options.addOptionGroup(guid);
73+
options.addOption(Option.builder("v").longOpt("vdc-count").desc("Total number of VDCs in the cloud")
74+
.required().hasArg().argName("vdc-count").build());
75+
options.addOption(Option.builder().longOpt("stacktrace").desc("Prints a detailed stacktrace for errors").build());
76+
return options;
77+
}
78+
79+
public static String versionLine() {
80+
return GeoPinCli.class.getSimpleName() + (VERSION == null ? "" : " v" + VERSION);
81+
}
82+
83+
public static void help() {
84+
System.out.println();
85+
System.out.println(GeoPinCli.class.getSimpleName() +
86+
" calculates which VDC a request will go to when geo-pinning is enabled");
87+
System.out.println();
88+
HelpFormatter hf = new HelpFormatter();
89+
hf.printHelp("java -jar " + JAR_NAME + ".jar", options(), true);
90+
System.out.println("* note that geo-pinning will only distribute among healthy, accessible VDCs");
91+
System.out.println("* note also that if geo-read-retry-failover is enabled and a read request fails,");
92+
System.out.println(" each retry will go to the next VDC in order");
93+
System.out.println();
94+
}
95+
}

‎gradle/wrapper/gradle-wrapper.jar‎

2.56 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Feb 10 16:00:30 CST 2015
1+
#Tue Jan 05 14:25:15 PST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

0 commit comments

Comments
 (0)