Repository: logging-log4j-audit Updated Branches: refs/heads/master f0884aeb8 -> 3ba2b5963
Minor cleanup Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/3ba2b596 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/3ba2b596 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/3ba2b596 Branch: refs/heads/master Commit: 3ba2b59630e871ddd0bff2d3abc35c856a7620f5 Parents: f0884ae Author: Ralph Goers <[email protected]> Authored: Sat Sep 2 22:01:09 2017 -0700 Committer: Ralph Goers <[email protected]> Committed: Sat Sep 2 22:01:09 2017 -0700 ---------------------------------------------------------------------- .../catalog/config/JsonObjectMapperFactory.java | 16 ++++++++++++++-- .../log4j/catalog/config/WebAppInitializer.java | 2 +- .../resources/CatalogService/application.properties | 2 -- .../main/resources/CatalogService/lab.properties | 2 -- 4 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/3ba2b596/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java index fdd0cb9..cb77f3c 100644 --- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java +++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java @@ -1,6 +1,18 @@ /* - * Copyright (c) 2016 Nextiva, Inc. to Present. - * All rights reserved. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.apache.logging.log4j.catalog.config; http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/3ba2b596/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java index 4e978c2..2275320 100644 --- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java +++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java @@ -26,7 +26,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRegistration; public class WebAppInitializer implements WebApplicationInitializer { - private static final String APPLICATION_NAME = "CatalogService"; + private static final String APPLICATION_NAME = "AuditCatalog"; @Override public void onStartup(ServletContext servletContext) throws ServletException { http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/3ba2b596/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/application.properties ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/application.properties b/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/application.properties deleted file mode 100644 index 9ea7caf..0000000 --- a/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -dataSource.jdbcUsername=AES:Or9VPVQryD97GfO9dVJggA== -dataSource.jdbcPassword=AES:Or9VPVQryD97GfO9dVJggA== \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/3ba2b596/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/lab.properties ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/lab.properties b/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/lab.properties deleted file mode 100644 index 396b461..0000000 --- a/log4j-catalog/log4j-catalog-war/src/main/resources/CatalogService/lab.properties +++ /dev/null @@ -1,2 +0,0 @@ -http.client.socket.timeout=1100 -http.client.connect.timeout=1100
