Renamed all the groupid and artifacts to be inline with Quarkivers na…

…ming conventions.
quarkiverse · Aug 17, 2024 · 1106f9b · 1106f9b
1 parent 2aeb3cd
commit 1106f9b
Show file tree

Hide file tree

Showing 44 changed files with 2,338 additions and 7,689 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -11,4 +11,4 @@
 # In each subsection folders are ordered first by depth, then alphabetically.
 # This should make it easy to add new rules without breaking existing ones.
 
-#*   @quarkiverse/quarkiverse-diameter
+*   @quarkiverse/quarkiverse-jdiameter
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,8 +50,8 @@ jobs:
       - name: Update latest release version in docs
         run: |
           mvn -B -ntp -pl docs -am package -DskipTests -DskipITs -Denforcer.skip -Dformatter.skip -Dimpsort.skip
-          if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then
-            git add docs/modules/ROOT/pages/includes/attributes.adoc
+          if ! git diff --quiet docs/modules/ROOT/pages/includes; then
+            git add docs/modules/ROOT/pages/includes
             git commit -m "Update the latest release version ${{steps.metadata.outputs.current-version}} in documentation"
           fi
 

diff --git a/core/jdiameter-ha/api/pom.xml b/core/jdiameter-ha/api/pom.xml
@@ -4,19 +4,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.quarkiverse.diameter</groupId>
+        <groupId>io.quarkiverse.jdiameter</groupId>
         <artifactId>jdiameter-ha-parent</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jdiameter-ha-api</artifactId>
 
-    <name>Quarkus :: Diameter Stack HA :: ${project.artifactId}</name>
+    <name>Quarkus :: JDiameter Stack HA :: Api</name>
 
     <dependencies>
         <dependency>
-            <groupId>io.quarkiverse.diameter</groupId>
+            <groupId>io.quarkiverse.jdiameter</groupId>
             <artifactId>jdiameter-api</artifactId>
         </dependency>
     </dependencies>

diff --git a/core/jdiameter-ha/impl/pom.xml b/core/jdiameter-ha/impl/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.quarkiverse.diameter</groupId>
+        <groupId>io.quarkiverse.jdiameter</groupId>
         <artifactId>jdiameter-ha-parent</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jdiameter-ha-impl</artifactId>
 
-    <name>Quarkus :: Diameter Stack HA :: ${project.artifactId}</name>
+    <name>Quarkus :: JDiameter Stack HA :: Impl</name>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.quarkiverse.diameter</groupId>
+            <groupId>io.quarkiverse.jdiameter</groupId>
             <artifactId>jdiameter-impl</artifactId>
         </dependency>
 

diff --git a/core/jdiameter-ha/pom.xml b/core/jdiameter-ha/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.quarkiverse.diameter</groupId>
+        <groupId>io.quarkiverse.jdiameter</groupId>
         <artifactId>diameter-core-parent</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
@@ -14,7 +14,7 @@
 
     <packaging>pom</packaging>
 
-    <name>Quarkus :: Diameter Stack HA :: ${project.artifactId}</name>
+    <name>Quarkus :: JDiameter Stack HA :: Parent</name>
 
     <modules>
         <module>api</module>

diff --git a/core/jdiameter/api/pom.xml b/core/jdiameter/api/pom.xml
@@ -3,15 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.quarkiverse.diameter</groupId>
+        <groupId>io.quarkiverse.jdiameter</groupId>
         <artifactId>jdiameter-core</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jdiameter-api</artifactId>
 
-    <name>Quarkus :: Diameter Stack :: API</name>
+    <name>Quarkus :: JDiameter Stack :: API</name>
 
     <dependencies/>
 

diff --git a/core/jdiameter/impl/pom.xml b/core/jdiameter/impl/pom.xml
@@ -5,23 +5,23 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.quarkiverse.diameter</groupId>
+        <groupId>io.quarkiverse.jdiameter</groupId>
         <artifactId>jdiameter-core</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jdiameter-impl</artifactId>
 
-    <name>Quarkus :: Diameter Stack :: impl</name>
+    <name>Quarkus :: JDiameter Stack :: Impl</name>
 
     <properties>
         <vendor>Quarkus</vendor>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.quarkiverse.diameter</groupId>
