[resolves #132] Invalid module definition for org.eclipse.aether

Thomas Diesler · Thomas Diesler · commit 22414b56a13e · 2016-03-04T11:50:15.000+01:00
diff --git a/distro/standalone/pom.xml b/distro/standalone/pom.xml
@@ -28,7 +28,7 @@
 
     <name>Fuse Patch :: Distro :: Standalone</name>
 
-    <artifactId>fuse-patch-standalone</artifactId>
+    <artifactId>fuse-patch-distro-standalone</artifactId>
     <packaging>pom</packaging>
 
     <!-- Properties -->
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly.extras.patch</groupId>
-            <artifactId>fuse-patch-wildfly</artifactId>
+            <artifactId>fuse-patch-distro-wildfly</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
             <type>zip</type>
@@ -103,7 +103,7 @@
                         <configuration>
                             <executable>${fusepatch.home}/bin/fusepatch.${fusepatch.ext}</executable>
                             <arguments>
-                                <argument>--add=file:${fusepatch.home}/repository/fuse-patch-wildfly-${project.version}.zip</argument>
+                                <argument>--add=file:${fusepatch.home}/repository/fuse-patch-distro-wildfly-${project.version}.zip</argument>
                             </arguments>
                         </configuration>
                     </execution>
diff --git a/distro/standalone/scripts/assembly-directory.xml b/distro/standalone/scripts/assembly-directory.xml
@@ -32,7 +32,7 @@
             <outputDirectory>lib</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
             <excludes>
-                <exclude>*:fuse-patch-wildfly</exclude>
+                <exclude>*:fuse-patch-distro-wildfly</exclude>
             </excludes>
             <scope>provided</scope>
             <unpack>false</unpack>
@@ -41,7 +41,7 @@
             <outputDirectory>repository</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-                <include>*:fuse-patch-wildfly</include>
+                <include>*:fuse-patch-distro-wildfly</include>
             </includes>
             <scope>provided</scope>
             <unpack>false</unpack>
diff --git a/distro/wildfly/etc/wildfly/modules/system/layers/fuse/org/eclipse/aether/main/module.xml b/distro/wildfly/etc/wildfly/modules/system/layers/fuse/org/eclipse/aether/main/module.xml
@@ -26,12 +26,12 @@
     </properties>
 
     <resources>
-        <resource-root path="aether-api.jar"/>
-        <resource-root path="aether-impl.jar"/>
-        <resource-root path="aether-connector-basic.jar"/>
-        <resource-root path="aether-transport-file.jar"/>
-        <resource-root path="aether-transport-http.jar"/>
-        <resource-root path="maven-aether-provider.jar"/>
+        <resource-root path="aether-api-${version.eclipse.aether}.jar"/>
+        <resource-root path="aether-impl-${version.eclipse.aether}.jar"/>
+        <resource-root path="aether-connector-basic-${version.eclipse.aether}.jar"/>
+        <resource-root path="aether-transport-file-${version.eclipse.aether}.jar"/>
+        <resource-root path="aether-transport-http-${version.eclipse.aether}.jar"/>
+        <resource-root path="maven-aether-provider-${version.apache.maven}.jar"/>
     </resources>
 
     <dependencies>
diff --git a/distro/wildfly/pom.xml b/distro/wildfly/pom.xml
@@ -28,7 +28,7 @@
 
     <name>Fuse Patch :: Distro :: WildFly</name>
 
-    <artifactId>fuse-patch-wildfly</artifactId>
+    <artifactId>fuse-patch-distro-wildfly</artifactId>
     <packaging>pom</packaging>
 
     <dependencies>
diff --git a/distro/wildfly/scripts/assembly-artifacts.xml b/distro/wildfly/scripts/assembly-artifacts.xml
@@ -81,15 +81,15 @@
 		</fileSet>
         <fileSet>
             <outputDirectory>/</outputDirectory>
-            <directory>../../feature-pack/src/main/resources/content</directory>
+            <directory>../../features/core/src/main/resources/content</directory>
             <excludes>
                 <exclude>bin/*.bat</exclude>
                 <exclude>bin/*.sh</exclude>
             </excludes>
         </fileSet>
         <fileSet>
             <outputDirectory>/</outputDirectory>
-            <directory>../../feature-pack/src/main/resources/content</directory>
+            <directory>../../features/core/src/main/resources/content</directory>
             <includes>
                 <include>bin/*.bat</include>
                 <include>bin/*.sh</include>
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -53,7 +53,7 @@ The standalone distribution already contains the fuse-patch wildfly patch.
 
 ```
 $ bin/fusepatch.sh --query-repository
-fuse-patch-wildfly-2.0.0
+fuse-patch-distro-wildfly-2.0.0
 ```
 
 ### Client Configuration
@@ -75,8 +75,8 @@ The webservice enpoint is expected to be hosted on an application server, which
 Lets assume we work with WildFly and want to use fusepatch with WildFly.
 
 ```
-$ bin/fusepatch.sh --server ../wildfly-8.2.0.Final --update fuse-patch-wildfly
-Installed fuse-patch-wildfly-2.0.0
+$ bin/fusepatch.sh --server ../wildfly-8.2.0.Final --update fuse-patch-distro-wildfly
+Installed fuse-patch-distro-wildfly-2.0.0
 ```
 
 Note, that the above uses `--update` instead of `--install`, which installs the latest available patch for a given name.
@@ -86,18 +86,18 @@ Now we can switch to WildFly and query the server for installed patches
 ```
 $ cd ../wildfly-8.2.0.Final
 $ bin/fusepatch.sh --query-server
-fuse-patch-wildfly-2.0.0
+fuse-patch-distro-wildfly-2.0.0
 ```
 
 or managed paths
 
 ```
 $ cd ../wildfly-8.2.0.Final
 $ bin/fusepatch.sh --query-server-paths modules
-modules/layers.conf [fuse-patch-wildfly-2.0.0]
-modules/system/layers/fuse/org/wildfly/extras/patch/main/args4j-2.0.31.jar [fuse-patch-wildfly-2.0.0]
-modules/system/layers/fuse/org/wildfly/extras/patch/main/fuse-patch-core-1.4.1-SNAPSHOT.jar [fuse-patch-wildfly-2.0.0]
-modules/system/layers/fuse/org/wildfly/extras/patch/main/module.xml [fuse-patch-wildfly-2.0.0]
+modules/layers.conf [fuse-patch-distro-wildfly-2.0.0]
+modules/system/layers/fuse/org/wildfly/extras/patch/main/args4j-2.0.31.jar [fuse-patch-distro-wildfly-2.0.0]
+modules/system/layers/fuse/org/wildfly/extras/patch/main/fuse-patch-core-1.4.1-SNAPSHOT.jar [fuse-patch-distro-wildfly-2.0.0]
+modules/system/layers/fuse/org/wildfly/extras/patch/main/module.xml [fuse-patch-distro-wildfly-2.0.0]
 ```
 
 ###  Loading the Repository
diff --git a/features/core/pom.xml b/features/core/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly.extras.patch</groupId>
-            <artifactId>fuse-patch-wildfly</artifactId>
+            <artifactId>fuse-patch-distro-wildfly</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
             <exclusions>
diff --git a/features/core/scripts/feature-pack-build.xml b/features/core/scripts/feature-pack-build.xml
@@ -32,7 +32,7 @@
     </config>
     
     <copy-artifacts>
-        <copy-artifact artifact="org.wildfly.extras.patch:fuse-patch-wildfly" to-location="fusepatch/repository/"/>
+        <copy-artifact artifact="org.wildfly.extras.patch:fuse-patch-distro-wildfly" to-location="fusepatch/repository/"/>
     </copy-artifacts>
     
     <file-permissions>
diff --git a/features/full/pom.xml b/features/full/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly.extras.patch</groupId>
-            <artifactId>fuse-patch-wildfly</artifactId>
+            <artifactId>fuse-patch-distro-wildfly</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
             <exclusions>
diff --git a/features/full/scripts/feature-pack-build.xml b/features/full/scripts/feature-pack-build.xml
@@ -32,7 +32,7 @@
     </config>
     
     <copy-artifacts>
-        <copy-artifact artifact="org.wildfly.extras.patch:fuse-patch-wildfly" to-location="fusepatch/repository/"/>
+        <copy-artifact artifact="org.wildfly.extras.patch:fuse-patch-distro-wildfly" to-location="fusepatch/repository/"/>
     </copy-artifacts>
     
     <file-permissions>
diff --git a/installer/pom.xml b/installer/pom.xml
@@ -66,7 +66,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.wildfly.extras.patch</groupId>
-                                    <artifactId>fuse-patch-wildfly</artifactId>
+                                    <artifactId>fuse-patch-distro-wildfly</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
diff --git a/installer/src/main/java/org/wildfly/extras/patch/installer/AbstractInstaller.java b/installer/src/main/java/org/wildfly/extras/patch/installer/AbstractInstaller.java
@@ -137,7 +137,7 @@ private void run() throws Exception {
             BufferedReader br = new BufferedReader(new InputStreamReader(resource));
             String fusepatchVersion = br.readLine().trim();
 
-            resname = "META-INF/repository/fuse-patch-wildfly-" + fusepatchVersion + ".zip";
+            resname = "META-INF/repository/fuse-patch-distro-wildfly-" + fusepatchVersion + ".zip";
             resource = classLoader.getResourceAsStream(resname);
             IllegalStateAssertion.assertNotNull(resource, "Cannot obtain resource: " + resname);
 
diff --git a/installer/src/main/resources/META-INF/fuse-install.commands b/installer/src/main/resources/META-INF/fuse-install.commands
@@ -1,9 +1,9 @@
 #
-# bin/fusepatch.sh --add file:fusepatch/repository/fuse-patch-wildfly-${project.version}.zip
+# bin/fusepatch.sh --add file:fusepatch/repository/fuse-patch-distro-wildfly-${project.version}.zip
 #
-java -Djboss.home=. -Dlogging.configuration=file:bin/fusepatch-logging.properties -jar jboss-modules.jar -mp modules org.wildfly.extras.patch --add file:fusepatch/repository/fuse-patch-wildfly-${project.version}.zip
+java -Djboss.home=. -Dlogging.configuration=file:bin/fusepatch-logging.properties -jar jboss-modules.jar -mp modules org.wildfly.extras.patch --add file:fusepatch/repository/fuse-patch-distro-wildfly-${project.version}.zip
 
 #
-# bin/fusepatch.sh --update fuse-patch-wildfly
+# bin/fusepatch.sh --update fuse-patch-distro-wildfly
 #
-java -Djboss.home=. -Dlogging.configuration=file:bin/fusepatch-logging.properties -jar jboss-modules.jar -mp modules org.wildfly.extras.patch --update fuse-patch-wildfly
+java -Djboss.home=. -Dlogging.configuration=file:bin/fusepatch-logging.properties -jar jboss-modules.jar -mp modules org.wildfly.extras.patch --update fuse-patch-distro-wildfly
diff --git a/itests/jaxws/src/test/java/org/wildfly/extras/patch/test/RepositoryEndpointTest.java b/itests/jaxws/src/test/java/org/wildfly/extras/patch/test/RepositoryEndpointTest.java
@@ -92,7 +92,7 @@ public void testRepository() throws Exception {
         URL baseURL = repository.getRepositoryURL();
         Assert.assertEquals(new URL("http://localhost:8080/fuse-patch-jaxws/RepositoryEndpoint"), baseURL);
 
-        PatchId pid = PatchId.fromString("fuse-patch-wildfly-" + PatchTool.VERSION);
+        PatchId pid = PatchId.fromString("fuse-patch-distro-wildfly-" + PatchTool.VERSION);
         List<PatchId> pids = repository.queryAvailable(null);
 
         // With the feature pack runtime we need to install the fuse-patch package
@@ -107,7 +107,7 @@ public void testRepository() throws Exception {
         Assert.assertEquals(pid, pids.get(0));
 
         // Verify getLatestAvailable
-        Assert.assertEquals(pid, repository.getLatestAvailable("fuse-patch-wildfly"));
+        Assert.assertEquals(pid, repository.getLatestAvailable("fuse-patch-distro-wildfly"));
 
         // Add foo-1.0.0
         URL fileUrl = getArchiveURL("foo-1.0.0");
