You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/11 21:57:48 UTC
[52/53] [abbrv] storm git commit: STORM-1202: Migrate APIs to
org.apache.storm, but try to provide some form of backwards compatability
STORM-1202: Migrate APIs to org.apache.storm, but try to provide some form of backwards compatability
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b5fd753f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b5fd753f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b5fd753f
Branch: refs/heads/master
Commit: b5fd753f362c8c0737c1a205ba0d5faad08d4765
Parents: d839d1b
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 14:43:28 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 14:43:28 2016 -0600
----------------------------------------------------------------------
dev-tools/cleanup.sh | 21 ----------
dev-tools/move_package.sh | 73 ---------------------------------
dev-tools/travis/travis-install.sh | 3 +-
3 files changed, 1 insertion(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b5fd753f/dev-tools/cleanup.sh
----------------------------------------------------------------------
diff --git a/dev-tools/cleanup.sh b/dev-tools/cleanup.sh
deleted file mode 100755
index 6ff75eb..0000000
--- a/dev-tools/cleanup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# 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.
-
-BASE="$1"
-git reset HEAD -- "$BASE"
-git checkout -- "$BASE"
-git clean -fdx
http://git-wip-us.apache.org/repos/asf/storm/blob/b5fd753f/dev-tools/move_package.sh
----------------------------------------------------------------------
diff --git a/dev-tools/move_package.sh b/dev-tools/move_package.sh
deleted file mode 100755
index a2bfd17..0000000
--- a/dev-tools/move_package.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh -x
-# 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.
-set -u
-set -e
-
-BASE="$1"
-find "$BASE" -type f -print0 | xargs -0 egrep -l 'backtype.storm|storm.trident|storm.starter|storm.kafka|"backtype", "storm"' | egrep -v '.git/|docs/|CHANGELOG.md|dev-tools/move_package.sh|StormShadeRequest.java' | xargs sed -i.back -e 's/storm\(.\)trident/org\1apache\1storm\1trident/g' -e 's/backtype\(.\)storm/org\1apache\1storm/g' -e 's/storm\([\.\\]\)starter/org\1apache\1storm\1starter/g' -e 's/storm\([\.\\]\)kafka/org\1apache\1storm\1kafka/g' -e 's/"backtype", "storm"/"org", "apache", "storm"/g'
-find "$BASE" -iname \*.back | xargs rm
-mkdir -p "$BASE"/storm-core/src/jvm/org/apache/storm/ "$BASE"/storm-core/src/clj/org/apache/storm/ "$BASE"/storm-core/test/jvm/org/apache/storm/ "$BASE"/storm-core/test/clj/org/apache/storm/ "$BASE"/storm-core/test/clj/integration/org/apache/storm/
-#STORM-CORE
-#SRC JVM
-git mv "$BASE"/storm-core/src/jvm/backtype/storm/* "$BASE"/storm-core/src/jvm/org/apache/storm/
-rm -rf "$BASE"/storm-core/src/jvm/backtype
-git mv "$BASE"/storm-core/src/jvm/storm/trident "$BASE"/storm-core/src/jvm/org/apache/storm
-rm -rf "$BASE"/storm-core/src/jvm/storm
-
-#SRC CLJ
-git mv "$BASE"/storm-core/src/clj/backtype/storm/* "$BASE"/storm-core/src/clj/org/apache/storm/
-rm -rf "$BASE"/storm-core/src/clj/backtype
-git mv "$BASE"/storm-core/src/clj/storm/trident "$BASE"/storm-core/src/clj/org/apache/storm
-rm -rf "$BASE"/storm-core/src/clj/storm
-
-#TEST JVM
-git mv "$BASE"/storm-core/test/jvm/backtype/storm/* "$BASE"/storm-core/test/jvm/org/apache/storm/
-rm -rf "$BASE"/storm-core/test/jvm/backtype
-#git mv "$BASE"/storm-core/test/jvm/storm/trident "$BASE"/storm-core/test/jvm/org/apache/storm
-#rm -rf "$BASE"/storm-core/test/jvm/storm
-
-#TEST CLJ
-git mv "$BASE"/storm-core/test/clj/backtype/storm/* "$BASE"/storm-core/test/clj/org/apache/storm/
-rm -rf "$BASE"/storm-core/test/clj/backtype
-git mv "$BASE"/storm-core/test/clj/storm/trident "$BASE"/storm-core/test/clj/org/apache/storm
-rm -rf "$BASE"/storm-core/test/clj/storm
-git mv "$BASE"/storm-core/test/clj/integration/storm/* "$BASE"/storm-core/test/clj/integration/org/apache/storm
-rm -rf "$BASE"/storm-core/test/clj/integration/storm
-git mv "$BASE"/storm-core/test/clj/integration/backtype/storm/* "$BASE"/storm-core/test/clj/integration/org/apache/storm
-rm -rf "$BASE"/storm-core/test/clj/integration/backtype
-
-#STORM-STARTER
-mkdir -p "$BASE"/examples/storm-starter/src/jvm/org/apache/ "$BASE"/examples/storm-starter/src/clj/org/apache/ "$BASE"/examples/storm-starter/test/jvm/org/apache/
-#SRC JVM
-git mv "$BASE"/examples/storm-starter/src/jvm/storm "$BASE"/examples/storm-starter/src/jvm/org/apache/
-
-#SRC CLJ
-git mv "$BASE"/examples/storm-starter/src/clj/storm "$BASE"/examples/storm-starter/src/clj/org/apache/
-
-#TEST JVM
-git mv "$BASE"/examples/storm-starter/test/jvm/storm "$BASE"/examples/storm-starter/test/jvm/org/apache/
-
-
-#STORM-KAFKA
-mkdir -p "$BASE"/external/storm-kafka/src/jvm/org/apache/ "$BASE"/external/storm-kafka/src/test/org/apache/
-
-#SRC JVM
-git mv "$BASE"/external/storm-kafka/src/jvm/storm "$BASE"/external/storm-kafka/src/jvm/org/apache/
-
-#TEST JVM
-git mv "$BASE"/external/storm-kafka/src/test/storm "$BASE"/external/storm-kafka/src/test/org/apache/
-
http://git-wip-us.apache.org/repos/asf/storm/blob/b5fd753f/dev-tools/travis/travis-install.sh
----------------------------------------------------------------------
diff --git a/dev-tools/travis/travis-install.sh b/dev-tools/travis/travis-install.sh
index 62bd666..5a7ec50 100755
--- a/dev-tools/travis/travis-install.sh
+++ b/dev-tools/travis/travis-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# Licensed 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
@@ -19,7 +19,6 @@ STORM_SRC_ROOT_DIR=$1
TRAVIS_SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
cd ${STORM_SRC_ROOT_DIR}
-./dev-tools/move_package.sh "${STORM_SRC_ROOT_DIR}" || exit 1
python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install.txt" mvn clean install -DskipTests -Pnative --batch-mode
BUILD_RET_VAL=$?