diff --git a/phoss-smp-backend/pom.xml b/phoss-smp-backend/pom.xml
index 5fba80458..997f3419c 100644
--- a/phoss-smp-backend/pom.xml
+++ b/phoss-smp-backend/pom.xml
@@ -24,6 +24,7 @@
SMP backend library with all common parts used for a full SMP server web application
https://github.com/phax/phoss-smp/phoss-smp-backend
2015
+
MPL 2.0
@@ -31,10 +32,12 @@
repo
+
Philip Helger
http://www.helger.com
+
philip
@@ -43,6 +46,7 @@
http://www.helger.com
+
com.helger.commons
@@ -77,18 +81,20 @@
ph-oton-core
- com.helger
- phoss-directory-businesscard
+ com.helger.peppol
+ peppol-directory-businesscard
com.helger
ph-xmldsig
+
jakarta.servlet
jakarta.servlet-api
provided
+
junit
junit
@@ -99,6 +105,7 @@
ph-oton-security
true
+
org.slf4j
slf4j-simple
@@ -110,6 +117,7 @@
test
+
diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/ISMPBusinessCard.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/ISMPBusinessCard.java
index 322da2af8..0934c0c2a 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/ISMPBusinessCard.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/ISMPBusinessCard.java
@@ -20,7 +20,7 @@
import com.helger.commons.annotation.ReturnsMutableCopy;
import com.helger.commons.collection.impl.ICommonsList;
import com.helger.commons.id.IHasID;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
import com.helger.peppolid.IParticipantIdentifier;
/**
diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCard.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCard.java
index b858ab04f..c1b22cf6e 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCard.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCard.java
@@ -24,8 +24,8 @@
import com.helger.commons.hashcode.HashCodeGenerator;
import com.helger.commons.string.ToStringGenerator;
import com.helger.commons.type.ObjectType;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
import com.helger.peppolid.IParticipantIdentifier;
import com.helger.phoss.smp.domain.servicegroup.SMPServiceGroup;
diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardContact.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardContact.java
index 76e3c2d4d..edc5e62f8 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardContact.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardContact.java
@@ -24,8 +24,8 @@
import com.helger.commons.id.factory.GlobalIDFactory;
import com.helger.commons.string.StringHelper;
import com.helger.commons.string.ToStringGenerator;
-import com.helger.pd.businesscard.generic.PDContact;
-import com.helger.pd.businesscard.v3.PD3ContactType;
+import com.helger.peppol.businesscard.generic.PDContact;
+import com.helger.peppol.businesscard.v3.PD3ContactType;
/**
* A single business card contact.
diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardEntity.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardEntity.java
index 6ff90f2ac..0e3fe815d 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardEntity.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardEntity.java
@@ -31,11 +31,11 @@
import com.helger.commons.string.ToStringGenerator;
import com.helger.json.IJsonArray;
import com.helger.json.JsonArray;
-import com.helger.pd.businesscard.generic.PDBusinessEntity;
-import com.helger.pd.businesscard.generic.PDContact;
-import com.helger.pd.businesscard.generic.PDIdentifier;
-import com.helger.pd.businesscard.generic.PDName;
-import com.helger.pd.businesscard.v3.PD3BusinessEntityType;
+import com.helger.peppol.businesscard.generic.PDBusinessEntity;
+import com.helger.peppol.businesscard.generic.PDContact;
+import com.helger.peppol.businesscard.generic.PDIdentifier;
+import com.helger.peppol.businesscard.generic.PDName;
+import com.helger.peppol.businesscard.v3.PD3BusinessEntityType;
/**
* This class represents a single Business Card entity - a part of a Business
diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardIdentifier.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardIdentifier.java
index 3d30f784a..21462ae84 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardIdentifier.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardIdentifier.java
@@ -22,9 +22,9 @@
import com.helger.commons.id.IHasID;
import com.helger.commons.id.factory.GlobalIDFactory;
import com.helger.commons.string.ToStringGenerator;
-import com.helger.pd.businesscard.generic.PDIdentifier;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3IdentifierType;
+import com.helger.peppol.businesscard.generic.PDIdentifier;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3IdentifierType;
/**
* A single business card identifier.
diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardName.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardName.java
index bddc29edd..68f7ab1a9 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardName.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardName.java
@@ -25,9 +25,9 @@
import com.helger.commons.string.ToStringGenerator;
import com.helger.json.IJsonObject;
import com.helger.json.JsonObject;
-import com.helger.pd.businesscard.generic.PDName;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3MultilingualNameType;
+import com.helger.peppol.businesscard.generic.PDName;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3MultilingualNameType;
/**
* Generic name.
diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/restapi/BusinessCardServerAPI.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/restapi/BusinessCardServerAPI.java
index f0627f43c..83c96fdba 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/restapi/BusinessCardServerAPI.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/restapi/BusinessCardServerAPI.java
@@ -22,9 +22,9 @@
import com.helger.commons.statistics.IMutableStatisticsHandlerKeyedCounter;
import com.helger.commons.statistics.IStatisticsHandlerKeyedCounter;
import com.helger.commons.statistics.StatisticsManager;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.generic.PDBusinessEntity;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.generic.PDBusinessEntity;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
import com.helger.peppolid.IParticipantIdentifier;
import com.helger.peppolid.factory.IIdentifierFactory;
import com.helger.phoss.smp.domain.SMPMetaManager;
diff --git a/phoss-smp-webapp-xml/src/test/java/com/helger/phoss/smp/rest/BusinessCardInterfaceTest.java b/phoss-smp-webapp-xml/src/test/java/com/helger/phoss/smp/rest/BusinessCardInterfaceTest.java
index 11d8becd0..32e0d728b 100644
--- a/phoss-smp-webapp-xml/src/test/java/com/helger/phoss/smp/rest/BusinessCardInterfaceTest.java
+++ b/phoss-smp-webapp-xml/src/test/java/com/helger/phoss/smp/rest/BusinessCardInterfaceTest.java
@@ -38,15 +38,15 @@
import com.helger.commons.io.resource.FileSystemResource;
import com.helger.commons.string.StringHelper;
import com.helger.http.basicauth.BasicAuthClientCredentials;
-import com.helger.pd.businesscard.v1.PD1APIHelper;
-import com.helger.pd.businesscard.v1.PD1BusinessCardType;
-import com.helger.pd.businesscard.v1.PD1BusinessEntityType;
-import com.helger.pd.businesscard.v2.PD2APIHelper;
-import com.helger.pd.businesscard.v2.PD2BusinessCardType;
-import com.helger.pd.businesscard.v2.PD2BusinessEntityType;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
-import com.helger.pd.businesscard.v3.PD3BusinessEntityType;
+import com.helger.peppol.businesscard.v1.PD1APIHelper;
+import com.helger.peppol.businesscard.v1.PD1BusinessCardType;
+import com.helger.peppol.businesscard.v1.PD1BusinessEntityType;
+import com.helger.peppol.businesscard.v2.PD2APIHelper;
+import com.helger.peppol.businesscard.v2.PD2BusinessCardType;
+import com.helger.peppol.businesscard.v2.PD2BusinessEntityType;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3BusinessEntityType;
import com.helger.peppolid.IParticipantIdentifier;
import com.helger.peppolid.factory.PeppolIdentifierFactory;
import com.helger.peppolid.simple.participant.SimpleParticipantIdentifier;
@@ -81,9 +81,9 @@ public final class BusinessCardInterfaceTest
public final SMPServerRESTTestRule m_aRule = new SMPServerRESTTestRule (new FileSystemResource ("src/test/resources/test-smp-server-xml-peppol.properties"));
private final ObjectFactory m_aObjFactory = new ObjectFactory ();
- private final com.helger.pd.businesscard.v1.ObjectFactory m_aBC1ObjFactory = new com.helger.pd.businesscard.v1.ObjectFactory ();
- private final com.helger.pd.businesscard.v2.ObjectFactory m_aBC2ObjFactory = new com.helger.pd.businesscard.v2.ObjectFactory ();
- private final com.helger.pd.businesscard.v3.ObjectFactory m_aBC3ObjFactory = new com.helger.pd.businesscard.v3.ObjectFactory ();
+ private final com.helger.peppol.businesscard.v1.ObjectFactory m_aBC1ObjFactory = new com.helger.peppol.businesscard.v1.ObjectFactory ();
+ private final com.helger.peppol.businesscard.v2.ObjectFactory m_aBC2ObjFactory = new com.helger.peppol.businesscard.v2.ObjectFactory ();
+ private final com.helger.peppol.businesscard.v3.ObjectFactory m_aBC3ObjFactory = new com.helger.peppol.businesscard.v3.ObjectFactory ();
@Nonnull
private static Builder _addCredentials (@Nonnull final Builder aBuilder)
@@ -129,8 +129,8 @@ public void testGetCreateV1GetDeleteGet ()
try
{
// Create SG
- aResponseMsg = _addCredentials (aTarget.path (sPI)
- .request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (aSG)));
+ aResponseMsg = _addCredentials (aTarget.path (sPI).request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (
+ aSG)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get SG - must work
@@ -155,9 +155,8 @@ public void testGetCreateV1GetDeleteGet ()
aBE.setGeographicalInformation ("Berlin");
aBC.addBusinessEntity (aBE);
- aResponseMsg = _addCredentials (aTarget.path ("businesscard")
- .path (sPI)
- .request ()).put (Entity.xml (m_aBC1ObjFactory.createBusinessCard (aBC)));
+ aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+ m_aBC1ObjFactory.createBusinessCard (aBC)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get BC - must work (always V3)
@@ -174,9 +173,8 @@ public void testGetCreateV1GetDeleteGet ()
aBE.setCountryCode ("SE");
aBE.setGeographicalInformation ("Stockholm");
aBC.addBusinessEntity (aBE);
- aResponseMsg = _addCredentials (aTarget.path ("businesscard")
- .path (sPI)
- .request ()).put (Entity.xml (m_aBC1ObjFactory.createBusinessCard (aBC)));
+ aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+ m_aBC1ObjFactory.createBusinessCard (aBC)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get BC - must work (always V3)
@@ -228,8 +226,8 @@ public void testGetCreateV2GetDeleteGet ()
try
{
// Create SG
- aResponseMsg = _addCredentials (aTarget.path (sPI)
- .request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (aSG)));
+ aResponseMsg = _addCredentials (aTarget.path (sPI).request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (
+ aSG)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get SG - must work
@@ -254,9 +252,8 @@ public void testGetCreateV2GetDeleteGet ()
aBE.setGeographicalInformation ("Berlin");
aBC.addBusinessEntity (aBE);
- aResponseMsg = _addCredentials (aTarget.path ("businesscard")
- .path (sPI)
- .request ()).put (Entity.xml (m_aBC2ObjFactory.createBusinessCard (aBC)));
+ aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+ m_aBC2ObjFactory.createBusinessCard (aBC)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get BC - must work (always V3)
@@ -273,9 +270,8 @@ public void testGetCreateV2GetDeleteGet ()
aBE.setCountryCode ("SE");
aBE.setGeographicalInformation ("Stockholm");
aBC.addBusinessEntity (aBE);
- aResponseMsg = _addCredentials (aTarget.path ("businesscard")
- .path (sPI)
- .request ()).put (Entity.xml (m_aBC2ObjFactory.createBusinessCard (aBC)));
+ aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+ m_aBC2ObjFactory.createBusinessCard (aBC)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get BC - must work (always V3)
@@ -327,8 +323,8 @@ public void testGetCreateV3GetDeleteGet ()
try
{
// Create SG
- aResponseMsg = _addCredentials (aTarget.path (sPI)
- .request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (aSG)));
+ aResponseMsg = _addCredentials (aTarget.path (sPI).request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (
+ aSG)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get SG - must work
@@ -353,9 +349,8 @@ public void testGetCreateV3GetDeleteGet ()
aBE.setGeographicalInformation ("Berlin");
aBC.addBusinessEntity (aBE);
- aResponseMsg = _addCredentials (aTarget.path ("businesscard")
- .path (sPI)
- .request ()).put (Entity.xml (m_aBC3ObjFactory.createBusinessCard (aBC)));
+ aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+ m_aBC3ObjFactory.createBusinessCard (aBC)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get BC - must work (always V3)
@@ -372,9 +367,8 @@ public void testGetCreateV3GetDeleteGet ()
aBE.setCountryCode ("SE");
aBE.setGeographicalInformation ("Stockholm");
aBC.addBusinessEntity (aBE);
- aResponseMsg = _addCredentials (aTarget.path ("businesscard")
- .path (sPI)
- .request ()).put (Entity.xml (m_aBC3ObjFactory.createBusinessCard (aBC)));
+ aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+ m_aBC3ObjFactory.createBusinessCard (aBC)));
_testResponseJerseyClient (aResponseMsg, 200);
// Get BC - must work (always V3)
diff --git a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardGet.java b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardGet.java
index 48f2d35b7..30439dc61 100644
--- a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardGet.java
+++ b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardGet.java
@@ -22,8 +22,8 @@
import com.helger.commons.annotation.Nonempty;
import com.helger.commons.mime.CMimeType;
-import com.helger.pd.businesscard.v3.PD3BusinessCardMarshaller;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardMarshaller;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
import com.helger.phoss.smp.app.SMPWebAppConfiguration;
import com.helger.phoss.smp.domain.SMPMetaManager;
import com.helger.phoss.smp.exception.SMPPreconditionFailedException;
diff --git a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardPut.java b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardPut.java
index 24cdbd32c..64668649f 100644
--- a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardPut.java
+++ b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardPut.java
@@ -25,8 +25,8 @@
import com.helger.commons.http.CHttp;
import com.helger.commons.io.stream.StreamHelper;
import com.helger.commons.state.ESuccess;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.helper.PDBusinessCardHelper;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.helper.PDBusinessCardHelper;
import com.helger.phoss.smp.app.SMPWebAppConfiguration;
import com.helger.phoss.smp.domain.SMPMetaManager;
import com.helger.phoss.smp.exception.SMPBadRequestException;
diff --git a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetBusinessCard.java b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetBusinessCard.java
index 2eb29ab01..3e8614bde 100644
--- a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetBusinessCard.java
+++ b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetBusinessCard.java
@@ -39,8 +39,8 @@
import com.helger.json.IJsonObject;
import com.helger.json.serialize.JsonWriter;
import com.helger.json.serialize.JsonWriterSettings;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.helper.PDBusinessCardHelper;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.helper.PDBusinessCardHelper;
import com.helger.peppol.sml.ESMPAPIType;
import com.helger.peppolid.IParticipantIdentifier;
import com.helger.peppolid.factory.IIdentifierFactory;
diff --git a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetDocTypes.java b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetDocTypes.java
index 3d1b80e4c..39e18af4a 100644
--- a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetDocTypes.java
+++ b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetDocTypes.java
@@ -42,8 +42,8 @@
import com.helger.json.JsonObject;
import com.helger.json.serialize.JsonWriter;
import com.helger.json.serialize.JsonWriterSettings;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.helper.PDBusinessCardHelper;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.helper.PDBusinessCardHelper;
import com.helger.peppol.sml.ESMPAPIType;
import com.helger.peppolid.CIdentifier;
import com.helger.peppolid.IParticipantIdentifier;
diff --git a/pom.xml b/pom.xml
index aabd4a830..6a5a621ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
2.21.1
- 3.24.1
+ 3.25.0
@@ -126,14 +126,20 @@
com.helger.peppol
peppol-commons-parent-pom
- 9.0.8
+ 9.1.0
pom
import
+
+
+ com.helger.peppol
+ peppol-directory-businesscard
+ 9.1.0
+
com.helger
phoss-directory-parent-pom
- 0.12.2
+ 0.13.0
pom
import
@@ -150,7 +156,7 @@
com.fasterxml.jackson
jackson-bom
- 2.15.2
+ 2.15.3
pom
import