fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject incubator-fluo git commit: Fixes #777 - Set Fluo version in fluo.properties during build
Date Fri, 23 Sep 2016 13:44:04 GMT
Repository: incubator-fluo
Updated Branches:
  refs/heads/master 0d3acf85c -> f316e88ac


Fixes #777 - Set Fluo version in fluo.properties during build

* Configured Maven assembly plugin to filter fluo.properties
  and add project.version
* Used '\' to escape config properties that should not be changed
  by assembly filter


Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/f316e88a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/f316e88a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/f316e88a

Branch: refs/heads/master
Commit: f316e88acf118d25353403fd5b3de2fdf9d7c0d7
Parents: 0d3acf8
Author: Mike Walch <mwalch@apache.org>
Authored: Fri Sep 23 09:40:05 2016 -0400
Committer: Mike Walch <mwalch@apache.org>
Committed: Fri Sep 23 09:40:05 2016 -0400

----------------------------------------------------------------------
 modules/distribution/pom.xml                    |  1 +
 modules/distribution/src/main/assembly/bin.xml  | 22 +++++++++-----------
 .../src/main/config/fluo.properties             |  8 +++----
 3 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/f316e88a/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 90b0e7c..552633b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -71,6 +71,7 @@
             </goals>
             <phase>package</phase>
             <configuration>
+              <escapeString>\</escapeString>
               <descriptors>
                 <descriptor>src/main/assembly/bin.xml</descriptor>
               </descriptors>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/f316e88a/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/assembly/bin.xml b/modules/distribution/src/main/assembly/bin.xml
index 2e9fac6..e2b8bd1 100644
--- a/modules/distribution/src/main/assembly/bin.xml
+++ b/modules/distribution/src/main/assembly/bin.xml
@@ -53,9 +53,9 @@
     <fileSet>
       <directory>src/main/config</directory>
       <outputDirectory>conf/examples</outputDirectory>
-      <includes>
-        <include>*</include>
-      </includes>
+      <excludes>
+        <exclude>src/main/config/fluo.properties</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>src/main/lib</directory>
@@ -75,23 +75,21 @@
     <fileSet>
       <directory>../../docs</directory>
       <outputDirectory>docs</outputDirectory>
-      <includes>
-        <include>*</include>
-      </includes>
     </fileSet>
     <fileSet>
       <directory>../../contrib/grafana</directory>
       <outputDirectory>contrib/grafana</outputDirectory>
-      <includes>
-        <include>*</include>
-      </includes>
     </fileSet>
     <fileSet>
       <directory>../../contrib/influxdb</directory>
       <outputDirectory>contrib/influxdb</outputDirectory>
-      <includes>
-        <include>*</include>
-      </includes>
     </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>src/main/config/fluo.properties</source>
+      <outputDirectory>conf/examples</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+  </files>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/f316e88a/modules/distribution/src/main/config/fluo.properties
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/config/fluo.properties b/modules/distribution/src/main/config/fluo.properties
index 476edef..ad0c97f 100644
--- a/modules/distribution/src/main/config/fluo.properties
+++ b/modules/distribution/src/main/config/fluo.properties
@@ -28,7 +28,7 @@ fluo.client.application.name=
 # Zookeeper connection string specifying host and chroot where Fluo stores data.
 # A chroot directory suffix must be specified but doesn't need to be named
 # '/fluo'.  If not specified, a Fluo application cannot be initialized.
-# Interpolation (i.e ${fluo.client.accumulo.zookeepers}/fluo) can be used
+# Interpolation (i.e \${fluo.client.accumulo.zookeepers}/fluo) can be used
 # when setting this to reuse Accumulo's zookeeper connection string.
 #fluo.client.zookeeper.connect=localhost/fluo
 # Zookeeper timeout
@@ -47,7 +47,7 @@ fluo.client.accumulo.password=
 # Admin properties
 # ----------------
 # Accumulo table to initialize
-fluo.admin.accumulo.table=${fluo.client.application.name}
+fluo.admin.accumulo.table=\${fluo.client.application.name}
 # HDFS root path. Should match 'fs.defaultFS' property in Hadoop's core-site.xml
 fluo.admin.hdfs.root=hdfs://localhost:10000
 # Fluo uses iterators within Accumulo tablet servers, therefore Accumulo per
@@ -56,7 +56,7 @@ fluo.admin.hdfs.root=hdfs://localhost:10000
 # every tablet server.  For the default jars below, `fluo init` will place them
 # in HDFS.  If you add more jars to the classpath below, you will need to
 # add them to HDFS.
-fluo.admin.accumulo.classpath=${fluo.admin.hdfs.root}/fluo/lib/fluo-api-1.0.0-incubating-SNAPSHOT.jar,${fluo.admin.hdfs.root}/fluo/lib/fluo-accumulo-1.0.0-incubating-SNAPSHOT.jar
+fluo.admin.accumulo.classpath=\${fluo.admin.hdfs.root}/fluo/lib/fluo-api-${project.version}.jar,\${fluo.admin.hdfs.root}/fluo/lib/fluo-accumulo-${project.version}.jar
 
 # Observer properties
 # -------------------
@@ -139,7 +139,7 @@ fluo.admin.accumulo.classpath=${fluo.admin.hdfs.root}/fluo/lib/fluo-api-1.0.0-in
 # MiniFluo properties
 # -------------------
 # Path to directory where MiniFluo stores its data
-#fluo.mini.data.dir=${env:FLUO_HOME}/apps/${fluo.client.application.name}/mini
+#fluo.mini.data.dir=\${env:FLUO_HOME}/apps/\${fluo.client.application.name}/mini
 # Indicates if MiniFluo should start a MiniAccumulo cluster
 #fluo.mini.start.accumulo=true
 


Mime
View raw message