From 2156c69e7b2f31167ddea812ef705ab785a190be Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Thu, 5 May 2022 18:02:11 +0200 Subject: [PATCH] Removed USI --- .../findbugs-exclude.xml | 21 - dcng-webapp-phase4-it1-usi/pom.xml | 161 ----- .../src/etc/javadoc.css | 583 ------------------ .../src/etc/license-template.txt | 14 - .../java/com/helger/dcng/mockdp/MockDO.java | 376 ----------- .../helger/dcng/servlet/DcngRootServlet.java | 123 ---- .../dcng/servlet/DcngServletDODown.java | 49 -- .../helger/dcng/servlet/DcngServletDOUp.java | 49 -- .../dcng/servlet/DcngStatusServlet.java | 39 -- .../servlet/DcngStatusXServletHandler.java | 78 --- .../dcng/servlet/DcngWebAppListener.java | 91 --- .../src/main/resources/LICENSE | 497 --------------- .../src/main/resources/NOTICE | 5 - .../src/main/resources/application.properties | 56 -- .../src/main/resources/log4j2.xml | 32 - .../src/main/webapp/WEB-INF/web.xml | 45 -- .../test/java/com/helger/dcng/SPITest.java | 45 -- .../api/as4/MainSendRequestToNetherlands.java | 79 --- .../api/as4/MainSendRequestToRomania.java | 79 --- .../dcng/api/as4/MainSendRequestToSweden.java | 81 --- .../dcng/api/as4/MainSendSmpGetDocTypes.java | 48 -- .../dcng/api/as4/MainSendSmpGetEndpoints.java | 49 -- .../com/helger/dcng/jetty/JettyStopDCNG.java | 29 - .../com/helger/dcng/jetty/RunInJettyDCNG.java | 40 -- .../src/test/resources/xml/dba-nl-1.xml | 46 -- .../src/test/resources/xml/dba-ro-1.xml | 46 -- .../src/test/resources/xml/dba-se-1.xml | 46 -- pom.xml | 1 - 28 files changed, 2808 deletions(-) delete mode 100644 dcng-webapp-phase4-it1-usi/findbugs-exclude.xml delete mode 100644 dcng-webapp-phase4-it1-usi/pom.xml delete mode 100644 dcng-webapp-phase4-it1-usi/src/etc/javadoc.css delete mode 100644 dcng-webapp-phase4-it1-usi/src/etc/license-template.txt delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/mockdp/MockDO.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngRootServlet.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDODown.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDOUp.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusServlet.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusXServletHandler.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngWebAppListener.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/resources/LICENSE delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/resources/NOTICE delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/resources/application.properties delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/resources/log4j2.xml delete mode 100644 dcng-webapp-phase4-it1-usi/src/main/webapp/WEB-INF/web.xml delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/SPITest.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToNetherlands.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToRomania.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToSweden.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetDocTypes.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetEndpoints.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/JettyStopDCNG.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/RunInJettyDCNG.java delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-nl-1.xml delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-ro-1.xml delete mode 100644 dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-se-1.xml diff --git a/dcng-webapp-phase4-it1-usi/findbugs-exclude.xml b/dcng-webapp-phase4-it1-usi/findbugs-exclude.xml deleted file mode 100644 index 8c997f2..0000000 --- a/dcng-webapp-phase4-it1-usi/findbugs-exclude.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/dcng-webapp-phase4-it1-usi/pom.xml b/dcng-webapp-phase4-it1-usi/pom.xml deleted file mode 100644 index e4418e4..0000000 --- a/dcng-webapp-phase4-it1-usi/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - 4.0.0 - - com.helger.dcng - dcng-parent-pom - 0.2.3-SNAPSHOT - - dcng-webapp-phase4-it1-usi - war - dcng-webapp-phase4-it1-usi - Contains the DE4A Connector NG Web Application - phase4, Iteration 1, USI pattern - https://github.com/de4a-at/de4a-connector-ng/dcng-webapp-phase4-it1-usi - 2021 - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - de4a.eu - http://www.de4a.eu - - - - - philip - Philip Helger - ph(at)helger.com - - - - - - - eu.de4a - de4a-commons-parent-pom - 0.1.11 - pom - import - - - - - - - com.helger.dcng - dcng-web-api - - - com.helger.dcng - dcng-phase4 - - - com.helger.photon - ph-oton-core - - - eu.de4a - de4a-iem - - - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-web - - - org.slf4j - jul-to-slf4j - - - - com.sun.xml.bind - jaxb-impl - - - - javax.servlet - javax.servlet-api - provided - - - - com.helger.photon - ph-oton-jetty - test - - - - - - - ${basedir}/src/main/resources - ${project.build.directory}/classes - - - ${basedir}/src/main/webapp - ${project.build.directory}/webapp-classes - - - ${basedir}/src/test/resources - ${project.build.directory}/test-classes - - - - - - com.mycila - license-maven-plugin - - - **/LICENSE - **/NOTICE - conf/** - *.p12 - *.jks - - - - - org.eclipse.jetty - jetty-maven-plugin - 9.4.44.v20210927 - - 3 - - - - - diff --git a/dcng-webapp-phase4-it1-usi/src/etc/javadoc.css b/dcng-webapp-phase4-it1-usi/src/etc/javadoc.css deleted file mode 100644 index dfc0ced..0000000 --- a/dcng-webapp-phase4-it1-usi/src/etc/javadoc.css +++ /dev/null @@ -1,583 +0,0 @@ -/** - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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. - */ -/* - * based on phloc javadoc CSS. - * (c) 2011-2014 phloc systems. - * Derived from the original javadoc CSS from Sun JDK - */ - -body { - background-color: #FFFFFF; - color: #353833; - font-family: Arial, Helvetica, sans-serif; - font-size: 76%; - margin: 0; -} - -a:link,a:visited { - color: #880000; - text-decoration: none; -} - -a:hover,a:focus { - color: #BB2222; - text-decoration: none; -} - -a:active { - color: #4C6B87; - text-decoration: none; -} - -a[name] { - color: #353833; -} - -a[name]:hover { - color: #353833; - text-decoration: none; -} - -pre { - font-size: 1.3em; -} - -h1 { - font-size: 1.8em; -} - -h2 { - font-size: 1.5em; -} - -h3 { - font-size: 1.4em; -} - -h4 { - font-size: 1.3em; -} - -h5 { - font-size: 1.2em; -} - -h6 { - font-size: 1.1em; -} - -ul { - list-style-type: disc; -} - -code,tt { - font-size: 1.2em; -} - -dt code { - font-size: 1.2em; -} - -table tr td dt code { - font-size: 1.2em; - vertical-align: top; -} - -sup { - font-size: 0.6em; -} - -.clear { - clear: both; - height: 0; - overflow: hidden; -} - -.aboutLanguage { - float: right; - font-size: 0.8em; - margin-top: -7px; - padding: 0 21px; - z-index: 200; -} - -.legalCopy { - margin-left: 0.5em; -} - -.bar a,.bar a:link,.bar a:visited,.bar a:active { - color: #FFFFFF; - text-decoration: none; -} - -.bar a:hover,.bar a:focus { - color: #BB7A2A; -} - -.tab { - background-color: #0066FF; - background-image: url("resources/titlebar.gif"); - background-position: left top; - background-repeat: no-repeat; - color: #FFFFFF; - font-weight: bold; - padding: 8px; - width: 5em; -} - -.bar { - background-image: url("resources/background.gif"); - background-repeat: repeat-x; - color: #FFFFFF; - font-size: 1em; - height: auto; - margin: 0; - padding: 0.8em 0.5em 0.4em 0.8em; -} - -.topNav { - background-image: url("resources/background.gif"); - background-repeat: repeat-x; - clear: right; - color: #FFFFFF; - float: left; - height: 2.8em; - overflow: hidden; - padding: 10px 0 0; - width: 100%; -} - -.bottomNav { - background-image: url("resources/background.gif"); - background-repeat: repeat-x; - clear: right; - color: #FFFFFF; - float: left; - height: 2.8em; - margin-top: 10px; - overflow: hidden; - padding: 10px 0 0; - width: 100%; -} - -.subNav { - background-color: #DEE3E9; - border-bottom: 1px solid #9EADC0; - float: left; - overflow: hidden; - width: 100%; -} - -.subNav div { - clear: left; - float: left; - padding: 0 0 5px 6px; -} - -ul.navList,ul.subNavList { - float: left; - margin: 0 25px 0 0; - padding: 0; -} - -ul.navList li { - float: left; - list-style: none outside none; - padding: 3px 6px; -} - -ul.subNavList li { - float: left; - font-size: 90%; - list-style: none outside none; -} - -.topNav a:link,.topNav a:active,.topNav a:visited,.bottomNav a:link,.bottomNav a:active,.bottomNav a:visited - { - color: #FFFFFF; - text-decoration: none; -} - -.topNav a:hover,.bottomNav a:hover { - color: #BB7A2A; - text-decoration: none; -} - -.navBarCell1Rev { - background-color: #A88834; - background-image: url("resources/tab.gif"); - border: 1px solid #C9AA44; - color: #FFFFFF; - margin: auto 5px; -} - -.header,.footer { - clear: both; - margin: 0 20px; - padding: 5px 0 0; -} - -.indexHeader { - margin: 10px; - position: relative; -} - -.indexHeader h1 { - font-size: 1.3em; -} - -.title { - color: #880000; - margin: 10px 0; -} - -.subTitle { - margin: 5px 0 0; -} - -.header ul { - margin: 0 0 25px; - padding: 0; -} - -.footer ul { - margin: 20px 0 5px; -} - -.header ul li,.footer ul li { - font-size: 1.2em; - list-style: none outside none; -} - -div.details ul.blockList ul.blockList ul.blockList li.blockList h4,div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 - { - background-color: #DEE3E9; - border-bottom: 1px solid #9EADC0; - border-top: 1px solid #9EADC0; - margin: 0 0 6px -8px; - padding: 2px 5px; -} - -ul.blockList ul.blockList ul.blockList li.blockList h3 { - background-color: #DEE3E9; - border-bottom: 1px solid #9EADC0; - border-top: 1px solid #9EADC0; - margin: 0 0 6px -8px; - padding: 2px 5px; -} - -ul.blockList ul.blockList li.blockList h3 { - margin: 15px 0; - padding: 0; -} - -ul.blockList li.blockList h2 { - padding: 0 0 20px; -} - -.contentContainer,.sourceContainer,.classUseContainer,.serializedFormContainer,.constantValuesContainer - { - clear: both; - padding: 10px 20px; - position: relative; -} - -.indexContainer { - font-size: 1em; - margin: 10px; - position: relative; -} - -.indexContainer h2 { - font-size: 1.1em; - padding: 0 0 3px; -} - -.indexContainer ul { - margin: 0; - padding: 0; -} - -.indexContainer ul li { - list-style: none outside none; -} - -.contentContainer .description dl dt,.contentContainer .details dl dt,.serializedFormContainer dl dt - { - color: #4E4E4E; - font-size: 1.1em; - font-weight: bold; - margin: 10px 0 0; -} - -.contentContainer .description dl dd,.contentContainer .details dl dd,.serializedFormContainer dl dd - { - margin: 10px 0 10px 20px; -} - -.serializedFormContainer dl.nameValue dt { - display: inline; - font-size: 1.1em; - font-weight: bold; - margin-left: 1px; -} - -.serializedFormContainer dl.nameValue dd { - display: inline; - font-size: 1.1em; -} - -ul.horizontal li { - display: inline; - font-size: 0.9em; -} - -ul.inheritance { - margin: 0; - padding: 0; -} - -ul.inheritance li { - display: inline; - list-style: none outside none; -} - -ul.inheritance li ul.inheritance { - margin-left: 15px; - padding-left: 15px; - padding-top: 1px; -} - -ul.blockList,ul.blockListLast { - margin: 10px 0; - padding: 0; -} - -ul.blockList li.blockList,ul.blockListLast li.blockList { - list-style: none outside none; - margin-bottom: 25px; -} - -ul.blockList ul.blockList li.blockList,ul.blockList ul.blockListLast li.blockList - { - background-color: #F9F9F9; - border: 1px solid #9EADC0; - padding: 0 20px 5px 10px; -} - -ul.blockList ul.blockList ul.blockList li.blockList,ul.blockList ul.blockList ul.blockListLast li.blockList - { - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - background-color: #FFFFFF; - border-color: currentColor #9EADC0 #9EADC0; - border-image: none; - border-right: 1px solid #9EADC0; - border-style: none solid solid; - border-width: medium 1px 1px; - padding: 0 0 5px 8px; -} - -ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - border-color: currentColor currentColor #9EADC0; - border-image: none; - border-style: none none solid; - border-width: medium medium 1px; - margin-left: 0; - padding-bottom: 15px; - padding-left: 0; -} - -ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { - border-bottom: medium none; - list-style: none outside none; - padding-bottom: 0; -} - -table tr td dl,table tr td dl dt,table tr td dl dd { - margin-bottom: 1px; - margin-top: 0; -} - -.contentContainer table,.classUseContainer table,.constantValuesContainer table - { - border-bottom: 1px solid #9EADC0; - width: 100%; -} - -.contentContainer ul li table,.classUseContainer ul li table,.constantValuesContainer ul li table - { - width: 100%; -} - -.contentContainer .description table,.contentContainer .details table { - border-bottom: medium none; -} - -.contentContainer ul li table th.colOne,.contentContainer ul li table th.colFirst,.contentContainer ul li table th.colLast,.classUseContainer ul li table th,.constantValuesContainer ul li table th,.contentContainer ul li table td.colOne,.contentContainer ul li table td.colFirst,.contentContainer ul li table td.colLast,.classUseContainer ul li table td,.constantValuesContainer ul li table td - { - padding-right: 20px; - vertical-align: top; -} - -.contentContainer ul li table th.colLast,.classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,.contentContainer ul li table td.colLast,.classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,.contentContainer ul li table th.colOne,.classUseContainer ul li table th.colOne,.contentContainer ul li table td.colOne,.classUseContainer ul li table td.colOne - { - padding-right: 3px; -} - -.overviewSummary caption,.packageSummary caption,.contentContainer ul.blockList li.blockList caption,.summary caption,.classUseContainer caption,.constantValuesContainer caption - { - background-repeat: no-repeat; - clear: none; - color: #FFFFFF; - font-weight: bold; - margin: 0; - overflow: hidden; - padding: 0; - position: relative; - text-align: left; -} - -caption a:link,caption a:hover,caption a:active,caption a:visited { - color: #FFFFFF; -} - -.overviewSummary caption span,.packageSummary caption span,.contentContainer ul.blockList li.blockList caption span,.summary caption span,.classUseContainer caption span,.constantValuesContainer caption span - { - background-image: url("resources/titlebar.gif"); - display: block; - float: left; - height: 18px; - padding-left: 8px; - padding-top: 8px; - white-space: nowrap; -} - -.overviewSummary .tabEnd,.packageSummary .tabEnd,.contentContainer ul.blockList li.blockList .tabEnd,.summary .tabEnd,.classUseContainer .tabEnd,.constantValuesContainer .tabEnd - { - background-image: url("resources/titlebar_end.gif"); - background-position: right top; - background-repeat: no-repeat; - float: left; - position: relative; - width: 10px; -} - -ul.blockList ul.blockList li.blockList table { - margin: 0 0 12px; - width: 100%; -} - -.tableSubHeadingColor { - background-color: #EEEEFF; -} - -.altColor { - background-color: #EEEEEF; -} - -.rowColor { - background-color: #FFFFFF; -} - -.overviewSummary td,.packageSummary td,.contentContainer ul.blockList li.blockList td,.summary td,.classUseContainer td,.constantValuesContainer td - { - padding: 3px 3px 3px 7px; - text-align: left; -} - -th.colFirst,th.colLast,th.colOne,.constantValuesContainer th { - background: none repeat scroll 0 0 #DEE3E9; - border-bottom: 1px solid #9EADC0; - border-top: 1px solid #9EADC0; - padding: 3px 3px 3px 7px; - text-align: left; -} - -td.colOne a:link,td.colOne a:active,td.colOne a:visited,td.colOne a:hover,td.colFirst a:link,td.colFirst a:active,td.colFirst a:visited,td.colFirst a:hover,td.colLast a:link,td.colLast a:active,td.colLast a:visited,td.colLast a:hover,.constantValuesContainer td a:link,.constantValuesContainer td a:active,.constantValuesContainer td a:visited,.constantValuesContainer td a:hover - { - font-weight: bold; -} - -td.colFirst,th.colFirst { - border-left: 1px solid #9EADC0; - white-space: nowrap; -} - -td.colLast,th.colLast { - border-right: 1px solid #9EADC0; -} - -td.colOne,th.colOne { - border-left: 1px solid #9EADC0; - border-right: 1px solid #9EADC0; -} - -table.overviewSummary { - margin-left: 0; - padding: 0; -} - -table.overviewSummary td.colFirst,table.overviewSummary th.colFirst,table.overviewSummary td.colOne,table.overviewSummary th.colOne - { - vertical-align: middle; - width: 25%; -} - -table.packageSummary td.colFirst,table.overviewSummary th.colFirst { - vertical-align: middle; - width: 25%; -} - -.description pre { - margin-top: 0; -} - -.deprecatedContent { - margin: 0; - padding: 10px 0; -} - -.docSummary { - padding: 0; -} - -.sourceLineNo { - color: #008000; - padding: 0 30px 0 0; -} - -h1.hidden { - font-size: 0.9em; - overflow: hidden; - visibility: hidden; -} - -.block { - display: block; - margin: 3px 0 0; -} - -.strong { - font-weight: bold; -} diff --git a/dcng-webapp-phase4-it1-usi/src/etc/license-template.txt b/dcng-webapp-phase4-it1-usi/src/etc/license-template.txt deleted file mode 100644 index ed125c3..0000000 --- a/dcng-webapp-phase4-it1-usi/src/etc/license-template.txt +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (C) 2021 Philip Helger (www.helger.com) -philip[at]helger[dot]com - -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. \ No newline at end of file diff --git a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/mockdp/MockDO.java b/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/mockdp/MockDO.java deleted file mode 100644 index 40d3896..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/mockdp/MockDO.java +++ /dev/null @@ -1,376 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.mockdp; - -import java.nio.charset.StandardCharsets; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicBoolean; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; - -import com.helger.commons.collection.impl.CommonsArrayList; -import com.helger.commons.collection.impl.ICommonsList; -import com.helger.commons.concurrent.ExecutorServiceHelper; -import com.helger.commons.concurrent.ThreadHelper; -import com.helger.commons.datetime.PDTFactory; -import com.helger.commons.error.level.EErrorLevel; -import com.helger.commons.io.ByteArrayWrapper; -import com.helger.commons.mime.CMimeType; -import com.helger.commons.state.ESuccess; -import com.helger.dcng.api.DcngConfig; -import com.helger.dcng.api.DcngIdentifierFactory; -import com.helger.dcng.api.me.EMEProtocol; -import com.helger.dcng.api.me.incoming.IMEIncomingHandler; -import com.helger.dcng.api.me.incoming.MEIncomingException; -import com.helger.dcng.api.me.model.MEMessage; -import com.helger.dcng.api.rest.DCNGPayload; -import com.helger.dcng.webapi.as4.ApiPostLookupAndSend; -import com.helger.json.IJsonObject; -import com.helger.json.serialize.JsonWriterSettings; -import com.helger.xml.serialize.read.DOMReader; -import com.helger.xml.serialize.write.EXMLSerializeIndent; -import com.helger.xml.serialize.write.XMLWriter; -import com.helger.xml.serialize.write.XMLWriterSettings; - -import eu.de4a.iem.jaxb.common.idtypes.LegalPersonIdentifierType; -import eu.de4a.iem.jaxb.common.types.CanonicalEvidenceType; -import eu.de4a.iem.jaxb.common.types.ErrorListType; -import eu.de4a.iem.jaxb.common.types.ErrorType; -import eu.de4a.iem.jaxb.common.types.RequestTransferEvidenceUSIIMDRType; -import eu.de4a.iem.jaxb.common.types.ResponseTransferEvidenceType; -import eu.de4a.iem.jaxb.w3.cv11.bc.LegalEntityLegalNameType; -import eu.de4a.iem.xml.de4a.DE4AMarshaller; -import eu.de4a.iem.xml.de4a.DE4AResponseDocumentHelper; -import eu.de4a.iem.xml.de4a.EDE4ACanonicalEvidenceType; -import eu.de4a.kafkaclient.DE4AKafkaClient; - -/** - * This is a mock handler for an incoming message. - * - * @author Philip Helger - */ -public final class MockDO implements IMEIncomingHandler -{ - public static final AtomicBoolean DO_ACTIVE = new AtomicBoolean (true); - private static final Logger LOGGER = LoggerFactory.getLogger (MockDO.class); - - private static void _waitAndRunAsync (@Nonnull final MEMessage aMessage, @Nonnull final byte [] aBytes) - { - final ExecutorService aES = Executors.newFixedThreadPool (1); - aES.submit ( () -> { - // Ensure sync response is received first - ThreadHelper.sleep (1000); - - // Start new transmission - final ICommonsList aPayloads = new CommonsArrayList <> (); - final DCNGPayload a = new DCNGPayload (); - a.setValue (aBytes); - a.setMimeType (CMimeType.APPLICATION_XML.getAsString ()); - a.setContentID ("ResponseTransferEvidence"); - aPayloads.add (a); - - // Swap sender and receiver - // Different response type - final IJsonObject aJson = ApiPostLookupAndSend.perform (aMessage.getReceiverID (), - aMessage.getSenderID (), - aMessage.getDocumentTypeID (), - DcngConfig.getIdentifierFactory () - .createProcessIdentifier (DcngIdentifierFactory.PROCESS_SCHEME, - "response"), - EMEProtocol.AS4.getTransportProfileID (), - aPayloads); - LOGGER.info ("Sending result:\n" + aJson.getAsJsonString (JsonWriterSettings.DEFAULT_SETTINGS_FORMATTED)); - }); - ExecutorServiceHelper.shutdownAndWaitUntilAllTasksAreFinished (aES); - } - - @SuppressWarnings ("unused") - @Nonnull - private static ESuccess _handleDBARequest (@Nonnull final MEMessage aMessage, @Nonnull final Document aDoc) - { - LOGGER.info ("Handling as DBA request"); - - final RequestTransferEvidenceUSIIMDRType aRequest = DE4AMarshaller.drImRequestMarshaller ().read (aDoc); - if (aRequest == null) - { - DE4AKafkaClient.send (EErrorLevel.ERROR, "Passed request ist not a valid IM request"); - return ESuccess.FAILURE; - } - - final String sExampleRequest = "\r\n" + - " 696b5578-70e2-425c-86c9-bffab3226495\r\n" + - " SpecificationId\r\n" + - " 2021-09-21T09:20:44.894Z\r\n" + - " ProcedureId\r\n" + - " \r\n" + - " iso6523-actorid-upis::9999:nl000000024\r\n" + - " (RVO) Rijksdienst voor Ondernemend Nederland (Netherlands Enterprise Agency)\r\n" + - " \r\n" + - " \r\n" + - " iso6523-actorid-upis::9999:at000000271\r\n" + - " (BMDW) Bundesministerium für Digitalisierung und Wirtschaftsstandort\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " AT/NL/???\r\n" + - " Carl-Markus Piswanger e.U.\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " SDGR14\r\n" + - " \r\n" + - " urn:de4a-eu:CanonicalEvidenceType::CompanyRegistration\r\n" + - ""; - - final LegalPersonIdentifierType aCompany = aRequest.getDataRequestSubject ().getDataSubjectCompany (); - if (aCompany == null) - { - DE4AKafkaClient.send (EErrorLevel.ERROR, "No DRS company found"); - return ESuccess.FAILURE; - } - - if (!"urn:de4a-eu:CanonicalEvidenceType::CompanyRegistration".equals (aRequest.getCanonicalEvidenceTypeId ())) - { - DE4AKafkaClient.send (EErrorLevel.ERROR, - "The CanonicalEvidenceType '" + - aRequest.getCanonicalEvidenceTypeId () + - "' is not supported"); - return ESuccess.FAILURE; - } - - final String sExampleResponse = "\r\n" + - " 21ce328c-f614-43cc-a035-1e41552ad577\r\n" + - " SpecificationId\r\n" + - " 2021-09-06T17:02:12.129Z\r\n" + - " ProcedureId\r\n" + - " \r\n" + - " iso6523-actorid-upis::9915:de4atest\r\n" + - " (BMDW) Bundesministerium für Digitalisierung und Wirtschaftsstandort\r\n" + - " \r\n" + - " \r\n" + - " iso6523-actorid-upis::9999:nl990000106\r\n" + - " (KVK) Chamber of Commerce of Netherlands\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " NL/AT/90000471\r\n" + - " ELVILA SA\r\n" + - " \r\n" + - " \r\n" + - " urn:de4a-eu:CanonicalEvidenceType::CompanyRegistration\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " Regional Tris-ice Coöperatie\r\n" + - " \r\n" + - " coöp\r\n" + - " economically active\r\n" + - " \r\n" + - " 7500\r\n" + - " \r\n" + - " 1980-09-18\r\n" + - " NLNHR.90000471\r\n" + - " \r\n" + - " nepemailadres@kvk.nl\r\n" + - " +31 0209999999\r\n" + - " \r\n" + - " \r\n" + - " Leverkruidweg\r\n" + - " 379\r\n" + - " 1508 WN\r\n" + - " Zaandam\r\n" + - " NL\r\n" + - " \r\n" + - " \r\n" + - " Leverkruidweg\r\n" + - " 379\r\n" + - " 1508 WN\r\n" + - " Zaandam\r\n" + - " NL\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - ""; - - final ResponseTransferEvidenceType aResponse = DE4AResponseDocumentHelper.createResponseTransferEvidence (aRequest); - - if (!DO_ACTIVE.get ()) - { - // TODO error message - DE4AKafkaClient.send (EErrorLevel.ERROR, "We cannot reach our DO - oooooohhhhh :("); - final ErrorListType aErrorList = new ErrorListType (); - final ErrorType aError = new ErrorType (); - aError.setCode ("67890"); - aError.setText ("Our DO is not reachable - please try again later"); - aErrorList.addError (aError); - aResponse.setErrorList (aErrorList); - } - else - if (!"AT/NL/???".equals (aCompany.getLegalPersonIdentifier ()) && - !"AT/RO/???".equals (aCompany.getLegalPersonIdentifier ()) && - !"AT/SE/???".equals (aCompany.getLegalPersonIdentifier ())) - { - // TODO error message - DE4AKafkaClient.send (EErrorLevel.ERROR, - "The DRS company identifier '" + - aCompany.getLegalPersonIdentifier () + - "' is not supported"); - final ErrorListType aErrorList = new ErrorListType (); - final ErrorType aError = new ErrorType (); - aError.setCode ("12345"); - aError.setText ("The eIDAS identifier '" + aCompany.getLegalPersonIdentifier () + "' is unknown"); - aErrorList.addError (aError); - aResponse.setErrorList (aErrorList); - } - else - { - DE4AKafkaClient.send (EErrorLevel.INFO, - "The DRS company identifier '" + - aCompany.getLegalPersonIdentifier () + - "' was found - building result"); - - // Copy whatever needs to be copied - final CanonicalEvidenceType aCE = new CanonicalEvidenceType (); - { - final eu.de4a.iem.jaxb.t42.v0_6.LegalEntityType p = new eu.de4a.iem.jaxb.t42.v0_6.LegalEntityType (); - { - final eu.de4a.iem.jaxb.t42.v0_6.NamesType a = new eu.de4a.iem.jaxb.t42.v0_6.NamesType (); - final LegalEntityLegalNameType aLegalName = new LegalEntityLegalNameType (); - aLegalName.setValue ("Bla Blub GmbH"); - a.setLegalEntityLegalName (aLegalName); - p.addCompanyName (a); - } - p.setCompanyType ("GmbH"); - p.setCompanyStatus ("active"); - { - final eu.de4a.iem.jaxb.t42.v0_6.ActivityType a = new eu.de4a.iem.jaxb.t42.v0_6.ActivityType (); - a.addNaceCode ("1234"); - p.setCompanyActivity (a); - } - p.setRegistrationDate (PDTFactory.getCurrentLocalDate ().minusDays (1000)); - p.setCompanyEUID ("AT98765"); - { - final eu.de4a.iem.jaxb.t42.v0_6.AddressType a = new eu.de4a.iem.jaxb.t42.v0_6.AddressType (); - a.setThoroughfare ("Wien"); - a.setPostCode ("1010"); - a.setPoBox ("543"); - a.setAdminUnitL1 ("Austria"); - p.addRegisteredAddress (a); - } - aCE.setAny (eu.de4a.iem.xml.de4a.t42.v0_6.DE4AT42Marshaller.legalEntity () - .getAsDocument (p) - .getDocumentElement ()); - } - aResponse.setCanonicalEvidence (aCE); - } - - final DE4AMarshaller aMarshaller = DE4AMarshaller.drImResponseMarshaller (EDE4ACanonicalEvidenceType.T42_COMPANY_INFO_V06); - LOGGER.info ("Message to be send back:\n" + aMarshaller.setFormattedOutput (true).getAsString (aResponse)); - - _waitAndRunAsync (aMessage, aMarshaller.getAsBytes (aResponse)); - - return ESuccess.SUCCESS; - } - - private static void _handleXML (@Nonnull final MEMessage aMessage, - @Nullable final String sNamespaceURL, - @Nullable final String sLocalName, - @Nonnull final Document aDoc) - { - boolean bHandled = false; - - if ("RequestTransferEvidence".equals (sLocalName) && - "http://www.de4a.eu/2020/data/requestor/pattern/intermediate".equals (sNamespaceURL)) - { - // DBA request at DT/DO - if (_handleDBARequest (aMessage, aDoc).isSuccess ()) - { - bHandled = true; - } - } - else - if ("ResponseTransferEvidence".equals (sLocalName) && - "http://www.de4a.eu/2020/data/requestor/pattern/intermediate".equals (sNamespaceURL)) - { - // DBA response at DR/DT - } - - if (!bHandled) - { - // Do something with it - LOGGER.info ("Received unhandled XML:\n" + - XMLWriter.getNodeAsString (aDoc, - new XMLWriterSettings ().setIndent (EXMLSerializeIndent.INDENT_AND_ALIGN))); - } - } - - static void handleIncomingRequest (@Nonnull final MEMessage aMessage, @Nonnull final ByteArrayWrapper aBytes) - { - LOGGER.info ("Now trying to read the message as XML"); - final Document aDoc = DOMReader.readXMLDOM (aBytes.bytes (), aBytes.getOffset (), aBytes.size ()); - if (aDoc == null) - { - DE4AKafkaClient.send (EErrorLevel.ERROR, - "Failed to read content as XML. Content as UTF-8:\n" + - new String (aBytes.bytes (), - aBytes.getOffset (), - aBytes.size (), - StandardCharsets.UTF_8)); - } - else - { - final String sNamespaceURL = aDoc.getDocumentElement ().getNamespaceURI (); - final String sLocalName = aDoc.getDocumentElement ().getLocalName (); - LOGGER.info ("Received a document with declaration '{" + sNamespaceURL + "}" + sLocalName + "'"); - - _handleXML (aMessage, sNamespaceURL, sLocalName, aDoc); - } - } - - public void handleIncomingRequest (@Nonnull final MEMessage aMessage) throws MEIncomingException - { - if (aMessage.payloads ().size () >= 2) - { - // The first one is the RegRep stupidity - final ByteArrayWrapper p = aMessage.payloads ().get (1).getData (); - handleIncomingRequest (aMessage, p); - } - else - { - DE4AKafkaClient.send (EErrorLevel.ERROR, - "Incoming message seems to be ill-formatted - too few payloads. Trying first one."); - final ByteArrayWrapper p = aMessage.payloads ().get (0).getData (); - handleIncomingRequest (aMessage, p); - } - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngRootServlet.java b/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngRootServlet.java deleted file mode 100644 index f9e4b99..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngRootServlet.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.servlet; - -import java.io.IOException; -import java.util.Map; - -import javax.annotation.Nonnull; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.helger.commons.collection.CollectionHelper; -import com.helger.commons.datetime.PDTFactory; -import com.helger.commons.http.CHttpHeader; -import com.helger.commons.mime.CMimeType; -import com.helger.dcng.api.me.IMessageExchangeSPI; -import com.helger.dcng.api.me.MessageExchangeManager; -import com.helger.dcng.core.CDcngVersion; - -/** - * Servlet for handling the initial calls without any path. This servlet shows - * some basic information. - * - * @author Philip Helger - */ -@WebServlet ("") -public class DcngRootServlet extends HttpServlet -{ - private static final Logger LOGGER = LoggerFactory.getLogger (DcngRootServlet.class); - - @Override - protected void doGet (@Nonnull final HttpServletRequest req, @Nonnull final HttpServletResponse resp) throws ServletException, IOException - { - final String sContextPath = req.getServletContext ().getContextPath (); - final String sCSS = "* { font-family: sans-serif; }" + - " a:link, a:visited, a:hover, a:active { color: #2255ff; }" + - " code { font-family:monospace; color:#e83e8c; }"; - - final StringBuilder aSB = new StringBuilder (); - aSB.append ("DE4A Connector NG"); - aSB.append ("

