Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WINDUP-3407]-WINDUP Themed Release #86

Merged
merged 9 commits into from Jul 26, 2022
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 22 additions & 7 deletions pom.xml
Expand Up @@ -14,7 +14,7 @@
</parent>

<groupId>org.jboss.windup.web</groupId>
<artifactId>mta-web-distribution</artifactId>
<artifactId>windup-web-distribution</artifactId>
<version>5.3.1-SNAPSHOT</version>

<name>Windup Web - Distribution Build</name>
Expand Down Expand Up @@ -109,7 +109,7 @@
<artifactItem>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-keycloak-tool</artifactId>
<version>5.8.0.Final</version>
<version>5.9.0-SNAPSHOT</version>
<outputDirectory>${keycloak.tool.basedir}</outputDirectory>
<destFileName>${keycloak.tool.name}</destFileName>
<overWrite>true</overWrite>
Expand Down Expand Up @@ -142,7 +142,7 @@
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
<destFileName>mta-ui.war</destFileName>
<destFileName>windup-ui.war</destFileName>
<outputDirectory>${project.build.directory}/${wildfly.directory}/standalone/deployments/</outputDirectory>
</artifactItem>
</artifactItems>
Expand Down Expand Up @@ -194,7 +194,7 @@
<artifactItem>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-keycloak-theme</artifactId>
<version>5.5.0.Final</version>
<version>5.6.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/${product-name}/</includes>
Expand Down Expand Up @@ -497,10 +497,10 @@
<phase>package</phase>
<configuration>
<licensesOutputDirectory>
${project.build.directory}/mta-web-distribution-${project.version}/docs/licenses
${project.build.directory}/windup-web-distribution-${project.version}/docs/licenses
</licensesOutputDirectory>
<licensesOutputFile>
${project.build.directory}/mta-web-distribution-${project.version}/docs/licenses/licenses.xml
${project.build.directory}/windup-web-distribution-${project.version}/docs/licenses/licenses.xml
</licensesOutputFile>
</configuration>
</execution>
Expand Down Expand Up @@ -572,12 +572,27 @@
</profile>

<profile>
<id>mta</id>
<id>windup</id>
<activation>
<property>
<name>!downstream</name>
</property>
</activation>
<properties>
<product-name>windup</product-name>
</properties>
<build>
<finalName>windup-web-distribution-${project.version}</finalName>
</build>
</profile>
<profile>
<id>mta</id>
<activation>
<property>
<name>downstream</name>
<value>mta</value>
</property>
</activation>
<properties>
<product-name>mta</product-name>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions src/main/cli/setup-windup-keycloak-properties.cli
@@ -1,3 +1,3 @@
/system-property=keycloak.server.url:add(value="/auth")
/subsystem=keycloak/secure-deployment=api.war:add(realm=mta, realm-public-key="${keycloak.realm.public.key}", auth-server-url="${keycloak.server.url}", ssl-required="NONE", resource=mta-web, public-client=true)
/subsystem=keycloak/secure-deployment=mta-ui.war:add(realm=mta, realm-public-key="${keycloak.realm.public.key}", auth-server-url="${keycloak.server.url}", ssl-required="NONE", resource=mta-web, public-client=true)
/subsystem=keycloak/secure-deployment=api.war:add(realm=windup, realm-public-key="${keycloak.realm.public.key}", auth-server-url="${keycloak.server.url}", ssl-required="NONE", resource=windup-web, public-client=true)
/subsystem=keycloak/secure-deployment=windup-ui.war:add(realm=windup, realm-public-key="${keycloak.realm.public.key}", auth-server-url="${keycloak.server.url}", ssl-required="NONE", resource=windup-web, public-client=true)
20 changes: 10 additions & 10 deletions src/main/resources/Dockerfile
Expand Up @@ -2,25 +2,25 @@ FROM registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:latest

EXPOSE 8080

LABEL description="Migration Toolkit for Applications Web Console" \
LABEL description="Windup Migration Toolkit for Applications Web Console" \
version="4.0.0-SNAPSHOT" \
io.k8s.description="Migration Toolkit for Applications Web Console" \
io.k8s.display-name="MTA Web Console" \
io.k8s.description="Windup Migration Toolkit for Applications Web Console" \
io.k8s.display-name="WINDUP Web Console" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="mta,migration"
io.openshift.tags="windup,migration"

ADD . /opt/mta-web-distribution/
#RUN chown --recursive jboss:jboss /opt/mta-web-distribution
ADD . /opt/windup-web-distribution/
#RUN chown --recursive jboss:jboss /opt/windup-web-distribution

user 0
RUN chown --recursive jboss:0 /opt/mta-web-distribution
RUN chgrp -R 0 /opt/mta-web-distribution \
RUN chown --recursive jboss:0 /opt/windup-web-distribution
RUN chgrp -R 0 /opt/windup-web-distribution \
&& chgrp -R 0 /home/jboss \
&& chmod -R g+rwX /opt/mta-web-distribution \
&& chmod -R g+rwX /opt/windup-web-distribution \
&& chmod -R g+rwX /home/jboss