+            <groupId>io.quarkiverse.jdiameter</groupId>
             <artifactId>jdiameter-api</artifactId>
         </dependency>
         <dependency>

diff --git a/core/jdiameter/pom.xml b/core/jdiameter/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.quarkiverse.diameter</groupId>
+        <groupId>io.quarkiverse.jdiameter</groupId>
         <artifactId>diameter-core-parent</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
@@ -15,7 +15,7 @@
 
     <packaging>pom</packaging>
 
-    <name>Quarkus :: Diameter Stack :: ${project.artifactId}</name>
+    <name>Quarkus :: JDiameter Stack :: Parent</name>
 
     <modules>
         <module>api</module>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.quarkiverse.diameter</groupId>
-        <artifactId>diameter-parent</artifactId>
+        <groupId>io.quarkiverse.jdiameter</groupId>
+        <artifactId>quarkus-jdiameter-parent</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -14,40 +14,7 @@
 
     <artifactId>diameter-core-parent</artifactId>
 
-    <name>Quarkus :: Diameter Core :: ${project.artifactId}</name>
-
-    <developers>
-        <developer>
-            <id>ammendonca</id>
-            <name>Alexandre Mendonça</name>
-            <email>[email protected]</email>
-            <organization>TeleStax</organization>
-            <organizationUrl>http://www.telestax.com/</organizationUrl>
-            <roles>
-                <role>Project Lead</role>
-            </roles>
-            <timezone>0</timezone>
-        </developer>
-        <developer>
-            <id>baranowb</id>
-            <name>Bartosz Baranowski</name>
-            <email>[email protected]</email>
-            <organization>TeleStax</organization>
-            <organizationUrl>http://www.telestax.com/</organizationUrl>
-            <roles>
-                <role>Developer</role>
-            </roles>
-            <timezone>+1</timezone>
-        </developer>
-    </developers>
-
-    <licenses>
-        <license>
-            <name>GNU Affero General Public License</name>
-            <url>https://www.gnu.org/licenses/agpl-3.0.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+    <name>Quarkus :: JDiameter Core :: Parent</name>
 
     <modules>
         <module>jdiameter</module>

diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
@@ -3,4 +3,4 @@
 * xref:Diameter_User_Guide.adoc[Original JDiameter User Guide]
 
 
-* xref:Quarkus/Implementing-Diameter-Service.adoc[Implementing Diameter Service]
+* xref:Implementing-Diameter-Service.adoc[Implementing Diameter Service]
diff --git a/...ROOT/pages/CommonContent/Conventions.adoc → docs/modules/ROOT/pages/Conventions.adoc b/...ROOT/pages/CommonContent/Conventions.adoc → docs/modules/ROOT/pages/Conventions.adoc
@@ -1,4 +1,4 @@
-include::../includes/attributes.adoc[]
+include::includes/attributes.adoc[]
 = Document Conventions
 
 This manual uses several conventions to highlight certain words and phrases and draw attention to specific pieces of information.

diff --git a/...uarkus/Implementing-Diameter-Service.adoc → .../pages/Implementing-Diameter-Service.adoc b/...uarkus/Implementing-Diameter-Service.adoc → .../pages/Implementing-Diameter-Service.adoc
@@ -1,4 +1,4 @@
-include::../includes/attributes.adoc[]
+include::includes/attributes.adoc[]
 = {product-name}
 
 The Diameter protocol is a computer networking protocol for Authentication, Authorization and Accounting, as defined in link:https://datatracker.ietf.org/doc/html/rfc6733[RFC6733].
@@ -43,12 +43,15 @@ The DiameterService interceptor will initialise all the configured services and
 [source,java]
 ----
 
-@DiameterService <1> @DiameterServiceOption(config = "client1") <2> public class MyDiameterService implements ClientCCASessionListener <3>
+@DiameterService <1>
+@DiameterServiceOption(config = "client1") <2>
+public class MyDiameterService implements ClientCCASessionListener <3>
 {
-@Override public void doCreditControlAnswer(ClientCCASession session, JCreditControlRequest request, JCreditControlAnswer answer) throws InternalException
-{
-//...
-} }
+    @Override public void doCreditControlAnswer(ClientCCASession session, JCreditControlRequest request, JCreditControlAnswer answer) throws InternalException
+    {
+    //...
+    }
+}
 
 ----
 