DE4A Connector NG

"); - aSB.append ("
Version: ").append (CDcngVersion.BUILD_VERSION).append ("
"); - aSB.append ("
Build timestamp: ").append (CDcngVersion.BUILD_TIMESTAMP).append ("
"); - aSB.append ("
Current time: ").append (PDTFactory.getCurrentZonedDateTimeUTC ().toString ()).append ("
"); - aSB.append ("
Check /status
"); - aSB.append ("
Source code on GitHub
"); - - { - aSB.append ("

Registered Message Exchange implementations

"); - for (final Map.Entry aEntry : CollectionHelper.getSortedByKey (MessageExchangeManager.getAll ()) - .entrySet ()) - { - aSB.append ("
ID ").append (aEntry.getKey ()).append (" mapped to ").append (aEntry.getValue ()).append ("
"); - } - } - - // if (GlobalDebug.isDebugMode ()) - { - aSB.append ("

Servlet information

"); - for (final Map.Entry aEntry : CollectionHelper.getSortedByKey (req.getServletContext () - .getServletRegistrations ()) - .entrySet ()) - { - aSB.append ("
Servlet ") - .append (aEntry.getKey ()) - .append (" mapped to ") - .append (aEntry.getValue ().getMappings ()) - .append ("
"); - } - } - - // APIs - { - aSB.append ("

