Skip to content

Commit

Permalink
deegree#976 Set unused types to deprecated and added log4j2 propertie…
Browse files Browse the repository at this point in the history
…s configuration
  • Loading branch information
tfr42 committed Jun 14, 2019
1 parent 2058cc6 commit 6639545
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
* @author last edited by: $Author$
*
* @version $Revision$, $Date$
* @deprecated This annotation is deprecated as of version 3.4 of deegree.
*/
@Deprecated
@Retention(SOURCE)
@Target(TYPE)
public @interface LoggingNotes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@
* @author last edited by: $Author$
*
* @version $Revision$, $Date$
* @deprecated This annotation is deprecated as of version 3.4 of deegree.
*/
@Retention(SOURCE)
@Target(PACKAGE)
@Deprecated
public @interface PackageLoggingNotes {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,13 @@
* @author <a href="mailto:bezema@lat-lon.de">Rutger Bezema</a>
* @author last edited by: $Author$
* @version $Revision$, $Date$
* @deprecated This annotation is deprecated as of version 3.4 of deegree.
*
*/
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Target(ElementType.TYPE)
@Deprecated
public @interface Tool {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@
* @author last edited by: $Author: stranger $
*
* @version $Revision: $, $Date: $
* @deprecated This class is deprecated as of version 3.4 of deegree.
*/
@Deprecated
public class DuplicateMessageFilter extends AbstractFilter {

private static final Logger LOG = getLogger( DuplicateMessageFilter.class );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@
* @author last edited by: $Author$
*
* @version $Revision$, $Date$
* @deprecated This class is deprecated as of version 3.4 of deegree.
*/

@SupportedAnnotationTypes(value = { "org.deegree.commons.annotations.PackageLoggingNotes",
"org.deegree.commons.annotations.LoggingNotes" })
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@SupportedOptions({ "log4j.outputdir" })
@Deprecated
public class LoggingAnnotationProcessor extends AbstractProcessor {

private static final Logger LOG = getLogger( LoggingAnnotationProcessor.class );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
* @author last edited by: $Author$
*
* @version $Revision$, $Date$
* @deprecated This class is deprecated as of version 3.4 of deegree.
*/
@Deprecated
public class RollbackPrintWriter {

private PrintWriter out;
Expand Down
1 change: 0 additions & 1 deletion deegree-services/deegree-webservices/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<executions>
<execution>
<goals>
<goal>assemble-log4j</goal>
<goal>generate-buildinfo</goal>
</goals>
</execution>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
status = error
dest = err
name = deegreeLogConfig

property.filename = deegree.log
property.logpath = value: ${sys:java.io.tmpdir:-/var/tmp/}

filter.threshold.type = ThresholdFilter
filter.threshold.level = debug

appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %m%n
appender.console.filter.threshold.type = ThresholdFilter
appender.console.filter.threshold.level = error

appender.rolling.type = RollingFile
appender.rolling.name = RollingFile
appender.rolling.fileName = ${filename}
appender.rolling.filePattern = deegree-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz
appender.rolling.layout.type = PatternLayout
appender.rolling.layout.pattern = %d %p %C{1.} [%t] %m%n
appender.rolling.policies.type = Policies
appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
appender.rolling.policies.time.interval = 1
appender.rolling.policies.time.modulate = true
appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
appender.rolling.policies.size.size=100MB
appender.rolling.strategy.type = DefaultRolloverStrategy
appender.rolling.strategy.max = 10

logger.rolling.name = org.deegree
logger.rolling.level = info
logger.rolling.additivity = false
logger.rolling.appenderRef.rolling.ref = RollingFile

rootLogger.level = info
rootLogger.appenderRef.stdout.ref = STDOUT
9 changes: 0 additions & 9 deletions deegree-tests/deegree-workspace-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@
<goal>generate-portnumber</goal>
</goals>
</execution>
<execution>
<id>default</id>
<goals>
<goal>assemble-log4j</goal>
</goals>
<configuration>
<deegreeLoggingLevel>WARN</deegreeLoggingLevel>
</configuration>
</execution>
</executions>
</plugin>

Expand Down
5 changes: 0 additions & 5 deletions deegree-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
<groupId>org.deegree</groupId>
<artifactId>deegree-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>assemble-log4j</goal>
</goals>
</execution>
<execution>
<id>assemble-console</id>
<goals>
Expand Down

0 comments on commit 6639545

Please sign in to comment.