You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/01/31 05:35:22 UTC
logging-log4j-audit git commit: Add missing license headers
Repository: logging-log4j-audit
Updated Branches:
refs/heads/master bc1467a94 -> acd58e6d7
Add missing license headers
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/acd58e6d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/acd58e6d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/acd58e6d
Branch: refs/heads/master
Commit: acd58e6d76cd3da28451bf085a45fc3132886fda
Parents: bc1467a
Author: Ralph Goers <rg...@apache.org>
Authored: Tue Jan 30 22:35:12 2018 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Tue Jan 30 22:35:12 2018 -0700
----------------------------------------------------------------------
.../service/catalog/AuditCatalogManager.java | 17 ++++++-
.../audit/service/catalog/AuditManager.java | 16 +++++++
.../service/controller/CatalogController.java | 47 +++++++++++++++-----
.../log4j/audit/service/CatalogTest.java | 16 +++++++
.../catalog/api/util/CatalogEventFilter.java | 16 +++++++
.../jpa/config/PostgresqlDataSourceConfig.java | 2 -
.../catalog/jpa/converter/EventConverter.java | 24 +++++-----
.../log4j/catalog/jpa/model/AttributeModel.java | 4 +-
log4j-catalog/log4j-catalog-war/pom.xml | 16 +++++++
.../catalog/controller/AttributeController.java | 16 +++++++
.../catalog/controller/CategoryController.java | 16 +++++++
.../controller/ConstraintController.java | 16 +++++++
.../catalog/controller/EventController.java | 16 +++++++
.../catalog/controller/ProductController.java | 16 +++++++
.../catalog/service/CatalogInitializer.java | 17 ++++++-
.../webapp/WEB-INF/templates/attributes.html | 16 +++++++
.../webapp/WEB-INF/templates/categories.html | 16 +++++++
.../main/webapp/WEB-INF/templates/events.html | 16 +++++++
.../main/webapp/WEB-INF/templates/products.html | 16 +++++++
.../main/webapp/WEB-INF/templates/template.html | 16 +++++++
.../src/main/webapp/css/app.css | 16 +++++++
.../log4j-catalog-war/src/main/webapp/js/app.js | 16 +++++++
.../src/main/webapp/js/attributes.js | 16 +++++++
.../src/main/webapp/js/categories.js | 16 +++++++
.../src/main/webapp/js/events.js | 16 +++++++
.../src/main/webapp/js/products.js | 16 +++++++
pom.xml | 8 +++-
27 files changed, 411 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
index 7908cc5..fb05b9b 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
@@ -1,3 +1,19 @@
+/*
+ * 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.audit.service.catalog;
import javax.annotation.PostConstruct;
@@ -120,7 +136,6 @@ public class AuditCatalogManager extends CatalogManagerImpl implements AuditMana
attributeService.deleteAttribute(attributeModel.getId());
}
}
- eventConverter.setAttributes(attributeModels);
Map<String, Event> eventMap = new HashMap<>();
List<EventModel> eventModels = new ArrayList<>();
logger.debug("Loading events");
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditManager.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditManager.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditManager.java
index 653aea3..0473f9d 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditManager.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditManager.java
@@ -1,3 +1,19 @@
+/*
+ * 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.audit.service.catalog;
import org.apache.logging.log4j.audit.catalog.CatalogManager;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
index 8a93dd7..f79cb4b 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
@@ -1,10 +1,26 @@
+/*
+ * 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.audit.service.controller;
-import javax.annotation.PostConstruct;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import javax.annotation.PostConstruct;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -48,6 +64,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
@RestController
@@ -174,7 +191,6 @@ public class CatalogController {
}
model = attributeService.saveAttribute(attributeConverter.convert(attribute));
auditManager.saveAttribute(attribute);
- eventConverter.addAttribute(model);
}
return new ResponseEntity<>(attributeModelConverter.convert(model), HttpStatus.CREATED);
}
@@ -202,7 +218,12 @@ public class CatalogController {
@ApiOperation(value = "Deletes a catalog Attribute", notes = "Deletes a catalog attribute", tags = {"Catalog"})
@DeleteMapping(value = "/attribute/{id}")
public ResponseEntity<?> deleteAttribute(@RequestParam("id") Long attributeId) {
- attributeService.deleteAttribute(attributeId);
+ synchronized (this) {
+ Optional<AttributeModel> opt = attributeService.getAttribute(attributeId);
+ if (opt.isPresent()) {
+ attributeService.deleteAttribute(attributeId);
+ }
+ }
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -246,12 +267,15 @@ public class CatalogController {
if (DEFAULT_CATALOG.equals(event.getCatalogId())) {
throw new IllegalArgumentException("The default catalog cannot be modified at run time.");
}
- Optional<EventModel> opt = eventService.getEvent(event.getCatalogId(), event.getName());
- if (opt != null && opt.isPresent()) {
- throw new IllegalStateException("An event named "+ event.getName() + " in catalog " +
- event.getCatalogId() + " already exists");
+ EventModel model;
+ synchronized(this) {
+ Optional<EventModel> opt = eventService.getEvent(event.getCatalogId(), event.getName());
+ if (opt != null && opt.isPresent()) {
+ throw new IllegalStateException(
+ "An event named " + event.getName() + " in catalog " + event.getCatalogId() + " already exists");
+ }
+ model = auditManager.saveEvent(event);
}
- EventModel model = auditManager.saveEvent(event);
return new ResponseEntity<>(eventModelConverter.convert(model), HttpStatus.CREATED);
}
@@ -265,8 +289,11 @@ public class CatalogController {
if (DEFAULT_CATALOG.equals(event.getCatalogId())) {
throw new IllegalArgumentException("The default catalog cannot be modified at run time.");
}
- EventModel model = eventConverter.convert(event);
- model = eventService.saveEvent(model);
+ EventModel model;
+ synchronized(this) {
+ model = eventConverter.convert(event);
+ model = eventService.saveEvent(model);
+ }
return new ResponseEntity<>(eventModelConverter.convert(model), HttpStatus.OK);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java b/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java
index d02dda8..deb2bff 100644
--- a/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java
+++ b/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.audit.service;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java
index fb8b1e9..6ba2215 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java
@@ -1,3 +1,19 @@
+/*
+ * 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.api.util;
import com.fasterxml.jackson.core.JsonGenerator;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
index 7984b65..5a90989 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
@@ -16,12 +16,10 @@
*/
package org.apache.logging.log4j.catalog.jpa.config;
-import java.sql.SQLException;
import javax.sql.DataSource;
import com.mchange.v2.c3p0.DriverManagerDataSource;
import org.apache.logging.log4j.catalog.api.annotation.JdbcUrl;
-import org.postgresql.Driver;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
index c9d5a8c..cf77f1b 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
@@ -25,10 +25,12 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Event;
import org.apache.logging.log4j.catalog.api.EventAttribute;
+import org.apache.logging.log4j.catalog.api.constant.Constants;
import org.apache.logging.log4j.catalog.api.exception.CatalogModificationException;
import org.apache.logging.log4j.catalog.jpa.model.AttributeModel;
import org.apache.logging.log4j.catalog.jpa.model.EventAttributeModel;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
+import org.apache.logging.log4j.catalog.jpa.service.AttributeService;
import org.apache.logging.log4j.catalog.jpa.service.EventService;
import org.modelmapper.AbstractConverter;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,15 +46,8 @@ public class EventConverter extends AbstractConverter<Event, EventModel> {
@Autowired
private EventService eventService;
- private List<AttributeModel> attributeModels;
-
- public void setAttributes(List<AttributeModel> attributes) {
- this.attributeModels = attributes;
- }
-
- public void addAttribute(AttributeModel attribute) {
- this.attributeModels.add(attribute);
- }
+ @Autowired
+ private AttributeService attributeService;
public EventModel convert(Event event) {
LOGGER.traceEntry(event.getName());
@@ -79,8 +74,7 @@ public class EventConverter extends AbstractConverter<Event, EventModel> {
if (eventAttributeModel != null) {
eventAttributeModel.setRequired(eventAttribute.isRequired());
} else {
- Optional<AttributeModel> optional =
- attributeModels.stream().filter(a -> a.getName().equals(eventAttribute.getName())).findFirst();
+ Optional<AttributeModel> optional = getAttribute(event.getCatalogId(), eventAttribute.getName());
if (optional.isPresent()) {
eventAttributeModel = new EventAttributeModel();
eventAttributeModel.setRequired(eventAttribute.isRequired());
@@ -97,4 +91,12 @@ public class EventConverter extends AbstractConverter<Event, EventModel> {
model.setAttributes(eventAttributeModels);
return LOGGER.traceExit(model);
}
+
+ private Optional<AttributeModel> getAttribute(String catalogId, String name) {
+ Optional<AttributeModel> optional = attributeService.getAttribute(catalogId, name);
+ if (!optional.isPresent()) {
+ optional = attributeService.getAttribute(Constants.DEFAULT_CATALOG, name);
+ }
+ return optional;
+ }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java
index 1fd5bf8..ccb0e18 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java
@@ -309,7 +309,7 @@ public class AttributeModel implements Serializable {
} */
public int hashCode() {
- return new HashCodeBuilder().append(name).toHashCode();
+ return new HashCodeBuilder().append(name).append(catalogId).toHashCode();
}
public boolean equals(Object o) {
@@ -318,6 +318,6 @@ public class AttributeModel implements Serializable {
if (!(o instanceof AttributeModel)) return false;
AttributeModel other = (AttributeModel)o;
- return new EqualsBuilder().append(name, other.name).isEquals();
+ return new EqualsBuilder().append(name, other.name).append(catalogId, other.catalogId).isEquals();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/pom.xml b/log4j-catalog/log4j-catalog-war/pom.xml
index bba439a..4031968 100644
--- a/log4j-catalog/log4j-catalog-war/pom.xml
+++ b/log4j-catalog/log4j-catalog-war/pom.xml
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+ ~ 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.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
index bd93a00..ec12244 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
+++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
@@ -1,3 +1,19 @@
+/*
+ * 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.controller;
import javax.annotation.PostConstruct;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
index 1a0c4ea..578b70c 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
+++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
@@ -1,3 +1,19 @@
+/*
+ * 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.controller;
import javax.annotation.PostConstruct;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
index bb5288f..ef8f290 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
+++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
@@ -1,3 +1,19 @@
+/*
+ * 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.controller;
import java.lang.reflect.Type;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
index a7a5746..b3a5ade 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
+++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
@@ -1,3 +1,19 @@
+/*
+ * 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.controller;
import javax.annotation.PostConstruct;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
index 9d663a8..d566519 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
+++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
@@ -1,3 +1,19 @@
+/*
+ * 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.controller;
import javax.annotation.PostConstruct;
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java
index 6b9f4be..5e5eb35 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java
+++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java
@@ -1,3 +1,19 @@
+/*
+ * 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.service;
import javax.annotation.PostConstruct;
@@ -75,7 +91,6 @@ public class CatalogInitializer {
attributeService.saveAttribute(model);
attributeModels.add(model);
}
- eventConverter.setAttributes(attributeModels);
Map<String, EventModel> eventMap = new HashMap<>();
logger.debug("Loading events");
for (Event event : catalogData.getEvents()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/attributes.html
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/attributes.html b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/attributes.html
index 8f775e9..af6f007 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/attributes.html
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/attributes.html
@@ -1,3 +1,19 @@
+<!--
+ ~ 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.
+ -->
<html>
<head>
<title>Audit Catalog - Attributes</title>
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/categories.html
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/categories.html b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/categories.html
index 518e8e1..7a6baff 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/categories.html
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/categories.html
@@ -1,3 +1,19 @@
+<!--
+ ~ 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.
+ -->
<html>
<head>
<title>Audit Catalog - categories</title>
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/events.html
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/events.html b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/events.html
index 2548fa7..c83bf71 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/events.html
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/events.html
@@ -1,3 +1,19 @@
+<!--
+ ~ 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.
+ -->
<html>
<head>
<title>Audit Catalog - Events</title>
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/products.html
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/products.html b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/products.html
index 62be813..e20cf2d 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/products.html
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/products.html
@@ -1,3 +1,19 @@
+<!--
+ ~ 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.
+ -->
<html>
<head>
<title>Audit Catalog - Products</title>
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/template.html
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/template.html b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/template.html
index 18d4fe0..66e61df 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/template.html
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/WEB-INF/templates/template.html
@@ -1,3 +1,19 @@
+<!--
+ ~ 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.
+ -->
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/css/app.css
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/css/app.css b/log4j-catalog/log4j-catalog-war/src/main/webapp/css/app.css
index 7614b09..d1ffda7 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/css/app.css
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/css/app.css
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
@import url('https://fonts.googleapis.com/css?family=Lato');
body {
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/js/app.js
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/app.js b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/app.js
index 6eb6508..1e906d3 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/app.js
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/app.js
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
$(document).ready(function () {
// Clear localStorage
localStorage.clear();
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/js/attributes.js
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/attributes.js b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/attributes.js
index fd42a5a..bb71036 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/attributes.js
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/attributes.js
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
$(document).ready(function () {
$('#AttributesTableContainer').jtable({
title: 'Table of Attributes',
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/js/categories.js
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/categories.js b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/categories.js
index 368bc85..2860099 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/categories.js
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/categories.js
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
$(document).ready(function () {
$('#CategoriesTableContainer').jtable({
title: 'Table of categories',
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/js/events.js
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/events.js b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/events.js
index d2881db..4e0db28 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/events.js
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/events.js
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
$(document).ready(function () {
$('#EventsTableContainer').jtable({
title: 'Table of events',
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/log4j-catalog/log4j-catalog-war/src/main/webapp/js/products.js
----------------------------------------------------------------------
diff --git a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/products.js b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/products.js
index 9bb2eb7..0f14509 100644
--- a/log4j-catalog/log4j-catalog-war/src/main/webapp/js/products.js
+++ b/log4j-catalog/log4j-catalog-war/src/main/webapp/js/products.js
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
$(document).ready(function () {
$('#ProductsTableContainer').jtable({
title: 'Table of Products',
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/acd58e6d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e82ba35..79a47e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
<pdf.plugin.version>1.2</pdf.plugin.version>
<pmd.plugin.version>3.6</pmd.plugin.version>
<postgresql.version>42.2.0</postgresql.version>
- <rat.plugin.version>0.11</rat.plugin.version>
+ <rat.plugin.version>0.12</rat.plugin.version>
<release.plugin.version>2.5.3</release.plugin.version>
<scm.plugin.version>1.9.4</scm.plugin.version>
<site.plugin.version>3.4</site.plugin.version>
@@ -1301,6 +1301,12 @@
<configuration>
<excludes>
<exclude>**/*.asc</exclude>
+ <exclude>**/jquery*.js</exclude>
+ <exclude>**/json2*.js</exclude>
+ <exclude>**/jtable*.css</exclude>
+ <exclude>**/*.less</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/jquery-*/*.*</exclude>
<exclude>.idea/**/*</exclude>
<exclude>src/site/resources/js/jquery.js</exclude>
<exclude>src/site/resources/js/jquery.min.js</exclude>