svn commit: r1363241 - in /sqoop/branches/sqoop2/dist/src/main/server/conf: sqoop.properties sqoop_bootstrap.properties

[ja...@apache.org]

Author: jarcec
Date: Thu Jul 19 06:43:53 2012
New Revision: 1363241

URL: http://svn.apache.org/viewvc?rev=1363241&view=rev
Log:
SQOOP-491.Create configuration directory with documented configuration files under Sqoop2.

(Arvind Prabhakar via Jarek Jarcec Cecho)

Modified:
    sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties
    sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties

Modified: sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties
URL: http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties?rev=1363241&r1=1363240&r2=1363241&view=diff
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties (original)
+++ sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop.properties Thu Jul 19 06:43:53 2012
@@ -15,9 +15,38 @@
 # limitations under the License.
 #
 
-# Log4J system
+#
+# Sqoop configuration file used by the built in configuration
+# provider: org.apache.sqoop.core.PropertiesConfigurationProvider.
+# This file must reside in the system configuration directory
+# which is specified by the system property "sqoop.config.dir"
+# and must be called sqoop.properties.
+#
+# NOTE: Tokens specified in this file that are marked by a
+# leading and trailing '@' characters should be replaced by
+# their appropriate values. For example, the token @LOGDIR@
+# should be replaced  appropriately.
+#
+# The following tokens are used in this configuration file:
+#
+# LOGDIR
+#   The absolute path to the directory where system genearated
+#   log files will be kept.
+#
+# BASEDIR
+#   The absolute path to the directory where Sqoop 2 is installed
+#
+
+#
+# Logging Configuration
+# Any property that starts with the prefix
+# org.apache.sqoop.log4j is parsed out by the configuration
+# system and passed to the log4j subsystem. This allows you
+# to specify log4j configuration properties from within the
+# Sqoop configuration.
+#
 org.apache.sqoop.log4j.appender.file=org.apache.log4j.RollingFileAppender
-org.apache.sqoop.log4j.appender.file.File=logs/sqoop.log
+org.apache.sqoop.log4j.appender.file.File=@LOGDIR@/sqoop.log
 org.apache.sqoop.log4j.appender.file.MaxFileSize=25MB
 org.apache.sqoop.log4j.appender.file.MaxBackupIndex=5
 org.apache.sqoop.log4j.appender.file.layout=org.apache.log4j.PatternLayout
@@ -27,14 +56,30 @@ org.apache.sqoop.log4j.rootCategory=WARN
 org.apache.sqoop.log4j.category.org.apache.sqoop=DEBUG
 org.apache.sqoop.log4j.category.org.apache.derby=INFO
 
-# Repository
+#
+# Repository configuration
+# The Repository subsystem provides the special prefix which
+# is "org.apache.sqoop.repository.sysprop". Any property that
+# is specified with this prefix is parsed out and set as a
+# system property. For example, if the built in Derby repository
+# is being used, the sysprop prefixed proeprties can be used
+# to affect Derby configuration at startup time by setting
+# the appropriate system properties.
+#
+
+# Repository provider
 org.apache.sqoop.repository.provider=org.apache.sqoop.repository.JdbcRepositoryProvider
+
+# JDBC repository provider configuration
 org.apache.sqoop.repository.jdbc.handler=org.apache.sqoop.repository.derby.DerbyRepositoryHandler
 org.apache.sqoop.repository.jdbc.transaction.isolation=READ_COMMITTED
 org.apache.sqoop.repository.jdbc.maximum.connections=10
-org.apache.sqoop.repository.jdbc.url=jdbc:derby:repository/db;create=true
+org.apache.sqoop.repository.jdbc.url=jdbc:derby:@BASEDIR@/repository/db;create=true
 org.apache.sqoop.repository.jdbc.create.schema=true
 org.apache.sqoop.repository.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
 org.apache.sqoop.repository.jdbc.user=sa
 org.apache.sqoop.repository.jdbc.password=
-org.apache.sqoop.repository.sysprop.derby.stream.error.file=logs/derbyrepo.log
+
+# System properties for embedded Derby configuration
+org.apache.sqoop.repository.sysprop.derby.stream.error.file=@LOGDIR@/derbyrepo.log
+

Modified: sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties
URL: http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties?rev=1363241&r1=1363240&r2=1363241&view=diff
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties (original)
+++ sqoop/branches/sqoop2/dist/src/main/server/conf/sqoop_bootstrap.properties Thu Jul 19 06:43:53 2012
@@ -14,4 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+#
+# Bootstrap configuration for Sqoop. This file is picked up
+# from the directory specified by the system property
+# "sqoop.config.dir". Sqoop will not boot up if this property
+# is not set, or if there is no file by the name
+# "sqoop_bootstrap.properties" in the directory pointed by
+# this system property.
+#
+
+#
+# Specifies the configuration provider to be used.
+# This is a required configuration that must be specified.
+# The default value for this is:
+#   org.apache.sqoop.core.PropertiesConfigurationProvider
+# The PropertiesConfigurationProvider expects the system
+# configuration directory to be specified by the system
+# property "sqoop.config.dir", and it must contain a file
+# by the name "sqoop.properties".
+#
 sqoop.config.provider=org.apache.sqoop.core.PropertiesConfigurationProvider
+