checkpoint

cloud/docker-image/pom.xml

@@ -175,6 +175,12 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>catalog-filesystem</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>catalog-inline</artifactId>

cloud/docker-image/src/main/docker/zpm.json.template

@@ -36,6 +36,7 @@
     "io.aklivity.zilla:binding-tls",
     "io.aklivity.zilla:binding-ws",
     "io.aklivity.zilla:catalog-apicurio",
+    "io.aklivity.zilla:catalog-filesystem",
     "io.aklivity.zilla:catalog-inline",
     "io.aklivity.zilla:catalog-karapace",
     "io.aklivity.zilla:common",

incubator/catalog-filesystem.spec/pom.xml

@@ -83,6 +83,11 @@
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/mqtt.yaml</exclude>
+          </excludes>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>

incubator/catalog-filesystem.spec/src/main/scripts/io/aklivity/zilla/specs/catalog/filesystem/config/asyncapi/mqtt.yaml

@@ -0,0 +1,11 @@
+asyncapi: 3.0.0
+info:
+  title: Zilla MQTT Proxy
+  version: 1.0.0
+  license:
+    name: Aklivity Community License
+servers:
+  plain:
+    host: mqtt://localhost:7183
+    protocol: mqtt
+defaultContentType: application/json

incubator/catalog-filesystem.spec/src/main/scripts/io/aklivity/zilla/specs/catalog/filesystem/config/catalog.yaml

@@ -19,4 +19,8 @@ catalogs:
   catalog0:
     type: filesystem
     options:
-      max-age: 30
+      subjects:
+        subject1:
+          url: asyncapi/mqtt.yaml
+          version: latest
+

incubator/catalog-filesystem.spec/src/main/scripts/io/aklivity/zilla/specs/catalog/filesystem/config/event.yaml

@@ -23,10 +23,15 @@ telemetry:
         events:
           - qname: test.catalog0
             id: catalog.filesystem.file.not.found
-            message: FILE_NOT_FOUND GET asyncapi.yaml 0
+            message: FILE_NOT_FOUND asyncapi/kafka.yaml
 catalogs:
   catalog0:
     type: filesystem
+    options:
+      subjects:
+        subject1:
+          url: asyncapi/kafka.yaml
+          version: latest
 bindings:
   net0:
     type: test

incubator/catalog-filesystem.spec/src/main/scripts/io/aklivity/zilla/specs/catalog/filesystem/schema/filesystem.schema.patch.json

@@ -31,15 +31,34 @@
                     {
                         "properties":
                         {
-                            "url":
+                            "subjects":
                             {
-                                "type": "string"
-                            },
-                            "max-age":
-                            {
-                                "title": "Max Age",
-                                "type": "number",
-                                "default": 300
+                                "type": "object",
+                                "patternProperties":
+                                {
+                                    "^[a-zA-Z]+[a-zA-Z0-9\\._\\-]*$":
+                                    {
+                                        "title": "Subject",
+                                        "type": "object",
+                                        "properties":
+                                        {
+                                            "url":
+                                            {
+                                                "type": "string"
+                                            },
+                                            "version":
+                                            {
+                                                "type": "string",
+                                                "default": "latest"
+                                            }
+                                        },
+                                        "required":
+                                        [
+                                            "url"
+                                        ],
+                                        "additionalProperties": false
+                                    }
+                                }
                             }
                         },
                         "additionalProperties": false

incubator/catalog-filesystem/pom.xml

@@ -77,7 +77,7 @@
         <version>${project.version}</version>
         <configuration>
           <scopeNames>core filesystem internal</scopeNames>
-          <packageName>io.aklivity.zilla.incubator.catalog.filesystem.internal.types</packageName>
+          <packageName>io.aklivity.zilla.runtime.catalog.filesystem.internal.types</packageName>
         </configuration>
         <executions>
           <execution>
@@ -109,16 +109,34 @@
                   <artifactId>catalog-filesystem.spec</artifactId>
                   <fileMappers>
                     <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
-                      <pattern>^\Qio/aklivity/zilla/incubator/catalog/filesystem/\E</pattern>
-                      <replacement>io/aklivity/zilla/incubator/catalog/filesystem/internal/</replacement>
+                      <pattern>^\Qio/aklivity/zilla/specs/catalog/filesystem/\E</pattern>
+                      <replacement>io/aklivity/zilla/runtime/catalog/filesystem/internal/</replacement>
                     </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
                   </fileMappers>
                 </artifactItem>
               </artifactItems>
-              <includes>io/aklivity/zilla/incubator/catalog/filesystem/schema/filesystem.schema.patch.json</includes>
+              <includes>io/aklivity/zilla/specs/catalog/filesystem/schema/filesystem.schema.patch.json</includes>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-asyncapi</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>catalog-filesystem.spec</artifactId>
+                  <version>${project.version}</version>
+                  <outputDirectory>${basedir}/target/test-classes</outputDirectory>
+                  <includes>**\/*.yaml</includes>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -142,7 +160,7 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>io/aklivity/zilla/incubator/catalog/filesystem/internal/types/**/*.class</exclude>
+            <exclude>io/aklivity/zilla/runtime/catalog/filesystem/internal/types/**/*.class</exclude>
           </excludes>
           <rules>
             <rule>

incubator/catalog-filesystem/src/main/java/io/aklivity/zilla/runtime/catalog/filesystem/internal/FilesystemCatalog.java

@@ -46,6 +46,6 @@ public CatalogContext supply(
     @Override
     public URL type()
     {
-        return getClass().getResource("schema/apicurio.schema.patch.json");
+        return getClass().getResource("schema/filesystem.schema.patch.json");
     }
 }

incubator/catalog-filesystem/src/main/java/io/aklivity/zilla/runtime/catalog/filesystem/internal/FilesystemCatalogContext.java

@@ -14,6 +14,7 @@
  */
 package io.aklivity.zilla.runtime.catalog.filesystem.internal;
 
+import io.aklivity.zilla.runtime.catalog.filesystem.internal.config.FilesystemOptionsConfig;
 import io.aklivity.zilla.runtime.engine.EngineContext;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogContext;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
@@ -33,6 +34,7 @@ public FilesystemCatalogContext(
     public CatalogHandler attach(
         CatalogConfig catalog)
     {
-        return new FilesystemCatalogHandler(FilesystemOptionsConfig.class.cast(catalog.options), context, catalog.id);
+        return new FilesystemCatalogHandler(
+            FilesystemOptionsConfig.class.cast(catalog.options), context, catalog.id, catalog.readURL);
     }
 }