You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ki...@apache.org on 2013/01/08 09:23:00 UTC
git commit: Fixing license headers
Updated Branches:
refs/heads/master 914b67802 -> cfacca1c5
Fixing license headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/cfacca1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/cfacca1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/cfacca1c
Branch: refs/heads/master
Commit: cfacca1c5b4b3da87709e7453961caaf9abe8cee
Parents: 914b678
Author: Kishore Gopalakrishna <g....@gmail.com>
Authored: Tue Jan 8 00:22:33 2013 -0800
Committer: Kishore Gopalakrishna <g....@gmail.com>
Committed: Tue Jan 8 00:22:33 2013 -0800
----------------------------------------------------------------------
README.md | 8 ++--
helix-admin-webapp/src/assemble/assembly.xml | 28 ++++++++-------
.../src/main/config/log4j.properties | 25 +++++++------
helix-admin-webapp/src/main/webapp/WEB-INF/web.xml | 28 ++++++++-------
helix-admin-webapp/src/main/webapp/index.jsp | 25 +++++++------
helix-admin-webapp/src/test/conf/testng.xml | 27 +++++++-------
.../resources/cluster-manager-version.properties | 25 +++++++------
mockservice/header.txt | 13 -------
mockservice/src/main/config/log4j.properties | 29 ++++++++-------
mockservice/src/test/conf/testng.xml | 27 +++++++-------
src/site/markdown/Architecture.md | 5 +--
src/site/markdown/UseCases.md | 4 +-
src/site/markdown/index.md | 8 ++--
13 files changed, 128 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e367b24..c7d736d 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Here are some common state models used
For example in the case of a MasterSlave state model one can specify the state machine as follows. The table says given a start state and an end state what should be the next state.
For example, if the current state is Offline and the target state is Master, the table says that the next state is Slave. So in this case, Helix issues an Offline-Slave transition
-<pre><code>
+```
OFFLINE | SLAVE | MASTER
_____________________________
| | | |
@@ -77,7 +77,7 @@ SLAVE | OFFLINE | N/A | MASTER |
MASTER | SLAVE | SLAVE | N/A |
|__________|________|_________|
-</code></pre>
+```
Helix also supports the ability to provide constraints on each state. For example in a MasterSlave state model with a replication factor of 3 one can say
@@ -99,7 +99,7 @@ Helix framework can be used to build distributed, scalable, elastic and fault to
Once the state machine and constraints are configured through Helix, application will have the provide implementation to handle the transitions appropriately.
-<pre><code>
+```
MasterSlaveStateModel extends HelixStateModel {
void onOfflineToSlave(Message m, NotificationContext context){
@@ -115,7 +115,7 @@ MasterSlaveStateModel extends HelixStateModel {
print("Transitioning from Slave to Offline for resource:"+ m.getResourceName() + " and partition:"+ m.getPartitionName());
}
}
-</code></pre>
+```
Once the state machine is configured, the framework allows one to
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/helix-admin-webapp/src/assemble/assembly.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/assemble/assembly.xml b/helix-admin-webapp/src/assemble/assembly.xml
index 00ec7dd..c20e0ee 100644
--- a/helix-admin-webapp/src/assemble/assembly.xml
+++ b/helix-admin-webapp/src/assemble/assembly.xml
@@ -1,19 +1,21 @@
+<?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
- Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
-
- 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
-
- 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.
+ 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>pkg</id>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/helix-admin-webapp/src/main/config/log4j.properties
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/config/log4j.properties b/helix-admin-webapp/src/main/config/log4j.properties
index 8c80259..375c7ba 100644
--- a/helix-admin-webapp/src/main/config/log4j.properties
+++ b/helix-admin-webapp/src/main/config/log4j.properties
@@ -1,17 +1,20 @@
#
-# Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
+# 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
#
-# 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
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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.
+# 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 root logger level to DEBUG and its only appender to A1.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/helix-admin-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/webapp/WEB-INF/web.xml b/helix-admin-webapp/src/main/webapp/WEB-INF/web.xml
index 8655d14..36c5645 100644
--- a/helix-admin-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/helix-admin-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,19 +1,21 @@
+<?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
- Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
-
- 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
-
- 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.
+ 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.
-->
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/helix-admin-webapp/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/webapp/index.jsp b/helix-admin-webapp/src/main/webapp/index.jsp
index 75b6d3b..8cfd61a 100644
--- a/helix-admin-webapp/src/main/webapp/index.jsp
+++ b/helix-admin-webapp/src/main/webapp/index.jsp
@@ -1,18 +1,21 @@
<%--
- Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
+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
- 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
+ http://www.apache.org/licenses/LICENSE-2.0
- 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.
+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>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/helix-admin-webapp/src/test/conf/testng.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/test/conf/testng.xml b/helix-admin-webapp/src/test/conf/testng.xml
index fffa30c..cba086f 100644
--- a/helix-admin-webapp/src/test/conf/testng.xml
+++ b/helix-admin-webapp/src/test/conf/testng.xml
@@ -1,20 +1,21 @@
<?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
- Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
-
- 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
-
- 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.
+ 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.
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Suite" parallel="none">
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/helix-core/src/main/resources/cluster-manager-version.properties
----------------------------------------------------------------------
diff --git a/helix-core/src/main/resources/cluster-manager-version.properties b/helix-core/src/main/resources/cluster-manager-version.properties
index 7dc387c..765ad63 100644
--- a/helix-core/src/main/resources/cluster-manager-version.properties
+++ b/helix-core/src/main/resources/cluster-manager-version.properties
@@ -1,17 +1,20 @@
#
-# Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
+# 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
#
-# 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
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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.
+# 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.
#
clustermanager.version=${pom.version}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/mockservice/header.txt
----------------------------------------------------------------------
diff --git a/mockservice/header.txt b/mockservice/header.txt
deleted file mode 100644
index 5330b23..0000000
--- a/mockservice/header.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
-
-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
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/mockservice/src/main/config/log4j.properties
----------------------------------------------------------------------
diff --git a/mockservice/src/main/config/log4j.properties b/mockservice/src/main/config/log4j.properties
index f23c80c..91fac03 100644
--- a/mockservice/src/main/config/log4j.properties
+++ b/mockservice/src/main/config/log4j.properties
@@ -1,18 +1,21 @@
#
-# Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
+# 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
#
-# 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
-#
-# 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.
+# 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 root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=DEBUG,A1
@@ -25,4 +28,4 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
log4j.logger.org.I0Itec=ERROR
-log4j.logger.org.apache=ERROR
\ No newline at end of file
+log4j.logger.org.apache=ERROR
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/mockservice/src/test/conf/testng.xml
----------------------------------------------------------------------
diff --git a/mockservice/src/test/conf/testng.xml b/mockservice/src/test/conf/testng.xml
index a6298bc..58f0803 100644
--- a/mockservice/src/test/conf/testng.xml
+++ b/mockservice/src/test/conf/testng.xml
@@ -1,20 +1,21 @@
<?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
- Copyright (C) 2012 LinkedIn Inc <op...@linkedin.com>
-
- 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
-
- 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.
+ 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.
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Suite" parallel="none">
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/src/site/markdown/Architecture.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Architecture.md b/src/site/markdown/Architecture.md
index f8fa8fc..cf14b47 100644
--- a/src/site/markdown/Architecture.md
+++ b/src/site/markdown/Architecture.md
@@ -92,8 +92,7 @@ Apart from defining State for each partition, the transition path to each STATE
Helix provides a way to configure an application specific state machine along with constraints on each state. Along with constraints on State, Helix also provides a way to specify constraints on transitions.(More on this later)
-
-<pre><code>
+```
OFFLINE | SLAVE | MASTER
_____________________________
| | | |
@@ -106,7 +105,7 @@ SLAVE | OFFLINE | N/A | MASTER |
MASTER | SLAVE | SLAVE | N/A |
|__________|________|_________|
-</code></pre>
+```
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/src/site/markdown/UseCases.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/UseCases.md b/src/site/markdown/UseCases.md
index d2547ef..d46b372 100644
--- a/src/site/markdown/UseCases.md
+++ b/src/site/markdown/UseCases.md
@@ -41,7 +41,7 @@ For fault tolerance, it adds the constraint that no two replicas of the same par
Espresso follows a Master-Slave state model. A replica can be in Offline,Slave or Master state.
The state machine table describes the next state given the Current State, Final State
-<pre><code>
+```
OFFLINE | SLAVE | MASTER
_____________________________
| | | |
@@ -54,7 +54,7 @@ SLAVE | OFFLINE | N/A | MASTER |
MASTER | SLAVE | SLAVE | N/A |
|__________|________|_________|
-</code></pre>
+```
### Constraints
* Max number of replicas in Master state:1
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/cfacca1c/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index da41a5c..7fc0c41 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -69,7 +69,7 @@ Here are some common state models used
For example in the case of a MasterSlave state model one can specify the state machine as follows. The table says given a start state and an end state what should be the next state.
For example, if the current state is Offline and the target state is Master, the table says that the next state is Slave. So in this case, Helix issues an Offline-Slave transition
-<pre><code>
+```
OFFLINE | SLAVE | MASTER
_____________________________
| | | |
@@ -82,7 +82,7 @@ SLAVE | OFFLINE | N/A | MASTER |
MASTER | SLAVE | SLAVE | N/A |
|__________|________|_________|
-</code></pre>
+```
Helix also supports the ability to provide constraints on each state. For example in a MasterSlave state model with a replication factor of 3 one can say
@@ -104,7 +104,7 @@ Helix framework can be used to build distributed, scalable, elastic and fault to
Once the state machine and constraints are configured through Helix, application will have the provide implementation to handle the transitions appropriately.
-<pre><code>
+```
MasterSlaveStateModel extends HelixStateModel {
void onOfflineToSlave(Message m, NotificationContext context){
@@ -120,7 +120,7 @@ MasterSlaveStateModel extends HelixStateModel {
print("Transitioning from Slave to Offline for resource:"+ m.getResourceName() + " and partition:"+ m.getPartitionName());
}
}
-</code></pre>
+```
Once the state machine is configured, the framework allows one to