Merge branch 'master' into keycloak

windup · Jul 29, 2022 · 88a4e3c · 88a4e3c
2 parents 6667be3 + 2212f3a
commit 88a4e3c
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 33 deletions.
diff --git a/executor/pom.xml b/executor/pom.xml
@@ -160,7 +160,7 @@
                             <overwrite>false</overwrite>
                             <addonRepository>${project.build.directory}/classes/${windup.distribution.name}-${version.windup}/addons</addonRepository>
                             <addonIds>
-                                <addonId>org.jboss.windup:windup-server-provider-spi,${project.version}</addonId>
+                                <addonId>org.jboss.windup:windup-server-provider-spi,${version.windup}</addonId>
                                 <addonId>org.jboss.windup.web.addons:windup-web-support,${project.version}</addonId>
                                 <addonId>org.jboss.windup.web.addons:windup-web-messaging-executor,${project.version}</addonId>
                             </addonIds>

diff --git a/services/src/test/resources/WEB-INF/classes/windupweb.properties b/services/src/test/resources/WEB-INF/classes/windupweb.properties
@@ -1,3 +1,3 @@
-addon.repository=target/mta-web/api/WEB-INF/mta-cli/addons/
-rules.repository=target/mta-web/api/WEB-INF/mta-cli/rules/
-labels.repository=target/mta-web/api/WEB-INF/mta-cli/labels/
+addon.repository=target/windup-web/api/WEB-INF/windup-cli/addons/
+rules.repository=target/windup-web/api/WEB-INF/windup-cli/rules/
+labels.repository=target/windup-web/api/WEB-INF/windup-cli/labels/
diff --git a/tests/wildfly-dist/src/main/resources/keycloak_database/keycloak.mv.db b/tests/wildfly-dist/src/main/resources/keycloak_database/keycloak.mv.db
diff --git a/tools/graph-tool/src/main/webapp/messages.xlf b/tools/graph-tool/src/main/webapp/messages.xlf
@@ -316,7 +316,7 @@
       </trans-unit>
       <trans-unit id="e8f808887b0e059a2c5c94e12612d84ec037ec50" datatype="html">
         <source>
-        Welcome to the Migration Toolkit for Applications Web Console.
+        Welcome to the Windup Web Console.
     </source>
         <target/>
         <note priority="1" from="description">Header</note>
@@ -332,7 +332,7 @@
         <note priority="1" from="description">Intro text, 1st part</note>
       </trans-unit>
       <trans-unit id="be4447ba967dd93b3fe55e4f2e58d1cbe312b2b6" datatype="html">
-        <source>Migration Toolkit for Applications Web Console Documentation</source>
+        <source>Windup Web Console Documentation</source>
         <target/>
         <note priority="1" from="description">Intro text, 2nd part</note>
       </trans-unit>

diff --git a/ui-pf4/src/main/webapp/public/index.html b/ui-pf4/src/main/webapp/public/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
-      name="Windup Migration Toolkit for Applications"
+      name="Windup"
       content="Windup is an assembly of tools that support large-scale Java application modernization and migration projects across a broad range of transformations and use cases."
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Windup Migration Toolkit for Applications Web Console</title>
+    <title>Windup Web Console</title>
     <script src="%PUBLIC_URL%/version.properties.js"></script>
     <script>
       window["mainApp"] = true;

