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 2015/11/05 22:33:26 UTC
[1/2] storm git commit: add missing Apache license headers
Repository: storm
Updated Branches:
refs/heads/jstorm-import dbc1236fb -> 27fb31c1c
add missing Apache license headers
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/75df7c2b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/75df7c2b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/75df7c2b
Branch: refs/heads/jstorm-import
Commit: 75df7c2b78723418223aaebfa0456dc1900a9343
Parents: dbc1236
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Nov 5 16:19:44 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Nov 5 16:31:06 2015 -0500
----------------------------------------------------------------------
bin/check_jstorm_Supervisor.sh | 16 ++++++++++++++
bin/start.sh | 17 ++++++++++++++-
bin/stop.sh | 16 ++++++++++++++
conf/cgconfig.conf | 16 ++++++++++++++
conf/client_log4j.properties | 17 +++++++++++++++
conf/client_logback.xml | 16 ++++++++++++++
conf/jstorm.log4j.properties | 17 +++++++++++++++
conf/jstorm.logback.xml | 16 ++++++++++++++
conf/storm.yaml | 17 +++++++++++++++
dev-tools/storm-eclipse-java-formatter.xml | 16 ++++++++++++++
example/sequence-split-merge/conf/conf.prop | 17 +++++++++++++++
example/sequence-split-merge/conf/conf.yaml | 17 +++++++++++++++
example/sequence-split-merge/conf/topology.yaml | 16 ++++++++++++++
example/sequence-split-merge/drpc.sh | 16 ++++++++++++++
example/sequence-split-merge/pom.xml | 16 ++++++++++++++
example/sequence-split-merge/start.sh | 16 ++++++++++++++
jstorm-core/pom.xml | 16 ++++++++++++++
jstorm-core/src/main/resources/logback-test.xml | 16 ++++++++++++++
jstorm-ui/pom.xml | 16 ++++++++++++++
jstorm-ui/src/main/resources/logback-test.xml | 16 ++++++++++++++
.../src/main/webapp/WEB-INF/faces-config.xml | 16 ++++++++++++++
jstorm-ui/src/main/webapp/WEB-INF/web.xml | 16 ++++++++++++++
jstorm-ui/src/main/webapp/assets/css/aloha.css | 17 +++++++++++++++
jstorm-ui/src/main/webapp/clusters.xhtml | 16 ++++++++++++++
jstorm-ui/src/main/webapp/log.xhtml | 16 ++++++++++++++
jstorm-ui/src/main/webapp/table.xhtml | 16 ++++++++++++++
jstorm-ui/src/main/webapp/windowtable.xhtml | 16 ++++++++++++++
other/genthrift.sh | 15 +++++++++++++
other/storm.thrift | 23 ++++++++++++++++++++
other/storm.thrift.bak | 22 +++++++++++++++++++
pom.xml | 16 ++++++++++++++
release.xml | 16 ++++++++++++++
32 files changed, 530 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/bin/check_jstorm_Supervisor.sh
----------------------------------------------------------------------
diff --git a/bin/check_jstorm_Supervisor.sh b/bin/check_jstorm_Supervisor.sh
index 1ec4394..1b9292c 100644
--- a/bin/check_jstorm_Supervisor.sh
+++ b/bin/check_jstorm_Supervisor.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+#
+# 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.
JAVA_HOME=/opt/taobao/java
export PATH=$PATH:$JAVA_HOME/bin
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/bin/start.sh
----------------------------------------------------------------------
diff --git a/bin/start.sh b/bin/start.sh
index 01f81e0..483a97b 100644
--- a/bin/start.sh
+++ b/bin/start.sh
@@ -1,5 +1,20 @@
#!/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.
if [ -e ~/.bashrc ]
then
source ~/.bashrc
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/bin/stop.sh
----------------------------------------------------------------------
diff --git a/bin/stop.sh b/bin/stop.sh
index aa7935a..d46140a 100755
--- a/bin/stop.sh
+++ b/bin/stop.sh
@@ -1,4 +1,20 @@
#!/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.
function killJStorm()
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/conf/cgconfig.conf
----------------------------------------------------------------------
diff --git a/conf/cgconfig.conf b/conf/cgconfig.conf
index c21cd13..e4c8b2c 100755
--- a/conf/cgconfig.conf
+++ b/conf/cgconfig.conf
@@ -1,3 +1,19 @@
+# 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.
+
mount {
cpu = /cgroup/cpu;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/conf/client_log4j.properties
----------------------------------------------------------------------
diff --git a/conf/client_log4j.properties b/conf/client_log4j.properties
index e80ce0b..2b44bd1 100755
--- a/conf/client_log4j.properties
+++ b/conf/client_log4j.properties
@@ -1,3 +1,20 @@
+#
+# 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.
+
#This file should be deleted when deployed to server (workaround to leiningen classpath putting dev resources on path)
#This file is needed for tests
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/conf/client_logback.xml
----------------------------------------------------------------------
diff --git a/conf/client_logback.xml b/conf/client_logback.xml
index 02ef72e..27799bf 100755
--- a/conf/client_logback.xml
+++ b/conf/client_logback.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<configuration scan="true" scanPeriod="30 seconds">
<appender name="A1" class="ch.qos.logback.core.ConsoleAppender">
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/conf/jstorm.log4j.properties
----------------------------------------------------------------------
diff --git a/conf/jstorm.log4j.properties b/conf/jstorm.log4j.properties
index ef31aed..7a3700e 100755
--- a/conf/jstorm.log4j.properties
+++ b/conf/jstorm.log4j.properties
@@ -1,3 +1,20 @@
+#
+# 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.
+
#This file should be deleted when deployed to server (workaround to leiningen classpath putting dev resources on path)
#This file is needed for tests
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/conf/jstorm.logback.xml
----------------------------------------------------------------------
diff --git a/conf/jstorm.logback.xml b/conf/jstorm.logback.xml
index bd097ea..0b85a00 100755
--- a/conf/jstorm.logback.xml
+++ b/conf/jstorm.logback.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<configuration scan="true" scanPeriod="60 seconds">
<appender name="A1"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/conf/storm.yaml
----------------------------------------------------------------------
diff --git a/conf/storm.yaml b/conf/storm.yaml
index 99bc984..c45d850 100755
--- a/conf/storm.yaml
+++ b/conf/storm.yaml
@@ -1,3 +1,20 @@
+#
+# 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.
+
########### These MUST be filled in for a storm configuration
storm.zookeeper.servers:
- "localhost"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/dev-tools/storm-eclipse-java-formatter.xml
----------------------------------------------------------------------
diff --git a/dev-tools/storm-eclipse-java-formatter.xml b/dev-tools/storm-eclipse-java-formatter.xml
index 25e6f92..9670c9d 100755
--- a/dev-tools/storm-eclipse-java-formatter.xml
+++ b/dev-tools/storm-eclipse-java-formatter.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<profiles version="12">
<profile kind="CodeFormatterProfile" name="Apache Storm Java Formatter" version="12">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/example/sequence-split-merge/conf/conf.prop
----------------------------------------------------------------------
diff --git a/example/sequence-split-merge/conf/conf.prop b/example/sequence-split-merge/conf/conf.prop
index f3e0055..8fd429e 100755
--- a/example/sequence-split-merge/conf/conf.prop
+++ b/example/sequence-split-merge/conf/conf.prop
@@ -1,3 +1,20 @@
+#
+# 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.
+
topology.name=SequenceTest
topology.workers=8
topology.max.spout.pending=10000
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/example/sequence-split-merge/conf/conf.yaml
----------------------------------------------------------------------
diff --git a/example/sequence-split-merge/conf/conf.yaml b/example/sequence-split-merge/conf/conf.yaml
index 599c629..bb029a7 100755
--- a/example/sequence-split-merge/conf/conf.yaml
+++ b/example/sequence-split-merge/conf/conf.yaml
@@ -1,3 +1,20 @@
+#
+# 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.
+
topology.name: SequenceTest
topology.workers: 8
topology.max.spout.pending: 10000
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/example/sequence-split-merge/conf/topology.yaml
----------------------------------------------------------------------
diff --git a/example/sequence-split-merge/conf/topology.yaml b/example/sequence-split-merge/conf/topology.yaml
index 89632d0..1376c65 100755
--- a/example/sequence-split-merge/conf/topology.yaml
+++ b/example/sequence-split-merge/conf/topology.yaml
@@ -1,3 +1,19 @@
+#
+# 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.
storm.cluster.mode: "local"
#storm.cluster.mode: "distributed"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/example/sequence-split-merge/drpc.sh
----------------------------------------------------------------------
diff --git a/example/sequence-split-merge/drpc.sh b/example/sequence-split-merge/drpc.sh
index 1492a51..9b10240 100755
--- a/example/sequence-split-merge/drpc.sh
+++ b/example/sequence-split-merge/drpc.sh
@@ -1,3 +1,19 @@
#!/bin/bash
+#
+# 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.
jstorm jar target/sequence-split-merge-1.1.0-jar-with-dependencies.jar com.alipay.dw.jstorm.example.drpc.ReachTopology reach
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/example/sequence-split-merge/pom.xml
----------------------------------------------------------------------
diff --git a/example/sequence-split-merge/pom.xml b/example/sequence-split-merge/pom.xml
index afba08c..2836402 100755
--- a/example/sequence-split-merge/pom.xml
+++ b/example/sequence-split-merge/pom.xml
@@ -1,3 +1,19 @@
+<!--
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/example/sequence-split-merge/start.sh
----------------------------------------------------------------------
diff --git a/example/sequence-split-merge/start.sh b/example/sequence-split-merge/start.sh
index dc634f2..64556b9 100755
--- a/example/sequence-split-merge/start.sh
+++ b/example/sequence-split-merge/start.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+#
+# 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.
#jstorm jar target/sequence-split-merge-1.1.0-jar-with-dependencies.jar com.alipay.dw.jstorm.transcation.TransactionalGlobalCount global
jstorm jar target/sequence-split-merge-1.1.0-jar-with-dependencies.jar com.alipay.dw.jstorm.example.sequence.SequenceTopology conf/conf.yaml
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-core/pom.xml
----------------------------------------------------------------------
diff --git a/jstorm-core/pom.xml b/jstorm-core/pom.xml
index 2eab1b8..489ff69 100755
--- a/jstorm-core/pom.xml
+++ b/jstorm-core/pom.xml
@@ -1,3 +1,19 @@
+<!--
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-core/src/main/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/resources/logback-test.xml b/jstorm-core/src/main/resources/logback-test.xml
index 4ac2b1d..a16a633 100755
--- a/jstorm-core/src/main/resources/logback-test.xml
+++ b/jstorm-core/src/main/resources/logback-test.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<configuration scan="true" scanPeriod="30 seconds">
<appender name="A1" class="ch.qos.logback.core.ConsoleAppender">
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/pom.xml
----------------------------------------------------------------------
diff --git a/jstorm-ui/pom.xml b/jstorm-ui/pom.xml
index 8c13332..e0846d8 100755
--- a/jstorm-ui/pom.xml
+++ b/jstorm-ui/pom.xml
@@ -1,3 +1,19 @@
+<!--
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/resources/logback-test.xml b/jstorm-ui/src/main/resources/logback-test.xml
index d3335e8..bec504a 100755
--- a/jstorm-ui/src/main/resources/logback-test.xml
+++ b/jstorm-ui/src/main/resources/logback-test.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<configuration scan="true" scanPeriod="10 seconds">
<appender name="A1"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/webapp/WEB-INF/faces-config.xml
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/webapp/WEB-INF/faces-config.xml b/jstorm-ui/src/main/webapp/WEB-INF/faces-config.xml
index 96d0dd3..3651ca1 100755
--- a/jstorm-ui/src/main/webapp/WEB-INF/faces-config.xml
+++ b/jstorm-ui/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<faces-config
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/webapp/WEB-INF/web.xml b/jstorm-ui/src/main/webapp/WEB-INF/web.xml
index e237d86..347165f 100755
--- a/jstorm-ui/src/main/webapp/WEB-INF/web.xml
+++ b/jstorm-ui/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/webapp/assets/css/aloha.css
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/webapp/assets/css/aloha.css b/jstorm-ui/src/main/webapp/assets/css/aloha.css
index 740776d..fa3b5b8 100755
--- a/jstorm-ui/src/main/webapp/assets/css/aloha.css
+++ b/jstorm-ui/src/main/webapp/assets/css/aloha.css
@@ -1,3 +1,20 @@
+/**
+ * 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.
+ */
.disp_table {
width: 100%;
line-height: 30px;
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/webapp/clusters.xhtml
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/webapp/clusters.xhtml b/jstorm-ui/src/main/webapp/clusters.xhtml
index 6ff2866..797e7e3 100755
--- a/jstorm-ui/src/main/webapp/clusters.xhtml
+++ b/jstorm-ui/src/main/webapp/clusters.xhtml
@@ -1,5 +1,21 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ 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.
+-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/webapp/log.xhtml
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/webapp/log.xhtml b/jstorm-ui/src/main/webapp/log.xhtml
index 9408fa7..887de69 100755
--- a/jstorm-ui/src/main/webapp/log.xhtml
+++ b/jstorm-ui/src/main/webapp/log.xhtml
@@ -1,5 +1,21 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ 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.
+-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/webapp/table.xhtml
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/webapp/table.xhtml b/jstorm-ui/src/main/webapp/table.xhtml
index 9254962..560eefe 100755
--- a/jstorm-ui/src/main/webapp/table.xhtml
+++ b/jstorm-ui/src/main/webapp/table.xhtml
@@ -1,5 +1,21 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ 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.
+-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/jstorm-ui/src/main/webapp/windowtable.xhtml
----------------------------------------------------------------------
diff --git a/jstorm-ui/src/main/webapp/windowtable.xhtml b/jstorm-ui/src/main/webapp/windowtable.xhtml
index 38bd5cd..96c4eca 100755
--- a/jstorm-ui/src/main/webapp/windowtable.xhtml
+++ b/jstorm-ui/src/main/webapp/windowtable.xhtml
@@ -1,5 +1,21 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ 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.
+-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/other/genthrift.sh
----------------------------------------------------------------------
diff --git a/other/genthrift.sh b/other/genthrift.sh
index 4dbe5b2..5e8a2e5 100755
--- a/other/genthrift.sh
+++ b/other/genthrift.sh
@@ -1,3 +1,18 @@
+# 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.
rm -rf gen-javabean gen-py py java
rm -rf jvm/backtype/storm/generated
thrift --gen java:beans,hashcode,nocamel --gen py:utf8strings storm.thrift
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/other/storm.thrift
----------------------------------------------------------------------
diff --git a/other/storm.thrift b/other/storm.thrift
index c7f2421..e03813a 100755
--- a/other/storm.thrift
+++ b/other/storm.thrift
@@ -1,5 +1,28 @@
#!/usr/local/bin/thrift --gen java:beans,nocamel,hashcode
+/*
+ * 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.
+ *
+ * Contains some contributions under the Thrift Software License.
+ * Please see doc/old-thrift-license.txt in the Thrift distribution for
+ * details.
+ */
+
namespace java backtype.storm.generated
union JavaObjectArg {
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/other/storm.thrift.bak
----------------------------------------------------------------------
diff --git a/other/storm.thrift.bak b/other/storm.thrift.bak
index f0b032e..2cd4eda 100755
--- a/other/storm.thrift.bak
+++ b/other/storm.thrift.bak
@@ -1,4 +1,26 @@
#!/usr/local/bin/thrift --gen java:beans,nocamel,hashcode
+/*
+ * 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.
+ *
+ * Contains some contributions under the Thrift Software License.
+ * Please see doc/old-thrift-license.txt in the Thrift distribution for
+ * details.
+ */
namespace java backtype.storm.generated
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fccb414..332fd0e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,19 @@
+<!--
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/storm/blob/75df7c2b/release.xml
----------------------------------------------------------------------
diff --git a/release.xml b/release.xml
index 56721a9..306c523 100755
--- a/release.xml
+++ b/release.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<assembly>
<id>tgz</id>
<baseDirectory>jstorm-${project.version}</baseDirectory>
[2/2] storm git commit: remove netbeans configuration file
Posted by pt...@apache.org.
remove netbeans configuration file
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/27fb31c1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/27fb31c1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/27fb31c1
Branch: refs/heads/jstorm-import
Commit: 27fb31c1caa1d60d4a9ffb5abafdc856fb84093c
Parents: 75df7c2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Nov 5 16:32:48 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Nov 5 16:32:48 2015 -0500
----------------------------------------------------------------------
jstorm-ui/nb-configuration.xml | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/27fb31c1/jstorm-ui/nb-configuration.xml
----------------------------------------------------------------------
diff --git a/jstorm-ui/nb-configuration.xml b/jstorm-ui/nb-configuration.xml
deleted file mode 100755
index 8a03a42..0000000
--- a/jstorm-ui/nb-configuration.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
- <!-- This file contains additional configuration written by modules in the
- NetBeans IDE. The configuration is intended to be shared among all the users
- of project and therefore it is assumed to be part of version control checkout.
- Without this configuration present, some functionality in the IDE may be
- limited or fail altogether. -->
- <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
- <!-- Properties that influence various parts of the IDE, especially code
- formatting and the like. You can copy and paste the single properties, into
- the pom.xml file and the IDE will pick them up. That way multiple projects
- can share the same settings (useful for formatting rules for example). Any
- value defined here will override the pom.xml file value but is only applicable
- to the current project. -->
- <netbeans.compile.on.save>all</netbeans.compile.on.save>
- <org-netbeans-modules-projectapi.jsf_2e_language>Facelets</org-netbeans-modules-projectapi.jsf_2e_language>
- </properties>
-</project-shared-configuration>