You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/03/23 21:15:28 UTC
[1/3] storm git commit: STORM-1622: Rename classes with older third
party shaded packages
Repository: storm
Updated Branches:
refs/heads/1.x-branch dee9aee3d -> 6163f58ad
STORM-1622: Rename classes with older third party shaded packages
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7ad1bfff
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7ad1bfff
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7ad1bfff
Branch: refs/heads/1.x-branch
Commit: 7ad1bfff49f969caade3029982227795ed5a5280
Parents: 821d4ef
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Sun Mar 20 18:04:02 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Mon Mar 21 10:39:50 2016 +0530
----------------------------------------------------------------------
.../org/apache/storm/hack/DefaultShader.java | 2 +-
.../org/apache/storm/hack/StormShadeRequest.java | 19 ++++++++++++++++---
.../apache/storm/hack/relocation/Relocator.java | 2 ++
.../storm/hack/relocation/SimpleRelocator.java | 10 +++++++++-
4 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7ad1bfff/storm-rename-hack/src/main/java/org/apache/storm/hack/DefaultShader.java
----------------------------------------------------------------------
diff --git a/storm-rename-hack/src/main/java/org/apache/storm/hack/DefaultShader.java b/storm-rename-hack/src/main/java/org/apache/storm/hack/DefaultShader.java
index f6867b7..c053012 100644
--- a/storm-rename-hack/src/main/java/org/apache/storm/hack/DefaultShader.java
+++ b/storm-rename-hack/src/main/java/org/apache/storm/hack/DefaultShader.java
@@ -376,7 +376,7 @@ public class DefaultShader {
{
value = prefix + r.relocatePath( name ) + suffix;
if (!warned.contains(orig)) {
- LOG.warn("Relocating {} to {} in {} please modify your code to use the new namespace", orig, value, className);
+ LOG.warn("Relocating {} to {} in {}. {}", orig, value, className, r.getWarnMessage());
warned.add(orig);
}
break;
http://git-wip-us.apache.org/repos/asf/storm/blob/7ad1bfff/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java
----------------------------------------------------------------------
diff --git a/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java b/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java
index 03d60b7..0e2a4e1 100644
--- a/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java
+++ b/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java
@@ -28,10 +28,23 @@ import java.util.Arrays;
public class StormShadeRequest {
public static ShadeRequest makeRequest() {
ShadeRequest request = new ShadeRequest();
+ String oldNamespaceWarnMessage = "please modify your code to use the new namespace";
+ String internalClassAccessMessage = "You are accessing an internal class of storm which can be removed in future. "
+ + "Do not use the shaded classes inside storm";
request.setRelocators(Arrays.asList(
- (Relocator)new SimpleRelocator("backtype.storm", "org.apache.storm"),
- (Relocator)new SimpleRelocator("storm.trident", "org.apache.storm.trident"),
- (Relocator)new SimpleRelocator("org.apache.thrift7", "org.apache.storm.thrift")
+ (Relocator)new SimpleRelocator("backtype.storm", "org.apache.storm", oldNamespaceWarnMessage),
+ (Relocator)new SimpleRelocator("storm.trident", "org.apache.storm.trident", oldNamespaceWarnMessage),
+ (Relocator)new SimpleRelocator("org.apache.thrift7", "org.apache.storm.thrift", oldNamespaceWarnMessage),
+
+ // Following are the shaded packages for which patterns names were changed.
+ (Relocator) new SimpleRelocator("org.apache.storm.snakeyaml", "org.apache.storm.shade.org.yaml.snakeyaml", internalClassAccessMessage),
+ (Relocator) new SimpleRelocator("org.apache.storm.commons.io", "org.apache.storm.shade.org.apache.commons.io", internalClassAccessMessage),
+ (Relocator) new SimpleRelocator("org.apache.storm.commons.codec", "org.apache.storm.shade.org.apache.commons.codec", internalClassAccessMessage),
+ (Relocator) new SimpleRelocator("org.apache.storm.commons.lang", "org.apache.storm.shade.org.apache.commons.lang", internalClassAccessMessage),
+ (Relocator) new SimpleRelocator("org.apache.storm.json.simple", "org.apache.storm.shade.org.json.simple", internalClassAccessMessage),
+ (Relocator) new SimpleRelocator("org.apache.storm.guava.thirdparty", "org.apache.storm.shade.com.google.thirdparty", internalClassAccessMessage),
+ (Relocator) new SimpleRelocator("org.apache.storm.guava", "org.apache.storm.shade.com.google.common", internalClassAccessMessage)
+
));
request.setResourceTransformers(Arrays.asList(
(ResourceTransformer)new ClojureTransformer()
http://git-wip-us.apache.org/repos/asf/storm/blob/7ad1bfff/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/Relocator.java
----------------------------------------------------------------------
diff --git a/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/Relocator.java b/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/Relocator.java
index f8b9714..65a6042 100644
--- a/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/Relocator.java
+++ b/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/Relocator.java
@@ -37,4 +37,6 @@ public interface Relocator
String relocateClass( String clazz );
String applyToSourceContent( String sourceContent );
+
+ String getWarnMessage();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/7ad1bfff/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/SimpleRelocator.java
----------------------------------------------------------------------
diff --git a/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/SimpleRelocator.java b/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/SimpleRelocator.java
index 5c58680..83cf13b 100644
--- a/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/SimpleRelocator.java
+++ b/storm-rename-hack/src/main/java/org/apache/storm/hack/relocation/SimpleRelocator.java
@@ -38,7 +38,9 @@ public class SimpleRelocator
private final String shadedPathPattern;
- public SimpleRelocator( String patt, String shadedPattern)
+ private final String warnMessage;
+
+ public SimpleRelocator( String patt, String shadedPattern, String warnMessage)
{
if ( patt == null )
{
@@ -61,6 +63,8 @@ public class SimpleRelocator
this.shadedPattern = "hidden." + this.pattern;
this.shadedPathPattern = "hidden/" + this.pathPattern;
}
+
+ this.warnMessage = warnMessage;
}
public boolean canRelocatePath( String path )
@@ -94,4 +98,8 @@ public class SimpleRelocator
{
return sourceContent.replaceAll( "\\b" + pattern, shadedPattern );
}
+
+ public String getWarnMessage() {
+ return warnMessage;
+ }
}
[3/3] storm git commit: add STORM-1622 to changelog
Posted by pt...@apache.org.
add STORM-1622 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6163f58a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6163f58a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6163f58a
Branch: refs/heads/1.x-branch
Commit: 6163f58ad409cb2efcb17b24ddbeb09a9f3a0792
Parents: c41e649
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Mar 23 16:12:50 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Mar 23 16:12:50 2016 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6163f58a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79824da..fa2a042 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1622: Rename classes with older third party shaded packages
* STORM-1537: Upgrade to kryo 3
* STORM-1556: nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode
* STORM-1636: Supervisor shutdown with worker id pass in being nil
[2/3] storm git commit: Merge branch 'shaded-classes2' of
github.com:abhishekagarwal87/storm into 1.x-branch
Posted by pt...@apache.org.
Merge branch 'shaded-classes2' of github.com:abhishekagarwal87/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c41e6495
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c41e6495
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c41e6495
Branch: refs/heads/1.x-branch
Commit: c41e6495b4d7bb4aa7157a9c0986fdd6725efdc3
Parents: dee9aee 7ad1bff
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Mar 23 16:12:02 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Mar 23 16:12:02 2016 -0400
----------------------------------------------------------------------
.../org/apache/storm/hack/DefaultShader.java | 2 +-
.../org/apache/storm/hack/StormShadeRequest.java | 19 ++++++++++++++++---
.../apache/storm/hack/relocation/Relocator.java | 2 ++
.../storm/hack/relocation/SimpleRelocator.java | 10 +++++++++-
4 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------