Next steps for integration

cuioss · Nov 6, 2023 · 897eece · 897eece
1 parent d9d5e18
commit 897eece
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 18 deletions.
diff --git a/modules/portal-ui-bootstrap-page-templates/pom.xml b/modules/portal-ui-bootstrap-page-templates/pom.xml
@@ -14,6 +14,14 @@
     <properties>
         <maven.jar.plugin.automatic.module.name>
             de.cuioss.portal.ui.pagetemplates</maven.jar.plugin.automatic.module.name>
+
+        <bootstrap.target>
+            ${project.build.directory}/classes/META-INF/resources/bootstrap</bootstrap.target>
+
+        <build.dependency.unpack>
+            ${project.build.directory}/unpack</build.dependency.unpack>
+        <version.webjar.bootstrap>3.4.1</version.webjar.bootstrap>
+
     </properties>
     <dependencies>
         <dependency>
@@ -36,4 +44,59 @@
             <artifactId>portal-ui-unit-testing</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+                        <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-thirdparty</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifact>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>bootstrap</artifactId>
+                                    <version>${version.webjar.bootstrap}</version>
+                                    <type>jar</type>
+                                    <outputDirectory>${build.dependency.unpack}</outputDirectory>
+                                    <includes>**/webjars/**/*</includes>
+                                </artifact>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-files</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${bootstrap.target}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>
+                                        ${build.dependency.unpack}/META-INF/resources/webjars/bootstrap/${version.webjar.bootstrap}/</directory>
+                                    <includes>
+                                        <include>**/jquery*</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/...ortal-ui-bootstrap-page-templates/src/main/resources/META-INF/templates/portal/root.xhtml b/...ortal-ui-bootstrap-page-templates/src/main/resources/META-INF/templates/portal/root.xhtml
@@ -91,7 +91,7 @@
 
                 <p:idleMonitor id="idle"
                     timeout="#{clientWindowManager.maxInactiveInterval * 1000 * 60}"
-                    onidle="icw.cui.executeOnIdle();" />
+                    onidle="Cui.Core.executeOnIdle();" />
 
                 <boot:modalDialog id="confirmDialogTimeout"
                     closable="false"

diff --git a/...ootstrap-page-templates/src/main/resources/META-INF/templates/portal/technical_root.xhtml b/...ootstrap-page-templates/src/main/resources/META-INF/templates/portal/technical_root.xhtml
@@ -116,9 +116,9 @@
                 name="fonts.css" />
 
             <!-- This css is intended for vendor / customer specific extensions, that are not covered by theming -->
-            <h:outputStylesheet library="vendor" name="vendor.css" />
+			<!--             <h:outputStylesheet library="vendor" name="vendor.css" /> -->
 
-        </ui:insert>
+		</ui:insert>
 
         <!-- Ensures that bootstrap.js is always loaded -->
         <h:outputScript library="thirdparty.js" name="bootstrap.js" />

diff --git a/modules/portal-ui-bootstrap-page-templates/src/main/resources/META-INF/web-fragment.xml b/modules/portal-ui-bootstrap-page-templates/src/main/resources/META-INF/web-fragment.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
+    version="4.0">
+    <distributable />
+    <name>PortalUIBootstrapTemplates</name>
+
+    <!-- Primefaces Configuration -->
+    <context-param>
+        <description>Styles are to be derived from the bootstrap mapping</description>
+        <param-name>primefaces.THEME</param-name>
+        <param-value>none</param-value>
+    </context-param>
+
+</web-fragment>
diff --git a/modules/portal-ui-quarkus-extension/src/main/resources/META-INF/faces-config.xml b/modules/portal-ui-quarkus-extension/src/main/resources/META-INF/faces-config.xml
@@ -11,12 +11,12 @@
         </after>
     </ordering>
 
-    <render-kit>
-        <renderer>
-            <component-family>javax.faces.Output</component-family>
-            <renderer-type>javax.faces.Head</renderer-type>
-            <renderer-class>org.apache.myfaces.renderkit.html.HtmlHeadRenderer</renderer-class>
-        </renderer>
-    </render-kit>
+<!--     <render-kit> -->
+<!--         <renderer> -->
+<!--             <component-family>javax.faces.Output</component-family> -->
+<!--             <renderer-type>javax.faces.Head</renderer-type> -->
+<!--             <renderer-class>org.apache.myfaces.renderkit.html.HtmlHeadRenderer</renderer-class> -->
+<!--         </renderer> -->
+<!--     </render-kit> -->
 
 </faces-config>
diff --git a/...va/de/cuioss/portal/ui/runtime/application/bundle/PortalDefaultResourceBundleLocator.java b/...va/de/cuioss/portal/ui/runtime/application/bundle/PortalDefaultResourceBundleLocator.java
@@ -23,7 +23,6 @@
 import de.cuioss.portal.common.bundle.ResourceBundleLocator;
 import de.cuioss.portal.common.priority.PortalPriorities;
 import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
 /**
  * Defines the base bundles to be defined within a portal application:
@@ -34,7 +33,6 @@
 @Priority(PortalPriorities.PORTAL_CORE_LEVEL)
 @ApplicationScoped
 @EqualsAndHashCode
-@ToString
 public class PortalDefaultResourceBundleLocator implements ResourceBundleLocator {
 
     private static final long serialVersionUID = -8478481710191113463L;
@@ -45,4 +43,9 @@ public class PortalDefaultResourceBundleLocator implements ResourceBundleLocator
     public Optional<String> getBundlePath() {
         return Optional.of(PATH);
     }
+
+    @Override
+    public String toString() {
+        return "%s: Path='%s'".formatted(getClass().getName(), PATH);
+    }
 }
diff --git a/modules/portal-ui-runtime/src/main/resources/META-INF/web-fragment.xml b/modules/portal-ui-runtime/src/main/resources/META-INF/web-fragment.xml
@@ -41,12 +41,6 @@
     </servlet-mapping>
 
     <!-- Primefaces Configuration -->
-    <context-param>
-        <description>the css styles and images package to include found in
-		the resources library primefaces-"param-value"</description>
-        <param-name>primefaces.THEME</param-name>
-        <param-value>cui-mapping</param-value>
-    </context-param>
     <context-param>
         <description>This parameter forces the primefaces upload component to use the servlet 3.x api for
         file uploads instead of commons-upload</description>