diff --git a/ui-pf4/src/main/webapp/public/manifest.json b/ui-pf4/src/main/webapp/public/manifest.json
@@ -1,6 +1,6 @@
 {
   "short_name": "Windup",
-  "name": "Windup Migration Toolkit for Applications",
+  "name": "Windup",
   "icons": [
     {
       "src": "favicon.png",

diff --git a/ui-pf4/src/main/webapp/src/components/welcome/tests/__snapshots__/welcome.test.tsx.snap b/ui-pf4/src/main/webapp/src/components/welcome/tests/__snapshots__/welcome.test.tsx.snap
@@ -20,10 +20,10 @@ exports[`Welcome Renders without crashing 1`] = `
     size="lg"
   >
     Welcome to 
-    Windup Migration Toolkit for Applications
+    Windup
   </Title>
   <EmptyStateBody>
-    Windup Migration Toolkit for Applications
+    Windup
      helps you assess and perform large-scale application migrations and modernizations. Start by creating a project for your applications.
   </EmptyStateBody>
   <Button

diff --git a/ui-pf4/src/main/webapp/src/images/windup-logo-header.svg b/ui-pf4/src/main/webapp/src/images/windup-logo-header.svg
diff --git a/ui-pf4/src/main/webapp/src/layout/ButtonAboutApp/ButtonAboutApp.tsx b/ui-pf4/src/main/webapp/src/layout/ButtonAboutApp/ButtonAboutApp.tsx
@@ -63,7 +63,7 @@ export const ButtonAboutApp: React.FC = () => {
         productName={Theme.name}
         className="about-app__component"
       >
-        <TextContent className="pf-u-py-xl">
+        <TextContent>
           <h4>About</h4>
           <p>
             <a
@@ -143,7 +143,35 @@ export const ButtonAboutApp: React.FC = () => {
             </ListItem>
           </List>
         </TextContent>
-        <div className="pf-c-about-modal-box__strapline">
+        <TextContent className="pf-u-py-xl">
+          <p>
+            The Icon Library used in this project is a derivative of the{" "}
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://www.redhat.com/en/about/brand/standards/icons/standard-icons"
+            >
+              Standard Icons library
+            </a>{" "}
+            by{" "}
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://www.redhat.com/"
+            >
+              Red Hat
+            </a>
+            , used under{" "}
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://creativecommons.org/licenses/by/4.0/"
+            >
+              CC BY 4.0
+            </a>
+          </p>
+        </TextContent>
+        <div>
           <Flex>
             <FlexItem>
               <a

diff --git a/...ain/webapp/src/layout/ButtonAboutApp/__tests__/__snapshots__/ButtonAboutApp.test.tsx.snap b/...ain/webapp/src/layout/ButtonAboutApp/__tests__/__snapshots__/ButtonAboutApp.test.tsx.snap
@@ -23,12 +23,10 @@ exports[`Test snapshot :: open modal 1`] = `
     isOpen={true}
     noAboutModalBoxContentContainer={false}
     onClose={[Function]}
-    productName="Windup Migration Toolkit for Applications"
+    productName="Windup"
     trademark=""
   >
-    <TextContent
-      className="pf-u-py-xl"
-    >
+    <TextContent>
       <h4>
         About
       </h4>
@@ -38,7 +36,7 @@ exports[`Test snapshot :: open modal 1`] = `
           rel="noopener noreferrer"
           target="_blank"
         >
-          Windup Migration Toolkit for Applications
+          Windup
         </a>
          
         allows application architects and developers to quickly decompile, analyze, assess and modernize large scale application portfolios and migrate them to Red Hat Middleware, cloud and containers.
@@ -56,7 +54,7 @@ exports[`Test snapshot :: open modal 1`] = `
           <span
             className="dt"
           >
-            Windup Migration Toolkit for Applications
+            Windup
              Core
           </span>
         </GridItem>
@@ -71,7 +69,7 @@ exports[`Test snapshot :: open modal 1`] = `
           <span
             className="dt"
           >
-            Windup Migration Toolkit for Applications
+            Windup
              Web Console
           </span>
         </GridItem>
@@ -105,9 +103,41 @@ exports[`Test snapshot :: open modal 1`] = `
         </ListItem>
       </List>
     </TextContent>
-    <div
-      className="pf-c-about-modal-box__strapline"
+    <TextContent
+      className="pf-u-py-xl"
     >
+      <p>
+        The Icon Library used in this project is a derivative of the
+         
+        <a
+          href="https://www.redhat.com/en/about/brand/standards/icons/standard-icons"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Standard Icons library
+        </a>
+         
+        by
+         
+        <a
+          href="https://www.redhat.com/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Red Hat
+        </a>
+        , used under
+         
+        <a
+          href="https://creativecommons.org/licenses/by/4.0/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          CC BY 4.0
+        </a>
+      </p>
+    </TextContent>
+    <div>
       <Flex>
         <FlexItem>
           <a
@@ -223,12 +253,10 @@ exports[`Test snapshot 1`] = `
     isOpen={false}
     noAboutModalBoxContentContainer={false}
     onClose={[Function]}
-    productName="Windup Migration Toolkit for Applications"
+    productName="Windup"
     trademark=""
   >
-    <TextContent
-      className="pf-u-py-xl"
-    >
+    <TextContent>
       <h4>
         About
       </h4>
@@ -238,7 +266,7 @@ exports[`Test snapshot 1`] = `
           rel="noopener noreferrer"
           target="_blank"
         >
-          Windup Migration Toolkit for Applications
+          Windup
         </a>
          
         allows application architects and developers to quickly decompile, analyze, assess and modernize large scale application portfolios and migrate them to Red Hat Middleware, cloud and containers.
@@ -256,7 +284,7 @@ exports[`Test snapshot 1`] = `
           <span
             className="dt"
           >
-            Windup Migration Toolkit for Applications
+            Windup
              Core
           </span>
         </GridItem>
@@ -271,7 +299,7 @@ exports[`Test snapshot 1`] = `
           <span
             className="dt"
           >
-            Windup Migration Toolkit for Applications
+            Windup
              Web Console
           </span>
         </GridItem>
@@ -305,9 +333,41 @@ exports[`Test snapshot 1`] = `
         </ListItem>
       </List>
     </TextContent>
-    <div
-      className="pf-c-about-modal-box__strapline"
+    <TextContent
+      className="pf-u-py-xl"
     >
+      <p>
+        The Icon Library used in this project is a derivative of the
+         
+        <a
+          href="https://www.redhat.com/en/about/brand/standards/icons/standard-icons"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Standard Icons library
+        </a>
+         
+        by
+         
+        <a
+          href="https://www.redhat.com/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Red Hat
+        </a>
+        , used under
+         
+        <a
+          href="https://creativecommons.org/licenses/by/4.0/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          CC BY 4.0
+        </a>
+      </p>
+    </TextContent>
+    <div>
       <Flex>
         <FlexItem>
           <a

diff --git a/ui-pf4/src/main/webapp/src/layout/ThemeUtils.tsx b/ui-pf4/src/main/webapp/src/layout/ThemeUtils.tsx
@@ -26,7 +26,7 @@ type ThemeListType = {
 
 const themeList: ThemeListType = {
   windup: {
-    name: "Windup Migration Toolkit for Applications",
+    name: "Windup",
     logoSrc: windupLogo,
     logoNavbarSrc: windupNavBrandImage,
     faviconSrc: windupFavicon,