You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/01/02 22:53:23 UTC

[sling-org-apache-sling-app-cms] 08/09: Minor - fixing nasty stack trace when catching exceptions

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 55363d701b6ee8ffccc2f66536f5f0d0ad4bdc59
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jan 2 17:48:56 2020 -0500

    Minor - fixing nasty stack trace when catching exceptions
---
 builder/src/main/provisioning/cms.txt                                 | 1 +
 .../resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp  | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index ef0181b..73e54f4 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -123,6 +123,7 @@
 [configurations]
   org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling-cms-error
      user.mapping=[
+        "org.apache.sling.cms.core:sling-cms-error\=sling-cms-error",
         "org.apache.sling.models.impl:sling-cms-error\=sling-cms-error"
     ]
 
diff --git a/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp b/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp
index e2b9f80..8439fa8 100644
--- a/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp
@@ -14,6 +14,4 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.
- */ --%><%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%@include file="/libs/sling-cms/global.jsp"%><sling:adaptTo var="errorHandler" adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.ErrorHandler" />
-<sling:include path="${sling:getRelativeResource(errorHandler.handler,'jcr:content').path}.html" resourceType="${sling:getRelativeResource(errorHandler.handler,'jcr:content').resourceType}" />
\ No newline at end of file
+ */ --%><%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%@include file="/libs/sling-cms/global.jsp"%><sling:adaptTo var="errorHandler" adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.ErrorHandler" />
\ No newline at end of file