Disabled JOSSO CE build by default (IAM.tf is now used)\nImproved per…

…formance by instally system artifacts in internal maven repository
atricore · Nov 15, 2022 · 27531f3 · 27531f3
1 parent 224d271
commit 27531f3
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 13 deletions.
diff --git a/distributions/iam-tf/pom.xml b/distributions/iam-tf/pom.xml
@@ -289,7 +289,7 @@
                         <configuration>
                             <copyPom>true</copyPom>
                             <useRepositoryLayout>true</useRepositoryLayout>
-                            <outputDirectory>target/dependencies/system</outputDirectory>
+                            <outputDirectory>target/dependencies/data/work/maven/repository</outputDirectory>
                             <excludeTransitive>true</excludeTransitive>
                             <excludeArtifactIds>apache-felix-karaf,atricore-idbus,josso,org.atricore.josso.izpack</excludeArtifactIds>
                         </configuration>

diff --git a/distributions/iam-tf/src/main/descriptors/unix-bin.xml b/distributions/iam-tf/src/main/descriptors/unix-bin.xml
@@ -36,10 +36,17 @@
             </includes>
         </fileSet>
 
+        <!--
+        ======================================
+         Install IDBUs
+         system folder is not installed at /system, but at /data/work/maven/repository
+        ======================================
+        -->
         <fileSet>
             <directory>target/dependency/tar.gzs/atricore-idbus-${atricore.idbus.version}</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
+                <exclude>system/**</exclude>
                 <exclude>**/org.ops4j.pax.url.mvn.cfg</exclude>
                 <exclude>**/org.ops4j.pax.url.mvn.cfg.online</exclude>
                 <exclude>**/system.properties</exclude>
@@ -48,9 +55,14 @@
             </excludes>
         </fileSet>
 
+        <fileSet>
+            <directory>target/dependency/tar.gzs/atricore-idbus-${atricore.idbus.version}/system</directory>
+            <outputDirectory>/data/work/maven/repository</outputDirectory>
+        </fileSet>
+
         <fileSet>
             <directory>target/dependency/tar.gzs/josso-${josso1.version}/dist/agents</directory>
-            <outputDirectory>/server/josso/dist/agents</outputDirectory>
+            <outputDirectory>/josso/dist/agents</outputDirectory>
             <excludes>
                 <exclude>**/log4j-1.2.14.jar</exclude>
             </excludes>
@@ -63,7 +75,8 @@
 
         <fileSet>
             <directory>target/dependency/tar.gzs/josso-ce-repo-${josso2.version}</directory>
-            <outputDirectory>/m3-local-repository</outputDirectory>
+            <!--outputDirectory>/m3-local-repository</outputDirectory-->
+            <outputDirectory>/data/work/maven/repository</outputDirectory>
         </fileSet>
 
         <!-- Copy license and other files from root -->

diff --git a/distributions/iam-tf/src/main/descriptors/windows-bin.xml b/distributions/iam-tf/src/main/descriptors/windows-bin.xml
@@ -30,26 +30,35 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <!-- Exclude the files we're replacing to avoid duplicated ZIP entries -->
+                <exclude>system/**</exclude>
                 <exclude>**/org.ops4j.pax.url.mvn.cfg</exclude>
                 <exclude>**/org.ops4j.pax.url.mvn.cfg.online</exclude>
                 <exclude>**/system.properties</exclude>
                 <exclude>**/org.apache.karaf.features.cfg</exclude>
                 <exclude>**/idbus.jar</exclude>
             </excludes>
         </fileSet>
+        <fileSet>
+            <directory>target/dependency/zips/atricore-idbus-${atricore.idbus.version}/system</directory>
+            <outputDirectory>/data/work/maven/repository</outputDirectory>
+        </fileSet>
 
         <fileSet>
             <directory>target/dependency/zips/josso-${josso1.version}/dist/agents</directory>
             <outputDirectory>/josso/dist/agents</outputDirectory>
+            <excludes>
+                <exclude>**/log4j-1.2.14.jar</exclude>
+            </excludes>
         </fileSet>
 
-        <fileSet>
+        <!--fileSet>
             <directory>target/dependency/zips/josso-${josso1.version}/dist/samples</directory>
             <outputDirectory>/josso/dist/samples</outputDirectory>
-        </fileSet>
+        </fileSet-->
 
         <fileSet>
-            <directory>target/dependency/zips/josso-ce-repo-${version}/</directory>
+            <directory>target/dependency/zips/josso-ce-repo-${josso2.version}</directory>
+            <!--outputDirectory>/m3-local-repository</outputDirectory-->
             <outputDirectory>/data/work/maven/repository</outputDirectory>
         </fileSet>
 

diff --git a/distributions/iam-tf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg b/distributions/iam-tf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
@@ -57,9 +57,8 @@ org.ops4j.pax.url.mvn.localRepository=file:${karaf.base}/appliances@snapshots
 # The following property value will add the system folder as a repo.
 #
 org.ops4j.pax.url.mvn.defaultRepositories=\
-    file:${karaf.base}/system@snapshots,\
+    file:${karaf.base}/data/work/maven/repository@snapshots,\
     file:${karaf.base}/features@snapshots,\
-    file:${karaf.base}/m3-local-repository@snapshots,\
     file:${karaf.base}/extensions@snapshots
 
 #
@@ -76,8 +75,7 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
 # The following property value will add the system folder as a repo.
 #
 org.ops4j.pax.url.mvn.repositories=\
-    file:${karaf.base}/system@snapshots,\
-    file:${karaf.base}/m3-local-repository@snapshots,\
+    file:${karaf.base}/data/work/maven/repository@snapshots,\
     file:${karaf.base}/extensions@snapshots
 
 # Rename this to enable online repos

diff --git a/distributions/iam-tf/src/main/distribution/text/etc/system.properties b/distributions/iam-tf/src/main/distribution/text/etc/system.properties
@@ -40,7 +40,7 @@ karaf.name=iam-tf
 # other maven repositories.  For the full maven configuration, see
 # the org.ops4j.pax.url.mvn.cfg file.
 #
-karaf.default.repository=system
+karaf.default.repository=/data/work/maven/repository
 
 #
 # Location of a shell script that will be run when starting a shell

diff --git a/distributions/pom.xml b/distributions/pom.xml
@@ -38,8 +38,6 @@
     <name>JOSSO 2 CE :: Distributions</name>
 
     <modules>
-        <module>josso-ce-repo</module>
-        <module>josso-ce</module>
         <module>iam-tf</module>
     </modules>
 
@@ -52,6 +50,20 @@
         </profile>
         <profile>
             <id>cloud</id>
+            <modules>
+                <module>iam-tf</module>
+                <module>iam-tf-cloud</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>all</id>
+            <modules>
+                <module>iam-tf</module>
+                <module>josso-ce</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>cloud-all</id>
             <modules>
                 <module>iam-tf</module>
                 <module>iam-tf-cloud</module>