You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2023/03/31 14:22:02 UTC

[syncope] 01/02: Archetype refinements

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit e19789fb8da2ab36ebbcbe18c4bf3e94d8d179ad
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Mar 31 16:17:56 2023 +0200

    Archetype refinements
---
 .../src/main/resources/archetype-resources/common/pom.xml     |  4 ++++
 .../src/main/resources/archetype-resources/console/pom.xml    |  4 ++--
 archetype/src/main/resources/archetype-resources/core/pom.xml | 11 +----------
 .../src/main/resources/archetype-resources/enduser/pom.xml    |  4 ++--
 archetype/src/main/resources/archetype-resources/wa/pom.xml   |  4 ++--
 archetype/src/main/resources/meta-pom.xml                     |  7 ++++++-
 .../asciidoc/reference-guide/configuration/deployment.adoc    | 11 +++++------
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/archetype/src/main/resources/archetype-resources/common/pom.xml b/archetype/src/main/resources/archetype-resources/common/pom.xml
index b7e87968a9..16e1d9e0e1 100644
--- a/archetype/src/main/resources/archetype-resources/common/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/common/pom.xml
@@ -38,6 +38,10 @@ under the License.
       <groupId>org.apache.syncope.common.idm</groupId>
       <artifactId>syncope-common-idm-lib</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.syncope.common.am</groupId>
+      <artifactId>syncope-common-am-lib</artifactId>
+    </dependency>
 
   </dependencies>
   
diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml
index b1bca65547..ca0a693f0e 100644
--- a/archetype/src/main/resources/archetype-resources/console/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/console/pom.xml
@@ -121,8 +121,8 @@ under the License.
     </profile>
     
     <profile>
-      <id>executable</id>
-      
+      <id>standalone</id>
+
       <dependencies>
         <dependency>
           <groupId>org.springframework.boot</groupId>
diff --git a/archetype/src/main/resources/archetype-resources/core/pom.xml b/archetype/src/main/resources/archetype-resources/core/pom.xml
index 9b380d03a4..13e2b72dbc 100644
--- a/archetype/src/main/resources/archetype-resources/core/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/core/pom.xml
@@ -168,16 +168,7 @@ under the License.
     </profile>
     
     <profile>
-      <!--
-      This profile builds an executable war file.
-      In order for the app to run, it is necessary to include the conf directory and the JDBC driver in the runtime
-      classpath; according to official docs [1] this can be achieved by setting the LOADER_PATH env variable as follows:
-      
-      export LOADER_PATH=/path/to/conf/dir,/path/to/jdbc-driver.jar
-      
-      [1] https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html
-      -->
-      <id>executable</id>
+      <id>standalone</id>
       
       <dependencies>
         <dependency>
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index 04dbfa86d3..d9bf3513bb 100644
--- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
@@ -148,8 +148,8 @@ under the License.
     </profile>
     
     <profile>
-      <id>executable</id>
-      
+      <id>standalone</id>
+
       <dependencies>
         <dependency>
           <groupId>org.springframework.boot</groupId>
diff --git a/archetype/src/main/resources/archetype-resources/wa/pom.xml b/archetype/src/main/resources/archetype-resources/wa/pom.xml
index cab9c2420c..49caf5ed88 100644
--- a/archetype/src/main/resources/archetype-resources/wa/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/wa/pom.xml
@@ -106,8 +106,8 @@ under the License.
 
   <profiles>
     <profile>
-      <id>executable</id>
-      
+      <id>standalone</id>
+
       <dependencies>
         <dependency>
           <groupId>org.springframework.boot</groupId>
diff --git a/archetype/src/main/resources/meta-pom.xml b/archetype/src/main/resources/meta-pom.xml
index 62a7b44c00..a441d69225 100644
--- a/archetype/src/main/resources/meta-pom.xml
+++ b/archetype/src/main/resources/meta-pom.xml
@@ -56,7 +56,12 @@ under the License.
         <artifactId>syncope-common-idm-lib</artifactId>
         <version>${syncope.version}</version>
       </dependency>
-      
+      <dependency>
+        <groupId>org.apache.syncope.common.am</groupId>
+        <artifactId>syncope-common-am-lib</artifactId>
+        <version>${syncope.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.syncope.core</groupId>
         <artifactId>syncope-core-starter</artifactId>
diff --git a/src/main/asciidoc/reference-guide/configuration/deployment.adoc b/src/main/asciidoc/reference-guide/configuration/deployment.adoc
index 0c1bd0cfd2..5ae020c58b 100644
--- a/src/main/asciidoc/reference-guide/configuration/deployment.adoc
+++ b/src/main/asciidoc/reference-guide/configuration/deployment.adoc
@@ -46,26 +46,25 @@ where `<KEYMASTER_ADDRESS>` can be either:
 
 ==== Standalone
 
-Projects generated from Maven archetype feature a dedicated `executable` profile, which will re-package all
-applications according to Spring Boot's
-https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html[executable format^].
+Projects generated from Maven archetype feature a dedicated `standalone` profile, which will re-package all
+applications as standalone fat JAR or WAR files.
 
 [TIP]
 Spring Boot applications can also be
 https://docs.spring.io/spring-boot/docs/current/reference/html/deployment.html#deployment.installing[installed as system services^].
 
-.Run Core application as executable under GNU / Linux
+.Run Core application as standalone under GNU / Linux
 ====
 Assuming that the JDBC driver JAR file for the configured <<dbms>> is available under `/opt/syncope/lib`,
 the Core application can be built and run as follows:
 
 [source,bash]
 ----
-$ mvn -P executable clean verify
+$ mvn -P standalone clean verify
 $ cp core/target/syncope.war /opt/syncope/lib
 $ cp core/target/classes/*properties /opt/syncope/conf
 
-$ export LOADER_PATH=/opt/syncope/conf,/opt/syncope/lib
+$ export LOADER_PATH=/opt/syncope/conf,/opt/syncope/lib,BOOT-INF/classes/WEB-INF/classes
 $ java -Dsyncope.conf.dir=/opt/syncope/conf \
   -Dsyncope.connid.location=file:/opt/syncope/bundles \
   -Dsyncope.log.dir=/opt/syncope/log \