API information

"); - - aSB.append ("

SMP

"); - aSB.append ("
GET /api/smp/doctypes - test me
"); - aSB.append ("
GET /api/smp/endpoints - test me
"); - - aSB.append ("

Sending AS4

"); - aSB.append ("
POST /api/send
"); - aSB.append ("
POST /api/lookup/send/
"); - } - - aSB.append (""); - - resp.addHeader (CHttpHeader.CONTENT_TYPE, CMimeType.TEXT_HTML.getAsString ()); - try - { - resp.getWriter ().write (aSB.toString ()); - resp.getWriter ().flush (); - } - catch (final IOException ex) - { - LOGGER.error ("Failed to write result", ex); - } - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDODown.java b/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDODown.java deleted file mode 100644 index 1e36b74..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDODown.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.servlet; - -import javax.servlet.annotation.WebServlet; - -import com.helger.commons.error.level.EErrorLevel; -import com.helger.commons.http.CHttp; -import com.helger.commons.http.EHttpMethod; -import com.helger.dcng.mockdp.MockDO; -import com.helger.xservlet.AbstractXServlet; - -import eu.de4a.kafkaclient.DE4AKafkaClient; - -/** - * The servlet to stop the DO. This is only required for Connectathons, to mimic - * a non-responsive DO. To turn in on again, see {@link DcngServletDOUp}. - * - * @author Philip Helger - */ -@WebServlet ("/do-down/*") -public class DcngServletDODown extends AbstractXServlet -{ - public static final String SERVLET_DEFAULT_NAME = "do-down"; - public static final String SERVLET_DEFAULT_PATH = '/' + SERVLET_DEFAULT_NAME; - - public DcngServletDODown () - { - handlerRegistry ().registerHandler (EHttpMethod.GET, (aRequestScope, aUnifiedResponse) -> { - DE4AKafkaClient.send (EErrorLevel.INFO, "Shutting down DO"); - MockDO.DO_ACTIVE.set (false); - aUnifiedResponse.setStatus (CHttp.HTTP_NO_CONTENT); - }); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDOUp.java b/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDOUp.java deleted file mode 100644 index fa3275f..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngServletDOUp.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.servlet; - -import javax.servlet.annotation.WebServlet; - -import com.helger.commons.error.level.EErrorLevel; -import com.helger.commons.http.CHttp; -import com.helger.commons.http.EHttpMethod; -import com.helger.dcng.mockdp.MockDO; -import com.helger.xservlet.AbstractXServlet; - -import eu.de4a.kafkaclient.DE4AKafkaClient; - -/** - * The servlet to start the DO. This is only required for Connectathons, to - * mimic a responsive DO. To turn in off, see {@link DcngServletDODown}. - * - * @author Philip Helger - */ -@WebServlet ("/do-up/*") -public class DcngServletDOUp extends AbstractXServlet -{ - public static final String SERVLET_DEFAULT_NAME = "do-down"; - public static final String SERVLET_DEFAULT_PATH = '/' + SERVLET_DEFAULT_NAME; - - public DcngServletDOUp () - { - handlerRegistry ().registerHandler (EHttpMethod.GET, (aRequestScope, aUnifiedResponse) -> { - DE4AKafkaClient.send (EErrorLevel.INFO, "Starting DO"); - MockDO.DO_ACTIVE.set (true); - aUnifiedResponse.setStatus (CHttp.HTTP_NO_CONTENT); - }); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusServlet.java b/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusServlet.java deleted file mode 100644 index f869821..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusServlet.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.servlet; - -import javax.servlet.annotation.WebServlet; - -import com.helger.commons.http.EHttpMethod; -import com.helger.xservlet.AbstractXServlet; - -/** - * The servlet to show the application status. - * - * @author Philip Helger - */ -@WebServlet ("/status/*") -public class DcngStatusServlet extends AbstractXServlet -{ - public static final String SERVLET_DEFAULT_NAME = "status"; - public static final String SERVLET_DEFAULT_PATH = '/' + SERVLET_DEFAULT_NAME; - - public DcngStatusServlet () - { - handlerRegistry ().registerHandler (EHttpMethod.GET, new DcngStatusXServletHandler ()); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusXServletHandler.java b/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusXServletHandler.java deleted file mode 100644 index 810aaca..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngStatusXServletHandler.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.servlet; - -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; - -import javax.annotation.Nonnull; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.helger.commons.mime.CMimeType; -import com.helger.commons.mime.MimeType; -import com.helger.dcng.api.DcngConfig; -import com.helger.dcng.core.DcngStatusHelper; -import com.helger.dcng.mockdp.MockDO; -import com.helger.json.IJsonObject; -import com.helger.json.JsonObject; -import com.helger.servlet.response.UnifiedResponse; -import com.helger.web.scope.IRequestWebScopeWithoutResponse; -import com.helger.xservlet.handler.simple.IXServletSimpleHandler; - -/** - * Main handler for the /status servlet - * - * @author Philip Helger - */ -final class DcngStatusXServletHandler implements IXServletSimpleHandler -{ - private static final Logger LOGGER = LoggerFactory.getLogger (DcngStatusXServletHandler.class); - private static final Charset CHARSET = StandardCharsets.UTF_8; - - public void handleRequest (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope, - @Nonnull final UnifiedResponse aUnifiedResponse) throws Exception - { - if (LOGGER.isDebugEnabled ()) - LOGGER.debug ("Status information requested"); - - // Build data to provide - final IJsonObject aStatusData; - if (DcngConfig.WebApp.isStatusEnabled ()) - { - aStatusData = DcngStatusHelper.getDefaultStatusData (); - // Mock status :) - aStatusData.add ("do.mock.active", MockDO.DO_ACTIVE.get ()); - } - else - { - // Status is disabled in the configuration - aStatusData = new JsonObject (); - aStatusData.add ("status.enabled", false); - } - - // Put JSON on response - aUnifiedResponse.disableCaching (); - aUnifiedResponse.setMimeType (new MimeType (CMimeType.APPLICATION_JSON).addParameter (CMimeType.PARAMETER_NAME_CHARSET, - CHARSET.name ())); - aUnifiedResponse.setContentAndCharset (aStatusData.getAsJsonString (), CHARSET); - - if (LOGGER.isTraceEnabled ()) - LOGGER.trace ("Return status JSON: " + aStatusData.getAsJsonString ()); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngWebAppListener.java b/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngWebAppListener.java deleted file mode 100644 index 251e879..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/java/com/helger/dcng/servlet/DcngWebAppListener.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.servlet; - -import javax.annotation.Nonnull; -import javax.servlet.ServletContext; - -import com.helger.dcng.api.DcngConfig; -import com.helger.dcng.core.DcngInit; -import com.helger.dcng.mockdp.MockDO; -import com.helger.dcng.webapi.DcngApiInit; -import com.helger.photon.api.IAPIRegistry; -import com.helger.photon.audit.AuditHelper; -import com.helger.photon.audit.DoNothingAuditor; -import com.helger.photon.core.servlet.WebAppListener; -import com.helger.photon.security.login.LoggedInUserManager; - -/** - * Global startup etc. listener. Initializes everything. - * - * @author Philip Helger - */ -public class DcngWebAppListener extends WebAppListener -{ - public DcngWebAppListener () - { - setHandleStatisticsOnEnd (false); - } - - @Override - protected String getDataPath (@Nonnull final ServletContext aSC) - { - String ret = DcngConfig.WebApp.getDataPath (); - if (ret == null) - { - // Fall back to servlet context path - ret = super.getDataPath (aSC); - } - return ret; - } - - @Override - protected String getServletContextPath (final ServletContext aSC) - { - try - { - return super.getServletContextPath (aSC); - } - catch (final IllegalStateException ex) - { - // E.g. "Unpack WAR files" in Tomcat is disabled - return getDataPath (aSC); - } - } - - @Override - protected void afterContextInitialized (final ServletContext aSC) - { - // Use default handler - DcngInit.initGlobally (aSC, new MockDO ()); - - // Don't write audit logs - AuditHelper.setAuditor (new DoNothingAuditor (LoggedInUserManager.getInstance ())); - } - - @Override - protected void initAPI (@Nonnull final IAPIRegistry aAPIRegistry) - { - DcngApiInit.initAPI (aAPIRegistry); - } - - @Override - protected void beforeContextDestroyed (final ServletContext aSC) - { - DcngInit.shutdownGlobally (aSC); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/main/resources/LICENSE b/dcng-webapp-phase4-it1-usi/src/main/resources/LICENSE deleted file mode 100644 index 6c1850f..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/resources/LICENSE +++ /dev/null @@ -1,497 +0,0 @@ -This project is dual licensed under Apache License, Version 2.0 -and the EUROPEAN UNION PUBLIC LICENCE v. 1.2. - - ============================================================================ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. - - ============================================================================ - - EUROPEAN UNION PUBLIC LICENCE v. 1.2 - EUPL © the European Union 2007, 2016 - -This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined -below) which is provided under the terms of this Licence. Any use of the Work, -other than as authorised under this Licence is prohibited (to the extent such -use is covered by a right of the copyright holder of the Work). - -The Work is provided under the terms of this Licence when the Licensor (as -defined below) has placed the following notice immediately following the -copyright notice for the Work: - - Licensed under the EUPL - -or has expressed by any other means his willingness to license under the EUPL. - -1. Definitions - -In this Licence, the following terms have the following meaning: - -- ‘The Licence’: this Licence. - -- ‘The Original Work’: the work or software distributed or communicated by the - Licensor under this Licence, available as Source Code and also as Executable - Code as the case may be. - -- ‘Derivative Works’: the works or software that could be created by the - Licensee, based upon the Original Work or modifications thereof. This Licence - does not define the extent of modification or dependence on the Original Work - required in order to classify a work as a Derivative Work; this extent is - determined by copyright law applicable in the country mentioned in Article 15. - -- ‘The Work’: the Original Work or its Derivative Works. - -- ‘The Source Code’: the human-readable form of the Work which is the most - convenient for people to study and modify. - -- ‘The Executable Code’: any code which has generally been compiled and which is - meant to be interpreted by a computer as a program. - -- ‘The Licensor’: the natural or legal person that distributes or communicates - the Work under the Licence. - -- ‘Contributor(s)’: any natural or legal person who modifies the Work under the - Licence, or otherwise contributes to the creation of a Derivative Work. - -- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of - the Work under the terms of the Licence. - -- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, - renting, distributing, communicating, transmitting, or otherwise making - available, online or offline, copies of the Work or providing access to its - essential functionalities at the disposal of any other natural or legal - person. - -2. Scope of the rights granted by the Licence - -The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, -sublicensable licence to do the following, for the duration of copyright vested -in the Original Work: - -- use the Work in any circumstance and for all usage, -- reproduce the Work, -- modify the Work, and make Derivative Works based upon the Work, -- communicate to the public, including the right to make available or display - the Work or copies thereof to the public and perform publicly, as the case may - be, the Work, -- distribute the Work or copies thereof, -- lend and rent the Work or copies thereof, -- sublicense rights in the Work or copies thereof. - -Those rights can be exercised on any media, supports and formats, whether now -known or later invented, as far as the applicable law permits so. - -In the countries where moral rights apply, the Licensor waives his right to -exercise his moral right to the extent allowed by law in order to make effective -the licence of the economic rights here above listed. - -The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to -any patents held by the Licensor, to the extent necessary to make use of the -rights granted on the Work under this Licence. - -3. Communication of the Source Code - -The Licensor may provide the Work either in its Source Code form, or as -Executable Code. If the Work is provided as Executable Code, the Licensor -provides in addition a machine-readable copy of the Source Code of the Work -along with each copy of the Work that the Licensor distributes or indicates, in -a notice following the copyright notice attached to the Work, a repository where -the Source Code is easily and freely accessible for as long as the Licensor -continues to distribute or communicate the Work. - -4. Limitations on copyright - -Nothing in this Licence is intended to deprive the Licensee of the benefits from -any exception or limitation to the exclusive rights of the rights owners in the -Work, of the exhaustion of those rights or of other applicable limitations -thereto. - -5. Obligations of the Licensee - -The grant of the rights mentioned above is subject to some restrictions and -obligations imposed on the Licensee. Those obligations are the following: - -Attribution right: The Licensee shall keep intact all copyright, patent or -trademarks notices and all notices that refer to the Licence and to the -disclaimer of warranties. The Licensee must include a copy of such notices and a -copy of the Licence with every copy of the Work he/she distributes or -communicates. The Licensee must cause any Derivative Work to carry prominent -notices stating that the Work has been modified and the date of modification. - -Copyleft clause: If the Licensee distributes or communicates copies of the -Original Works or Derivative Works, this Distribution or Communication will be -done under the terms of this Licence or of a later version of this Licence -unless the Original Work is expressly distributed only under this version of the -Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee -(becoming Licensor) cannot offer or impose any additional terms or conditions on -the Work or Derivative Work that alter or restrict the terms of the Licence. - -Compatibility clause: If the Licensee Distributes or Communicates Derivative -Works or copies thereof based upon both the Work and another work licensed under -a Compatible Licence, this Distribution or Communication can be done under the -terms of this Compatible Licence. For the sake of this clause, ‘Compatible -Licence’ refers to the licences listed in the appendix attached to this Licence. -Should the Licensee's obligations under the Compatible Licence conflict with -his/her obligations under this Licence, the obligations of the Compatible -Licence shall prevail. - -Provision of Source Code: When distributing or communicating copies of the Work, -the Licensee will provide a machine-readable copy of the Source Code or indicate -a repository where this Source will be easily and freely available for as long -as the Licensee continues to distribute or communicate the Work. - -Legal Protection: This Licence does not grant permission to use the trade names, -trademarks, service marks, or names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the copyright notice. - -6. Chain of Authorship - -The original Licensor warrants that the copyright in the Original Work granted -hereunder is owned by him/her or licensed to him/her and that he/she has the -power and authority to grant the Licence. - -Each Contributor warrants that the copyright in the modifications he/she brings -to the Work are owned by him/her or licensed to him/her and that he/she has the -power and authority to grant the Licence. - -Each time You accept the Licence, the original Licensor and subsequent -Contributors grant You a licence to their contributions to the Work, under the -terms of this Licence. - -7. Disclaimer of Warranty - -The Work is a work in progress, which is continuously improved by numerous -Contributors. It is not a finished work and may therefore contain defects or -‘bugs’ inherent to this type of development. - -For the above reason, the Work is provided under the Licence on an ‘as is’ basis -and without warranties of any kind concerning the Work, including without -limitation merchantability, fitness for a particular purpose, absence of defects -or errors, accuracy, non-infringement of intellectual property rights other than -copyright as stated in Article 6 of this Licence. - -This disclaimer of warranty is an essential part of the Licence and a condition -for the grant of any rights to the Work. - -8. Disclaimer of Liability - -Except in the cases of wilful misconduct or damages directly caused to natural -persons, the Licensor will in no event be liable for any direct or indirect, -material or moral, damages of any kind, arising out of the Licence or of the use -of the Work, including without limitation, damages for loss of goodwill, work -stoppage, computer failure or malfunction, loss of data or any commercial -damage, even if the Licensor has been advised of the possibility of such damage. -However, the Licensor will be liable under statutory product liability laws as -far such laws apply to the Work. - -9. Additional agreements - -While distributing the Work, You may choose to conclude an additional agreement, -defining obligations or services consistent with this Licence. However, if -accepting obligations, You may act only on your own behalf and on your sole -responsibility, not on behalf of the original Licensor or any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor harmless -for any liability incurred by, or claims asserted against such Contributor by -the fact You have accepted any warranty or additional liability. - -10. Acceptance of the Licence - -The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ -placed under the bottom of a window displaying the text of this Licence or by -affirming consent in any other similar way, in accordance with the rules of -applicable law. Clicking on that icon indicates your clear and irrevocable -acceptance of this Licence and all of its terms and conditions. - -Similarly, you irrevocably accept this Licence and all of its terms and -conditions by exercising any rights granted to You by Article 2 of this Licence, -such as the use of the Work, the creation by You of a Derivative Work or the -Distribution or Communication by You of the Work or copies thereof. - -11. Information to the public - -In case of any Distribution or Communication of the Work by means of electronic -communication by You (for example, by offering to download the Work from a -remote location) the distribution channel or media (for example, a website) must -at least provide to the public the information requested by the applicable law -regarding the Licensor, the Licence and the way it may be accessible, concluded, -stored and reproduced by the Licensee. - -12. Termination of the Licence - -The Licence and the rights granted hereunder will terminate automatically upon -any breach by the Licensee of the terms of the Licence. - -Such a termination will not terminate the licences of any person who has -received the Work from the Licensee under the Licence, provided such persons -remain in full compliance with the Licence. - -13. Miscellaneous - -Without prejudice of Article 9 above, the Licence represents the complete -agreement between the Parties as to the Work. - -If any provision of the Licence is invalid or unenforceable under applicable -law, this will not affect the validity or enforceability of the Licence as a -whole. Such provision will be construed or reformed so as necessary to make it -valid and enforceable. - -The European Commission may publish other linguistic versions or new versions of -this Licence or updated versions of the Appendix, so far this is required and -reasonable, without reducing the scope of the rights granted by the Licence. New -versions of the Licence will be published with a unique version number. - -All linguistic versions of this Licence, approved by the European Commission, -have identical value. Parties can take advantage of the linguistic version of -their choice. - -14. Jurisdiction - -Without prejudice to specific agreement between parties, - -- any litigation resulting from the interpretation of this License, arising - between the European Union institutions, bodies, offices or agencies, as a - Licensor, and any Licensee, will be subject to the jurisdiction of the Court - of Justice of the European Union, as laid down in article 272 of the Treaty on - the Functioning of the European Union, - -- any litigation arising between other parties and resulting from the - interpretation of this License, will be subject to the exclusive jurisdiction - of the competent court where the Licensor resides or conducts its primary - business. - -15. Applicable Law - -Without prejudice to specific agreement between parties, - -- this Licence shall be governed by the law of the European Union Member State - where the Licensor has his seat, resides or has his registered office, - -- this licence shall be governed by Belgian law if the Licensor has no seat, - residence or registered office inside a European Union Member State. - -Appendix - -‘Compatible Licences’ according to Article 5 EUPL are: - -- GNU General Public License (GPL) v. 2, v. 3 -- GNU Affero General Public License (AGPL) v. 3 -- Open Software License (OSL) v. 2.1, v. 3.0 -- Eclipse Public License (EPL) v. 1.0 -- CeCILL v. 2.0, v. 2.1 -- Mozilla Public Licence (MPL) v. 2 -- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 -- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for - works other than software -- European Union Public Licence (EUPL) v. 1.1, v. 1.2 -- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong - Reciprocity (LiLiQ-R+). - -The European Commission may update this Appendix to later versions of the above -licences without producing a new version of the EUPL, as long as they provide -the rights granted in Article 2 of this Licence and protect the covered Source -Code from exclusive appropriation. - -All other changes or additions to this Appendix require the production of a new -EUPL version. - \ No newline at end of file diff --git a/dcng-webapp-phase4-it1-usi/src/main/resources/NOTICE b/dcng-webapp-phase4-it1-usi/src/main/resources/NOTICE deleted file mode 100644 index 6b30bbf..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/resources/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -============================================================================= -= NOTICE file corresponding to section 4d of the Apache License Version 2.0 = -============================================================================= -This product includes Open Source Software developed by -Philip Helger - https://www.helger.com/ diff --git a/dcng-webapp-phase4-it1-usi/src/main/resources/application.properties b/dcng-webapp-phase4-it1-usi/src/main/resources/application.properties deleted file mode 100644 index 5e63e2e..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/resources/application.properties +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2021 Philip Helger (www.helger.com) -# philip[at]helger[dot]com -# -# 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. -# - -# [CHANGEME] Global flags for initializer -global.debug = false -global.production = false - -# [CHANGEME] Instance name for logging only -global.instancename = dev-from-ide - -# [CHANGEME] For debugging only -http.tls.trustall = true - -# Global Toop Kafka tracker active? -de4a.tracker.enabled = true -de4a.tracker.viahttp = false -de4a.tracker.topic = de4a-at-dev - -# What AS4 implementation to use? -de4a.me.implementation = phase4 - -# [CHANGEME] destination URL for incoming AS4 messages to DC/DP -de4a.me.incoming.url= - -# [CHANGEME] -phase4.send.fromparty.id = de4a-test1 -# Empty means: no dump -phase4.send.response.folder = - -phase4.datapath = conf/as4 -# Configure if you like -phase4.debug.http = false -phase4.debug.incoming = false -phase4.dump.incoming.path = conf/as4-dumps/incoming -phase4.dump.outgoing.path = conf/as4-dumps/outgoing - -# AS4 keystore for signing/decrypting -phase4.keystore.type = pkcs12 -phase4.keystore.path = de4a-as4-pilot-2021.p12 -phase4.keystore.password = de4a -phase4.keystore.key-alias = connector -phase4.keystore.key-password = de4a diff --git a/dcng-webapp-phase4-it1-usi/src/main/resources/log4j2.xml b/dcng-webapp-phase4-it1-usi/src/main/resources/log4j2.xml deleted file mode 100644 index 5b79bf5..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/resources/log4j2.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dcng-webapp-phase4-it1-usi/src/main/webapp/WEB-INF/web.xml b/dcng-webapp-phase4-it1-usi/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 0998eb0..0000000 --- a/dcng-webapp-phase4-it1-usi/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - DE4A Connector NG - https://github.com/de4a-at/de4a-connector-ng - - - 60 - - - - com.helger.dcng.servlet.DcngWebAppListener - - - - PhotonAPIServlet - com.helger.photon.api.servlet.PhotonAPIServlet - - - - PhotonAPIServlet - /api/* - - diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/SPITest.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/SPITest.java deleted file mode 100644 index 542675d..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/SPITest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng; - -import org.junit.Test; - -import com.helger.commons.mock.SPITestHelper; -import com.helger.dcng.api.DcngConfig; -import com.helger.photon.core.mock.PhotonCoreValidator; - -/** - * Test SPI definitions and web.xml - * - * @author Philip Helger - */ -public final class SPITest -{ - @Test - public void testBasic () throws Exception - { - SPITestHelper.testIfAllSPIImplementationsAreValid (); - PhotonCoreValidator.validateExternalResources (); - } - - @Test - public void testConfig () throws Exception - { - // Required to test the ph-config bug when building on the commandline - DcngConfig.Tracker.isTrackerEnabled (); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToNetherlands.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToNetherlands.java deleted file mode 100644 index dd1c0e1..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToNetherlands.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.api.as4; - -import java.io.IOException; - -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ByteArrayEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.helger.commons.CGlobal; -import com.helger.commons.io.resource.ClassPathResource; -import com.helger.commons.io.stream.StreamHelper; -import com.helger.commons.mime.CMimeType; -import com.helger.dcng.api.DcngIdentifierFactory; -import com.helger.dcng.api.me.EMEProtocol; -import com.helger.dcng.api.rest.DCNGOutgoingMessage; -import com.helger.dcng.api.rest.DCNGOutgoingMetadata; -import com.helger.dcng.api.rest.DCNGPayload; -import com.helger.dcng.api.rest.DcngRestJAXB; -import com.helger.httpclient.HttpClientManager; -import com.helger.httpclient.HttpClientSettings; -import com.helger.httpclient.response.ResponseHandlerJson; -import com.helger.json.IJson; -import com.helger.json.serialize.JsonWriter; -import com.helger.json.serialize.JsonWriterSettings; - -public final class MainSendRequestToNetherlands -{ - private static final Logger LOGGER = LoggerFactory.getLogger (MainSendRequestToNetherlands.class); - - public static void main (final String [] args) throws IOException - { - final DCNGOutgoingMessage aOM = new DCNGOutgoingMessage (); - { - final DCNGOutgoingMetadata aMetadata = new DCNGOutgoingMetadata (); - aMetadata.setSenderID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9915:de4atest")); - aMetadata.setReceiverID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9991:nl990000106")); - aMetadata.setDocTypeID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.DOCTYPE_SCHEME, "CompanyRegistration")); - aMetadata.setProcessID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PROCESS_SCHEME, "request")); - // aMetadata.setPayloadType (DCNGPayloadType.REQUEST); - aMetadata.setTransportProtocol (EMEProtocol.AS4.getTransportProfileID ()); - aOM.setMetadata (aMetadata); - } - { - final DCNGPayload aPayload = new DCNGPayload (); - aPayload.setValue (StreamHelper.getAllBytes (new ClassPathResource ("xml/dba-nl-1.xml"))); - aPayload.setMimeType (CMimeType.APPLICATION_XML.getAsString ()); - aPayload.setContentID ("RequestTransferEvidence"); - aOM.addPayload (aPayload); - } - - LOGGER.info (DcngRestJAXB.outgoingMessage ().getAsString (aOM)); - - try (final HttpClientManager aHCM = HttpClientManager.create (new HttpClientSettings ().setSocketTimeoutMS ((int) (30 * - CGlobal.MILLISECONDS_PER_SECOND)))) - { - final HttpPost aPost = new HttpPost ("http://localhost:9092/api/lookup/send"); - aPost.setEntity (new ByteArrayEntity (DcngRestJAXB.outgoingMessage ().getAsBytes (aOM))); - final IJson aJson = aHCM.execute (aPost, new ResponseHandlerJson ()); - LOGGER.info (new JsonWriter (new JsonWriterSettings ().setIndentEnabled (true)).writeAsString (aJson)); - } - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToRomania.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToRomania.java deleted file mode 100644 index dbde10b..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToRomania.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.api.as4; - -import java.io.IOException; - -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ByteArrayEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.helger.commons.CGlobal; -import com.helger.commons.io.resource.ClassPathResource; -import com.helger.commons.io.stream.StreamHelper; -import com.helger.commons.mime.CMimeType; -import com.helger.dcng.api.DcngIdentifierFactory; -import com.helger.dcng.api.me.EMEProtocol; -import com.helger.dcng.api.rest.DCNGOutgoingMessage; -import com.helger.dcng.api.rest.DCNGOutgoingMetadata; -import com.helger.dcng.api.rest.DCNGPayload; -import com.helger.dcng.api.rest.DcngRestJAXB; -import com.helger.httpclient.HttpClientManager; -import com.helger.httpclient.HttpClientSettings; -import com.helger.httpclient.response.ResponseHandlerJson; -import com.helger.json.IJson; -import com.helger.json.serialize.JsonWriter; -import com.helger.json.serialize.JsonWriterSettings; - -public final class MainSendRequestToRomania -{ - private static final Logger LOGGER = LoggerFactory.getLogger (MainSendRequestToRomania.class); - - public static void main (final String [] args) throws IOException - { - final DCNGOutgoingMessage aOM = new DCNGOutgoingMessage (); - { - final DCNGOutgoingMetadata aMetadata = new DCNGOutgoingMetadata (); - aMetadata.setSenderID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9915:de4atest")); - aMetadata.setReceiverID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9991:ro000000006")); - aMetadata.setDocTypeID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.DOCTYPE_SCHEME, "CompanyRegistration")); - aMetadata.setProcessID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PROCESS_SCHEME, "request")); - // aMetadata.setPayloadType (DCNGPayloadType.REQUEST); - aMetadata.setTransportProtocol (EMEProtocol.AS4.getTransportProfileID ()); - aOM.setMetadata (aMetadata); - } - { - final DCNGPayload aPayload = new DCNGPayload (); - aPayload.setValue (StreamHelper.getAllBytes (new ClassPathResource ("xml/dba-ro-1.xml"))); - aPayload.setMimeType (CMimeType.APPLICATION_XML.getAsString ()); - aPayload.setContentID ("RequestTransferEvidence"); - aOM.addPayload (aPayload); - } - - LOGGER.info (DcngRestJAXB.outgoingMessage ().getAsString (aOM)); - - try (final HttpClientManager aHCM = HttpClientManager.create (new HttpClientSettings ().setSocketTimeoutMS ((int) (30 * - CGlobal.MILLISECONDS_PER_SECOND)))) - { - final HttpPost aPost = new HttpPost ("http://localhost:9092/api/lookup/send"); - aPost.setEntity (new ByteArrayEntity (DcngRestJAXB.outgoingMessage ().getAsBytes (aOM))); - final IJson aJson = aHCM.execute (aPost, new ResponseHandlerJson ()); - LOGGER.info (new JsonWriter (new JsonWriterSettings ().setIndentEnabled (true)).writeAsString (aJson)); - } - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToSweden.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToSweden.java deleted file mode 100644 index 6eaebd6..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendRequestToSweden.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.api.as4; - -import java.io.IOException; - -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ByteArrayEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.helger.commons.CGlobal; -import com.helger.commons.io.resource.ClassPathResource; -import com.helger.commons.io.stream.StreamHelper; -import com.helger.commons.mime.CMimeType; -import com.helger.dcng.api.DcngIdentifierFactory; -import com.helger.dcng.api.me.EMEProtocol; -import com.helger.dcng.api.rest.DCNGOutgoingMessage; -import com.helger.dcng.api.rest.DCNGOutgoingMetadata; -import com.helger.dcng.api.rest.DCNGPayload; -import com.helger.dcng.api.rest.DcngRestJAXB; -import com.helger.httpclient.HttpClientManager; -import com.helger.httpclient.HttpClientSettings; -import com.helger.httpclient.response.ResponseHandlerJson; -import com.helger.json.IJson; -import com.helger.json.serialize.JsonWriter; -import com.helger.json.serialize.JsonWriterSettings; - -public final class MainSendRequestToSweden -{ - private static final Logger LOGGER = LoggerFactory.getLogger (MainSendRequestToSweden.class); - - public static void main (final String [] args) throws IOException - { - final DCNGOutgoingMessage aOM = new DCNGOutgoingMessage (); - { - final DCNGOutgoingMetadata aMetadata = new DCNGOutgoingMetadata (); - aMetadata.setSenderID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9915:de4atest")); - aMetadata.setReceiverID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9991:se000000013")); - aMetadata.setDocTypeID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.DOCTYPE_SCHEME, "CompanyRegistration")); - aMetadata.setProcessID (DcngRestJAXB.createDCNGID (DcngIdentifierFactory.PROCESS_SCHEME, "request")); - // aMetadata.setPayloadType (DCNGPayloadType.REQUEST); - aMetadata.setTransportProtocol (EMEProtocol.AS4.getTransportProfileID ()); - aOM.setMetadata (aMetadata); - } - { - final DCNGPayload aPayload = new DCNGPayload (); - aPayload.setValue (StreamHelper.getAllBytes (new ClassPathResource ("xml/dba-se-1.xml"))); - if (aPayload.getValue () == null || aPayload.getValue ().length == 0) - throw new IllegalStateException ("Payload is empty"); - aPayload.setMimeType (CMimeType.APPLICATION_XML.getAsString ()); - aPayload.setContentID ("RequestTransferEvidence"); - aOM.addPayload (aPayload); - } - - LOGGER.info (DcngRestJAXB.outgoingMessage ().getAsString (aOM)); - - try (final HttpClientManager aHCM = HttpClientManager.create (new HttpClientSettings ().setSocketTimeoutMS ((int) (30 * - CGlobal.MILLISECONDS_PER_SECOND)))) - { - final HttpPost aPost = new HttpPost ("http://localhost:9092/api/lookup/send"); - aPost.setEntity (new ByteArrayEntity (DcngRestJAXB.outgoingMessage ().getAsBytes (aOM))); - final IJson aJson = aHCM.execute (aPost, new ResponseHandlerJson ()); - LOGGER.info (new JsonWriter (new JsonWriterSettings ().setIndentEnabled (true)).writeAsString (aJson)); - } - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetDocTypes.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetDocTypes.java deleted file mode 100644 index 89907c8..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetDocTypes.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.api.as4; - -import java.io.IOException; - -import org.apache.http.client.methods.HttpGet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.helger.dcng.api.DcngIdentifierFactory; -import com.helger.httpclient.HttpClientManager; -import com.helger.httpclient.response.ResponseHandlerJson; -import com.helger.json.IJson; -import com.helger.json.serialize.JsonWriter; -import com.helger.json.serialize.JsonWriterSettings; -import com.helger.peppolid.CIdentifier; - -public class MainSendSmpGetDocTypes -{ - private static final Logger LOGGER = LoggerFactory.getLogger (MainSendSmpGetDocTypes.class); - - public static void main (final String [] args) throws IOException - { - final String sReceiverID = CIdentifier.getURIPercentEncoded (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9999:ro000000006"); - - try (final HttpClientManager aHCM = new HttpClientManager ()) - { - final HttpGet aGet = new HttpGet ("http://localhost:9092/api/smp/doctypes/" + sReceiverID); - final IJson aJson = aHCM.execute (aGet, new ResponseHandlerJson ()); - LOGGER.info (new JsonWriter (new JsonWriterSettings ().setIndentEnabled (true)).writeAsString (aJson)); - } - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetEndpoints.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetEndpoints.java deleted file mode 100644 index 711a756..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/api/as4/MainSendSmpGetEndpoints.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.api.as4; - -import java.io.IOException; - -import org.apache.http.client.methods.HttpGet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.helger.dcng.api.DcngIdentifierFactory; -import com.helger.httpclient.HttpClientManager; -import com.helger.httpclient.response.ResponseHandlerJson; -import com.helger.json.IJson; -import com.helger.json.serialize.JsonWriter; -import com.helger.json.serialize.JsonWriterSettings; -import com.helger.peppolid.CIdentifier; - -public class MainSendSmpGetEndpoints -{ - private static final Logger LOGGER = LoggerFactory.getLogger (MainSendSmpGetEndpoints.class); - - public static void main (final String [] args) throws IOException - { - final String sReceiverID = CIdentifier.getURIPercentEncoded (DcngIdentifierFactory.PARTICIPANT_SCHEME, "9999:ro000000006"); - final String sDocTypeID = CIdentifier.getURIPercentEncoded (DcngIdentifierFactory.DOCTYPE_SCHEME, "CompanyRegistration"); - - try (final HttpClientManager aHCM = new HttpClientManager ()) - { - final HttpGet aGet = new HttpGet ("http://localhost:9092/api/smp/endpoints/" + sReceiverID + "/" + sDocTypeID); - final IJson aJson = aHCM.execute (aGet, new ResponseHandlerJson ()); - LOGGER.info (new JsonWriter (new JsonWriterSettings ().setIndentEnabled (true)).writeAsString (aJson)); - } - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/JettyStopDCNG.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/JettyStopDCNG.java deleted file mode 100644 index 7d2feb4..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/JettyStopDCNG.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.jetty; - -import java.io.IOException; - -import com.helger.photon.jetty.JettyStopper; - -public final class JettyStopDCNG -{ - public static void main (final String [] args) throws IOException - { - new JettyStopper ().setStopPort (9093).run (); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/RunInJettyDCNG.java b/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/RunInJettyDCNG.java deleted file mode 100644 index c4912d6..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/java/com/helger/dcng/jetty/RunInJettyDCNG.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 Philip Helger (www.helger.com) - * philip[at]helger[dot]com - * - * 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 com.helger.dcng.jetty; - -import javax.annotation.concurrent.Immutable; - -import com.helger.photon.jetty.JettyStarter; - -/** - * Run as a standalone web application in Jetty on port 9092.
- * http://localhost:9092/ - * - * @author Philip Helger - */ -@Immutable -public final class RunInJettyDCNG -{ - public static void main (final String [] args) throws Exception - { - final JettyStarter js = new JettyStarter (RunInJettyDCNG.class).setPort (9092) - .setStopPort (9093) - .setSessionCookieName ("DCNG_SESSION") - .setContainerIncludeJarPattern (JettyStarter.CONTAINER_INCLUDE_JAR_PATTERN_ALL); - js.run (); - } -} diff --git a/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-nl-1.xml b/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-nl-1.xml deleted file mode 100644 index ec00ffb..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-nl-1.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 21ce328c-f614-43cc-a035-1e41552ad577 - SpecificationId - 2021-09-06T17:02:12.129Z - ProcedureId - - iso6523-actorid-upis::9915:de4atest - (BMDW) Bundesministerium für Digitalisierung und Wirtschaftsstandort - - - iso6523-actorid-upis::9991:nl990000106 - (KVK) Chamber of Commerce of Netherlands - - - - NL/AT/90000471 - ELVILA SA - - - - SDGR14 - - urn:de4a-eu:CanonicalEvidenceType::CompanyRegistration - \ No newline at end of file diff --git a/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-ro-1.xml b/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-ro-1.xml deleted file mode 100644 index 634ec31..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-ro-1.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - f531d97e-f43b-4b9c-9a1b-daf0f22bf70a - SpecificationId - 2021-09-02T17:54:27.566Z - ProcedureId - - iso6523-actorid-upis::9915:de4atest - (BMDW) Bundesministerium für Digitalisierung und Wirtschaftsstandort - - - iso6523-actorid-upis::9991:ro000000006 - (ORNC) Oficiul National B22 Al Registrului Comertului - - - - RO/AT/J40/365/1991 - Regional Tris-ice Coöperatie - - - - SDGR14 - - urn:de4a-eu:CanonicalEvidenceType::CompanyRegistration - diff --git a/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-se-1.xml b/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-se-1.xml deleted file mode 100644 index 8ea553c..0000000 --- a/dcng-webapp-phase4-it1-usi/src/test/resources/xml/dba-se-1.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 3400a4fd-97ef-4e8d-a496-ecc24c3e8d21 - SpecificationId - 2021-09-07T12:16:48.957Z - ProcedureId - - iso6523-actorid-upis::9915:de4atest - (BMDW) Bundesministerium für Digitalisierung und Wirtschaftsstandort - - - iso6523-actorid-upis::9991:se000000013 - (BVE) BOLAGSVERKET (Companies Registration Office) - - - - SE/AT/5591674170 - Företag Ett AB - - - - SDGR14 - - urn:de4a-eu:CanonicalEvidenceType::CompanyRegistration - diff --git a/pom.xml b/pom.xml index f2c811f..6d4b538 100644 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,6 @@ dcng-holodeck dcng-web-api dcng-webapp-phase4-it1-im - dcng-webapp-phase4-it1-usi