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 2012/12/28 03:28:44 UTC
git commit: Fixing version related files,
filtering maven-metadata-appassembler.xml
Updated Branches:
refs/heads/master dc593ee1e -> 6100c0861
Fixing version related files, filtering maven-metadata-appassembler.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/6100c086
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/6100c086
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/6100c086
Branch: refs/heads/master
Commit: 6100c0861df6e75da0085e38e358ee63707cb333
Parents: dc593ee
Author: Kishore Gopalakrishna <g....@gmail.com>
Authored: Thu Dec 27 18:27:54 2012 -0800
Committer: Kishore Gopalakrishna <g....@gmail.com>
Committed: Thu Dec 27 18:27:54 2012 -0800
----------------------------------------------------------------------
helix-admin-webapp/helix-admin-webapp-0.5.28.ivy | 48 ----------
.../helix-admin-webapp-0.6.0-incubator.ivy | 47 ++++++++++
helix-admin-webapp/src/assemble/assembly.xml | 14 +++-
.../src/main/config/log4j.properties | 5 +-
helix-core/helix-core-0.5.28.ivy | 70 ---------------
helix-core/helix-core-0.6.0-incubator.ivy | 69 ++++++++++++++
helix-core/pom.xml | 8 +--
helix-core/src/assemble/assembly.xml | 14 +++-
.../resources/cluster-manager-version.properties | 2 +-
src/site/markdown/recipes/lock_manager.md | 6 +-
10 files changed, 147 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/helix-admin-webapp/helix-admin-webapp-0.5.28.ivy
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/helix-admin-webapp-0.5.28.ivy b/helix-admin-webapp/helix-admin-webapp-0.5.28.ivy
deleted file mode 100644
index 695f347..0000000
--- a/helix-admin-webapp/helix-admin-webapp-0.5.28.ivy
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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.
--->
-<ivy-module version="1.0">
- <info organisation="org.apache.helix"
- module="helix-admin-webapp"
- revision="0.5.28"
- status="integration"
- publication="20120315141623"
- />
- <configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
- <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
- <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
- <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
- <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
- <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
- </configurations>
- <publications>
- <artifact name="helix-admin-webapp" type="jar" ext="jar" conf="master"/>
- </publications>
- <dependencies>
- <dependency org="org.apache.helix" name="helix-core" rev="0.5.28" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.3.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- </dependencies>
-</ivy-module>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/helix-admin-webapp/helix-admin-webapp-0.6.0-incubator.ivy
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/helix-admin-webapp-0.6.0-incubator.ivy b/helix-admin-webapp/helix-admin-webapp-0.6.0-incubator.ivy
new file mode 100644
index 0000000..f96ef39
--- /dev/null
+++ b/helix-admin-webapp/helix-admin-webapp-0.6.0-incubator.ivy
@@ -0,0 +1,47 @@
+<?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.
+-->
+<ivy-module version="1.0">
+ <info organisation="org.apache.helix"
+ module="helix-admin-webapp"
+ revision="0.5.28"
+ status="integration"
+ publication="20120315141623"
+ />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
+ <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
+ <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+ <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
+ </configurations>
+ <publications>
+ <artifact name="helix-admin-webapp" type="jar" ext="jar" conf="master"/>
+ </publications>
+ <dependencies>
+ <dependency org="org.apache.helix" name="helix-core" rev="0.5.28" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="commons-cli" name="commons-cli" rev="1.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ </dependencies>
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/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 56e4545..00ec7dd 100644
--- a/helix-admin-webapp/src/assemble/assembly.xml
+++ b/helix-admin-webapp/src/assemble/assembly.xml
@@ -29,13 +29,21 @@
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
- <directory>target/helix-admin-webapp-pkg/repo</directory>
+ <directory>target/helix-admin-webapp-pkg/repo/</directory>
<outputDirectory>repo</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/helix-admin-webapp-pkg/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
</fileSet>
- <!-- <fileSet> <directory>src/main/conf</directory> <includes> <include>app-env.bat</include>
- </includes> <outputDirectory>/booter-windows/bin</outputDirectory> </fileSet> -->
<fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/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 2047151..8c80259 100644
--- a/helix-admin-webapp/src/main/config/log4j.properties
+++ b/helix-admin-webapp/src/main/config/log4j.properties
@@ -15,7 +15,7 @@
#
# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=ERROR,A1
+log4j.rootLogger=WARN,A1
# A1 is set to be a ConsoleAppender.
log4j.appender.A1=org.apache.log4j.ConsoleAppender
@@ -25,4 +25,5 @@ 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
+log4j.logger.org.apache.zookeeper=ERROR
+log4j.logger.org.apache.helix=INFO
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/helix-core/helix-core-0.5.28.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.5.28.ivy b/helix-core/helix-core-0.5.28.ivy
deleted file mode 100644
index 808dc9f..0000000
--- a/helix-core/helix-core-0.5.28.ivy
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
--->
-<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
- <info organisation="org.apache.helix"
- module="helix-core"
- revision="0.5.28"
- status="release"
- publication="2011111505113547"
- >
- <description homepage="http://maven.apache.org" />
- </info>
-
- <configurations>
- <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
- <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
- <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
- <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
- <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
- <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
- <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
- <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
- <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
- <conf name="optional" visibility="public" description="contains all optional dependencies"/>
- </configurations>
-
- <publications>
- <artifact name="helix-core" type="jar" ext="jar" conf="master"/>
- <artifact name="helix-core" type="jar" ext="jar" conf="sources" m:classifier="sources"/>
- </publications>
-
- <dependencies>
- <dependency org="log4j" name="log4j" rev="1.2.15" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.3.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="commons-math" name="commons-math" rev="2.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="com.github.sgroschupf" name="zkclient" rev="0.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.apache.camel" name="camel-josql" rev="2.5.0" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.apache.camel" name="camel-core" rev="2.5.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="net.sf.josql" name="gentlyweb-utils" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="net.sf.josql" name="josql" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="net.sf" name="jsqlparser" rev="0.7.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-
- </dependencies>
-</ivy-module>
-
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/helix-core/helix-core-0.6.0-incubator.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.6.0-incubator.ivy b/helix-core/helix-core-0.6.0-incubator.ivy
new file mode 100644
index 0000000..63f82b3
--- /dev/null
+++ b/helix-core/helix-core-0.6.0-incubator.ivy
@@ -0,0 +1,69 @@
+<?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.
+-->
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
+ <info organisation="org.apache.helix"
+ module="helix-core"
+ revision="0.6.0-incubator"
+ status="release"
+ publication="2011111505113547"
+ >
+ <description homepage="http://maven.apache.org" />
+ </info>
+
+ <configurations>
+ <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
+ <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
+ <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
+ <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
+ <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
+ <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
+ <conf name="optional" visibility="public" description="contains all optional dependencies"/>
+ </configurations>
+
+ <publications>
+ <artifact name="helix-core" type="jar" ext="jar" conf="master"/>
+ <artifact name="helix-core" type="jar" ext="jar" conf="sources" m:classifier="sources"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="log4j" name="log4j" rev="1.2.15" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="commons-math" name="commons-math" rev="2.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="com.github.sgroschupf" name="zkclient" rev="0.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.apache.camel" name="camel-josql" rev="2.5.0" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.apache.camel" name="camel-core" rev="2.5.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="net.sf.josql" name="gentlyweb-utils" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="net.sf.josql" name="josql" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.restlet" name="org.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="com.noelios.restlet" name="com.noelios.restlet" rev="1.1.10" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="net.sf" name="jsqlparser" rev="0.7.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+
+ </dependencies>
+</ivy-module>
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/helix-core/pom.xml
----------------------------------------------------------------------
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index ad32db0..7f06987 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -67,12 +67,7 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.8.5</version>
@@ -132,6 +127,7 @@ under the License.
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>${basedir}</directory>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/helix-core/src/assemble/assembly.xml
----------------------------------------------------------------------
diff --git a/helix-core/src/assemble/assembly.xml b/helix-core/src/assemble/assembly.xml
index cd08a32..c2d08a1 100644
--- a/helix-core/src/assemble/assembly.xml
+++ b/helix-core/src/assemble/assembly.xml
@@ -31,13 +31,21 @@ under the License.
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/${project.artifactId}-pkg/repo</directory>
+ <directory>${project.build.directory}/${project.artifactId}-pkg/repo/</directory>
<outputDirectory>repo</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/${project.artifactId}-pkg/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
</fileSet>
- <!-- <fileSet> <directory>src/main/conf</directory> <includes> <include>app-env.bat</include>
- </includes> <outputDirectory>/booter-windows/bin</outputDirectory> </fileSet> -->
<fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/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 bab8038..7dc387c 100644
--- a/helix-core/src/main/resources/cluster-manager-version.properties
+++ b/helix-core/src/main/resources/cluster-manager-version.properties
@@ -14,4 +14,4 @@
# limitations under the License.
#
-clustermanager.version=0.5.28
+clustermanager.version=${pom.version}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6100c086/src/site/markdown/recipes/lock_manager.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/recipes/lock_manager.md b/src/site/markdown/recipes/lock_manager.md
index fdba382..84420dd 100644
--- a/src/site/markdown/recipes/lock_manager.md
+++ b/src/site/markdown/recipes/lock_manager.md
@@ -93,7 +93,7 @@ lock-group_7 localhost_12000
lock-group_8 localhost_12000
lock-group_9 localhost_12000
Stopping localhost_12000
-localhost_12000Interrupted
+localhost_12000 Interrupted
localhost_12001 acquired lock:lock-group_9
localhost_12001 acquired lock:lock-group_8
localhost_12002 acquired lock:lock-group_6
@@ -182,7 +182,7 @@ public class LockFactory extends StateModelFactory<Lock>{
}
```
-At node start up, simply join the cluster and helix will invoke the appropriate call backs on Lock instance. One can start any number of nodes and Helix detects that a new node has joined the cluster and re-distributes the locks automatically.
+At node start up, simply join the cluster and helix will invoke the appropriate callbacks on Lock instance. One can start any number of nodes and Helix detects that a new node has joined the cluster and re-distributes the locks automatically.
```
public class LockProcess{
@@ -220,7 +220,7 @@ Controller can be started either as a separate process or can be embedded within
This is recommended when number of nodes in the cluster >100. For fault tolerance, you can run multiple controllers on different boxes.
```
-./run-helix-controller --zkSvr localhost:2199 --cluster mycluster 2>&1 > /tmp/controller.log &
+./run-helix-controller --zkSvr localhost:2199 --cluster lock-manager-demo 2>&1 > /tmp/controller.log &
```
###### Embedded within the node process