Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e772931
mobb fix commit: 3e323b01-c236-4236-945f-f7a90300bec3
Dec 26, 2024
2d988d1
mobb fix commit: 7b09c6d9-a9ac-4bc0-8e9f-77aec4c62311
Dec 26, 2024
48a97b8
mobb fix commit: 6c88a048-fc47-4123-8363-826eb6417739
Dec 26, 2024
20d92e7
mobb fix commit: 0c425f35-fb5c-4272-98a2-2f80c9cd51d5
Dec 26, 2024
292b8b0
mobb fix commit: e5527333-d82a-4775-9bb3-330d07734fcd
Dec 26, 2024
76fe290
mobb fix commit: f0efc679-3962-400f-84d1-4d2e9ba0ea80
Dec 26, 2024
09d09ab
mobb fix commit: c194cfb6-e627-4c18-b420-0964ee67bbe5
Dec 26, 2024
f3c3d2e
mobb fix commit: 47244089-5bae-4007-8526-b544aaa9d62c
Dec 26, 2024
fd806f7
mobb fix commit: c7945535-b83d-4480-a497-e0c6e04ef1aa
Dec 26, 2024
80c5073
mobb fix commit: adc2c76a-25f5-44cc-90b8-c80e40dd800b
Dec 26, 2024
ec5e8a5
mobb fix commit: 4d7114ed-1ad3-4298-9178-3d93893a5372
Dec 26, 2024
991f50a
mobb fix commit: f295193e-c52e-466f-a0cb-7077db71df22
Dec 26, 2024
52df25f
mobb fix commit: cef88ab3-df2e-4789-99ce-c677f69f96d8
Dec 26, 2024
879340b
mobb fix commit: 6401428f-1408-4b7e-9021-e1b70b94cd38
Dec 26, 2024
b588b8e
mobb fix commit: 1fe31b60-5e3b-406e-a7aa-7f79854f2623
Dec 26, 2024
89f1d53
mobb fix commit: 5b8d6ae5-794f-402a-b230-9b96439d0939
Dec 26, 2024
8820566
mobb fix commit: 58bc4745-787a-4d79-ab20-28ef8137ee9f
Dec 26, 2024
74d4765
mobb fix commit: 5532ceb7-abcd-4f72-b323-c0bea49c5bf5
Dec 26, 2024
560bcc9
mobb fix commit: 9ff70bd9-6771-4481-a879-abf63dbc1f8e
Dec 26, 2024
7b1d022
mobb fix commit: 4a839b4a-804d-4f3f-bbf1-9876deb0e173
Dec 26, 2024
2a66130
mobb fix commit: 43953b37-78c9-4184-a07e-ac262bdf732c
Dec 26, 2024
f4a21f4
mobb fix commit: 43006778-7ee2-4923-aa24-11e94c05021e
Dec 26, 2024
81fcebf
mobb fix commit: 3eb2e076-e82e-45f4-933c-24ffb1314e42
Dec 26, 2024
968b18c
mobb fix commit: 01bcebd2-417b-4bc0-b2e2-707092f2e1bb
Dec 26, 2024
129b1e1
mobb fix commit: cef48ed1-22b2-4bb8-b541-f7b09849acd8
Dec 26, 2024
8ef5497
mobb fix commit: 398ef260-8d3c-4733-a01d-928b850d8089
Dec 26, 2024
90358f5
mobb fix commit: 9305aabb-5274-4cf4-8d92-a3bb4786852c
Dec 26, 2024
ee9c101
mobb fix commit: f1267657-1764-4a67-8a69-1c36e51e82c3
Dec 26, 2024
2bfb772
mobb fix commit: ac572ed6-16ce-4597-908b-270dc1cd6d8b
Dec 26, 2024
ef4eadb
mobb fix commit: 2532cc0e-b7fc-452a-9bea-4d3dfa1062c9
Dec 26, 2024
1c6e456
mobb fix commit: 252143d8-e8be-4262-a41e-6f40bfc05245
Dec 26, 2024
61a5b9c
mobb fix commit: a81be157-6393-4a22-b784-805b4e8f17bf
Dec 26, 2024
4f76ea7
mobb fix commit: 8c73d4c9-1791-44d5-9331-49cbb5d1b491
Dec 26, 2024
028f93e
mobb fix commit: c1d75715-dbc9-46b2-8f14-bfdad18b947c
Dec 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ protected boolean isEditable() {
} catch (CmsException e1) {
// should usually never happen
if (LOG.isErrorEnabled()) {
LOG.error(e1.getLocalizedMessage(), e1);
LOG.error("Unexpected error: mobb-18f25a3a013eabc9981de50e0579fddc", e1);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void executeListIndepActions() {
try {
getToolManager().jspForwardTool(this, "/history/comparison/difference", params);
} catch (Exception e) {
LOG.debug(e.getMessage(), e);
LOG.debug("Unexpected error: mobb-e31df73dd4847f4cf0dd4d0776ee5ee5", e);
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ public String getRootFolder() {
} catch (CmsException e) {
// should usually never happen
if (LOG.isInfoEnabled()) {
LOG.info(e.getLocalizedMessage(), e);
LOG.info("Unexpected error: mobb-7ed77b74cb98a90aaf555cb48759608c", e);
}
return "/";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ private void copyOtherFiles(String startfolder) {
}
} catch (Exception e) {
LOG.error(e.getLocalizedMessage(), e);
m_report.println(e);
m_report.println("Unexpected error: mobb-90b917d302fabbe913973b54f3447b81");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ade/sitemap/CmsVfsSitemapService.java
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ public void saveSitemapAttributes(CmsUUID rootId, Map<String, String> attributes
getCmsObject().unlockResource(configResource);
}
} catch (Exception e) {
LOG.debug(e.getLocalizedMessage(), e);
LOG.debug("Unexpected error: mobb-3fd0dfa0c72f28f38a40ba46668218a8", e);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private String getProjectSelectOptions(CmsObject cms, Locale locale) {
} catch (CmsException e) {
// should usually never happen
if (LOG.isErrorEnabled()) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-66186ed0532f95102141196796afdcfe", e);
}
allProjects = Collections.emptyList();
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/gwt/CmsGwtService.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public void log(String message, Throwable t) {
*/
public void logError(Throwable t) {

LOG.error(t.getLocalizedMessage(), t);
LOG.error("Unexpected error: mobb-9f5d3978ae4d85e4bfd2e557a56d5a50", t);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/i18n/CmsMessageToBundleIndex.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static CmsMessageToBundleIndex read(CmsObject cms) throws CmsException {
I_CmsResourceType xmlType = OpenCms.getResourceManager().getResourceType(typeName);
resources.addAll(cms.readResources("/", CmsResourceFilter.ALL.addRequireType(xmlType), true));
} catch (Exception e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-0931039390779c8abe4f6fc30e214f79", e);
}
}
Set<String> bundleNames = resources.stream().map(
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/i18n/tools/CmsContainerPageCopier.java
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ private void attachLocaleGroups(CmsResource copiedPage) throws CmsException {
try {
localeGroupService.attachLocaleGroupIndirect(m_originalPage, copiedPage);
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-8f377563975c1d2cf7e2452584eae496", e);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/importexport/CmsImportVersion4.java
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ private void readResourcesFromManifest() throws CmsImportExportException {
translatedName),
e);
}
m_report.println(e);
m_report.println("Unexpected error: mobb-b2b9381f2ec97225215ea4c18be87932");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/jsp/CmsJspTagHeadIncludes.java
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ private Set<String> getCSSHeadIncludes(CmsObject cms, CmsResource resource) {
resource);
return contentDefinition.getContentHandler().getCSSHeadIncludes(cms, resource);
} catch (CmsException e) {
LOG.warn(e.getLocalizedMessage(), e);
LOG.warn("Unexpected error: mobb-5956b3d71c9503bad9fcb781b3eab7c0", e);
// NOOP, use the empty set
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public CmsDynamicFunctionFormatWrapper(CmsObject cms, CmsDynamicFunctionBean.For
try {
m_jspResource = cms.readResource(format.getJspStructureId());
} catch (CmsException e) {
LOG.warn(e.getLocalizedMessage(), e);
LOG.warn("Unexpected error: mobb-a8e9a7975eab503044394a872f631566", e);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/loader/CmsTemplateContextManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public String readPropertyFromTemplate(CmsObject cms, CmsResource res, String pr
return cms.readPropertyObject(templatePath, propertyName, false).getValue(fallbackValue);
}
} catch (Exception e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-5a7cf133ade8dbee51b962df55f5b3fc");
return fallbackValue;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/publish/CmsPublishEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ protected byte[] getReportContents(CmsPublishJobFinished publishJob) throws CmsE
result = m_driverManager.readPublishReportContents(dbc, publishJob.getPublishHistoryId());
} catch (CmsException e) {
dbc.rollback();
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-124d2a26dbac7d63fcf152f88f731e39", e);
throw e;
} finally {
dbc.clear();
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/report/A_CmsReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void println(CmsMessageContainer container) {
*/
public void println(CmsMessageContainer container, int format) {

println(container.key(getLocale()), format);
println("Unexpected error: mobb-b8f67be0c5408f6a43c0a8847e02a6c3", format);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/org/opencms/report/CmsLogReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public synchronized void print(String value, int format) {
public synchronized void println() {

if (CmsLog.getLog(m_channel).isInfoEnabled()) {
CmsLog.getLog(m_channel).info(m_buffer.toString());
CmsLog.getLog(m_channel).info("Unexpected error: mobb-2c4566bf85859f7a6f9674423f60c307");
}
m_buffer = new StringBuffer();
setLastEntryTime(System.currentTimeMillis());
Expand All @@ -139,7 +139,7 @@ public synchronized void println(Throwable t) {
message.append(t.getMessage());
m_buffer.append(message);
addError(message.toString());
CmsLog.getLog(m_channel).info(m_buffer.toString(), t);
CmsLog.getLog(m_channel).info(m_buffer.toString(), "Unexpected error: mobb-2c7830faf1f06fcddff71b97ec46ca4a");
}
m_buffer = new StringBuffer();
setLastEntryTime(System.currentTimeMillis());
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/report/CmsPrintStreamReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public synchronized void println(Throwable t) {
StringBuffer buf = new StringBuffer();
buf.append(getMessages().key(Messages.RPT_EXCEPTION_0));
buf.append(t.getMessage());
println(new String(buf), FORMAT_ERROR);
println("Unexpected error: mobb-0c2200a3e77442220e3328343a8a2985", FORMAT_ERROR);
t.printStackTrace(m_printStream);
setLastEntryTime(System.currentTimeMillis());
}
Expand Down
4 changes: 2 additions & 2 deletions src/org/opencms/search/CmsSearchManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -2515,7 +2515,7 @@ public void setOfflineUpdateFrequency(String offlineUpdateFrequency) {
Messages.LOG_PARSE_OFFLINE_UPDATE_FAILED_2,
offlineUpdateFrequency,
Long.valueOf(DEFAULT_OFFLINE_UPDATE_FREQNENCY)),
e);
"Unexpected error: mobb-eb2b1dda8baa20648829c0034612d092");
setOfflineUpdateFrequency(DEFAULT_OFFLINE_UPDATE_FREQNENCY);
}
}
Expand Down Expand Up @@ -2755,7 +2755,7 @@ protected Collection<CmsPublishedResource> findRelatedContainerPages(
adminCms.getRequestContext().removeSiteRoot(pubRes.getRootPath()));
}
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-48c1e213d9b32d78c53d3a16f969ee7a", e);
}
}
// add all found container pages as published resource objects to the list
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/apps/search/CmsSearchReplaceThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public List<CmsResource> getMatchedResources() {
try {
result.add(getCms().readResource(resource.getStructureId()));
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-ee104a2b699963bea10c24c99c806145", e);
}
}
return result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ protected void onSiteChange(String site) {
m_siteRoot = site;
updateRoot(rootCms, siteRootResource);
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-8f2b3d428a1a210089115ba96afacdb4", e);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/dialogs/embedded/CmsDataViewParams.java
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public I_CmsDataView createViewInstance(CmsObject cms, Locale locale) {
dataView.initialize(cms, m_viewArg, locale);
return dataView;
} catch (Exception e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-6800ea30847391011cc2042df2063740", e);
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/dialogs/history/diff/CmsTextDiff.java
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public Optional<Component> diff(CmsObject cms, CmsHistoryResourceBean v1, CmsHis
// set the content to null, so the content dialog will not be shown
originalSource = null;
copySource = null;
LOG.error(e.getMessage(), e);
LOG.error("Unexpected error: mobb-0610230ad7f7d15c3c7b92a4e6f98525", e);
}
} else if ((type instanceof CmsResourceTypePlain)
|| (type instanceof CmsResourceTypeJsp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ public boolean addDescriptor() {
m_editorState.put(EditMode.DEFAULT, getDefaultState());
m_editorState.put(EditMode.MASTER, getMasterState());
} catch (CmsException | IOException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-78b72eca8fb5643f79f9616a313a0502", e);
if (m_descContent != null) {
m_descContent = null;
}
Expand Down
4 changes: 2 additions & 2 deletions src/org/opencms/ui/sitemap/CmsSitemapTreeDataProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public List<CmsSitemapTreeNodeData> getChildren(CmsSitemapTreeNodeData nodeData)
continue;
}
} catch (Exception e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-a6d64d5fc0b719421c825a189cd77db7");
}

CmsSitemapTreeNodeData data = new CmsSitemapTreeNodeData(
Expand All @@ -167,7 +167,7 @@ public List<CmsSitemapTreeNodeData> getChildren(CmsSitemapTreeNodeData nodeData)
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
} catch (CmsRpcException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-988906913c181b818d81610057fb069f");

}
return result;
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/util/CmsMacroResolver.java
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ public String getMacroValue(String macro) {
CmsADEConfigData config = OpenCms.getADEManager().lookupConfigurationWithCache(m_cms, adeContext);
String val = config.getAttribute(key, defaultValue);
if (val == null) {
LOG.warn("Sitemap attribute not defined: " + key);
LOG.warn("Unexpected error: mobb-f3a392be055d73402859d9694ee91f07");
}
return val;

Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/util/CmsRequestUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ public static JSONObject getJsonParameterMap(Map<String, String[]> params) {
result.putOpt(paramKey, paramValue);
} catch (JSONException e) {
// should never happen
LOG.warn(e.getLocalizedMessage(), e);
LOG.warn(e.getLocalizedMessage(), "Unexpected error: mobb-3ff11b39e6fcabf98841380d037a519f");
}
}
return result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public Set<CmsResource> findInvalidResources(Set<CmsResource> resources) {
}
} catch (CmsException e) {
// should never happen
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-d4aa357e30d177880c99c724c3a1cf99");
}
for (CmsResource resource : resources) {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/workplace/editors/CmsDialogElements.java
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public static List<CmsDialogElement> computeElements(CmsObject cms, String xmlPa
CmsFile pageFile = cms.readFile(xmlPageUri, CmsResourceFilter.IGNORE_EXPIRATION);
page = CmsXmlPageFactory.unmarshal(cms, pageFile);
} catch (CmsException e) {
LOG.warn(Messages.get().getBundle().key(Messages.LOG_READ_XMLPAGE_FAILED_1, xmlPageUri), e);
LOG.warn(Messages.get().getBundle().key(Messages.LOG_READ_XMLPAGE_FAILED_1, xmlPageUri), "Unexpected error: mobb-ae50b5984cec31a25431bb74988b7800");
// xmlpage will be null, only "template-elements" property on template will be checked
}
return computeElements(cms, page, xmlPageUri, locale);
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/workplace/explorer/CmsResourceUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ public CmsPermissionSet getPermissionSet() {
pset.denyPermissions(CmsPermissionSet.PERMISSION_READ);
}
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage());
LOG.error("Unexpected error: mobb-970e5820fc3768a9988bf38da795e2f5");
}
try {
if (getCms().hasPermissions(resource, CmsPermissionSet.ACCESS_VIEW, false, CmsResourceFilter.ALL)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private List<CmsResource> resourcesForType(String folder, String name) {
CmsResourceFilter filter = CmsResourceFilter.IGNORE_EXPIRATION.addRequireType(type);
return cms.readResources(folder, filter);
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-09b94861e7eac7b90cdcefa6bf758b07");
getReport().println(e);
return Collections.emptyList();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public CmsJsonResult renderJson(CmsJsonHandlerContext context, boolean throwErro
CmsJsonDocumentXmlContent jsonDocument = new CmsJsonDocumentXmlContent(jsonRequest, context.getContent());
return new CmsJsonResult(jsonDocument.getJson(), HttpServletResponse.SC_OK);
} catch (JSONException | PathNotFoundException e) {
LOG.info(e.getLocalizedMessage(), e);
LOG.info(e.getLocalizedMessage(), "Unexpected error: mobb-12b64123e839a257b4b4ba3149098a02");
return new CmsJsonResult(e.getLocalizedMessage(), HttpServletResponse.SC_NOT_FOUND);
} catch (CmsJsonHandlerException e) {
LOG.debug(e.getLocalizedMessage(), e);
Expand Down