user jboss

ENTRYPOINT /opt/mta-web-distribution/run_mta.sh -b 0.0.0.0
ENTRYPOINT /opt/windup-web-distribution/run_windup.sh -b 0.0.0.0


48 changes: 24 additions & 24 deletions src/main/resources/README.txt
@@ -1,49 +1,49 @@
____ _ _ _ __ __ _____
| \/ ||__ __| / \
| |\/| | | | / _ \
| | | | | | / ___ \
| | | |__| |_/_/ \_\
_ ___ __
| | / (_)___ ____/ /_ ______
| | /| / / / __ \/ __ / / / / __ \
| |/ |/ / / / / / /_/ / /_/ / /_/ /
|__/|__/_/_/ /_/\__,_/\__,_/ .___/
/_/

Migration Toolkit for Applications (WINDUP) ${project.version} is an extensible and customizable rule-based tool that helps simplify migration of Java applications.

Migration Toolkit for Applications (MTA) ${project.version} is an extensible and customizable rule-based tool that helps simplify migration of Java applications.

MTA examines application artifacts, including project source directories and applications archives,
WINDUP examines application artifacts, including project source directories and applications archives,
then produces an HTML report highlighting areas that need changes.

MTA can be used to migrate Java applications from previous versions of Red Hat JBoss Enterprise Application Platform
WINDUP can be used to migrate Java applications from previous versions of Red Hat JBoss Enterprise Application Platform
or from other containers, such as Oracle WebLogic Server or IBM WebSphere Application Server.


How Does MTA Simplify Migration?
How Does WINDUP Simplify Migration?
-------------------------------------
MTA looks for common resources and highlights technologies and known “trouble spots” when migrating applications.
WINDUP looks for common resources and highlights technologies and known “trouble spots” when migrating applications.
The goal is to provide a high level view into the technologies used by the application and provide a detailed report organizations can use to estimate,
document, and migrate enterprise applications to Java EE and JBoss EAP.


Run MTA
Run WINDUP
---------------
Open a terminal and navigate to the MTA_HOME directory.
Open a terminal and navigate to the WINDUP_HOME directory.

Run MTA against the application using the appropriate command.
Run WINDUP against the application using the appropriate command.

For Linux:

$ MTA_HOME/run_mta.sh
$ WINDUP_HOME/run_windup.sh

For Windows:

> MTA_HOME/run_mta.bat
> WINDUP_HOME/run_windup.bat


