fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [1/2] incubator-fluo git commit: Fixed #700 - Shorten configuration prefixes to simply 'fluo'
Date Fri, 08 Jul 2016 16:49:40 GMT
Repository: incubator-fluo
Updated Branches:
  refs/heads/master b2c91b95b -> 16ded1c28


Fixed #700 - Shorten configuration prefixes to simply 'fluo'


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

Branch: refs/heads/master
Commit: d7e3617402fbcf7f3b9c59239cb9cda16a77b6d8
Parents: b2c91b9
Author: Mike Walch <mwalch@gmail.com>
Authored: Fri Jul 8 10:23:35 2016 -0400
Committer: Mike Walch <mwalch@gmail.com>
Committed: Fri Jul 8 10:23:35 2016 -0400

----------------------------------------------------------------------
 docs/applications.md                            |  16 +--
 docs/grafana.md                                 |  14 +--
 docs/metrics.md                                 |   6 +-
 .../org/apache/fluo/api/client/FluoAdmin.java   |   8 +-
 .../org/apache/fluo/api/client/FluoFactory.java |  30 +++--
 .../fluo/api/config/FluoConfiguration.java      |   6 +-
 .../apache/fluo/core/client/FluoAdminImpl.java  |   5 +-
 .../apache/fluo/core/metrics/MetricNames.java   |   8 +-
 .../src/main/config/fluo.properties             | 116 +++++++++----------
 modules/distribution/src/main/config/log4j.xml  |   2 +-
 .../distribution/src/main/config/logback.xml    |   4 +-
 modules/distribution/src/main/scripts/fluo      |   2 +-
 .../org/apache/fluo/integration/log/LogIT.java  |  10 +-
 13 files changed, 112 insertions(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/docs/applications.md
----------------------------------------------------------------------
diff --git a/docs/applications.md b/docs/applications.md
index f70917b..17609be 100644
--- a/docs/applications.md
+++ b/docs/applications.md
@@ -36,7 +36,7 @@ to connect to your Fluo instance.
 
 If you have access to the [fluo.properties] file that was used to configure your Fluo instance,
you can use
 it to build a [FluoConfiguration] object with all necessary properties which are all properties
with the 
-`org.apache.fluo.client.*` prefix in [fluo.properties]:
+`fluo.client.*` prefix in [fluo.properties]:
 
 ```java
 FluoConfiguration config = new FluoConfiguration(new File("fluo.properties"));
@@ -115,13 +115,13 @@ debug Fluo applications, low-level logging of transactions can be turned
on by
 setting the following loggers to TRACE:
 
 
-| Logger                  | Level | Information                                         
                                              |
-|-------------------------|-------|----------------------------------------------------------------------------------------------------|
-| `org.apache.fluo.tx`            | TRACE | Provides detailed information about what transactions
read and wrote                               |
-| `org.apache.fluo.tx.summary`    | TRACE | Provides a one line summary about each transaction
executed                                        |
-| `org.apache.fluo.tx.collisions` | TRACE | Provides details about what data was involved
When a transaction collides with another transaction |
+| Logger               | Level | Information                                            
                                           |
+|----------------------|-------|----------------------------------------------------------------------------------------------------|
+| `fluo.tx`            | TRACE | Provides detailed information about what transactions read
and wrote                               |
+| `fluo.tx.summary`    | TRACE | Provides a one line summary about each transaction executed
                                       |
+| `fluo.tx.collisions` | TRACE | Provides details about what data was involved When a transaction
collides with another transaction |
 
-Below is an example log after setting `org.apache.fluo.tx` to TRACE.   The number
+Below is an example log after setting `fluo.tx` to TRACE.   The number
 following `txid: ` is the transactions start timestamp from the Oracle.  
 
 ```
@@ -151,7 +151,7 @@ The log above traces the following sequence of events.
  * T2 sets row `4333` and `column `stat count` to `2`
  * T2 commits successfully with a commit timestamp of `6`
 
-Below is an example log after only setting `org.apache.fluo.tx.collisions` to TRACE.
+Below is an example log after only setting `fluo.tx.collisions` to TRACE.
 This setting will only log trace information when a collision occurs.  Unlike
 the previous example, what the transaction read and wrote is not logged.  This
 shows that a transaction with a start timestamp of `106` and a class name of

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/docs/grafana.md
----------------------------------------------------------------------
diff --git a/docs/grafana.md b/docs/grafana.md
index 869f943..3263e8b 100644
--- a/docs/grafana.md
+++ b/docs/grafana.md
@@ -38,9 +38,9 @@ and Grafana on your own.
       batch-pending = 5
       batch-timeout = "1s"
       templates = [
-        "org.apache.fluo.*.*.tx.*.*.* ..app.host.measurement.measurement.observer.field",
-        "org.apache.fluo.*.*.*.*.* ..app.host.measurement.measurement.field",
-        "org.apache.fluo.*.*.*.* ..app.host.measurement.measurement",
+        "fluo.*.*.tx.*.*.* ..app.host.measurement.measurement.observer.field",
+        "fluo.*.*.*.*.* ..app.host.measurement.measurement.field",
+        "fluo.*.*.*.* ..app.host.measurement.measurement",
       ]
     ```
 
@@ -58,10 +58,10 @@ and Grafana on your own.
    `<INFLUXDB_HOST>` with the actual host.
 
     ```
-    org.apache.fluo.metrics.reporter.graphite.enable=true
-    org.apache.fluo.metrics.reporter.graphite.host=<INFLUXDB_HOST>
-    org.apache.fluo.metrics.reporter.graphite.port=2003
-    org.apache.fluo.metrics.reporter.graphite.frequency=30
+    fluo.metrics.reporter.graphite.enable=true
+    fluo.metrics.reporter.graphite.host=<INFLUXDB_HOST>
+    fluo.metrics.reporter.graphite.port=2003
+    fluo.metrics.reporter.graphite.frequency=30
     ```
 
     The reporting frequency of 30 sec is required if you are using the provided

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/docs/metrics.md
----------------------------------------------------------------------
diff --git a/docs/metrics.md b/docs/metrics.md
index 52735d0..b98e68f 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -22,15 +22,15 @@ Inorder to configure metrics reporters, look at the metrics section in
an
 applications `fluo.properties` file.  This sections has a lot of commented out
 options for configuring reporters.  
 
-    org.apache.fluo.metrics.reporter.console.enable=false
-    org.apache.fluo.metrics.reporter.console.frequency=30
+    fluo.metrics.reporter.console.enable=false
+    fluo.metrics.reporter.console.frequency=30
 
 The frequency is in seconds for all reporters.
   
 Metrics reported by Fluo
 ------------------------
 
-All metrics reported by Fluo have the prefix `org.apache.fluo.<APP>.<PID>.` which
is denoted by `<prefix>` in
+All metrics reported by Fluo have the prefix `fluo.<APP>.<PID>.` which is denoted
by `<prefix>` in
 the table below.  In the prefix, `<APP>` represents the Fluo application name and `<PID>`
is the 
 process ID of the Fluo oracle or worker that is reporting the metric.  When running in yarn,
this 
 id is of the format `worker-<instance id>` or `oracle-<instance id>`.  When not
running from yarn, 

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/api/src/main/java/org/apache/fluo/api/client/FluoAdmin.java
----------------------------------------------------------------------
diff --git a/modules/api/src/main/java/org/apache/fluo/api/client/FluoAdmin.java b/modules/api/src/main/java/org/apache/fluo/api/client/FluoAdmin.java
index 980a712..f988a07 100644
--- a/modules/api/src/main/java/org/apache/fluo/api/client/FluoAdmin.java
+++ b/modules/api/src/main/java/org/apache/fluo/api/client/FluoAdmin.java
@@ -64,7 +64,7 @@ public interface FluoAdmin extends AutoCloseable {
   /**
    * Exception that is thrown if Fluo application was already initialized. An application
is already
    * initialized if a directory with same name as application exists at the chroot directory
set by
-   * the property org.apache.fluo.client.zookeeper.connect. If this directory can be cleared,
set
+   * the property fluo.client.zookeeper.connect. If this directory can be cleared, set
    * {@link InitOpts#setClearTable(boolean)} to true
    *
    * @since 1.0.0
@@ -83,9 +83,9 @@ public interface FluoAdmin extends AutoCloseable {
   }
 
   /**
-   * Exception that is thrown if Accumulo table (set by org.apache.fluo.admin.accumulo.table)
exists
-   * during initialization. If this table can be cleared, set
-   * {@link InitOpts#setClearZookeeper(boolean)} to true
+   * Exception that is thrown if Accumulo table (set by fluo.admin.accumulo.table) exists
during
+   * initialization. If this table can be cleared, set {@link InitOpts#setClearZookeeper(boolean)}
+   * to true
    *
    * @since 1.0.0
    */

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/api/src/main/java/org/apache/fluo/api/client/FluoFactory.java
----------------------------------------------------------------------
diff --git a/modules/api/src/main/java/org/apache/fluo/api/client/FluoFactory.java b/modules/api/src/main/java/org/apache/fluo/api/client/FluoFactory.java
index cd9bd2f..8c5daf9 100644
--- a/modules/api/src/main/java/org/apache/fluo/api/client/FluoFactory.java
+++ b/modules/api/src/main/java/org/apache/fluo/api/client/FluoFactory.java
@@ -42,23 +42,23 @@ public class FluoFactory {
 
   private static final String FLUO_IMPL_PREFIX = FLUO_PREFIX + ".impl";
   private static final String CLIENT_CLASS_PROP = FLUO_IMPL_PREFIX + ".client.class";
-  private static final String CLIENT_CLASS_DEFAULT = FLUO_PREFIX + ".core.client.FluoClientImpl";
+  private static final String CLIENT_CLASS_DEFAULT = "org.apache.fluo.core.client.FluoClientImpl";
   private static final String ADMIN_CLASS_PROP = FLUO_IMPL_PREFIX + ".admin.class";
-  private static final String ADMIN_CLASS_DEFAULT = FLUO_PREFIX + ".core.client.FluoAdminImpl";
+  private static final String ADMIN_CLASS_DEFAULT = "org.apache.fluo.core.client.FluoAdminImpl";
   private static final String WORKER_CLASS_PROP = FLUO_IMPL_PREFIX + ".worker.class";
-  private static final String WORKER_CLASS_DEFAULT = FLUO_PREFIX + ".core.worker.FluoWorkerImpl";
+  private static final String WORKER_CLASS_DEFAULT = "org.apache.fluo.core.worker.FluoWorkerImpl";
   private static final String ORACLE_CLASS_PROP = FLUO_IMPL_PREFIX + ".oracle.class";
-  private static final String ORACLE_CLASS_DEFAULT = FLUO_PREFIX + ".core.oracle.FluoOracleImpl";
+  private static final String ORACLE_CLASS_DEFAULT = "org.apache.fluo.core.oracle.FluoOracleImpl";
   private static final String MINI_CLASS_PROP = FLUO_IMPL_PREFIX + ".mini.class";
-  private static final String MINI_CLASS_DEFAULT = FLUO_PREFIX + ".mini.MiniFluoImpl";
+  private static final String MINI_CLASS_DEFAULT = "org.apache.fluo.mini.MiniFluoImpl";
 
   /**
    * Creates a {@link FluoClient} for reading and writing data to Fluo. {@link FluoClient#close()}
    * should be called when you are finished using it. Configuration (see {@link FluoConfiguration})
    * should contain properties with client.* prefix. Please review all client.* properties
but many
    * have a default. At a minimum, configuration should contain the following properties
that have
-   * no default: org.apache.fluo.client.accumulo.user, org.apache.fluo.client.accumulo.password,
-   * org.apache.fluo.client.accumulo.instance
+   * no default: fluo.client.accumulo.user, fluo.client.accumulo.password,
+   * fluo.client.accumulo.instance
    */
   public static FluoClient newClient(SimpleConfiguration configuration) {
     return getAndBuildClassWithConfig(configuration, CLIENT_CLASS_PROP, CLIENT_CLASS_DEFAULT);
@@ -68,9 +68,9 @@ public class FluoFactory {
    * Creates a {@link FluoAdmin} client for administering Fluo. Configuration (see
    * {@link FluoConfiguration}) should contain properties with client.* and admin.* prefix.
Please
    * review all properties but many have a default. At a minimum, configuration should contain
the
-   * following properties that have no default: org.apache.fluo.client.accumulo.user,
-   * org.apache.fluo.client.accumulo.password, org.apache.fluo.client.accumulo.instance,
-   * org.apache.fluo.admin.accumulo.table, org.apache.fluo.admin.accumulo.classpath
+   * following properties that have no default: fluo.client.accumulo.user,
+   * fluo.client.accumulo.password, fluo.client.accumulo.instance, fluo.admin.accumulo.table,
+   * fluo.admin.accumulo.classpath
    */
   public static FluoAdmin newAdmin(SimpleConfiguration configuration) {
     return getAndBuildClassWithConfig(configuration, ADMIN_CLASS_PROP, ADMIN_CLASS_DEFAULT);
@@ -78,12 +78,10 @@ public class FluoFactory {
 
   /**
    * Creates a {@link MiniFluo} using the provided configuration. Configuration (see
-   * {@link FluoConfiguration}) should either contain the property
-   * org.apache.fluo.mini.start.accumulo (set to true) to indicate that MiniFluo should start
its
-   * own Accumulo instance or it should contain the following properties if it is connecting
to an
-   * existing instance: org.apache.fluo.client.accumulo.user,
-   * org.apache.fluo.client.accumulo.password, org.apache.fluo.client.accumulo.instance,
-   * org.apache.fluo.admin.accumulo.table
+   * {@link FluoConfiguration}) should either contain the property fluo.mini.start.accumulo
(set to
+   * true) to indicate that MiniFluo should start its own Accumulo instance or it should
contain the
+   * following properties if it is connecting to an existing instance: fluo.client.accumulo.user,
+   * fluo.client.accumulo.password, fluo.client.accumulo.instance, fluo.admin.accumulo.table
    */
   public static MiniFluo newMiniFluo(SimpleConfiguration configuration) {
     return getAndBuildClassWithConfig(configuration, MINI_CLASS_PROP, MINI_CLASS_DEFAULT);

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java b/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
index b1630a4..562221d 100644
--- a/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
+++ b/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
@@ -39,7 +39,7 @@ public class FluoConfiguration extends SimpleConfiguration {
 
   private static final Logger log = LoggerFactory.getLogger(FluoConfiguration.class);
 
-  public static final String FLUO_PREFIX = "org.apache.fluo";
+  public static final String FLUO_PREFIX = "fluo";
 
   // Client properties
   private static final String CLIENT_PREFIX = FLUO_PREFIX + ".client";
@@ -527,8 +527,8 @@ public class FluoConfiguration extends SimpleConfiguration {
       valid &= verifyStringPropNotSet(CLIENT_ZOOKEEPER_CONNECT_PROP);
       if (valid == false) {
         log.error("Client properties should not be set in your configuration if MiniFluo
is "
-            + "configured to start its own accumulo (indicated by "
-            + "org.apache.fluo.mini.start.accumulo being set to true)");
+            + "configured to start its own accumulo (indicated by fluo.mini.start.accumulo
being "
+            + "set to true)");
       }
     } else {
       valid &= hasRequiredClientProps();

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
index 8952352..1bbab42 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
@@ -88,9 +88,8 @@ public class FluoAdminImpl implements FluoAdmin {
   @Override
   public void initialize(InitOpts opts) throws AlreadyInitializedException, TableExistsException
{
     Preconditions.checkArgument(!ZookeeperUtil.parseRoot(config.getInstanceZookeepers())
-        .equals("/"),
-        "The Zookeeper connection string (set by 'org.apache.fluo.client.zookeeper.connect')
"
-            + " must have a chroot suffix.");
+        .equals("/"), "The Zookeeper connection string (set by 'fluo.client.zookeeper.connect')
"
+        + " must have a chroot suffix.");
 
     if (zookeeperInitialized() && !opts.getClearZookeeper()) {
       throw new AlreadyInitializedException("Fluo application already initialized at "

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/core/src/main/java/org/apache/fluo/core/metrics/MetricNames.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/core/metrics/MetricNames.java b/modules/core/src/main/java/org/apache/fluo/core/metrics/MetricNames.java
index eceae4d..c7939ec 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/metrics/MetricNames.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/metrics/MetricNames.java
@@ -44,10 +44,10 @@ public class MetricNames {
         + appName);
     Preconditions.checkArgument(!hostId.contains("."), "Host ID should not contain '.': "
+ hostId);
 
-    // All metrics start with prefix "org.apache.fluo.APP.HOST."
+    // All metrics start with prefix "fluo.APP.HOST."
     final String metricsPrefix = FluoConfiguration.FLUO_PREFIX + "." + appName + "." + hostId
+ ".";
 
-    // Transaction metrics: org.apache.fluo.APP.HOST.tx.METRIC.OBSERVER
+    // Transaction metrics: fluo.APP.HOST.tx.METRIC.OBSERVER
     final String txPrefix = metricsPrefix + "tx.";
     txLockWaitTime = txPrefix + "lock_wait_time.";
     txExecTime = txPrefix + "execution_time.";
@@ -61,10 +61,10 @@ public class MetricNames {
 
     txCommitting = metricsPrefix + "transactor.committing";
 
-    // Worker metrics: org.apache.fluo.APP.HOST.worker.METRIC
+    // Worker metrics: fluo.APP.HOST.worker.METRIC
     notificationsQueued = metricsPrefix + "worker.notifications_queued";
 
-    // Oracle metrics: org.apache.fluo.APP.HOST.oracle.METRIC
+    // Oracle metrics: fluo.APP.HOST.oracle.METRIC
     final String oraclePrefix = metricsPrefix + "oracle.";
     oracleResponseTime = oraclePrefix + "response_time";
     oracleClientStamps = oraclePrefix + "client_stamps";

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/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 7644f4e..8e5e338 100644
--- a/modules/distribution/src/main/config/fluo.properties
+++ b/modules/distribution/src/main/config/fluo.properties
@@ -18,134 +18,134 @@
 # NOTE - All properties that have a default are set with it.  Uncomment
 # a property if you want to use a value different than the default. 
 # Properties that have no default are uncommented and must be set by
-# the user.  Most are unset except for org.apache.fluo.accumulo.classpath which 
+# the user.  Most are unset except for fluo.accumulo.classpath which
 # has a suggested value.
 
 # Client properties
 # -----------------
 # Fluo application name
-org.apache.fluo.client.application.name=
+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 ${org.apache.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.
-#org.apache.fluo.client.zookeeper.connect=localhost/fluo
+#fluo.client.zookeeper.connect=localhost/fluo
 # Zookeeper timeout
-#org.apache.fluo.client.zookeeper.timeout=30000
+#fluo.client.zookeeper.timeout=30000
 # Accumulo instance to connect to
-org.apache.fluo.client.accumulo.instance=
+fluo.client.accumulo.instance=
 # Accumulo user
-org.apache.fluo.client.accumulo.user=
+fluo.client.accumulo.user=
 # Accumulo password
-org.apache.fluo.client.accumulo.password=
+fluo.client.accumulo.password=
 # Accumulo zookeepers
-#org.apache.fluo.client.accumulo.zookeepers=localhost
+#fluo.client.accumulo.zookeepers=localhost
 # Client retry timeout (in milliseconds). Set to -1 to retry forever.
-#org.apache.fluo.client.retry.timeout.ms=-1
+#fluo.client.retry.timeout.ms=-1
 
 # Admin properties
 # ----------------
 # Accumulo table to initialize
-org.apache.fluo.admin.accumulo.table=${org.apache.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
-org.apache.fluo.admin.hdfs.root=hdfs://localhost:10000
+fluo.admin.hdfs.root=hdfs://localhost:10000
 # Fluo uses iterators within Accumulo tablet servers, therefore Accumulo per
 # table classpath need to be configured with a comma seperated list of uris
 # where Accumulo can find Fluo jars.  These jars should be reachable from
 # 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.
-org.apache.fluo.admin.accumulo.classpath=${org.apache.fluo.admin.hdfs.root}/fluo/lib/fluo-api-1.0.0-beta-3-SNAPSHOT.jar,${org.apache.fluo.admin.hdfs.root}/fluo/lib/fluo-accumulo-1.0.0-beta-3-SNAPSHOT.jar
+fluo.admin.accumulo.classpath=${fluo.admin.hdfs.root}/fluo/lib/fluo-api-1.0.0-beta-3-SNAPSHOT.jar,${fluo.admin.hdfs.root}/fluo/lib/fluo-accumulo-1.0.0-beta-3-SNAPSHOT.jar
 
 # Observer properties
 # -------------------
 # Specifies observers
-# org.apache.fluo.observer.0=com.foo.Observer1
+# fluo.observer.0=com.foo.Observer1
 # Can optionally have configuration key values
-# org.apache.fluo.observer.1=com.foo.Observer2,configKey1=configVal1,configKey2=configVal2
+# fluo.observer.1=com.foo.Observer2,configKey1=configVal1,configKey2=configVal2
 
 # Transaction properties
 # ----------------------
 # Amount of time (in milliseconds) clients wait before rolling back transaction
-#org.apache.fluo.tx.rollback.time=300000
+#fluo.tx.rollback.time=300000
 
 # Worker properties
 # -----------------
 # Number of threads in each worker instance
-#org.apache.fluo.worker.num.threads=10
+#fluo.worker.num.threads=10
 
 # Loader properties
 # -----------------
 # Number of threads each loader runs.  Can set to zero for no threads, thread
-# adding Loader will execute.  Must also set org.apache.fluo.loader.queue.size to zero
+# adding Loader will execute.  Must also set fluo.loader.queue.size to zero
 # when setting this to zero.
-#org.apache.fluo.loader.num.threads=10
+#fluo.loader.num.threads=10
 # Queue size of loader
-#org.apache.fluo.loader.queue.size=10
+#fluo.loader.queue.size=10
 
 # YARN properties
 # ----------------
 # Number of oracle yarn instances
-#org.apache.fluo.yarn.oracle.instances=1
+#fluo.yarn.oracle.instances=1
 # Max memory of Oracle yarn containers (in MB)
-#org.apache.fluo.yarn.oracle.max.memory.mb=512
+#fluo.yarn.oracle.max.memory.mb=512
 # Number of oracle virtual cores
-#org.apache.fluo.yarn.oracle.num.cores=1
+#fluo.yarn.oracle.num.cores=1
 # Number of worker yarn instances
-#org.apache.fluo.yarn.worker.instances=1
+#fluo.yarn.worker.instances=1
 # Max memory of worker YARN containers (in MB). If YARN is killing worker processes consider
 # increasing twill.java.reserved.memory.mb (which defaults to 200 and is set in yarn-site.xml).
 # The twill.java.reserved.memory.mb config determines the gap between the YARN memory limit
set
 # below and the java -Xmx setting.  For example, if max memory is 1024 and twill reserved
memory
 # is 200, the java -Xmx setting will be 1024-200 = 824 MB.
-#org.apache.fluo.yarn.worker.max.memory.mb=1024
+#fluo.yarn.worker.max.memory.mb=1024
 # Number of worker virtual cores
-#org.apache.fluo.yarn.worker.num.cores=1
+#fluo.yarn.worker.num.cores=1
 
 #Metrics
 #------------------
 #Configure reporters for metrics.   The frequency for each type of reporter is in seconds.
 
-#org.apache.fluo.metrics.reporter.console.enable=false
-#org.apache.fluo.metrics.reporter.console.target=stdout
-#org.apache.fluo.metrics.reporter.console.rateUnit=seconds
-#org.apache.fluo.metrics.reporter.console.durationUnit=milliseconds
-#org.apache.fluo.metrics.reporter.console.frequency=60
-
-#org.apache.fluo.metrics.reporter.csv.enable=false
-#org.apache.fluo.metrics.reporter.csv.dir=/tmp/
-#org.apache.fluo.metrics.reporter.csv.rateUnit=seconds
-#org.apache.fluo.metrics.reporter.csv.durationUnit=milliseconds
-#org.apache.fluo.metrics.reporter.csv.frequency=60
-
-#org.apache.fluo.metrics.reporter.graphite.enable=false
-#org.apache.fluo.metrics.reporter.graphite.host=carbon.server.com
-#org.apache.fluo.metrics.reporter.graphite.port=8080
-#org.apache.fluo.metrics.reporter.graphite.rateUnit=seconds
-#org.apache.fluo.metrics.reporter.graphite.durationUnit=milliseconds
-#org.apache.fluo.metrics.reporter.graphite.frequency=60
-#org.apache.fluo.metrics.reporter.graphite.prefix=
-
-#org.apache.fluo.metrics.reporter.jmx.enable=false
-#org.apache.fluo.metrics.reporter.jmx.rateUnit=seconds
-#org.apache.fluo.metrics.reporter.jmx.durationUnit=milliseconds
-
-#org.apache.fluo.metrics.reporter.slf4j.enable=false
-#org.apache.fluo.metrics.reporter.slf4j.logger=metrics
-#org.apache.fluo.metrics.reporter.slf4j.rateUnit=seconds
-#org.apache.fluo.metrics.reporter.slf4j.durationUnit=milliseconds
+#fluo.metrics.reporter.console.enable=false
+#fluo.metrics.reporter.console.target=stdout
+#fluo.metrics.reporter.console.rateUnit=seconds
+#fluo.metrics.reporter.console.durationUnit=milliseconds
+#fluo.metrics.reporter.console.frequency=60
+
+#fluo.metrics.reporter.csv.enable=false
+#fluo.metrics.reporter.csv.dir=/tmp/
+#fluo.metrics.reporter.csv.rateUnit=seconds
+#fluo.metrics.reporter.csv.durationUnit=milliseconds
+#fluo.metrics.reporter.csv.frequency=60
+
+#fluo.metrics.reporter.graphite.enable=false
+#fluo.metrics.reporter.graphite.host=carbon.server.com
+#fluo.metrics.reporter.graphite.port=8080
+#fluo.metrics.reporter.graphite.rateUnit=seconds
+#fluo.metrics.reporter.graphite.durationUnit=milliseconds
+#fluo.metrics.reporter.graphite.frequency=60
+#fluo.metrics.reporter.graphite.prefix=
+
+#fluo.metrics.reporter.jmx.enable=false
+#fluo.metrics.reporter.jmx.rateUnit=seconds
+#fluo.metrics.reporter.jmx.durationUnit=milliseconds
+
+#fluo.metrics.reporter.slf4j.enable=false
+#fluo.metrics.reporter.slf4j.logger=metrics
+#fluo.metrics.reporter.slf4j.rateUnit=seconds
+#fluo.metrics.reporter.slf4j.durationUnit=milliseconds
 
 # MiniFluo properties
 # -------------------
 # Path to directory where MiniFluo stores its data
-#org.apache.fluo.mini.data.dir=${env:FLUO_HOME}/apps/${org.apache.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
-#org.apache.fluo.mini.start.accumulo=true
+#fluo.mini.start.accumulo=true
 
 #Application properties
 #---------------
-#Properties with a prefix of org.apache.fluo.app are stored in zookeeper at
+#Properties with a prefix of fluo.app are stored in zookeeper at
 #initialization time and can easily be retrieved by a Fluo application running
 #on any node in the cluster.
-#org.apache.fluo.app.config1=val1
+#fluo.app.config1=val1

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/distribution/src/main/config/log4j.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/config/log4j.xml b/modules/distribution/src/main/config/log4j.xml
index 29f3cb1..65b2355 100644
--- a/modules/distribution/src/main/config/log4j.xml
+++ b/modules/distribution/src/main/config/log4j.xml
@@ -20,7 +20,7 @@ This file configures logging for MiniFluo (when using 'mini-fluo' command)
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
   <appender name="A2" class="org.apache.log4j.RollingFileAppender">
-    <param name="File" value="${org.apache.fluo.log.dir}/${org.apache.fluo.log.app}_${org.apache.fluo.log.host}.log"
/>
+    <param name="File" value="${fluo.log.dir}/${fluo.log.app}_${fluo.log.host}.log" />
     <param name="MaxFileSize" value="1000MB" />
     <param name="MaxBackupIndex" value="10" />
     <param name="Threshold" value="DEBUG" />

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/distribution/src/main/config/logback.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/config/logback.xml b/modules/distribution/src/main/config/logback.xml
index 4ae0774..fc75138 100644
--- a/modules/distribution/src/main/config/logback.xml
+++ b/modules/distribution/src/main/config/logback.xml
@@ -19,9 +19,9 @@ This file configures logging for the Fluo oracle and workers (when using
'fluo'
 <configuration>
 
   <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${org.apache.fluo.log.dir}/${org.apache.fluo.log.app}_${org.apache.fluo.log.host}.log</file>
+    <file>${fluo.log.dir}/${fluo.log.app}_${fluo.log.host}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${org.apache.fluo.log.dir}/${org.apache.fluo.log.app}_${org.apache.fluo.log.host}.log.%i</fileNamePattern>
+      <fileNamePattern>${fluo.log.dir}/${fluo.log.app}_${fluo.log.host}.log.%i</fileNamePattern>
       <minIndex>1</minIndex>
       <maxIndex>10</maxIndex>
     </rollingPolicy>

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/distribution/src/main/scripts/fluo
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/scripts/fluo b/modules/distribution/src/main/scripts/fluo
index b9cd984..3f91f75 100755
--- a/modules/distribution/src/main/scripts/fluo
+++ b/modules/distribution/src/main/scripts/fluo
@@ -108,7 +108,7 @@ new)
   mkdir -p $APP_CONF_DIR
   mkdir -p $APP_LIB_DIR
   copy_config fluo.properties
-  $SED "s/org.apache.fluo.client.application.name=/org.apache.fluo.client.application.name=$APP/g"
$APP_CONF_DIR/fluo.properties
+  $SED "s/fluo.client.application.name=/fluo.client.application.name=$APP/g" $APP_CONF_DIR/fluo.properties
   copy_config logback.xml
   ;;
 init)

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/d7e36174/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
----------------------------------------------------------------------
diff --git a/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
index b26f0ee..7f76d0a 100644
--- a/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
+++ b/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
@@ -126,7 +126,7 @@ public class LogIT extends ITBaseMini {
 
   @Test
   public void testCollisionLogging() throws Exception {
-    Logger logger = Logger.getLogger("org.apache.fluo.tx.collisions");
+    Logger logger = Logger.getLogger("fluo.tx.collisions");
 
     StringWriter writer = new StringWriter();
     WriterAppender appender = new WriterAppender(new PatternLayout("%p, %m%n"), writer);
@@ -171,7 +171,7 @@ public class LogIT extends ITBaseMini {
 
   @Test
   public void testSummaryLogging() throws Exception {
-    Logger logger = Logger.getLogger("org.apache.fluo.tx.summary");
+    Logger logger = Logger.getLogger("fluo.tx.summary");
 
     StringWriter writer = new StringWriter();
     WriterAppender appender = new WriterAppender(new PatternLayout("%p, %m%n"), writer);
@@ -220,7 +220,7 @@ public class LogIT extends ITBaseMini {
 
   @Test
   public void testAllLogging() throws Exception {
-    Logger logger = Logger.getLogger("org.apache.fluo.tx");
+    Logger logger = Logger.getLogger("fluo.tx");
 
     StringWriter writer = new StringWriter();
     WriterAppender appender =
@@ -310,7 +310,7 @@ public class LogIT extends ITBaseMini {
     }
 
 
-    Logger logger = Logger.getLogger("org.apache.fluo.tx");
+    Logger logger = Logger.getLogger("fluo.tx");
 
     StringWriter writer = new StringWriter();
     WriterAppender appender =
@@ -352,7 +352,7 @@ public class LogIT extends ITBaseMini {
 
   @Test
   public void testBinaryLogging() throws Exception {
-    Logger logger = Logger.getLogger("org.apache.fluo.tx");
+    Logger logger = Logger.getLogger("fluo.tx");
 
     StringWriter writer = new StringWriter();
     WriterAppender appender =


Mime
View raw message