Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polishing

Browse Source
This commit is contained in:
Costin Leau
2012-07-18 16:18:33 +03:00
parent e8efc552d3
commit b7a0ebf505
5 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/shell/core/JLineLogHandler.java
View File

@@ -39,7 +39,10 @@ import org.springframework.shell.support.util.StringUtils;
public class JLineLogHandler extends Handler {
// Constants
private static final boolean BRIGHT_COLORS = Boolean.getBoolean("roo.bright");
private static final boolean ROO_BRIGHT_COLORS = Boolean.getBoolean("roo.bright");
private static final boolean SHELL_BRIGHT_COLORS = Boolean.getBoolean("spring.shell.bright");
private static final boolean BRIGHT_COLORS = ROO_BRIGHT_COLORS || SHELL_BRIGHT_COLORS;
// Fields
private ConsoleReader reader;

53
src/main/java/org/springframework/shell/support/api/AddOnSearch.java
View File

@@ -1,53 +0,0 @@
/*
* Copyright 2011-2012 the original author or authors.
*
* Licensed 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.
*/
package org.springframework.shell.support.api;
import java.util.logging.Logger;
/**
* Interface defining an add-on search service.
*
* <p>
* This interface is included in the support module because several of Roo's core
* infrastructure modules require add-on search capabilities.
*
* @author Ben Alex
* @author Stefan Schmidt
* @since 1.1.1
*/
public interface AddOnSearch {
/**
* Search all add-ons presently known this Roo instance, including add-ons which have
* not been downloaded or installed by the user.
*
* <p>
* Information is optionally emitted to the console via {@link Logger#info}.
*
* @param showFeedback if false will never output any messages to the console (required)
* @param searchTerms comma separated list of search terms (required)
* @param refresh attempt a fresh download of roobot.xml (optional)
* @param linesPerResult maximum number of lines per add-on (optional)
* @param maxResults maximum number of results to display (optional)
* @param trustedOnly display only trusted add-ons in search results (optional)
* @param compatibleOnly display only compatible add-ons in search results (optional)
* @param communityOnly display only community-provided add-ons in search results (optional)
* @param requiresCommand display only add-ons which offer the specified command (optional)
* @return the total number of matches found, even if only some of these are displayed due to maxResults
* (or null if the add-on list is unavailable for some reason, eg network problems etc)
*/
Integer searchAddOns(boolean showFeedback, String searchTerms, boolean refresh, int linesPerResult, int maxResults, boolean trustedOnly, boolean compatibleOnly, boolean communityOnly, String requiresCommand);
}

5
src/main/java/org/springframework/shell/support/logging/HandlerUtils.java
View File

@@ -47,8 +47,9 @@ public abstract class HandlerUtils {
*/
public static Logger getLogger(final Class<?> clazz) {
Assert.notNull(clazz, "Class required");
Logger logger = Logger.getLogger(clazz.getName());
if (logger.getLevel() == null && clazz.getName().startsWith("org.springframework.shell")) {
String name = clazz.getName();
Logger logger = Logger.getLogger(name);
if (logger.getLevel() == null && name.startsWith("org.springframework.shell")) {
logger.setLevel(Level.FINE);
}
return logger;

12
src/main/resources/log4j.properties
View File

@@ -1,6 +1,16 @@
log4j.rootCategory=ERROR, stdout
# configure shell first
log4j.category.org.springframework.shell=INFO, out
# then everything else
log4j.rootCategory=WARN, stdout
# standard logging including calling site
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
# standard logging including calling site
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%m%n

12
src/test/resources/log4j.properties
View File

@@ -1,6 +1,16 @@
log4j.rootCategory=INFO, stdout
# configure shell first
log4j.category.org.springframework.shell=INFO, out
# then everything else
log4j.rootCategory=WARN, stdout
# standard logging including calling site
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
# standard logging including calling site
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%m%n