cmailleux 2005/12/27 16:24:56 CET
Modified files:
core/src/java/org/jahia/admin/production
ManageSiteProduction.java
core/src/java/org/jahia/services/importexport
ProductionJob.java
core/src/java/org/jahia/services/pages
JahiaPageBaseService.java
Log:
Use job name with a length < to 80 characters
Remove unused cache
Revision Changes Path
1.5 +11 -10
jahia/core/src/java/org/jahia/admin/production/ManageSiteProduction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/admin/production/ManageSiteProduction.java.diff?r1=1.4&r2=1.5&f=h
1.7 +1 -1
jahia/core/src/java/org/jahia/services/importexport/ProductionJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ProductionJob.java.diff?r1=1.6&r2=1.7&f=h
1.27 +16 -52
jahia/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java.diff?r1=1.26&r2=1.27&f=h
Index: ManageSiteProduction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/admin/production/ManageSiteProduction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ManageSiteProduction.java 25 Nov 2005 16:25:37 -0000 1.4
+++ ManageSiteProduction.java 27 Dec 2005 15:24:56 -0000 1.5
@@ -211,7 +211,7 @@
if (i > 0) targetSitesProperty.append(",");
URL url = new URL(targetSite);
String address =
url.getProtocol().concat("://").concat(url.getHost()).concat(url.getPort() !=
80 ? ":" + url.getPort() : "");
- targetSitesProperty.append(targetSite);
+ targetSitesProperty.append(i);
if(url.getPath().length()>0) {
String[] paths =
url.getPath().substring(1).split("/");
if(paths.length != 4) {
@@ -221,10 +221,11 @@
errors = true;
break;
}
-
settings.setProperty(ImportExportBaseService.PRODUCTION_CONTEXTNAME_PROPERTY +
targetSite,paths[0]);
-
settings.setProperty(ImportExportBaseService.PRODUCTION_SERVLETNAME_PROPERTY +
targetSite,paths[1]);
-
settings.setProperty(ImportExportBaseService.PRODUCTION_SITENAME_PROPERTY+targetSite,paths[3]);
-
settings.setProperty(ImportExportBaseService.PRODUCTION_ADDRESS_PROPERTY+targetSite,address);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_CONTEXTNAME_PROPERTY +
i,paths[0]);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_SERVLETNAME_PROPERTY +
i,paths[1]);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_SITENAME_PROPERTY+i,paths[3]);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_ADDRESS_PROPERTY+i,address);
+
settings.setProperty("prod_target_site_"+i,targetSite);
} else {
String warningMsg =
JahiaResourceBundle.getAdminResource("org.jahia.admin.productionManager.error.targetSite",
jParams, jParams.getLocale());
@@ -232,11 +233,11 @@
errors = true;
break;
}
-
settings.setProperty(ImportExportBaseService.PRODUCTION_USERNAME_PROPERTY +
targetSite, username);
-
settings.setProperty(ImportExportBaseService.PRODUCTION_PASSWORD_PROPERTY +
targetSite, Base64.encode(password.getBytes()));
-
settings.setProperty(ImportExportBaseService.PRODUCTION_CRON_PROPERTY +
targetSite, cron);
-
settings.setProperty(ImportExportBaseService.PRODUCTION_PROFILE_PROPERTY +
targetSite, profile);
-
settings.setProperty(ImportExportBaseService.PRODUCTION_SYNCRONIZE_PROPERTY+targetSite,syncronize);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_USERNAME_PROPERTY + i,
username);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_PASSWORD_PROPERTY + i,
Base64.encode(password.getBytes()));
+
settings.setProperty(ImportExportBaseService.PRODUCTION_CRON_PROPERTY + i,
cron);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_PROFILE_PROPERTY + i,
profile);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_SYNCRONIZE_PROPERTY+i,syncronize);
} else {
String warningMsg =
JahiaResourceBundle.getAdminResource("org.jahia.admin.productionManager.error.targetSite",
jParams, jParams.getLocale());
Index: ProductionJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ProductionJob.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProductionJob.java 25 Nov 2005 11:32:33 -0000 1.6
+++ ProductionJob.java 27 Dec 2005 15:24:56 -0000 1.7
@@ -56,7 +56,7 @@
JahiaSite site = jahiaSitesService.getSite(siteID);
boolean execute = true;
String targetNames =
site.getSettings().getProperty(ImportExportBaseService.PRODUCTION_TARGET_LIST_PROPERTY,
"");
- execute = targetNames.indexOf(targetName) > -1;
+ execute =
targetNames.indexOf(jobDetail.getName().split("_")[2]) > -1;
if (execute) {
JahiaUser member =
instance.getJahiaSiteUserManagerService().getMember(site.getID(),
jobDataMap.getString(PROFILE));
if (logger.isDebugEnabled())
Index: JahiaPageBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JahiaPageBaseService.java 21 Dec 2005 14:06:35 -0000 1.26
+++ JahiaPageBaseService.java 27 Dec 2005 15:24:56 -0000 1.27
@@ -58,10 +58,10 @@
public static final String CONTENT_PAGE_CACHE = "ContentPageCache";
/** The active Page info cache */
- private static Cache mPageInfosCache;
+// private static Cache mPageInfosCache;
/** The versioning info cache */
- private static Cache mVersioningPageInfosCache;
+// private static Cache mVersioningPageInfosCache;
/** the page child cache */
private static Cache mPageChildIDsCache;
@@ -101,10 +101,8 @@
/**
* Default construtor, creates a new <code>JahiaPageBaseService</code>
instance
*
- * @throws JahiaException when an initilization exception occured
*/
- protected JahiaPageBaseService()
- throws JahiaException {
+ protected JahiaPageBaseService() {
}
/**
@@ -330,7 +328,7 @@
}
// add the page into the cache
- mPageInfosCache.put(new Integer(pageID), pageInfoVector);
+// mPageInfosCache.put(new Integer(pageID), pageInfoVector);
pageInfo = null;
WorkflowEvent theEvent = new WorkflowEvent (this, contentPage,
jParam.getUser(), languageCode, false);
@@ -421,8 +419,8 @@
if (jParam.isInAdminMode() || (theVictim.getID() != currentPageID)) {
// First remove it from the cache
- mPageInfosCache.remove(new Integer(theVictim.getID()));
- mVersioningPageInfosCache.remove(new Integer(theVictim.getID()));
+// mPageInfosCache.remove(new Integer(theVictim.getID()));
+// mVersioningPageInfosCache.remove(new
Integer(theVictim.getID()));
// only direct pages do have content.
if (theVictim.getPageType() == JahiaPage.TYPE_DIRECT) {
@@ -950,7 +948,6 @@
boolean directPageOnly)
throws JahiaException {
Vector childs = new Vector();
- Integer intPageID = new Integer(pageID);
List childIDs = new Vector();
if ( ((pageInfosFlag & ContentPage.STAGING_PAGE_INFOS) != 0)
@@ -1120,7 +1117,6 @@
boolean directPageOnly)
throws JahiaException {
Vector childs = new Vector();
- Integer intPageID = new Integer(pageID);
List childIDs = null;
if (childIDs == null) {
// get all the child page IDs
@@ -1399,10 +1395,10 @@
// Initialize the pages cache
logger.debug(" - Instanciate the page cache ...");
- mPageInfosCache = cacheService.createCacheInstance(PAGE_INFO_CACHE);
+// mPageInfosCache =
cacheService.createCacheInstance(PAGE_INFO_CACHE);
- mVersioningPageInfosCache = cacheService.createCacheInstance(
- VERSIONING_PAGE_INFO_CACHE);
+// mVersioningPageInfosCache = cacheService.createCacheInstance(
+// VERSIONING_PAGE_INFO_CACHE);
mPageChildIDsCache = cacheService.createCacheInstance(
PAGE_CHILD_CACHE);
@@ -1417,21 +1413,13 @@
// get the template service reference.
logger.debug(" - Get the Page Template Service instance ...");
- if ((mPageInfosCache != null) &&
- (mVersioningPageInfosCache != null) &&
- (templateService != null)) {
+ if (templateService != null) {
logger.debug(" ** Page Service successfully initialized!");
- // preloading page infos in cache
- pageManager.preloadingPageInfos(mPageInfosCache,
mVersioningPageInfosCache);
-
- List pageIDs =
pageManager.getFirstNPageIDs(settingsBean.getPreloadCountForPageProperties());
-//
PagePropertyDB.getInstance().preloadCacheByPageID(pageIDs);
+
pageManager.getFirstNPageIDs(settingsBean.getPreloadCountForPageProperties());
} else {
// invalidate the previous initializations
- mPageInfosCache = null;
- mVersioningPageInfosCache = null;
templateService = null;
// and raise an exception :(
@@ -1814,32 +1802,16 @@
// the info out of the cache, if not present extract if from the
// database, and add it to the cache.
// Return null if the page info doesn't exist.
- private List lookupPageInfos(int pageID, EntryLoadRequest loadRequest)
- throws JahiaException {
+ private List lookupPageInfos(int pageID, EntryLoadRequest loadRequest) {
// Get the raw page infos
List pageInfoVector = null;
- boolean versioning = ! (loadRequest.getWorkflowState() >=
- EntryLoadRequest.ACTIVE_WORKFLOW_STATE);
- if (!versioning) {
- pageInfoVector = (List) mPageInfosCache.get(new Integer(pageID));
- } else {
- pageInfoVector = (List) mVersioningPageInfosCache.get(new
Integer(
- pageID));
- }
- if (pageInfoVector == null) {
- // the page doesn't exist yet in the cache, load it from the
- // database.
+ // the page doesn't exist yet in the cache, load it from the
+ // database.
pageInfoVector = pageManager.loadPageInfos(pageID, loadRequest);
if (pageInfoVector == null) {
pageInfoVector = new Vector();
}
- if (!versioning) {
- mPageInfosCache.put(new Integer(pageID), pageInfoVector);
- } else {
- mVersioningPageInfosCache.put(new Integer(pageID),
- pageInfoVector);
- }
- }
+
return pageInfoVector;
}
@@ -1853,9 +1825,6 @@
// If the shutdown process can be forced, a message should
indicate the editing
// user the service is in shutdown process, as soon as he does an
action.
//////////////////////////////////////////////////////////////////////////////////////
-
- mPageInfosCache.flush();
- mVersioningPageInfosCache.flush();
mPageChildIDsCache.flush();
}
@@ -1991,9 +1960,6 @@
JahiaException.CRITICAL_SEVERITY);
}
- // add the page into the cache
- mPageInfosCache.put(new Integer(pageID), pageInfoVector);
-
// log the page creation Event
JahiaEvent theEvent = new JahiaEvent(this, jParam, page);
sReg.getJahiaEventService().
@@ -2100,9 +2066,7 @@
}
public void invalidatePageCache(int pageID) {
- synchronized (mPageInfosCache) {
- mPageInfosCache.remove(new Integer(pageID));
- mVersioningPageInfosCache.remove(new Integer(pageID));
+ synchronized (mContentPageCache) {
mPageChildIDsCache.remove(new Integer(pageID));
// PagePropertyDB.getInstance().invalidateCacheForPage(pageID);
mContentPageCache.remove(new Integer(pageID));
