Rename modules from opds2 -> webpub.

io7m · io7m · commit 611ecffa9e31 · 2025-08-27T12:49:04.000Z
diff --git a/org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2Element.kt b/org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2Element.kt
diff --git a/org.thepalaceproject.webpub.core/pom.xml b/org.thepalaceproject.webpub.core/pom.xml
@@ -7,16 +7,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>org.thepalaceproject.opds2</artifactId>
-    <groupId>org.thepalaceproject.opds2</groupId>
+    <artifactId>org.thepalaceproject.webpub</artifactId>
+    <groupId>org.thepalaceproject.webpub</groupId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>org.thepalaceproject.opds2.core</artifactId>
+  <artifactId>org.thepalaceproject.webpub.core</artifactId>
 
   <packaging>jar</packaging>
-  <name>org.thepalaceproject.opds2.core</name>
-  <description>OPDS 2.0 Parser (Core)</description>
-  <url>https://www.io7m.com/software/opds2</url>
+  <name>org.thepalaceproject.webpub.core</name>
+  <description>WebPub Parser (Core)</description>
+  <url>https://www.github.com/ThePalaceProject/android-webpub</url>
 
   <dependencies>
     <dependency>
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Availability.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Availability.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2BelongsTo.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2BelongsTo.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Catalog.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Catalog.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Contributor.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Contributor.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Element.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Element.kt
@@ -0,0 +1,3 @@
+package org.thepalaceproject.webpub.core
+
+abstract class O2Element
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Encrypted.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Encrypted.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Extension.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Extension.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 /**
  * An annotation that indicates that a type is an extension to the OPDS 2.0
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Feed.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Feed.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2IndirectAcquisitionTree.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2IndirectAcquisitionTree.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LanguageMap.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LanguageMap.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import java.util.SortedMap
 
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LanguageMapDeserializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LanguageMapDeserializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.JsonToken
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LanguageMapSerializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LanguageMapSerializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Layout.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Layout.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 /**
  * @see "https://github.com/readium/webpub-manifest/blob/master/schema/metadata.schema.json"
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LayoutDeserializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LayoutDeserializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.JsonToken
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LayoutSerializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LayoutSerializer.kt
@@ -1,11 +1,11 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
-import org.thepalaceproject.opds2.core.O2Layout.FIXED
-import org.thepalaceproject.opds2.core.O2Layout.REFLOWABLE
-import org.thepalaceproject.opds2.core.O2Layout.SCROLLED
+import org.thepalaceproject.webpub.core.O2Layout.FIXED
+import org.thepalaceproject.webpub.core.O2Layout.REFLOWABLE
+import org.thepalaceproject.webpub.core.O2Layout.SCROLLED
 
 class O2LayoutSerializer :
   StdSerializer<O2Layout>(O2Layout::class.java) {
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Link.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Link.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import one.irradia.mime.api.MIMEType
 
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkBasic.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkBasic.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import one.irradia.mime.api.MIMEType
 import java.net.URI
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkDeserializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkDeserializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkProperties.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkProperties.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkSerializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkSerializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkTemplated.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2LinkTemplated.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import one.irradia.mime.api.MIMEType
 
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2MIMETypeDeserializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2MIMETypeDeserializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.JsonToken
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Mappers.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Mappers.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.core.StreamReadFeature
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Metadata.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Metadata.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Module.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Module.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.module.SimpleDeserializers
@@ -41,13 +41,13 @@ object O2Module {
       .allowClass(URI::class.java)
       .allowClassName("java.util.List<java.lang.String>")
       .allowClassName("java.util.List<java.net.URI>")
-      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2Catalog>")
-      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2IndirectAcquisitionTree>")
-      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2Link>")
-      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2LinkDeserializer\$O2LinkRaw>")
-      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2NavigationLink>")
-      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2Publication>")
-      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2Subject>")
+      .allowClassName("java.util.List<org.thepalaceproject.webpub.core.O2Catalog>")
+      .allowClassName("java.util.List<org.thepalaceproject.webpub.core.O2IndirectAcquisitionTree>")
+      .allowClassName("java.util.List<org.thepalaceproject.webpub.core.O2Link>")
+      .allowClassName("java.util.List<org.thepalaceproject.webpub.core.O2LinkDeserializer\$O2LinkRaw>")
+      .allowClassName("java.util.List<org.thepalaceproject.webpub.core.O2NavigationLink>")
+      .allowClassName("java.util.List<org.thepalaceproject.webpub.core.O2Publication>")
+      .allowClassName("java.util.List<org.thepalaceproject.webpub.core.O2Subject>")
       .allowClassName("java.util.Map<java.lang.String,java.lang.String>")
       .build()
   }
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Navigation.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Navigation.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2NavigationLink.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2NavigationLink.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import one.irradia.mime.api.MIMEType
 import java.net.URI
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2OffsetDateTimeDeserializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2OffsetDateTimeDeserializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.JsonToken
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2OffsetDateTimeSerializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2OffsetDateTimeSerializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Publication.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Publication.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2ReadingProgression.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2ReadingProgression.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 /**
  * @see "https://github.com/readium/webpub-manifest/blob/master/schema/metadata.schema.json"
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2ReadingProgressionDeserializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2ReadingProgressionDeserializer.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.JsonToken
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2ReadingProgressionSerializer.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2ReadingProgressionSerializer.kt
@@ -1,9 +1,10 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
-import org.thepalaceproject.opds2.core.O2ReadingProgression.*
+import org.thepalaceproject.webpub.core.O2ReadingProgression.LTR
+import org.thepalaceproject.webpub.core.O2ReadingProgression.RTL
 
 class O2ReadingProgressionSerializer :
   StdSerializer<O2ReadingProgression>(O2ReadingProgression::class.java) {
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Subject.kt b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/O2Subject.kt
@@ -1,4 +1,4 @@
-package org.thepalaceproject.opds2.core
+package org.thepalaceproject.webpub.core
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/package-info.java b/org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/package-info.java
diff --git a/org.thepalaceproject.webpub.tests/pom.xml b/org.thepalaceproject.webpub.tests/pom.xml
@@ -7,21 +7,21 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>org.thepalaceproject.opds2</artifactId>
-    <groupId>org.thepalaceproject.opds2</groupId>
+    <artifactId>org.thepalaceproject.webpub</artifactId>
+    <groupId>org.thepalaceproject.webpub</groupId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>org.thepalaceproject.opds2.tests</artifactId>
+  <artifactId>org.thepalaceproject.webpub.tests</artifactId>
 
   <packaging>jar</packaging>
-  <name>org.thepalaceproject.opds2.tests</name>
-  <description>OPDS 2.0 Parser (Test suite)</description>
-  <url>https://www.io7m.com/software/opds2</url>
+  <name>org.thepalaceproject.webpub.tests</name>
+  <description>WebPub Parser (Test suite)</description>
+  <url>https://www.github.com/ThePalaceProject/android-webpub</url>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>org.thepalaceproject.opds2.core</artifactId>
+      <artifactId>org.thepalaceproject.webpub.core</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/org.thepalaceproject.webpub.tests/src/main/kotlin/org/thepalaceproject/webpub/tests/O2FeedTest.kt b/org.thepalaceproject.webpub.tests/src/main/kotlin/org/thepalaceproject/webpub/tests/O2FeedTest.kt
@@ -1,12 +1,12 @@
-package org.thepalaceproject.opds2.tests
+package org.thepalaceproject.webpub.tests
 
 import com.fasterxml.jackson.databind.json.JsonMapper
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
-import org.thepalaceproject.opds2.core.O2Feed
-import org.thepalaceproject.opds2.core.O2Mappers
+import org.thepalaceproject.webpub.core.O2Feed
+import org.thepalaceproject.webpub.core.O2Mappers
 import java.io.IOException
 import java.io.InputStream
 import java.nio.file.Path
@@ -88,7 +88,7 @@ class O2FeedTest {
     name : String
   ) : InputStream {
     val path =
-      "/org/thepalaceproject/opds2/tests/$name"
+      "/org/thepalaceproject/webpub/tests/$name"
     val stream =
       O2FeedTest::class.java
         .getResourceAsStream(path)
diff --git a/org.thepalaceproject.webpub.tests/src/main/kotlin/org/thepalaceproject/webpub/tests/O2LinkTest.kt b/org.thepalaceproject.webpub.tests/src/main/kotlin/org/thepalaceproject/webpub/tests/O2LinkTest.kt
@@ -1,14 +1,14 @@
-package org.thepalaceproject.opds2.tests
+package org.thepalaceproject.webpub.tests
 
 import com.fasterxml.jackson.databind.json.JsonMapper
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
-import org.thepalaceproject.opds2.core.O2Link
-import org.thepalaceproject.opds2.core.O2LinkBasic
-import org.thepalaceproject.opds2.core.O2LinkTemplated
-import org.thepalaceproject.opds2.core.O2Mappers
+import org.thepalaceproject.webpub.core.O2Link
+import org.thepalaceproject.webpub.core.O2LinkBasic
+import org.thepalaceproject.webpub.core.O2LinkTemplated
+import org.thepalaceproject.webpub.core.O2Mappers
 import java.io.IOException
 import java.io.InputStream
 import java.nio.file.Path
@@ -72,7 +72,7 @@ class O2LinkTest {
     name : String
   ) : InputStream {
     val path =
-      "/org/thepalaceproject/opds2/tests/$name"
+      "/org/thepalaceproject/webpub/tests/$name"
     val stream =
       O2LinkTest::class.java
         .getResourceAsStream(path)
diff --git a/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/groups-20250821.json b/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/groups-20250821.json
diff --git a/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-basic-0.json b/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-basic-0.json
diff --git a/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-basic-1.json b/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-basic-1.json
diff --git a/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-templated-0.json b/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-templated-0.json
diff --git a/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-templated-1.json b/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/link-templated-1.json
diff --git a/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/registry-20250826.json b/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/registry-20250826.json
diff --git a/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/soundzter/soundzter-20250826.json b/org.thepalaceproject.webpub.tests/src/main/resources/org/thepalaceproject/webpub/tests/soundzter/soundzter-20250826.json
diff --git a/pom.xml b/pom.xml
@@ -11,18 +11,18 @@
     <version>9.0.0-beta0003</version>
   </parent>
 
-  <groupId>org.thepalaceproject.opds2</groupId>
-  <artifactId>org.thepalaceproject.opds2</artifactId>
+  <groupId>org.thepalaceproject.webpub</groupId>
+  <artifactId>org.thepalaceproject.webpub</artifactId>
   <version>1.0.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
-  <name>org.thepalaceproject.opds2</name>
+  <name>org.thepalaceproject.webpub</name>
   <description>OPDS 2.0 Parser</description>
-  <url>https://www.io7m.com/software/opds2</url>
+  <url>https://www.github.com/ThePalaceProject/android-webpub</url>
 
   <modules>
-    <module>org.thepalaceproject.opds2.core</module>
-    <module>org.thepalaceproject.opds2.tests</module>
+    <module>org.thepalaceproject.webpub.core</module>
+    <module>org.thepalaceproject.webpub.tests</module>
   </modules>
 
   <properties>
@@ -52,9 +52,9 @@
   <inceptionYear>2025</inceptionYear>
 
   <scm>
-    <url>https://www.github.com/ThePalaceProject/android-opds2</url>
-    <connection>scm:git:https://www.github.com/ThePalaceProject/android-opds2</connection>
-    <developerConnection>scm:git:https://www.github.com/ThePalaceProject/android-opds2</developerConnection>
+    <url>https://www.github.com/ThePalaceProject/android-webpub</url>
+    <connection>scm:git:https://www.github.com/ThePalaceProject/android-webpub</connection>
+    <developerConnection>scm:git:https://www.github.com/ThePalaceProject/android-webpub</developerConnection>
   </scm>
 
   <developers>
@@ -80,7 +80,7 @@
 
   <ciManagement>
     <system>GitHub Actions</system>
-    <url>https://www.github.com/ThePalaceProject/android-opds2/actions</url>
+    <url>https://www.github.com/ThePalaceProject/android-webpub/actions</url>
   </ciManagement>
 
   <prerequisites>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.thepalaceproject.opds2.core`
	`1`	`+package org.thepalaceproject.webpub.core`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonProperty`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package org.thepalaceproject.webpub.core`
	`2`	`+`
	`3`	`+abstract class O2Element`