MGR-139

appNG · Jul 27, 2022 · 09d473d · 09d473d
1 parent 097f713
commit 09d473d
Show file tree

Hide file tree

Showing 8 changed files with 391 additions and 402 deletions.
diff --git a/application-home/conf/datasources/ds-sites.xml b/application-home/conf/datasources/ds-sites.xml
@@ -100,7 +100,7 @@
 						<permission ref="site.reload" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/sites&#63;act=reloadTemplate&#38;siteid=${current.id}">
+				<link mode="intern" target="/sites&#63;act=reloadTemplate&#38;sitename=${current.name}">
 					<label>reload.template</label>
 					<icon>reload</icon>
 					<condition expression="${current.state.name() eq 'STARTED'}" />

diff --git a/application-home/conf/events/ev-sites.xml b/application-home/conf/events/ev-sites.xml
@@ -87,12 +87,12 @@
 			</permissions>
 			<params>
 				<param name="form_action" />
-				<param name="siteid" />
+				<param name="sitename" />
 			</params>
 		</config>
 		<condition expression="${form_action eq 'reloadTemplate'}" />
 		<bean id="sites">
-			<option name="site" id="${siteid}" />
+			<option name="site" sitename="${sitename}" />
 			<option name="action" id="reloadTemplate" />
 		</bean>
 	</action>

diff --git a/application-home/conf/pages/pg-sites.xml b/application-home/conf/pages/pg-sites.xml
@@ -380,7 +380,7 @@
 					<action id="reloadTemplate" eventId="siteEvent" onSuccess="/sites" forceForward="true">
 						<params>
 							<param name="form_action">${act}</param>
-							<param name="siteid">${siteid}</param>
+							<param name="sitename">${sitename}</param>
 						</params>
 					</action>
 				</element>

diff --git a/src/main/java/org/appng/application/manager/business/Sites.java b/src/main/java/org/appng/application/manager/business/Sites.java
@@ -24,11 +24,8 @@
 import org.appng.api.FieldProcessor;
 import org.appng.api.InvalidConfigurationException;
 import org.appng.api.Options;
-import org.appng.api.Platform;
 import org.appng.api.Request;
-import org.appng.api.Scope;
 import org.appng.api.model.Application;
-import org.appng.api.model.Properties;
 import org.appng.api.model.Site;
 import org.appng.application.manager.MessageConstants;
 import org.appng.application.manager.form.SiteForm;
@@ -85,9 +82,7 @@ public void perform(Site site, Application application, Environment environment,
 				service.reloadSite(request, application, siteId, fp);
 				okMessage = MessageConstants.SITE_RELOADED;
 			} else if (ACTION_RELOAD_TEMPLATE.equals(action)) {
-				Properties platformProps = environment.getAttribute(Scope.PLATFORM,
-						Platform.Environment.PLATFORM_CONFIG);
-				service.reloadTemplate(siteId, platformProps);
+				service.reloadTemplate(environment, options.getString(SITE, "sitename"));
 				okMessage = MessageConstants.SITE_TEMPLATE_RELOADED;
 			} else if (ACTION_RELOAD_PLATFORM.equals(action)) {
 				errorMessage = MessageConstants.PLATFORM_RELOAD_ERROR;

diff --git a/src/main/java/org/appng/application/manager/service/ManagerService.java b/src/main/java/org/appng/application/manager/service/ManagerService.java
@@ -63,7 +63,6 @@
 import org.appng.api.model.NameProvider;
 import org.appng.api.model.Nameable;
 import org.appng.api.model.Permission;
-import org.appng.api.model.Properties;
 import org.appng.api.model.Property;
 import org.appng.api.model.Resource;
 import org.appng.api.model.ResourceType;
@@ -113,8 +112,8 @@
 import org.appng.core.model.RepositoryUtils;
 import org.appng.core.service.CoreService;
 import org.appng.core.service.InitializerService;
-import org.appng.core.service.PlatformProperties;
 import org.appng.core.service.MigrationService.MigrationStatus;
+import org.appng.core.service.PlatformProperties;
 import org.appng.core.service.PropertySupport;
 import org.appng.core.xml.repository.PackageVersions;
 import org.appng.core.xml.repository.Packages;
@@ -1613,8 +1612,7 @@ public String startSite(Request request, Application application, Integer siteId
 			throws BusinessException {
 		SiteImpl site = getSite(siteId);
 		Environment env = request.getEnvironment();
-		Map<String, Site> siteMap = env.getAttribute(Scope.PLATFORM, Platform.Environment.SITES);
-		Site activeSite = siteMap.get(site.getName());
+		Site activeSite = RequestUtil.getSiteByName(env, site.getName());
 		if (null == activeSite || SiteState.STOPPED.equals(activeSite.getState())) {
 			if (site.isActive()) {
 				try {
@@ -1638,8 +1636,7 @@ public String stopSite(Request request, Application application, Integer siteId,
 			throws BusinessException {
 		SiteImpl site = getSite(siteId);
 		Environment env = request.getEnvironment();
-		Map<String, Site> siteMap = env.getAttribute(Scope.PLATFORM, Platform.Environment.SITES);
-		Site activeSite = siteMap.get(site.getName());
+		Site activeSite = RequestUtil.getSiteByName(env, site.getName());
 		if (null != activeSite) {
 			if (SiteState.STARTED.equals(activeSite.getState())) {
 				getInitializerService(application).shutDownSite(env, site, false);
@@ -1847,10 +1844,8 @@ public void resetConnection(Integer conId) {
 	}
 
 	@Override
-	public void reloadTemplate(Integer siteId, Properties platformConfig) {
-		SiteImpl site = siteRepository.findOne(siteId);
-		initSiteProperties(site);
-		refreshTemplate(site, PlatformProperties.get(platformConfig));
+	public void reloadTemplate(Environment env, String siteName) {
+		refreshTemplate(RequestUtil.getSiteByName(env, siteName), PlatformProperties.get(env));
 	}
 
 	public SiteApplication getSiteApplication(Integer siteId, Integer appId) {

diff --git a/src/main/java/org/appng/application/manager/service/Service.java b/src/main/java/org/appng/application/manager/service/Service.java
@@ -30,7 +30,6 @@
 import org.appng.api.model.Application;
 import org.appng.api.model.Identifier;
 import org.appng.api.model.Permission;
-import org.appng.api.model.Properties;
 import org.appng.api.model.ResourceType;
 import org.appng.api.model.Site;
 import org.appng.api.model.Subject;
@@ -251,6 +250,6 @@ String addArchiveToRepository(Request request, Integer repositoryId, FormUpload
 
 	void createEvent(Type type, String message);
 
-	void reloadTemplate(Integer siteId, Properties platformProps);
+	void reloadTemplate(Environment env, String siteName);
 
 }