svnno****@sourc*****
svnno****@sourc*****
2008年 10月 31日 (金) 11:46:04 JST
Revision: 1269 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1269 Author: shinsuke Date: 2008-10-31 11:46:04 +0900 (Fri, 31 Oct 2008) Log Message: ----------- clean up error messages. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties 2008-10-31 02:46:04 UTC (rev 1269) @@ -1,5 +1,4 @@ portlet.is.not.available=This content is not available now. Please try again later. -could.not.render.portlet=Sorry. Could not render this content. Please contact to a site administrator. could.not.access.portlet=Sorry, but we were unable access the requested content. Please contact to a site administrator. out.of.service=The content is not responding and has been taken out of service. -access.denied=Access denied. \ No newline at end of file +access.denied=Access denied. Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties 2008-10-31 02:46:04 UTC (rev 1269) @@ -1,5 +1,4 @@ portlet.is.not.available=This content is not available now. Please try again later. -could.not.render.portlet=Sorry. Could not render this content. Please contact to a site administrator. could.not.access.portlet=Sorry, but we were unable access the requested content. Please contact to a site administrator. out.of.service=The content is not responding and has been taken out of service. -access.denied=Access denied. \ No newline at end of file +access.denied=Access denied. Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties 2008-10-31 02:46:04 UTC (rev 1269) @@ -1,5 +1,4 @@ portlet.is.not.available=\u73fe\u5728\u3001\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u5229\u7528\u53ef\u80fd\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u5f8c\u3067\u518d\u5ea6\u304a\u8a66\u3057\u304f\u3060\u3055\u3044\u3002 -could.not.render.portlet=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u8868\u793a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30b5\u30a4\u30c8\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 could.not.access.portlet=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30b5\u30a4\u30c8\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 out.of.service=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u30b5\u30fc\u30d3\u30b9\u505c\u6b62\u4e2d\u3067\u3059\u3002 access.denied=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-10-31 02:46:04 UTC (rev 1269) @@ -254,7 +254,7 @@ {e.toString()}; log.log("1200011", args); // REPLACED - fragment.overrideRenderedContent("could.not.render.portlet"); + fragment.overrideRenderedContent("could.not.access.portlet"); } } @@ -307,7 +307,7 @@ {e.toString()}; log.log("1200012", args, e); // REPLACED - fragment.overrideRenderedContent("could.not.render.portlet"); + fragment.overrideRenderedContent("could.not.access.portlet"); } if (job != null) @@ -414,7 +414,7 @@ e1); } job.getFragment().overrideRenderedContent( - "could.not.render.portlet"); + "could.not.access.portlet"); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2008-10-31 02:46:04 UTC (rev 1269) @@ -340,7 +340,7 @@ Object[] args = new Object[] {curWindow.getId()}; log.log("1200019", args, t); // REPLACED - fragment.overrideRenderedContent("could.not.render.portlet"); + fragment.overrideRenderedContent("could.not.access.portlet"); } } finally