Repository: logging-log4j-audit Updated Branches: refs/heads/master d5b3c5bab -> 1deb7ebaf
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/1deb7eba/log4j-catalog/log4j-catalog-jpa/src/test/resources/sql/schema.sql ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-jpa/src/test/resources/sql/schema.sql b/log4j-catalog/log4j-catalog-jpa/src/test/resources/sql/schema.sql new file mode 100644 index 0000000..1618e73 --- /dev/null +++ b/log4j-catalog/log4j-catalog-jpa/src/test/resources/sql/schema.sql @@ -0,0 +1,121 @@ +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * 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. + */ +CREATE TABLE EVENT_ATTRIBUTE +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024), + DATATYPE VARCHAR(64), + INDEXED CHAR, + SORTABLE CHAR, + REQUIRED CHAR, + REQUEST_CONTEXT CHAR +); + +CREATE INDEX ATTRIBUTE_NAME ON EVENT_ATTRIBUTE(NAME); + +CREATE TABLE ATTRIBUTE_EXAMPLES +( + ATTRIBUTE_ID BIGINT NOT NULL, + EXAMPLE VARCHAR(64), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID), +); + +CREATE TABLE ATTRIBUTE_ALIASES +( + ATTRIBUTE_ID BIGINT NOT NULL, + ALIAS VARCHAR(64), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID), +); + +CREATE TABLE ATTRIBUTE_CONSTRAINT +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + ATTRIBUTE_ID BIGINT NOT NULL, + CONSTRAINT_TYPE VARCHAR(32) NOT NULL, + VALUE VARCHAR(256), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID), +); + +CREATE TABLE CATALOG_EVENT +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024) +); + +CREATE INDEX EVENT_NAME ON CATALOG_EVENT(NAME); + +CREATE TABLE EVENT_ALIASES +( + EVENT_ID BIGINT NOT NULL, + ALIAS VARCHAR(64) NOT NULL, + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID), +); + +CREATE TABLE EVENT_ATTRIBUTES +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + EVENT_ID BIGINT NOT NULL, + ATTRIBUTE_ID BIGINT NOT NULL, + IS_REQUIRED CHAR NOT NULL, + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID) +); + +CREATE TABLE CATALOG_CATEGORY +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024) + +); + +CREATE INDEX CATEGORY_NAME ON CATALOG_CATEGORY(NAME); + +CREATE TABLE CATEGORY_EVENTS +( + CATEGORY_ID BIGINT NOT NULL, + EVENT_ID BIGINT NOT NULL, + FOREIGN KEY (CATEGORY_ID) REFERENCES CATALOG_CATEGORY(ID), + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID) +); + +CREATE TABLE CATALOG_PRODUCT +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024) + +); + +CREATE INDEX PRODUCT_NAME ON CATALOG_PRODUCT(NAME); + +CREATE TABLE PRODUCT_EVENTS +( + PRODUCT_ID BIGINT NOT NULL, + EVENT_ID BIGINT NOT NULL, + FOREIGN KEY (PRODUCT_ID) REFERENCES CATALOG_PRODUCT(ID), + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID) +); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/1deb7eba/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 70fb6d2..6737ef6 100644 --- a/log4j-catalog/log4j-catalog-war/pom.xml +++ b/log4j-catalog/log4j-catalog-war/pom.xml @@ -48,6 +48,10 @@ <artifactId>log4j-catalog-api</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/1deb7eba/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/ConfigurationService.java ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/ConfigurationService.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/ConfigurationService.java new file mode 100644 index 0000000..73bb1dc --- /dev/null +++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/ConfigurationService.java @@ -0,0 +1,31 @@ +/* + * 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; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +public class ConfigurationService { + + @Value("${catalogServiceAuthToken:cbade18f-437a-412c-b0c5-9e246ee23ca6}") + private String catalogServiceAuthToken; + + public String getCatalogServiceAuthToken() { + return catalogServiceAuthToken; + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/1deb7eba/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java index 2eae80d..e441057 100644 --- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java +++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java @@ -29,7 +29,6 @@ import com.jcraft.jsch.UserInfo; import org.apache.logging.log4j.catalog.api.dao.CatalogDao; import org.apache.logging.log4j.catalog.git.dao.GitCatalogDao; import org.apache.logging.log4j.catalog.security.LocalAuthorizationInterceptor; -import org.apache.logging.log4j.catalog.jpa.service.ConfigurationService; import org.eclipse.jgit.api.TransportConfigCallback; import org.eclipse.jgit.transport.JschConfigSessionFactory; import org.eclipse.jgit.transport.OpenSshConfig; http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/1deb7eba/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java index 6f66191..3c97177 100644 --- a/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java +++ b/log4j-catalog/log4j-catalog-war/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java @@ -90,233 +90,6 @@ public class CatalogController { private CatalogDao catalogDao; - @PostMapping(value = "/catalog/products/list") - public ResponseEntity<List<Product>> productList() { - return null; - } - - @RequestMapping(value = "/catalog/events", method = RequestMethod.GET) - public ResponseEntity<Object> handleGetEventsList( - @RequestParam(required = false) String eventList, - @RequestParam(required = false) boolean attributeDetails, - HttpServletRequest servletRequest) throws ParseException { - - CatalogData catalogData = null; -/* try { - if (!GenericValidator.isBlankOrNull(eventList)) { - List<String> events = new ArrayList<>(StringUtils.commaDelimitedListToSet(eventList)); - catalogData = new CatalogData(); - catalogData.setEvents(new Events()); - for (String eventID : events) { - globalLoggingCatalog.getEventById(eventID, catalogData.getEvents().getEvent()); - } - } else { - catalogData = globalLoggingCatalog.getEvents(); - } - - if (attributeDetails && catalogData != null - && catalogData.getEvents() != null) { - List<Event> events = catalogData.getEvents().getEvent(); - for (Event event : events) { - if (event != null && event.getEventAttributes() != null) { - event.setAttributes(new Attributes()); - List<String> attributes = event.getEventAttributes() - .getAttribute(); - for (String eventAttribute : attributes) { - globalLoggingCatalog.getAttributeByName( - eventAttribute, event.getAttributes() - .getAttribute()); - } - } - } - } - } catch (GLCatalogException e) { - logger.error("Error While Retrieving Data", e); - - Status status = new Status(); - ErrorInfo errorInfo = new ErrorInfo(); - errorInfo.setErrorCode("00000"); - errorInfo.setErrorMessage(e.getMessage()); - status.getErrorInfo().add(errorInfo); - status.setStatusMessage(e.getMessage()); - return new ResponseEntity<Object>(status, - HttpStatus.INTERNAL_SERVER_ERROR); - } */ - - return new ResponseEntity<Object>(catalogData, HttpStatus.OK); - - } - - @RequestMapping(value = "/catalog/events/{eventID}", method = RequestMethod.GET) - public ResponseEntity<Object> handleGetEvent( - @PathVariable("eventID") String eventID, - @RequestParam(required = false) boolean attributeDetails, - HttpServletRequest servletRequest) { - - CatalogData catalogData = null; - /* try { - catalogData = globalLoggingCatalog.getEventById(eventID); - - if (attributeDetails - && catalogData != null - && catalogData.getEvents() != null - && catalogData.getEvents().getEvent().get(0) != null - && catalogData.getEvents().getEvent().get(0) - .getEventAttributes() != null) { - List<String> eventAttributes = catalogData.getEvents() - .getEvent().get(0).getEventAttributes().getAttribute(); - logger.debug("event attributes count: " - + eventAttributes.size()); - catalogData.getEvents().getEvent().get(0) - .setAttributes(new Attributes()); - for (String eventAttribute : eventAttributes) { - globalLoggingCatalog.getAttributeByName(eventAttribute, - catalogData.getEvents().getEvent().get(0) - .getAttributes().getAttribute()); - } - } - - } catch (Exception e) { - logger.error("Error While Retrieving Data", e); - - Status status = new Status(); - ErrorInfo errorInfo = new ErrorInfo(); - errorInfo.setErrorCode("00000"); - errorInfo.setErrorMessage(e.getMessage()); - status.getErrorInfo().add(errorInfo); - status.setStatusMessage(e.getMessage()); - return new ResponseEntity<Object>(status, - HttpStatus.INTERNAL_SERVER_ERROR); - } */ - - return new ResponseEntity<Object>(catalogData, HttpStatus.OK); - - } - - @RequestMapping(value = "/catalog/attributes", method = RequestMethod.GET) - public ResponseEntity<Object> handleGetAttributesList( - @RequestParam(required = false) String attributeList, - HttpServletRequest servletRequest) { - - CatalogData catalogData = null; - /* try { - - if (!GenericValidator.isBlankOrNull(attributeList)) { - List<String> attributes = new ArrayList<String>( - StringUtils.commaDelimitedListToSet(attributeList)); - catalogData = new CatalogData(); - catalogData.setAttributes(new Attributes()); - for (String attribute : attributes) { - globalLoggingCatalog.getAttributeByName(attribute, - catalogData.getAttributes().getAttribute()); - } - } else { - - catalogData = globalLoggingCatalog.getAttributes(); - } - } catch (GLCatalogException e) { - logger.error("Error While Retrieving Data", e); - - Status status = new Status(); - ErrorInfo errorInfo = new ErrorInfo(); - errorInfo.setErrorCode("00000"); - errorInfo.setErrorMessage(e.getMessage()); - status.getErrorInfo().add(errorInfo); - status.setStatusMessage(e.getMessage()); - return new ResponseEntity<Object>(status, - HttpStatus.INTERNAL_SERVER_ERROR); - } */ - - return new ResponseEntity<Object>(catalogData, HttpStatus.OK); - - } - - @RequestMapping(value = "/catalog/attributes/{attribute}", method = RequestMethod.GET) - public ResponseEntity<Object> handleGetAttribute( - @PathVariable("attribute") String attribute, - HttpServletRequest servletRequest) throws ParseException { - - CatalogData catalogData = null; -/* try { - catalogData = globalLoggingCatalog.getAttributeByName(attribute); - } catch (GLCatalogException e) { - logger.error("Error While Retrieving Data", e); - - Status status = new Status(); - ErrorInfo errorInfo = new ErrorInfo(); - errorInfo.setErrorCode("00000"); - errorInfo.setErrorMessage(e.getMessage()); - status.getErrorInfo().add(errorInfo); - status.setStatusMessage(e.getMessage()); - return new ResponseEntity<Object>(status, - HttpStatus.INTERNAL_SERVER_ERROR); - } */ - - return new ResponseEntity<Object>(catalogData, HttpStatus.OK); - - } - - @RequestMapping(value = "/catalog/categories", method = RequestMethod.GET) - public ResponseEntity<Object> handleGetCategoriesList( - @RequestParam(required = false) String categoryList, - HttpServletRequest servletRequest) { - - CatalogData catalogData = null; -/* try { - if (!GenericValidator.isBlankOrNull(categoryList)) { - List<String> categories = new ArrayList<String>( - StringUtils.commaDelimitedListToSet(categoryList)); - catalogData = new CatalogData(); - catalogData.setCategories(new Categories()); - for (String category : categories) { - globalLoggingCatalog.getCategoryByName(category, - catalogData.getCategories().getCategory()); - } - } else { - catalogData = globalLoggingCatalog.getCategories(); - } - } catch (GLCatalogException e) { - logger.error("Error While Retrieving Data", e); - - Status status = new Status(); - ErrorInfo errorInfo = new ErrorInfo(); - errorInfo.setErrorCode("00000"); - errorInfo.setErrorMessage(e.getMessage()); - status.getErrorInfo().add(errorInfo); - status.setStatusMessage(e.getMessage()); - return new ResponseEntity<Object>(status, - HttpStatus.INTERNAL_SERVER_ERROR); - } */ - - return new ResponseEntity<Object>(catalogData, HttpStatus.OK); - - } - - @RequestMapping(value = "/catalog/categories/{category}", method = RequestMethod.GET) - public ResponseEntity<Object> handleGetCategory( - @PathVariable("category") String category, - HttpServletRequest servletRequest) throws ParseException { - - CatalogData catalogData = null; - /* try { - catalogData = globalLoggingCatalog.getCategoryByName(category); - } catch (GLCatalogException e) { - logger.error("Error While Retrieving Data", e); - - Status status = new Status(); - ErrorInfo errorInfo = new ErrorInfo(); - errorInfo.setErrorCode("00000"); - errorInfo.setErrorMessage(e.getMessage()); - status.getErrorInfo().add(errorInfo); - status.setStatusMessage(e.getMessage()); - return new ResponseEntity<Object>(status, - HttpStatus.INTERNAL_SERVER_ERROR); - } */ - - return new ResponseEntity<Object>(catalogData, HttpStatus.OK); - - } - @PostMapping(value = "catalog") public ResponseEntity<?> saveCatalog() { CatalogData catalogData = new CatalogData(); @@ -372,28 +145,4 @@ public class CatalogController { } */ - private void getAttributeDetailsForEvents(CatalogData catalogData) { - /* for (Event _event : catalogData.getEvents().getEvent()) { - if (_event != null && _event.getEventAttributes() != null) { - - List<String> eventAttributes = _event.getEventAttributes() - .getAttribute(); - _event.setAttributes(new Attributes()); - for (String eventAttribute : eventAttributes) { - globalLoggingCatalog.getAttributeByName(eventAttribute, - _event.getAttributes().getAttribute()); - } - } - }*/ - } - - /** - * Sets the global log service. - * - * @param globalLoggingService - * the global log service - */ -/* public void setGlobalLogCatalog(GlobalLoggingCatalog globalLoggingCatalog) { - this.globalLoggingCatalog = globalLoggingCatalog; - } */ } http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/1deb7eba/log4j-catalog/log4j-catalog-war/src/main/resources/sql/schema.sql ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-war/src/main/resources/sql/schema.sql b/log4j-catalog/log4j-catalog-war/src/main/resources/sql/schema.sql new file mode 100644 index 0000000..8525361 --- /dev/null +++ b/log4j-catalog/log4j-catalog-war/src/main/resources/sql/schema.sql @@ -0,0 +1,121 @@ +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * 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. + */ +CREATE TABLE EVENT_ATTRIBUTE +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024), + DATATYPE VARCHAR(64), + INDEXED CHAR, + SORTABLE CHAR, + REQUIRED CHAR, + REQUEST_CONTEXT CHAR +); + +CREATE UNIQUE INDEX ATTRIBUTE_NAME ON EVENT_ATTRIBUTE(NAME); + +CREATE TABLE ATTRIBUTE_EXAMPLES +( + ATTRIBUTE_ID BIGINT NOT NULL, + EXAMPLE VARCHAR(64), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID), +); + +CREATE TABLE ATTRIBUTE_ALIASES +( + ATTRIBUTE_ID BIGINT NOT NULL, + ALIAS VARCHAR(64), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID), +); + +CREATE TABLE ATTRIBUTE_CONSTRAINT +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + ATTRIBUTE_ID BIGINT NOT NULL, + CONSTRAINT_TYPE VARCHAR(32) NOT NULL, + VALUE VARCHAR(256), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID), +); + +CREATE TABLE CATALOG_EVENT +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024) +); + +CREATE UNIQUE INDEX EVENT_NAME ON CATALOG_EVENT(NAME); + +CREATE TABLE EVENT_ALIASES +( + EVENT_ID BIGINT NOT NULL, + ALIAS VARCHAR(64) NOT NULL, + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID), +); + +CREATE TABLE EVENT_ATTRIBUTES +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + EVENT_ID BIGINT NOT NULL, + ATTRIBUTE_ID BIGINT NOT NULL, + IS_REQUIRED CHAR NOT NULL, + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID), + FOREIGN KEY (ATTRIBUTE_ID) REFERENCES EVENT_ATTRIBUTE(ID) +); + +CREATE TABLE CATALOG_CATEGORY +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024) + +); + +CREATE UNIQUE INDEX CATEGORY_NAME ON CATALOG_CATEGORY(NAME); + +CREATE TABLE CATEGORY_EVENTS +( + CATEGORY_ID BIGINT NOT NULL, + EVENT_ID BIGINT NOT NULL, + FOREIGN KEY (CATEGORY_ID) REFERENCES CATALOG_CATEGORY(ID), + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID) +); + +CREATE TABLE CATALOG_PRODUCT +( + ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1, INCREMENT BY 1) PRIMARY KEY, + CATALOG_ID VARCHAR(64) NOT NULL, + NAME VARCHAR(64) NOT NULL, + DISPLAY_NAME VARCHAR(64) NOT NULL, + DESCRIPTION VARCHAR(1024) + +); + +CREATE UNIQUE INDEX PRODUCT_NAME ON CATALOG_PRODUCT(NAME); + +CREATE TABLE PRODUCT_EVENTS +( + PRODUCT_ID BIGINT NOT NULL, + EVENT_ID BIGINT NOT NULL, + FOREIGN KEY (PRODUCT_ID) REFERENCES CATALOG_PRODUCT(ID), + FOREIGN KEY (EVENT_ID) REFERENCES CATALOG_EVENT(ID) +); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/1deb7eba/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6655851..9e02912 100644 --- a/pom.xml +++ b/pom.xml @@ -137,12 +137,12 @@ <javadoc.plugin.version>2.10.3</javadoc.plugin.version> <javaee.api.version>7.0</javaee.api.version> <javax.cache.api.version>1.0.0</javax.cache.api.version> - <jaxb.version>2.2.4</jaxb.version> + <jaxb.version>2.2.7</jaxb.version> <jboss.logging.version>3.3.0.Final</jboss.logging.version> <json.version>20090211</json.version> <junit.version>4.12</junit.version> <jxr.plugin.version>2.5</jxr.plugin.version> - <log4j.version>2.9.0</log4j.version> + <log4j.version>2.9.2-SNAPSHOT</log4j.version> <mockito.version>2.0.31-beta</mockito.version> <nextiva.properties.version>6.0.26</nextiva.properties.version> <nextiva.utilities.version>6.0.34-SNAPSHOT</nextiva.utilities.version> @@ -153,7 +153,7 @@ <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> - <slf4j.version>1.6.2</slf4j.version> + <slf4j.version>1.8.0-alpha2</slf4j.version> <spring.version>4.3.3.RELEASE</spring.version> <spring.agent.version>2.5.6</spring.agent.version> <spring.data.jpa.version>1.11.1.RELEASE</spring.data.jpa.version>