@@ -105,9 +108,10 @@ TIP: The stack will only be active if there is a defined DiameterService for the
 [source,java]
 ----
 
-@ApplicationScoped public class Demo
-{
-@DiameterConfig <1> Stack stack;
+@ApplicationScoped
+public class Demo {
+    @DiameterConfig <1>
+    Stack stack;
 
     @DiameterConfig("test2") <2>
     Configuration test2Config;
@@ -213,4 +217,4 @@ quarkus.diameter.test1.network.realms."server.test.com".application-id.auth-appl
 TIP: For more information about the extension configuration please refer to the <<configuration-reference,Configuration Reference>>.
 
 [[configuration-reference]]
-include::../includes/quarkus-diameter.adoc[leveloffset=+1]
+include::includes/quarkus-jdiameter.adoc[leveloffset=+1]
diff --git a/...t-Installing_Configuring_and_Running.adoc → ...t-Installing_Configuring_and_Running.adoc b/...t-Installing_Configuring_and_Running.adoc → ...t-Installing_Configuring_and_Running.adoc
@@ -1,4 +1,4 @@
-include::../includes/attributes.adoc[]
+include::includes/attributes.adoc[]
 :sectnums!:
 
 [appendix]

diff --git a/...les/ROOT/pages/CommonContent/Preface.adoc → docs/modules/ROOT/pages/Preface.adoc b/...les/ROOT/pages/CommonContent/Preface.adoc → docs/modules/ROOT/pages/Preface.adoc
@@ -1,4 +1,4 @@
-include::../includes/attributes.adoc[]
+include::includes/attributes.adoc[]
 :sectnums!:
 
 [preface]

diff --git a/...es/CommonContent/Section-Conventions.adoc → ...dules/ROOT/pages/Section-Conventions.adoc b/...es/CommonContent/Section-Conventions.adoc → ...dules/ROOT/pages/Section-Conventions.adoc
@@ -1,4 +1,4 @@
-include::../includes/attributes.adoc[]
+include::includes/attributes.adoc[]
 = Document Conventions
 
 This manual uses several conventions to highlight certain words and phrases and draw attention to specific pieces of information.

diff --git a/...pages/CommonContent/Section-Feedback.adoc → .../modules/ROOT/pages/Section-Feedback.adoc b/...pages/CommonContent/Section-Feedback.adoc → .../modules/ROOT/pages/Section-Feedback.adoc
@@ -1,4 +1,4 @@
-include::../includes/attributes.adoc[]
+include::includes/attributes.adoc[]
 = Provide feedback to the authors!
 (((feedback)))
 

diff --git a/..._the_JBOSS_HOME_Environment_Variable.adoc → ..._the_JBOSS_HOME_Environment_Variable.adoc b/..._the_JBOSS_HOME_Environment_Variable.adoc → ..._the_JBOSS_HOME_Environment_Variable.adoc
@@ -1,4 +1,4 @@
-include::../includes/attributes.adoc[]
+include::includes/attributes.adoc[]
 :sectnums!:
 
 [appendix]

diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,14 +1,3 @@
-:project-version: ${release.current-version}
-:examples-dir: ./../examples/
-:authors: Eddie Carpenter <[email protected]>
-:copyright: Apache2
-:product-name: Quarkus Diameter
-:description: {product-name} documentation
-:favicon: favicon.svg
 :project-version: 2.0.0
-:email: [email protected]
-:jee-platform: JBoss Application Server
-:jee-version: 1.8
 
-:this-issue-tracker-url: https://github.com/eddiecarpenter/quarkus-jdiameter/issues
-:this-trunk-source-code-url: https://github.com/eddiecarpenter/quarkus-jdiameter
+:examples-dir: ./../examples/
diff --git a/...T/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-agent.adoc b/...T/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-agent.adoc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@
		* xref:Diameter_User_Guide.adoc[Original JDiameter User Guide]


		* xref:Quarkus/Implementing-Diameter-Service.adoc[Implementing Diameter Service]
		* xref:Implementing-Diameter-Service.adoc[Implementing Diameter Service]