Get more resources
---------------------
User Guide is available at https://access.redhat.com/documentation/en/red-hat-jboss-migration-toolkit
MTA Wiki - https://github.com/windup/windup/wiki
MTA Forum for users - https://community.jboss.org/en/windup
MTA JIRA issue trackers
MTA core: https://issues.jboss.org/browse/WINDUP
MTA Rules: https://issues.jboss.org/browse/WINDUPRULE
MTA users mailing List: windup-users@lists.jboss.org
MTA on Twitter: @JBossWindup (https://twitter.com/jbosswindup)
MTA IRC channel: Server FreeNode (irc.freenode.net), channel #windup
WINDUP Wiki - https://github.com/windup/windup/wiki
WINDUP Forum for users - https://community.jboss.org/en/windup
WINDUP JIRA issue trackers
WINDUP core: https://issues.jboss.org/browse/WINDUP
WINDUP Rules: https://issues.jboss.org/browse/WINDUPRULE
WINDUP users mailing List: windup-users@lists.jboss.org
WINDUP on Twitter: @JBossWindup (https://twitter.com/jbosswindup)
WINDUP IRC channel: Server FreeNode (irc.freenode.net), channel #windup
8 changes: 4 additions & 4 deletions src/main/resources/openshift/README.md
@@ -1,4 +1,4 @@
# mta-ocp
# windup-ocp
Builder for the Migration Toolkit for Applications on OpenShift Container Platform

# Prerequisites
Expand All @@ -13,11 +13,11 @@ Builder for the Migration Toolkit for Applications on OpenShift Container Platfo

2. Follow the prompts to connect to your local OpenShift instance

3. The default project name is `mta`. If someone else in your group is using this name already, this may be unsuitable. In that case, edit the [`deployment.properties`](deployment.properties) file to change the value of `OCP_PROJECT` from `mta` to a name that you prefer.
3. The default project name is `windup`. If someone else in your group is using this name already, this may be unsuitable. In that case, edit the [`deployment.properties`](deployment.properties) file to change the value of `OCP_PROJECT` from `windup` to a name that you prefer.

3. Execute `deploy.sh`

In case you're trying to use MTA on [OpenShift Online Starter](https://www.openshift.com/products/online/), you can try the [`deployment_openshift_online_starter.properties`](deployment_openshift_online_starter.properties) running the following commands:
In case you're trying to use WINDUP on [OpenShift Online Starter](https://www.openshift.com/products/online/), you can try the [`deployment_openshift_online_starter.properties`](deployment_openshift_online_starter.properties) running the following commands:

1. `deploy.sh deployment_openshift_online_starter.properties`
2. changing the `mta-web-console-postgresql` container memory limit to be `256 MiB` in the OpenShift UI
2. changing the `windup-web-console-postgresql` container memory limit to be `256 MiB` in the OpenShift UI
16 changes: 8 additions & 8 deletions src/main/resources/openshift/deploy.sh
Expand Up @@ -22,7 +22,7 @@ done < ${PROPERTIES_FILE}
required_variables=(
'OCP_PROJECT'
'DB_VOLUME_CAPACITY'
'MTA_VOLUME_CAPACITY'
'WINDUP_VOLUME_CAPACITY'
'WEB_CONSOLE_REQUESTED_CPU'
'WEB_CONSOLE_REQUESTED_MEMORY'
'EXECUTOR_REQUESTED_CPU'
Expand Down Expand Up @@ -58,16 +58,16 @@ sleep 1
#sleep 1


echo " -> Process MTA Web Template"
echo " -> Process WINDUP Web Template"
# Template adapted from https://github.com/jboss-openshift/application-templates/blob/master/sso/sso70-postgresql-persistent.json
oc process -f templates/web-template-empty-dir-executor.json \
-p SSO_REALM=mta \
-p SSO_REALM=windup \
-p POSTGRESQL_MAX_CONNECTIONS=200 \
-p DB_DATABASE=${DB_DATABASE} \
-p DB_USERNAME=${DB_USERNAME} \
-p DB_PASSWORD=${DB_PASSWORD} \
-p VOLUME_CAPACITY=${DB_VOLUME_CAPACITY} \
-p MTA_VOLUME_CAPACITY=${MTA_VOLUME_CAPACITY} \
-p WINDUP_VOLUME_CAPACITY=${WINDUP_VOLUME_CAPACITY} \
-p WEB_CONSOLE_REQUESTED_CPU=${WEB_CONSOLE_REQUESTED_CPU} \
-p WEB_CONSOLE_REQUESTED_MEMORY=${WEB_CONSOLE_REQUESTED_MEMORY} \
-p EXECUTOR_REQUESTED_CPU=${EXECUTOR_REQUESTED_CPU} \
Expand All @@ -76,11 +76,11 @@ oc process -f templates/web-template-empty-dir-executor.json \
-p DOCKER_IMAGES_TAG=${DOCKER_IMAGES_TAG} | oc create -n ${OCP_PROJECT} -f -
sleep 1

echo -n " -> Deploy MTA Web Console ..."
echo -n " -> Deploy WINDUP Web Console ..."
N=0
until [ ${N} -ge 50 ]
do
IS_RUNNING=$(oc get pods | grep mta-web-console | grep -v build | grep -v deploy | grep Running | grep -v '0/'|wc -l)
IS_RUNNING=$(oc get pods | grep windup-web-console | grep -v build | grep -v deploy | grep Running | grep -v '0/'|wc -l)
if [ ${IS_RUNNING} == "1" ]
then
echo -e "done"
Expand All @@ -98,9 +98,9 @@ if [ ${N} -eq 50 ]
echo
echo "Check the status of the project in the OpenShift console to see if it is still processing or if there are errors"
else
CONSOLE_URL="http://$(oc get route --no-headers -o=custom-columns=HOST:.spec.host mta-web-console)/"
CONSOLE_URL="http://$(oc get route --no-headers -o=custom-columns=HOST:.spec.host windup-web-console)/"

echo "Upload, build and deployment successful!"
echo
echo "Open ${CONSOLE_URL} to start using the MTA Web Console on OpenShift (user='mta',password='password')"
echo "Open ${CONSOLE_URL} to start using the WINDUP Web Console on OpenShift (user='windup',password='password')"
fi
4 changes: 2 additions & 2 deletions src/main/resources/openshift/deployment.properties
@@ -1,6 +1,6 @@
OCP_PROJECT=mta
OCP_PROJECT=windup
DB_VOLUME_CAPACITY=10Gi
MTA_VOLUME_CAPACITY=10Gi
WINDUP_VOLUME_CAPACITY=10Gi
WEB_CONSOLE_REQUESTED_CPU=1
WEB_CONSOLE_REQUESTED_MEMORY=2Gi
EXECUTOR_REQUESTED_CPU=1
Expand Down
@@ -1,6 +1,6 @@
OCP_PROJECT=mta
OCP_PROJECT=windup
DB_VOLUME_CAPACITY=1Gi
MTA_VOLUME_CAPACITY=1Gi
WINDUP_VOLUME_CAPACITY=1Gi
WEB_CONSOLE_REQUESTED_CPU=2
WEB_CONSOLE_REQUESTED_MEMORY=1Gi
EXECUTOR_REQUESTED_CPU=1
Expand Down