Skip to content

Commit bd5e880

Browse files
user-54dbb57auser-54dbb57a
authored
Merge pull request #288 from entando/ENG-5541
ENG-5541 Implement support for Virtual Contexts
2 parents 33e4564 + 90f375d commit bd5e880

90 files changed

Lines changed: 2160 additions & 460 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ga-publication.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
--id "CHECKOUT FOR GA PUBLICATION" \
3939
--lcd "$LOCAL_CLONE_DIR"
4040
- name: "Cache Maven packages"
41-
uses: actions/cache@v2
41+
uses: actions/cache@v3
4242
with:
4343
path: ~/.m2
4444
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ jobs:
7878
java-version: 11
7979
#~ MAVEN CACHE
8080
- name: "Cache Maven packages"
81-
uses: actions/cache@v2
81+
uses: actions/cache@v3
8282
with:
8383
path: ~/.m2
8484
key: ${{ runner.os }}-m2
8585
restore-keys: ${{ runner.os }}-m2
8686
#~ SONAR CACHE
8787
- name: Cache SonarCloud packages
88-
uses: actions/cache@v1
88+
uses: actions/cache@v3
8989
with:
9090
path: ~/.sonar/cache
9191
key: ${{ runner.os }}-sonar
@@ -126,7 +126,7 @@ jobs:
126126
# #~ MAVEN CACHE
127127
# - name: "Cache Maven packages"
128128
# id: maven-cache
129-
# uses: actions/cache@v2
129+
# uses: actions/cache@v3
130130
# with:
131131
# path: ~/.m2
132132
# key: ${{ runner.os }}-m2-matrix-${{ matrix.scan-type }}

‎.github/workflows/publication.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: "Cache Maven packages"
5151
id: cache-maven
52-
uses: actions/cache@v2
52+
uses: actions/cache@v3
5353
with:
5454
path: ~/.m2
5555
key: ${{ runner.os }}-m2

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
.project
22
.classpath
33
.idea
4+
.run
45
.cache
56
.DS_Store
67
*.im?
8+
.run
79
target
810
work
911
*.tgz

‎admin-console/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.entando</groupId>
66
<artifactId>app-engine</artifactId>
7-
<version>7.3.0</version>
7+
<version>7.4.0-SNAPSHOT</version>
88
</parent>
99
<groupId>org.entando.entando</groupId>
1010
<artifactId>entando-admin-console</artifactId>

‎admin-console/src/main/java/com/agiletec/apsadmin/admin/lang/lang.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55

66
<struts>
77

8-
<package name="core_do/Lang" namespace="/do/Lang" extends="entando-default">
9-
10-
<action name="list" class="langFinderAction">
11-
<result type="tiles">admin.Lang.summary</result>
8+
<package name="core_do/Lang" namespace="/do/Lang" extends="entando-default">
9+
10+
<action name="list" class="langFinderAction">
11+
<result type="tiles">admin.Lang.summary</result>
1212
<interceptor-ref name="entandoDefaultStack">
1313
<param name="requestAuth.requiredPermission">superuser</param>
1414
<param name="chain.includeParameters">actionErrors</param>
15-
</interceptor-ref>
15+
</interceptor-ref>
1616
</action>
1717

1818
<action name="add" class="langAction" method="add">
1919
<result name="input" type="chain">list</result>
20-
<result type="redirectAction">list</result>
20+
<result type="redirectActionXF">list</result>
2121
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
2222
</action>
2323

2424
<action name="remove" class="langAction" method="remove">
2525
<result name="input" type="chain">list</result>
2626
<result type="chain">list</result>
2727
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
28-
</action>
29-
30-
</package>
28+
</action>
29+
30+
</package>
3131

3232
</struts>

‎admin-console/src/main/java/com/agiletec/apsadmin/admin/localestring/localeString.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
2-
<!DOCTYPE struts PUBLIC
3-
"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
4-
"http://struts.apache.org/dtds/struts-2.5.dtd">
5-
6-
<struts>
7-
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE struts PUBLIC
3+
"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
4+
"http://struts.apache.org/dtds/struts-2.5.dtd">
5+
6+
<struts>
7+
88
<package name="core_do/LocaleString" namespace="/do/LocaleString" extends="entando-default">
9-
10-
<action name="intro" class="localeStringAction">
11-
<result type="tiles">admin.LocaleString.intro</result>
12-
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
13-
</action>
9+
10+
<action name="intro" class="localeStringAction">
11+
<result type="tiles">admin.LocaleString.intro</result>
12+
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
13+
</action>
1414

1515
<action name="list" class="localeStringFinderAction">
1616
<result type="tiles">admin.LocaleString.summary</result>
@@ -34,20 +34,20 @@
3434

3535
<action name="save" class="localeStringAction" method="save">
3636
<result name="input" type="tiles">admin.LocaleString.entry</result>
37-
<result type="redirectAction">list</result>
37+
<result type="redirectActionXF">list</result>
3838
<interceptor-ref name="entandoValidationStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
3939
</action>
40-
41-
<action name="trash" class="localeStringAction" method="trash">
42-
<result type="tiles">admin.LocaleString.trash</result>
43-
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
44-
</action>
40+
41+
<action name="trash" class="localeStringAction" method="trash">
42+
<result type="tiles">admin.LocaleString.trash</result>
43+
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
44+
</action>
4545

4646
<action name="delete" class="localeStringAction" method="delete">
4747
<result type="chain">list</result>
4848
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">superuser</param></interceptor-ref>
49-
</action>
49+
</action>
5050

5151
</package>
52-
52+
5353
</struts>

‎admin-console/src/main/java/com/agiletec/apsadmin/category/category.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<action name="save" class="categoryAction" method="save">
6161
<result name="input" type="tiles">admin.Category.entry</result>
62-
<result type="redirectAction">
62+
<result type="redirectActionXF">
6363
<param name="actionName">viewTree</param>
6464
<param name="selectedNode">${categoryCode}</param>
6565
</result>
@@ -94,7 +94,7 @@
9494
</action>
9595

9696
<action name="executeMoveTree" class="categoryAction" method="executeMoveTree">
97-
<result type="redirectAction">viewTree</result>
97+
<result type="redirectActionXF">viewTree</result>
9898
<result name="categoryTree" type="chain">viewTree</result>
9999
<interceptor-ref name="entandoDefaultStack"><param name="requestAuth.requiredPermission">manageCategories</param></interceptor-ref>
100100
</action>

‎admin-console/src/main/java/com/agiletec/apsadmin/common/common.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<action name="doLogin" class="dispatchAction" method="doLogin">
2828
<result name="input">/WEB-INF/apsadmin/jsp/common/login.jsp</result>
29-
<result type="redirectAction">main</result>
29+
<result type="redirectActionXF">main</result>
3030
<interceptor-ref name="entandoLoginStack" />
3131
</action>
3232

‎admin-console/src/main/java/com/agiletec/apsadmin/global-messages_en.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,3 +544,6 @@ license.link.title=LGPL v3.0 license
544544
about.title=About
545545
about.description.1=Entando is the leading open source Application Composition Platform for Kubernetes. It enables parallel teams to accelerate development and innovation of business capabilities on a modern, cloud-native, and Kubernetes-native stack.
546546
about.description.2=The documentation helps you learn about the Entando Platform and start exploring its features. To get started using the Entando Platform, visit
547+
548+
context.rootContextNickname=<main>
549+
context.gotoContext=Go to...

0 commit comments

Comments
 (0)