From 8018d87024715a0ea4da6c0dc44b04b2bb8bec8e Mon Sep 17 00:00:00 2001
From: Thomas Diesler <thomas.diesler@jboss.com>
Date: Wed, 13 Mar 2013 15:56:01 +0100
Subject: [PATCH] [AS7-6727] Modular build for Karaf broken

---
 build-modular/build-modular-config.xml               | 12 ++++++------
 .../config/assembly/GenerateModulesDefinition.java   |  3 ++-
 .../layers/base}/javax/servlet/api/main/module.xml   |  0
 .../base}/org/apache/commons/logging/main/module.xml |  0
 .../layers/base}/org/jboss/as/osgi/main/module.xml   |  0
 .../layers/base}/org/jboss/as/web/main/module.xml    |  0
 .../base}/org/jboss/osgi/framework/main/module.xml   |  0
 .../layers/base}/org/osgi/core/main/module.xml       |  0
 .../layers/base}/org/osgi/enterprise/main/module.xml |  0
 .../base}/org/slf4j/jcl-over-slf4j/main/module.xml   |  0
 .../layers/base}/org/slf4j/main/module.xml           |  0
 11 files changed, 8 insertions(+), 7 deletions(-)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/javax/servlet/api/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/apache/commons/logging/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/jboss/as/osgi/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/jboss/as/web/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/jboss/osgi/framework/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/osgi/core/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/osgi/enterprise/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/slf4j/jcl-over-slf4j/main/module.xml (100%)
 rename config-assembly/src/test/resources/modules/{ => system/layers/base}/org/slf4j/main/module.xml (100%)

diff --git a/build-modular/build-modular-config.xml b/build-modular/build-modular-config.xml
index cd28649242f9..18dd43380e85 100644
--- a/build-modular/build-modular-config.xml
+++ b/build-modular/build-modular-config.xml
@@ -89,7 +89,7 @@
 
 	<target name="build-standalone-server" depends="init.standalone" description="Build the standalone server">
 		<!-- make output file directory -->
-		<mkdir dir="${server.output.dir}" />
+		<mkdir dir="${server.output.dir}/modules/system/layers/base" />
 		<delete>
 			<fileset dir="${server.output.dir}">
 				<include name="**/*" />
@@ -110,8 +110,8 @@
 		<copy file="${generated.standalone.configuration}" tofile="${server.output.dir}/standalone/configuration/standalone.xml" />
 
 		<!-- Copy the generated modules from the standard build -->
-		<copy todir="${server.output.dir}/modules">
-	        <fileset dir="${server.input.dir}/modules" includesfile="${generated.standalone.dependencies}"/>
+		<copy todir="${server.output.dir}/modules/system/layers/base">
+	        <fileset dir="${server.input.dir}/modules/system/layers/base" includesfile="${generated.standalone.dependencies}"/>
 		</copy>
 
 		<!-- These files contain digested passwords, which should not be visible to external users -->
@@ -147,7 +147,7 @@
 	<target name="build-domain-server" depends="init.domain" description="Build the domain server" if="domain.enabled.true">
 
 		<!-- Copy the non-generated server files from the standard build -->
-		<copy todir="${server.output.dir}">
+		<copy todir="${server.output.dir}/modules/system/layers/base">
 			<fileset dir="${server.input.dir}">
 				<include name="domain/**" />
 				<include name="bin/domain*.*" />
@@ -159,8 +159,8 @@
 		<copy file="${generated.domain.configuration}" tofile="${server.output.dir}/domain/configuration/domain.xml" />
 
 		<!-- Copy the generated modules from the standard build -->
-		<copy todir="${server.output.dir}/modules">
-	        <fileset dir="${server.input.dir}/modules" includesfile="${generated.domain.dependencies}"/>
+		<copy todir="${server.output.dir}/modules/system/layers/base">
+	        <fileset dir="${server.input.dir}/modules/system/layers/base" includesfile="${generated.domain.dependencies}"/>
 		</copy>
 
 		<!-- These files contain digested passwords, which should not be visible to external users -->
diff --git a/config-assembly/src/main/java/org/jboss/as/config/assembly/GenerateModulesDefinition.java b/config-assembly/src/main/java/org/jboss/as/config/assembly/GenerateModulesDefinition.java
index 9cdd75789ab4..06d9b47e7196 100644
--- a/config-assembly/src/main/java/org/jboss/as/config/assembly/GenerateModulesDefinition.java
+++ b/config-assembly/src/main/java/org/jboss/as/config/assembly/GenerateModulesDefinition.java
@@ -187,7 +187,8 @@ private void processModuleDependency(List<ModuleIdentifier> dependencies, Elemen
             dependencies.add(moduleId);
 
             String path = moduleId.getName().replace('.', '/') + '/' + moduleId.getSlot();
-            File moduleFile = new File(resourcesDir + File.separator + "modules" + File.separator + path + File.separator + "module.xml");
+            String modulespath = "modules" + File.separator + "system" + File.separator + "layers" + File.separator + "base";
+            File moduleFile = new File(resourcesDir + File.separator + modulespath + File.separator + path + File.separator + "module.xml");
 
             ModuleParser moduleParser = new ModuleParser(moduleFile);
             moduleParser.parse();
diff --git a/config-assembly/src/test/resources/modules/javax/servlet/api/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/javax/servlet/api/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/javax/servlet/api/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/javax/servlet/api/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/apache/commons/logging/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/apache/commons/logging/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/jboss/as/osgi/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/jboss/as/osgi/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/jboss/as/osgi/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/jboss/as/osgi/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/jboss/as/web/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/jboss/as/web/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/jboss/osgi/framework/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/jboss/osgi/framework/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/jboss/osgi/framework/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/jboss/osgi/framework/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/osgi/core/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/osgi/core/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/osgi/core/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/osgi/core/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/osgi/enterprise/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/osgi/enterprise/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/osgi/enterprise/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/osgi/enterprise/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/slf4j/jcl-over-slf4j/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/slf4j/jcl-over-slf4j/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml
diff --git a/config-assembly/src/test/resources/modules/org/slf4j/main/module.xml b/config-assembly/src/test/resources/modules/system/layers/base/org/slf4j/main/module.xml
similarity index 100%
rename from config-assembly/src/test/resources/modules/org/slf4j/main/module.xml
rename to config-assembly/src/test/resources/modules/system/layers/base/org/slf4j/main/module.xml