You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/12/13 21:21:28 UTC
[juneau] branch master updated: Remove unused settings from config
files.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new b317510 Remove unused settings from config files.
b317510 is described below
commit b31751097c62955bea82f851882efc04625d90ae
Author: JamesBognar <ja...@apache.org>
AuthorDate: Thu Dec 13 16:21:15 2018 -0500
Remove unused settings from config files.
---
.../.settings/org.eclipse.core.resources.prefs | 1 +
.../juneau-examples-rest-jetty/examples.cfg | 6 -
.../src/main/resources/juneau.cfg | 150 ---------------------
3 files changed, 1 insertion(+), 156 deletions(-)
diff --git a/juneau-core/juneau-core-test/.settings/org.eclipse.core.resources.prefs b/juneau-core/juneau-core-test/.settings/org.eclipse.core.resources.prefs
index f9fe345..cdfe4f1 100644
--- a/juneau-core/juneau-core-test/.settings/org.eclipse.core.resources.prefs
+++ b/juneau-core/juneau-core-test/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
diff --git a/juneau-examples/juneau-examples-rest-jetty/examples.cfg b/juneau-examples/juneau-examples-rest-jetty/examples.cfg
index 79baf96..5ac46d1 100755
--- a/juneau-examples/juneau-examples-rest-jetty/examples.cfg
+++ b/juneau-examples/juneau-examples-rest-jetty/examples.cfg
@@ -186,12 +186,6 @@ includeRowNums = false
gitHub = https://github.com/apache/juneau/blob/master/juneau-examples/juneau-examples-rest/src/main/java
#=======================================================================================================================
-# TempDirResource properties
-#=======================================================================================================================
-[TempDirResource]
-dir = $S{java.io.tmpdir}
-
-#=======================================================================================================================
# PetStoreResource properties
#=======================================================================================================================
[PetStore]
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
index 0012741..594c30a 100755
--- a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
+++ b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
@@ -12,35 +12,6 @@
# ***************************************************************************************************************************
#=======================================================================================================================
-# Basic configuration file for SaaS microservices
-# Subprojects can use this as a starting point.
-#=======================================================================================================================
-
-# What to do when the config file is saved.
-# Possible values:
-# NOTHING - Don't do anything.
-# RESTART_SERVER - Restart the Jetty server.
-# RESTART_SERVICE - Shutdown and exit with code '3'.
-saveConfigAction = RESTART_SERVER
-
-#=======================================================================================================================
-# Jetty settings
-#=======================================================================================================================
-[Jetty]
-
-# Path of the jetty.xml file used to configure the Jetty server.
-config = files/jetty.xml
-
-# Resolve Juneau variables in the jetty.xml file.
-resolveVars = true
-
-# Port to use for the jetty server.
-# You can specify multiple ports. The first available will be used. '0' indicates to try a random port.
-# The resulting available port gets set as the system property "availablePort" which can be referenced in the
-# jetty.xml file as "$S{availablePort}" (assuming resolveVars is enabled).
-port = 10000,0,0,0
-
-#=======================================================================================================================
# REST settings
#=======================================================================================================================
[REST]
@@ -60,121 +31,6 @@ header = <a href='$U{$C{REST/headerLink}}'><img src='$U{$C{REST/headerIcon}}' st
footer = <a href='$U{$C{REST/footerLink}}'><img style='float:right;padding-right:20px;height:32px' src='$U{$C{REST/footerIcon}}'>
#=======================================================================================================================
-# Console settings
-#=======================================================================================================================
-[Console]
-
-enabled = true
-
-# List of available console commands.
-# These are classes that implements ConsoleCommand that allow you to submit commands to the microservice via
-# the console.
-# When listed here, the implementations must provide a no-arg constructor.
-# They can also be provided dynamically by overriding the Microservice.createConsoleCommands() method.
-commands =
- org.apache.juneau.microservice.console.ExitCommand,
- org.apache.juneau.microservice.console.RestartCommand,
- org.apache.juneau.microservice.console.HelpCommand,
- org.apache.juneau.examples.rest.command.EchoCommand
-
-#=======================================================================================================================
-# Logger settings
-#-----------------------------------------------------------------------------------------------------------------------
-# See FileHandler Java class for details.
-#=======================================================================================================================
-[Logging]
-
-# The directory where to create the log file.
-# Default is "."
-logDir = ./target/logs
-
-# The name of the log file to create for the main logger.
-# The logDir and logFile make up the pattern that's passed to the FileHandler
-# constructor.
-# If value is not specified, then logging to a file will not be set up.
-logFile = microservice.%g.log
-
-# Whether to append to the existing log file or create a new one.
-append = false
-
-# The SimpleDateFormat format to use for dates.
-dateFormat = yyyy.MM.dd hh:mm:ss
-
-# The log message format.
-# The value can contain any of the following variables:
-# {date} - The date, formatted per dateFormat.
-# {class} - The class name.
-# {method} - The method name.
-# {logger} - The logger name.
-# {level} - The log level name.
-# {msg} - The log message.
-# {threadid} - The thread ID.
-# {exception} - The localized exception message.
-format = [{date} {level}] {msg}%n
-
-# The maximum log file size.
-# Suffixes available for numbers.
-# See Config.getInt(String,int) for details.
-limit = 1M
-
-# Max number of log files.
-count = 5
-
-# Default log levels.
-# Format is lax-JSON.
-# Keys are logger names.
-# Values are serialized Level POJOs (SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST)
-levels =
- {
- '': 'WARNING',
- org.apache.juneau: 'WARNING',
- org.eclipse.jetty: 'WARNING'
- }
-
-# Only print unique stack traces once and then refer to them by a simple 8 character hash identifier.
-# Useful for preventing log files from filling up with duplicate stack traces.
-useStackTraceHashes = true
-
-# The default level for the console logger.
-# Values are serialized Level POJOs (SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST)
-consoleLevel = WARNING
-
-# The default level for the file logger.
-# Values are serialized Level POJOs (SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST)
-# Default is INFO.
-fileLevel = INFO
-
-#=======================================================================================================================
-# System properties
-#-----------------------------------------------------------------------------------------------------------------------
-# These are arbitrary system properties that can be set during startup.
-#=======================================================================================================================
-[SystemProperties]
-
-# Configure Jetty for StdErrLog Logging
-# org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog
-
-# Configure Jetty to log using java-util logging
-org.eclipse.jetty.util.log.class = org.apache.juneau.microservice.jetty.JettyLogger
-
-# Jetty logging level
-org.eclipse.jetty.LEVEL = WARN
-
-derby.stream.error.file = $C{Logging/logDir}/derby-errors.log
-
-# Note that any configuration properties can also be set globally as system properties...
-
-# Disable classpath resource caching.
-# Useful if you're attached using a debugger and you're modifying classpath resources while running.
-RestContext.useClasspathResourceCaching.b = false
-
-#=======================================================================================================================
-# DockerRegistryResource properties
-#=======================================================================================================================
-[DockerRegistry]
-url = http://docker.apache.org:5000/v1
-
-#=======================================================================================================================
# SqlQueryResource properties
#=======================================================================================================================
[SqlQueryResource]
@@ -191,12 +47,6 @@ includeRowNums = false
gitHub = https://github.com/apache/juneau/blob/master/juneau-examples/juneau-examples-rest/src/main/java
#=======================================================================================================================
-# TempDirResource properties
-#=======================================================================================================================
-[TempDirResource]
-dir = $S{java.io.tmpdir}
-
-#=======================================================================================================================
# PetStoreResource properties
#=======================================================================================================================
[PetStore]