remove main security main class + rename google index.html

Signed-off-by: tvallin <[email protected]>

archetypes/helidon/src/main/archetype/common/security.xml

@@ -84,9 +84,6 @@
                         <option value="abac" name="ABAC" description="Attribute Based Access Control">
                             <output>
                                 <model>
-                                    <list key="providers-config-entries">
-                                        <value file="files/application.abac.yaml"/>
-                                    </list>
                                     <list key="dependencies">
                                         <map>
                                             <value key="groupId">io.helidon.security.providers</value>

archetypes/helidon/src/main/archetype/mp/custom/files/application.abac.yaml

@@ -0,0 +1,3 @@
+  - abac:
+      fail-on-unvalidated: true
+      fail-if-none-validated: true

archetypes/helidon/src/main/archetype/mp/custom/files/application.oidc.yaml

@@ -1,16 +1,16 @@
-    - oidc:
-        # use a custom name, so it does not clash with other examples
-        cookie-name: "OIDC_EXAMPLE_COOKIE"
-        # support for "Authorization" header with bearer token
-        header-use: true
-        # the default redirect-uri, where the webserver listens on redirects from identity server
-        redirect-uri: "/oidc/redirect"
-        issuer: "https://tenant.some-server.com/oauth2/default"
-        audience: "configured audience"
-        client-id: "some client id"
-        client-secret: "some client secret"
-        identity-uri: "https://tenant.some-server.com/oauth2/default"
-        frontend-uri: "http://localhost:7987"
-        server-type: "@default"
-        # We want to redirect to login page (and token can be received either through cookie or header)
-        redirect: true
+  - oidc:
+      # use a custom name, so it does not clash with other examples
+      cookie-name: "OIDC_EXAMPLE_COOKIE"
+      # support for "Authorization" header with bearer token
+      header-use: true
+      # the default redirect-uri, where the webserver listens on redirects from identity server
+      redirect-uri: "/oidc/redirect"
+      issuer: "https://tenant.some-server.com/oauth2/default"
+      audience: "configured audience"
+      client-id: "some client id"
+      client-secret: "some client secret"
+      identity-uri: "https://tenant.some-server.com/oauth2/default"
+      frontend-uri: "http://localhost:7987"
+      server-type: "@default"
+      # We want to redirect to login page (and token can be received either through cookie or header)
+      redirect: true

archetypes/helidon/src/main/archetype/mp/custom/security-outputs.xml

@@ -99,7 +99,17 @@ to your tenant and application configuration.
                 </model>
             </output>
         </method>
+        <method name="security-abac">
+            <output if="${security.atz} contains ['abac']">
+                <model>
+                    <list key="providers-config-entries">
+                        <value file="files/application.abac.yaml"/>
+                    </list>
+                </model>
+            </output>
+        </method>
     </methods>
+    <call method="security-abac"/>
     <call method="security-oidc"/>
     <call method="security-jwt"/>
     <call method="security-google"/>

archetypes/helidon/src/main/archetype/se/common/common-se.xml

@@ -125,7 +125,14 @@
                 .build()
                 .start();
 
+        {{#Main-after-server}}
+        {{.}}
+        {{/Main-after-server}}
+
         System.out.println("WEB server is up! http://localhost:" + server.port() + "/simple-greet");
+        {{#Main-logging}}
+        {{.}}
+        {{/Main-logging}}
 ]]></value>
             </list>
             <list key="main-class-content">