June 2012 - gatein-commits - Jboss List Archives

gatein SVN: r8738 - epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2012-06-22 09:04:56 -0400 (Fri, 22 Jun 2012) New Revision: 8738 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/FilteredNavigationExportResource.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/NavigationExportResource.java Log: Bug 807281 - NPE when calling export-resource on an invalid navigation node. Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/FilteredNavigationExportResource.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/FilteredNavigationExportResource.java 2012-06-22 12:57:31 UTC (rev 8737) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/FilteredNavigationExportResource.java 2012-06-22 13:04:56 UTC (rev 8738) @@ -32,6 +32,7 @@ import org.gatein.management.api.binding.BindingProvider; import org.gatein.management.api.binding.Marshaller; import org.gatein.management.api.exceptions.OperationException; +import org.gatein.management.api.exceptions.ResourceNotFoundException; import org.gatein.management.api.operation.OperationContext; import org.gatein.management.api.operation.OperationContextDelegate; import org.gatein.management.api.operation.OperationHandler; @@ -104,6 +105,10 @@ resultHandler.completed(new ExportResourceModel(task)); } } + catch (ResourceNotFoundException e) + { + throw e; + } catch (OperationException e) { throw new OperationException(e.getOperationName(), getStepMessage(e, address, stepResultHandler), e); Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/NavigationExportResource.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/NavigationExportResource.java 2012-06-22 12:57:31 UTC (rev 8737) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/navigation/NavigationExportResource.java 2012-06-22 13:04:56 UTC (rev 8738) @@ -27,6 +27,7 @@ import org.exoplatform.portal.mop.description.DescriptionService; import org.exoplatform.portal.mop.management.exportimport.NavigationExportTask; import org.exoplatform.portal.mop.navigation.NavigationService; +import org.exoplatform.portal.mop.navigation.NodeContext; import org.gatein.management.api.ContentType; import org.gatein.management.api.PathTemplateFilter; import org.gatein.management.api.binding.BindingProvider; @@ -76,10 +77,16 @@ DescriptionService descriptionService = operationContext.getRuntimeContext().getRuntimeComponent(DescriptionService.class); NavigationService navigationService = operationContext.getRuntimeContext().getRuntimeComponent(NavigationService.class); + NavigationKey navigationKey = new NavigationKey(siteKey, navUri); + + // Find navigation first + NodeContext<?> context = NavigationUtils.loadNode(navigationService, navigationService.loadNavigation(siteKey), navigationKey.getNavUri()); + if (context == null) throw new ResourceNotFoundException("Navigation node not found for navigation uri '" + navUri +"'"); + BindingProvider bindingProvider = operationContext.getBindingProvider(); Marshaller<PageNavigation> marshaller = bindingProvider.getMarshaller(PageNavigation.class, ContentType.XML); - NavigationExportTask exportTask = new NavigationExportTask(new NavigationKey(siteKey, navUri), navigationService, descriptionService, marshaller); + NavigationExportTask exportTask = new NavigationExportTask(navigationKey, navigationService, descriptionService, marshaller); resultHandler.completed(new ExportResourceModel(exportTask)); }

11 years, 10 months

1
0
0 / 0

gatein SVN: r8737 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2012-06-22 08:57:31 -0400 (Fri, 22 Jun 2012) New Revision: 8737 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml Log: Bug 807012 - Remove possibly unused JARs from gatein.ear/lib Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-21 11:24:39 UTC (rev 8736) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-22 12:57:31 UTC (rev 8737) @@ -1250,10 +1250,10 @@ </exclusion> </exclusions> </dependency> - + </dependency>  @@ -1315,6 +1315,11 @@ <version>1.5.3</version> </dependency> + <dependency> + <artifactId>jgroups</artifactId> + <groupId>org.jgroups</groupId> + </dependency> +  <!-- <dependency> <artifactId>xercesImpl</artifactId>

11 years, 10 months

1
0
0 / 0

gatein SVN: r8736 - in epp/portal/branches/EPP_5_2_Branch: portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web and 1 other directories.

by do-not-reply＠jboss.org

Author: tkobayas(a)redhat.com Date: 2012-06-21 07:24:39 -0400 (Thu, 21 Jun 2012) New Revision: 8736 Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/LogoPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_ja.properties epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties Log: Bug 812814 - Unify Japanese translations Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -22,7 +22,7 @@ UIAccountForm.label.Profile=\u30e6\u30fc\u30b6\u30fc\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb UIAccountForm.title=\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u8ffd\u52a0/\u7de8\u96c6 UIAccountForm.label.username=#{word.userName}: -UIAccountForm.label.SearchUser=\u30e6\u30fc\u30b6\u30fc\u3092\u691c\u7d22 +UIAccountForm.label.SearchUser=\u30e6\u30fc\u30b6\u3092\u691c\u7d22 UIAccountForm.label.password1x=\u30d1\u30b9\u30ef\u30fc\u30c9: UIAccountForm.label.password2x=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u78ba\u8a8d: UIAccountForm.label.password=\u30d1\u30b9\u30ef\u30fc\u30c9: @@ -38,7 +38,7 @@ UIAccountForm.action.Back=#{word.back} UIAccountForm.action.Save=#{word.save} -UIAccountForm.label.action.SearchUser=\u30e6\u30fc\u30b6\u30fc\u3092\u691c\u7d22 +UIAccountForm.label.action.SearchUser=\u30e6\u30fc\u30b6\u30fc\u306e\u691c\u7d22 #{0} is the username that the remote user enter UIAccountForm.msg.user-exist=\u30e6\u30fc\u30b6\u30fc\u540d '{0}' \u306f\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002 UIAccountForm.msg.incorrect-password=\u5165\u529b\u3055\u308c\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u9593\u9055\u3063\u3066\u3044\u307e\u3059\u3002 @@ -56,8 +56,8 @@ UIAccountForm.label.option.male=\u7537\u6027 UIAccountForm.label.option.female=\u5973\u6027 -UIAccountForm.label.HomeInfo=\u81ea\u5b85\u60c5\u5831 -UIAccountForm.label.user.name.given=#{word.givenName}: +UIAccountForm.label.HomeInfo=Home\u60c5\u5831 +UIAccountForm.label.user.name.given=#{word.givenName}: UIAccountForm.label.user.name.family=#{word.familyName}: UIAccountForm.label.user.name.nickName=#{word.nickName}: UIAccountForm.label.user.bdate=#{word.birthday}: @@ -67,12 +67,12 @@ UIAccountForm.label.user.jobtitle=#{word.jobTitle}: UIAccountForm.label.user.language=\u8a00\u8a9e UIAccountForm.label.user.home-info.postal.name=#: -UIAccountForm.label.user.home-info.postal.street=#{word.street}: +UIAccountForm.label.user.home-info.postal.street=#{word.street}: UIAccountForm.label.user.home-info.postal.city=#{word.city}: UIAccountForm.label.user.home-info.postal.stateprov=#{word.stateProv}: -UIAccountForm.label.user.home-info.postal.postalcode=#{word.postalCode}: +UIAccountForm.label.user.home-info.postal.postalcode=#{word.postalCode}: UIAccountForm.label.user.home-info.postal.country=#{word.country}: -UIAccountForm.label.user.home-info.telecom.mobile.number=#{word.mobile}: +UIAccountForm.label.user.home-info.telecom.mobile.number=#{word.mobile}: UIAccountForm.label.user.home-info.telecom.telephone.number=#{word.tel}: UIAccountForm.label.user.home-info.online.email=#{word.email}: UIAccountForm.label.user.home-info.online.uri=#{word.website}: Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -17,11 +17,11 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -UIAdminToolbarPortlet.action.AddPage=\u65b0\u3057\u3044\u30da\u30fc\u30b8\u3092\u8ffd\u52a0 +UIAdminToolbarPortlet.action.AddPage=\u65b0\u898f\u30da\u30fc\u30b8\u3092\u8ffd\u52a0 UIAdminToolbarPortlet.action.EditPage=\u30da\u30fc\u30b8\u3092\u7de8\u96c6 -UIAdminToolbarPortlet.action.CreatePortal=\u65b0\u3057\u3044\u30dd\u30fc\u30bf\u30eb\u3092\u4f5c\u6210 +UIAdminToolbarPortlet.action.CreatePortal=\u65b0\u898f\u30dd\u30fc\u30bf\u30eb\u3092\u4f5c\u6210 UIAdminToolbarPortlet.action.EditPortal=\u30dd\u30fc\u30bf\u30eb\u3092\u7de8\u96c6 Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -30,7 +30,7 @@ UIToolbar.label.gadget=\u30ac\u30b8\u30a7\u30c3\u30c8 ## org.exoplatform.applicationregistry.webui.component.UIApplicationOrganizer -UIOrganizer.label.addCategory=\u30ab\u30c6\u30b4\u30ea\u306e\u8ffd\u52a0 +UIOrganizer.label.addCategory=\u30ab\u30c6\u30b4\u30ea\u30fc\u3092\u8ffd\u52a0 UIOrganizer.label.autoImport=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30a4\u30f3\u30dd\u30fc\u30c8 UIOrganizer.label.categories=\u30ab\u30c6\u30b4\u30ea UIOrganizer.title.editCategory=\u30ab\u30c6\u30b4\u30ea\u306e\u7de8\u96c6 @@ -70,7 +70,7 @@ UIAddApplicationForm.header.input=\u9078\u629e UIAddApplicationForm.label.option.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 UIAddApplicationForm.label.option.gadget=\u30ac\u30b8\u30a7\u30c3\u30c8 -UIAddApplicationForm.header.label=\u8868\u793a\u540d +UIAddApplicationForm.header.label=\u30c7\u30a3\u30b9\u30d7\u30ec\u30a4\u540d UIAddApplicationForm.header.description=\u8aac\u660e UIAddApplicationForm.action.Add=\u8ffd\u52a0 UIAddApplicationForm.msg.PortletExist=\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u30ab\u30c6\u30b4\u30ea\u30fc\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u3082\u306e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\uff01 @@ -86,7 +86,7 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=\u3053\u306e\u30ab\u30c6\u30b4\u30ea\u30fc\u306f\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u3082\u306e\u3092\u52a0\u3048\u3066\u304f\u3060\u3055\u3044\uff01 -UICategoryForm.tab.label.categoryPermission=\u6a29\u9650\u306e\u8a2d\u5b9a +UICategoryForm.tab.label.categoryPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u8a2d\u5b9a UICategoryForm.tab.label.categorySetting=\u30ab\u30c6\u30b4\u30ea\u306e\u8a2d\u5b9a ## org.exoplatform.applicationregistry.webui.component.UIPortletManagement @@ -145,5 +145,5 @@ UIGadgetEditor.msg.invalidSpec=\u3053\u306e\u30bd\u30fc\u30b9\u306f\u7121\u52b9\u306a\u30ac\u30b8\u30a7\u30c3\u30c8\u4ed5\u69d8\u3067\u3059\u3002 ##package org.exoplatform.organization.webui.component.UIListPermissionSelector UIListPermissionSelector.header.groupId=\u30b0\u30eb\u30fc\u30d7 -UIListPermissionSelector.header.membership=\u30e1\u30f3\u30d0\u30b7\u30c3\u30d7 +UIListPermissionSelector.header.membership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7 UIListPermissionSelectorPopup.title.ListPermissionSelector=\u6a29\u9650\u306e\u9078\u629e Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -101,7 +101,7 @@ UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: UIUserInfo.label.displayName=#{word.displayName}: -UIUserInfo.label.email=Email\u30a2\u30c9\u30ec\u30b9: +UIUserInfo.label.email=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9: UIUserInfo.label.user.language: Language UIUserInfo.action.Back=#{word.cancel} UIUserInfo.action.Save=#{word.save} @@ -111,7 +111,7 @@ UIUserInfo.label.user.language=#{word.language}: UIUserInfo.label.user.name.given=#{word.givenName}: UIUserInfo.label.user.name.family=#{word.familyName}: -UIUserInfo.label.user.name.nickName=#{word.nickName}: +UIUserInfo.label.user.name.nickName=#{word.nickName}: UIUserInfo.label.user.bdate=#{word.birthday}: UIUserInfo.label.user.gender=#{word.gender}: UIUserInfo.label.user.employer=#{word.employer}: @@ -120,12 +120,12 @@ UIUserInfo.label.user.home-info.postal.name=#: UIUserInfo.label.user.home-info.postal.street=#{word.street}: UIUserInfo.label.user.home-info.postal.city=#{word.city}: -UIUserInfo.label.user.home-info.postal.stateprov=#{word.stateProv}: +UIUserInfo.label.user.home-info.postal.stateprov=#{word.stateProv}: UIUserInfo.label.user.home-info.postal.postalcode=#{word.postalCode}: UIUserInfo.label.user.home-info.postal.country=#{word.country}: UIUserInfo.label.user.home-info.telecom.mobile.number=#{word.mobile}: UIUserInfo.label.user.home-info.telecom.telephone.number=#{word.tel}: -UIUserInfo.label.user.home-info.online.email=#{word.email}: +UIUserInfo.label.user.home-info.online.email=#{word.email}: UIUserInfo.label.user.home-info.online.uri=\u30a6\u30a7\u30d6\u6700\u3068: UIUserInfo.label.option.male=\u7537\u6027 UIUserInfo.label.option.female=\u5973\u6027 @@ -136,7 +136,7 @@ UIUserInfo.label.option.fr=\u30d5\u30e9\u30f3\u30b9\u8a9e UIUserInfo.label.option.ru=\u30ed\u30b7\u30a2\u8a9e -UIUserInfo.label.BusinessInfo=\u30d3\u30b8\u30cd\u30b9\u60c5\u5831 +UIUserInfo.label.BusinessInfo=\u52e4\u52d9\u5148\u60c5\u5831 UIUserInfo.label.user.business-info.postal.name=#: UIUserInfo.label.user.business-info.postal.city=#{word.city}: UIUserInfo.label.user.business-info.postal.stateprov=\u5dde/\u7fa4: @@ -182,7 +182,7 @@ UIGroupMembershipForm.label.username=\u30e6\u30fc\u30b6\u30fc\u540d UIGroupMembershipForm.label.membership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7 UIGroupMembershipForm.label.SearchUser=\u30e6\u30fc\u30b6\u3092\u9078\u629e -UIGroupMembershipForm.label.Refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5 +UIGroupMembershipForm.label.Refresh=\u66f4\u65b0 UIGroupMembershipForm.action.Save=#{word.save} UIUserMembershipSelector.deleteMembership=\u3053\u306e\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u672c\u5f53\u306b\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b? @@ -218,7 +218,7 @@ UISharedNavigationForm.label.membership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7 UISharedNavigationForm.tab.label.Permission=\u6a29\u9650\u306e\u9078\u629e UISharedNavigationForm.label.priority=\u512a\u5148\u9806\u4f4d -UISharedNavigationForm.msg.user-nonexist=User "{0}" \u306f\u5b58\u5728\u3057\u307e\u305b\u3093 +UISharedNavigationForm.msg.user-nonexist=\u30e6\u30fc\u30b6\u30fc "{0}" \u306f\u5b58\u5728\u3057\u307e\u305b\u3093 ############################################################################# # org.exoplatform.portal.component.customization.UISharePortalForm# @@ -246,7 +246,7 @@ UIGroupManagement.label.Groups=\u30b0\u30eb\u30fc\u30d7 UIGroupManagement.deleteGroup=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u3092\u524a\u9664\u3057\u3066\u3082\u672c\u5f53\u306b\u3088\u308d\u3057\u3044\u3067\u3059\u304b? UIGroupManagement.label.Groups=\u30b0\u30eb\u30fc\u30d7 -UIGroupManagement.label.AddGroup=\u30b0\u30eb\u30fc\u30d7\u3092\u8ffd\u52a0 +UIGroupManagement.label.AddGroup=\u65b0\u3057\u3044\u30b0\u30eb\u30fc\u30d7\u3092\u8ffd\u52a0 UIGroupManagement.label.EditGroup=\u9078\u629e\u3055\u308c\u305f\u30b0\u30eb\u30fc\u30d7\u3092\u7de8\u96c6 UIGroupManagement.label.DeleteGroup=\u9078\u629e\u3055\u308c\u305f\u30b0\u30eb\u30fc\u30d7\u3092\u524a\u9664 Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -29,9 +29,9 @@ UIRegisterForm.label.confirmPassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u78ba\u8a8d: -UIRegisterForm.label.firstName= \u540d\u524d: +UIRegisterForm.label.firstName= \u540d: -UIRegisterForm.label.lastName= \u540d\u5b57: +UIRegisterForm.label.lastName= \u59d3: -UIRegisterForm.label.emailAddress= e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9: +UIRegisterForm.label.emailAddress=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9: Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -26,7 +26,7 @@ UIIFrameEditMode.label.iframeUrl=URL -UIIFrameEditMode.label.editmode=\u30e2\u30fc\u30c9\u3092\u7de8\u96c6 +UIIFrameEditMode.label.editmode=\u7de8\u96c6\u30e2\u30fc\u30c9 UIIFrameEditMode.action.Save=\u4fdd\u5b58 Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/LogoPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/LogoPortlet_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/LogoPortlet_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -23,10 +23,10 @@ UILogoPortlet.note.Text=\u3053\u308c\u306f\u30ed\u30b4\u3067\u3059 UILogoEditMode.title=URL\u3092\u5909\u66f4 UILogoEditMode.label.logoUrl=URL -UILogoEditMode.label.editmode=\u30e2\u30fc\u30c9\u3092\u5909\u66f4 +UILogoEditMode.label.editmode=\u7de8\u96c6\u30e2\u30fc\u30c9 UILogoEditMode.action.Save=\u4fdd\u5b58 UILogoPortlet.action.changeLanguage=\u8a00\u8a9e\u3092\u5909\u66f4 UILogoPortlet.action.Register=\u767b\u9332 UILogoPortlet.action.signout=\u30b5\u30a4\u30f3\u30a2\u30a6\u30c8 UILogoPortlet.action.signin=\u30b5\u30a4\u30f3\u30a4\u30f3 -UILogoPortlet.label.Welcome=\u3044\u3089\u3063\u3057\u3083\u3044 +UILogoPortlet.label.Welcome=\u3088\u3046\u3053\u305d Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -24,8 +24,8 @@ #word.abort=Abort #word.action=Action word.accessPermission=\u30a2\u30af\u30bb\u30b9\u6a29\u9650 -word.abort=\u4e2d\u6b62 -word.action=\u5b9f\u884c +word.abort=\u4e2d\u65ad +word.action=\u30a2\u30af\u30b7\u30e7\u30f3 ################################################################### # EXPRESSION START WITH 'B' # ################################################################### @@ -62,7 +62,7 @@ #word.department=Department #word.description=Description word.date=\u65e5\u6642 -word.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf +word.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf\u30fc word.department=\u90e8\u9580 word.description=\u8aac\u660e @@ -72,7 +72,7 @@ #word.editPermission=Edit Permission #word.email=Email #word.employer=Employer -word.editPermission=\u5909\u66f4\u6a29\u9650 +word.editPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u7de8\u96c6 word.email=E\u30e1\u30fc\u30eb word.employer=\u4f1a\u793e @@ -200,7 +200,7 @@ #word.userName=User Name #word.update=Update word.uri=Uri -word.userName=\u30e6\u30fc\u30b6\u540d +word.userName=\u30e6\u30fc\u30b6\u30fc\u540d word.update=\u66f4\u65b0 ################################################################### Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2012-06-21 11:12:04 UTC (rev 8735) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2012-06-21 11:24:39 UTC (rev 8736) @@ -20,8 +20,8 @@ UIContentNavigation.msg.EditNode=\u30e2\u30fc\u30c9\u3092\u9078\u629e\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 UIPortletRegistryCategory.msg.editPortlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u9078\u629e\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 PopupPermissionSelector.title.null=null -PopupPermissionSelector.title.UIGroupMembershipSelector=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u30bb\u30ec\u30af\u30bf\u30fc -PopupPermissionSelector.title.PermissionSelector=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u30bb\u30ec\u30af\u30bf\u30fc +PopupPermissionSelector.title.UIGroupMembershipSelector=\u6a29\u9650\u306e\u9078\u629e +PopupPermissionSelector.title.PermissionSelector=\u6a29\u9650\u306e\u9078\u629e UIPermissionForm.label.null=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 UICategoryForm.action.Close=\u9589\u3058\u308b AddCategory.title.UICategoryForm=\u30ab\u30c6\u30b4\u30ea\u30fc\u3092\u8ffd\u52a0 @@ -37,7 +37,7 @@ EmptyFieldValidator.msg.empty-input="{0}" \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306f\u5fc5\u9808\u3067\u3059\u3002 EmptyFieldValidator.msg.empty="{0}" \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u60c5\u5831\u306f\u7a7a\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 ExpressionValidator.msg.value-invalid="{0}" \u306e\u30d5\u30a3\u30fc\u30eb\u30c9 "{1}" \u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306b\u30de\u30c3\u30c1\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 -UITestForm.label.UIAddApplication=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3002 +UITestForm.label.UIAddApplication=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0 StringLengthValidator.msg.length-invalid="{0}" \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u30c6\u30ad\u30b9\u30c8\u306e\u9577\u3055\u306f "{1}" \u3068 "{2}" \u6587\u5b57\u306e\u9593\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 ############################################################################# @@ -53,7 +53,7 @@ ############################################################################# #{0} = input field name -MandatoryValidatorIterator.msg.empty="{0}"\u306e\u30ea\u30b9\u30c8\u306f\u7a7a\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 +MandatoryValidatorIterator.msg.empty="{0}" \u306e\u30ea\u30b9\u30c8\u306f\u7a7a\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 ############################################################################# # Number Format Validator # @@ -266,7 +266,7 @@ # org.exoplatform.portal.component.customization.UIContainerForm# ############################################################################# -UIContainerForm.title=\u30b3\u30f3\u30c6\u30ca\u30fc\u3092\u7de8\u96c6 +UIContainerForm.title=\u30b3\u30f3\u30c6\u30ca\u3092\u7de8\u96c6 UIContainerForm.action.Save=#{word.save} UIContainerForm.action.Close=\u30ad\u30e3\u30f3\u30bb\u30eb UIContainerForm.label.id=\u30b3\u30f3\u30c6\u30ca\u30fcID @@ -278,7 +278,7 @@ UIContainerForm.label.style=#{word.style} UIContainerForm.label.ContainerSetting=\u30b3\u30f3\u30c6\u30ca\u30fc\u306e\u8a2d\u5b9a UIContainerForm.tab.label.ContainerSetting=\u30b3\u30f3\u30c6\u30ca\u30fc\u306e\u8a2d\u5b9a -UIContainerForm.tab.label.UIContainerPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u306b\u30a2\u30af\u30bb\u30b9 +UIContainerForm.tab.label.UIContainerPermission=\u30a2\u30af\u30bb\u30b9\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 UIContainerForm.tab.label.Template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 UIContainerForm.tab.label.Icon=\u30a2\u30a4\u30b3\u30f3 UIContainerForm.msg.InvalidWidthHeight="{0}" \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u30d4\u30af\u30bb\u30eb\u307e\u305f\u306f\u30d1\u30fc\u30bb\u30f3\u30c6\u30fc\u30b8\u306e\u5024\u3092\u5165\u529b\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 @@ -309,10 +309,10 @@ UIPortletForm.tab.label.Icon=\u30a2\u30a4\u30b3\u30f3\u3092\u9078\u629e UIPortletForm.tab.label.Theme=\u30c7\u30b3\u30ec\u30fc\u30b7\u30e7\u30f3\u30c6\u30fc\u30de UIPortletForm.tab.label.EditMode=\u7de8\u96c6\u30e2\u30fc\u30c9 -UIPortletForm.tab.label.PortletPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u306b\u30a2\u30af\u30bb\u30b9 +UIPortletForm.tab.label.PortletPermission=\u30a2\u30af\u30bb\u30b9\u6a29\u9650 UIPortletForm.Theme.title.Preview=\u30c6\u30fc\u30de\u306e\u30d7\u30ec\u30d3\u30e5\u30fc -UIPortletForm.Theme.title.SetDefault=\u30c7\u30d5\u30a9\u30eb\u30c8\u3092\u53d6\u5f97 -UIPortletForm.Icon.title.SetDefault=\u30c7\u30d5\u30a9\u30eb\u30c8\u3092\u53d6\u5f97 +UIPortletForm.Theme.title.SetDefault=\u30c7\u30d5\u30a9\u30eb\u30c8 +UIPortletForm.Icon.title.SetDefault=\u30c7\u30d5\u30a9\u30eb\u30c8 UIPortletForm.msg.InvalidWidthHeight="{0}" \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u30d4\u30af\u30bb\u30eb\u306e\u5024\u3092\u5165\u529b\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 ############################################################################# @@ -321,7 +321,7 @@ UIDescription.title.pageManagement=\u30da\u30fc\u30b8\u95b2\u89a7 UIDescription.title.portalManagement=\u30dd\u30fc\u30bf\u30eb\u95b2\u89a7 -UIDescription.title.pageWizard=\u30da\u30fc\u30b8\u4f5c\u6210\u30a6\u30a3\u30b6\u30fc\u30c9 +UIDescription.title.pageWizard=\u30da\u30fc\u30b8\u4f5c\u6210\u30a6\u30a4\u30b6\u30fc\u30c9 UIDescription.title.pageEditWizard=\u30da\u30fc\u30b8\u7de8\u96c6\u30a6\u30a3\u30b6\u30fc\u30c9 UIDescription.content.pageManagement=\u30da\u30fc\u30b8\u3092\u7ba1\u7406: \u3053\u308c\u306f\u3059\u3079\u3066\u306e\u30da\u30fc\u30b8\u306e\u4e00\u89a7\u3067\u3059\u3002 \u9069\u5207\u306a\u6a29\u9650\u304c\u3042\u308c\u3070\u3001 \u30da\u30fc\u30b8\u3092\u30d7\u30ec\u30d3\u30e5\u30fc (\u901a\u5e38\u306e\u30da\u30fc\u30b8\u306e\u307f)\u3001 \u7de8\u96c6\u307e\u305f\u306f\u524a\u9664\u3067\u304d\u307e\u3059\u3002 \u30aa\u30fc\u30ca\u30fc\u30bf\u30a4\u30d7(\u30dd\u30fc\u30bf\u30eb/\u30b0\u30eb\u30fc\u30d7/\u30e6\u30fc\u30b6\u30fc)\u3054\u3068\u3001\u30aa\u30fc\u30ca\u30fcid(\u30aa\u30fc\u30ca\u30fc\u30bf\u30a4\u30d7\u306e\u540d\u524d)\u3054\u3068\u3001\u30da\u30fc\u30b8\u540d\u3054\u3068\u306b\u30da\u30fc\u30b8\u3092\u691c\u7d22\u3067\u304d\u307e\u3059\u3002 \u65b0\u898f\u30da\u30fc\u30b8\u3092\u4f5c\u6210\u3059\u308b\u306b\u306f\u3001"\u65b0\u898f\u30da\u30fc\u30b8\u3092\u8ffd\u52a0" \u30dc\u30! bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3057\u3001\u5fc5\u8981\u306a\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u5165\u529b\u3057\u307e\u3059\u3002 UIDescription.content.portalManagement=\u30dd\u30fc\u30bf\u30eb\u3092\u7ba1\u7406: \u3053\u308c\u306f\u3059\u3079\u3066\u306e\u30dd\u30fc\u30bf\u30eb\u306e\u4e00\u89a7\u3067\u3059\u3002\u65b0\u898f\u30dd\u30fc\u30bf\u30eb\u3092\u4f5c\u6210\u3059\u308b\u306b\u306f\u3001"\u65b0\u898f\u30dd\u30fc\u30bf\u30eb\u3092\u4f5c\u6210" \u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3001\u5fc5\u8981\u306a\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u5165\u529b\u3057\u307e\u3059\u3002 \u9069\u5207\u306a\u6a29\u9650\u304c\u3042\u308c\u3070\u3001\u3053\u306e\u30ea\u30b9\u30c8\u304b\u3089\u30dd\u30fc\u30bf\u30eb\u3092\u4f5c\u6210\u3084\u524a\u9664\u304c\u53ef\u80fd\u3067\u3059\u3002 @@ -337,7 +337,7 @@ # org.exoplatform.portal.component.customization.UIPortalForm# ############################################################################# -UIPortalForm.title=\u30dd\u30fc\u30bf\u30eb\u3092\u7de8\u96c6 +UIPortalForm.title=\u30dd\u30fc\u30bf\u30eb\u3092\u7de8\u96c6 UIPortalForm.action.Save=#{word.save} UIPortalForm.action.Close=\u30ad\u30e3\u30f3\u30bb\u30eb UIPortalForm.msg.sameName=\u3053\u306e\u30dd\u30fc\u30bf\u30eb\u540d\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 @@ -351,11 +351,11 @@ UIPortalForm.label.option.always=\u5e38\u306b UIPortalForm.label.option.onDemand=\u30aa\u30f3\u30c7\u30de\u30f3\u30c9 UIPortalForm.label.option.never=\u3057\u306a\u3044 -UIPortalForm.tab.label.PortalSetting=\u30dd\u30fc\u30bf\u30eb\u306e\u8a2d\u5b9a +UIPortalForm.tab.label.PortalSetting=\u30dd\u30fc\u30bf\u30eb\u8a2d\u5b9a UIPortalForm.tab.label.PortalTemplate=\u30dd\u30fc\u30bf\u30eb \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 -UIPortalForm.tab.label.PermissionSetting=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u306e\u8a2d\u5b9a +UIPortalForm.tab.label.PermissionSetting=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u8a2d\u5b9a UIPortalForm.tab.label.FactoryId=\u30d5\u30a1\u30af\u30c8\u30ea\u30fcID -PortalTemplate.title=\u30dd\u30fc\u30bf\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 +PortalTemplate.title=\u30dd\u30fc\u30bf\u30eb \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 PortalTemplate.left.title=\u30b5\u30f3\u30d7\u30eb\u30dd\u30fc\u30bf\u30eb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30d7\u30ec\u30d3\u30e5\u30fc ##################################################################################### @@ -367,7 +367,7 @@ UITabPane.title.UIPermissionSelector=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u8a2d\u5b9a\u3092\u7de8\u96c6 UITabPane.title.UIListPermissionSelector=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u8a2d\u5b9a\u306b\u30a2\u30af\u30bb\u30b9 UITabPane.title.UIAccountProfiles=\u30a2\u30ab\u30a6\u30f3\u30c8\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb -UITabPane.title.UIAccountChangePass=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4 +UITabPane.title.UIAccountChangePass=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4 UIListPermissionSelector.header.groupId=\u30b0\u30eb\u30fc\u30d7ID UIListPermissionSelector.header.membership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u30bf\u30a4\u30d7 UIListPermissionSelector.header.action=\u30a2\u30af\u30b7\u30e7\u30f3 @@ -376,7 +376,7 @@ UIListPermissionSelector.label.publicMode=\u30d1\u30d6\u30ea\u30c3\u30af\u306b\u3059\u308b(\u3059\u3079\u3066\u306e\u4eba\u304c\u30a2\u30af\u30bb\u30b9\u53ef\u80fd): UIGroupMembershipSelector.msg.selectGroup=\u30b0\u30eb\u30fc\u30d7\u3092\u6700\u521d\u306b\u9078\u629e\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 UIGroupMembershipSelector.title=\u30b0\u30eb\u30fc\u30d7\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u30bb\u30ec\u30af\u30bf\u30fc -UIGroupMembershipSelector.title.ListPermissionSelector=\u30b0\u30eb\u30fc\u30d7\u3068\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u30bb\u30ec\u30af\u30bf\u30fc +UIGroupMembershipSelector.title.ListPermissionSelector=\u30b0\u30eb\u30fc\u30d7\u3068\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u9078\u629e UIGroupMembershipSelector.label.selectPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u9078\u629e UIGroupMembershipSelector.label.selectMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u9078\u629e UIGroupMembershipSelector.label.selectGroup=\u30b0\u30eb\u30fc\u30d7\u3092\u95b2\u89a7\u3057\u9078\u629e @@ -386,7 +386,7 @@ UIGroupSelector.title.selectGroupInfo=\u9078\u629e\u3057\u305f\u30b0\u30eb\u30fc\u30d7\u60c5\u5831 UIGroupSelector.lable.name=\u540d\u524d: UIGroupSelector.lable.groupId=\u30b0\u30eb\u30fc\u30d7ID: -UIGroupSelector.lable.description=\u8a18\u8ff0: +UIGroupSelector.lable.description=\u8aac\u660e: UIGroupSelector.action.done=\u5b8c\u4e86 ############################################################################# @@ -400,7 +400,7 @@ UIPageSelector.header.action=#{word.action} UIPageSelector.label.clearPage=\u30da\u30fc\u30b8\u3092\u30af\u30ea\u30a2 UIPageSelector.label.createPage=\u30da\u30fc\u30b8\u3092\u4f5c\u6210 -UIPageSelector.label.searchandSelectPage=\u30da\u30fc\u30b8\u3092\u691c\u7d22\u3057\u5909\u66f4 +UIPageSelector.label.searchandSelectPage=\u30da\u30fc\u30b8\u3092\u691c\u7d22 UIPageSelector.label.currentSelectedPage=\u9078\u629e\u3057\u305f\u30da\u30fc\u30b8\u60c5\u5831 UIPageSelector.label.title=\u30bf\u30a4\u30c8\u30eb UIPageSelector.label.name=#{word.name} @@ -430,7 +430,7 @@ UIVirtualList.header.title=\u30bf\u30a4\u30c8\u30eb UIVirtualList.header.accessGroups=\u30b0\u30eb\u30fc\u30d7\u306b\u30a2\u30af\u30bb\u30b9 UIVirtualList.header.action=#{word.action} -UIVirtualList.header.accessPermissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u306b\u30a2\u30af\u30bb\u30b9 +UIVirtualList.header.accessPermissions=\u30a2\u30af\u30bb\u30b9\u6a29\u9650 UIVirtualList.header.editPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u7de8\u96c6 UIPageBrowser.label.option.owner=#{word.owner} @@ -444,24 +444,24 @@ UIPageNodeSelector.msg.deleteNav=\u3053\u306e\u30da\u30fc\u30b8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002 UIPageNodeSelector.msg.NoPageNavigation=\u3053\u306e\u6a5f\u80fd\u3092\u4f7f\u3046\u306b\u306f\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u4f5c\u6210\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 UIPageNodeSelector.msg.curentPage=\u3053\u306e\u30da\u30fc\u30b8\u3092\u524a\u9664\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093: \u3053\u306e\u30da\u30fc\u30b8\u306f\u4ed6\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u306b\u3088\u3063\u3066\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002 -UIPageNodeSelector.msg.paste.sameName=\u3053\u306e\u30ce\u30fc\u30c9\u540d\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 +UIPageNodeSelector.msg.paste.sameName=\u3053\u306e\u30ce\u30fc\u30c9\u540d\u306f\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059 UIPageNodeSelector.msg.paste.sameSrcAndDes=\u9001\u4fe1\u5143\u3068\u5b9b\u5148\u306f\u7570\u306a\u3063\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 UIPageNodeSelector.deleteNode=\u3053\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b\uff1f UIPageNodeSelector.deleteNavigation=\u3053\u306e\u30ce\u30fc\u30c9\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b\uff1f UIPageNodeSelector.tooltip.newPageNavigation=\u65b0\u898f\u30da\u30fc\u30b8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u4f5c\u6210 UIPageNodeSelectorPopupMenu.event.AddUserNavigation=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0 UIPageNodeSelectorPopupMenu.event.AddNode=\u65b0\u898f\u30ce\u30fc\u30c9\u3092\u8ffd\u52a0 -UIPageNodeSelectorPopupMenu.event.PasteNode=\u30ce\u30fc\u30c9\u3092\u30da\u30fc\u30b9\u30c8 +UIPageNodeSelectorPopupMenu.event.PasteNode=\u30ce\u30fc\u30c9\u306e\u8cbc\u308a\u4ed8\u3051 UIPageNodeSelectorPopupMenu.event.CreateNavigation=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u4f5c\u6210 UIPageNodeSelectorPopupMenu.event.DeleteNavigation=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664 UIPageNodeSelectorPopupMenu.event.EditNavigation=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u7de8\u96c6 -UIPageNodeSelectorPopupMenu.event.SaveNavigation=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58 +UIPageNodeSelectorPopupMenu.event.SaveNavigation=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u306e\u4fdd\u5b58 ############################################################################# # org.exoplatform.portal.webui.portal.UIComposer # ############################################################################# -UIPageEditor.action.Abort=\u4e2d\u6b62 +UIPageEditor.action.Abort=\u4e2d\u65ad UIPageEditor.action.Finish=\u7d42\u4e86 UIPageEditor.title.UIPageEditor=\u30da\u30fc\u30b8\u30a8\u30c7\u30a3\u30bf UIPageEditor.action.ViewProperties=\u30da\u30fc\u30b8\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u898b\u308b @@ -548,7 +548,7 @@ UIPageNavigationForm.action.Save=#{word.save} UIPageNavigationForm.action.ClosePopup=#{word.close} UIPageNavigationForm.action.Close=\u30ad\u30e3\u30f3\u30bb\u30eb -UIPageNavigationForm.msg.selectGroup=\u30b0\u30eb\u30fc\u30d7\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044 +UIPageNavigationForm.msg.selectGroup=\u30b0\u30eb\u30fc\u30d7\u3092\u9078\u629e\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 UIPageNavigationForm.msg.existPageNavigation={0} \u306e\u30da\u30fc\u30b8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059 UIPageNavigation.msg.noMakablePageNavigation=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306e\u30da\u30fc\u30b8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u4f5c\u6210\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093 UIPageNavigation.tooltip.upLevel=1\u968e\u5c64\u4e0a\u304c\u3063\u3066\u304f\u3060\u3055\u3044 @@ -560,7 +560,7 @@ ############################################################################# UIPortalApplication.label.Loading=\u30ed\u30fc\u30c9\u4e2d... -UIPortalApplication.label.Abort=\u4e2d\u6b62 +UIPortalApplication.label.Abort=\u4e2d\u65ad UIPortalApplication.msg.deletePageBody=\u3053\u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306f\u30da\u30fc\u30b8\u30dc\u30c7\u30a3\u3092\u542b\u3093\u3067\u3044\u307e\u3059\u3002\u524a\u9664\u3067\u304d\u307e\u305b\u3093! ############################################################################# @@ -576,7 +576,7 @@ UIPermissionSelector.label.addEditPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u8a2d\u5b9a UIPermissionSelector.label.currentSelectedPermissionInfo=\u73fe\u5728\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 UIPermissionSelector.label.permissionType=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30d7 -UIPermissionSelector.action.SelectPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u9078\u629e +UIPermissionSelector.action.SelectPermission=\u6a29\u9650\u306e\u9078\u629e UIPermissionSelector.action.DeletePermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664 ############################################################################# @@ -594,9 +594,9 @@ UIUserMembershipSelector.header.membershipType=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u30bf\u30a4\u30d7 UIUserMembershipSelector.header.action=#{word.action} UIUserMembershipSelector.header.groupId=#{word.groupId} -UIUserMembershipSelector.action.SelectPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u9078\u629e +UIUserMembershipSelector.action.SelectPermission=\u6a29\u9650\u306e\u9078\u629e UIUserMembershipSelector.action.title.DeleteMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u524a\u9664 -UserPermissionSelector.title.UIGroupMembershipSelector=\u30b0\u30eb\u30fc\u30d7 \u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u524a\u9664 +UserPermissionSelector.title.UIGroupMembershipSelector=\u30b0\u30eb\u30fc\u30d7\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u30bb\u30ec\u30af\u30bf\u30fc ############################################################################# # org.exoplatform.webui.form.UIFormInputItemSelector # @@ -644,7 +644,7 @@ UIPageCreationWizard.label.step=\u30b9\u30c6\u30c3\u30d7 UIPageCreationWizard.label.wizardSteps=\u30a6\u30a4\u30b6\u30fc\u30c9\u30b9\u30c6\u30c3\u30d7 UIPageCreationWizard.label.step1.title=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30ce\u30fc\u30c9\u306e\u9078\u629e\u3068\u30da\u30fc\u30b8\u306e\u4f5c\u6210 -UIPageCreationWizard.label.step2.title=\u30da\u30fc\u30b8\u30ec\u30a4\u30a2\u30a6\u30c8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u9078\u629e +UIPageCreationWizard.label.step2.title=\u30da\u30fc\u30b8\uff65\u30ec\u30a4\u30a2\u30a6\u30c8\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u9078\u629e UIPageCreationWizard.label.step3.title=\u30da\u30fc\u30b8\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u518d\u8abf\u6574\u3068\u30da\u30fc\u30b8\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3078\u306e\u8ffd\u52a0 UIPageCreationWizard.label.abort=#{word.abort} UIPageCreationWizard.label.back=#{word.back} @@ -659,12 +659,12 @@ UIPageNodeWizardPreview.label.nodeName=\u30ce\u30fc\u30c9\u540d UIPageNodeWizardPreview.label.nodeLabel=\u30ce\u30fc\u30c9\u30e9\u30d9\u30eb UIPageNodeWizardPreview.label.icon=#{word.icon} -UIPageNodeWizardPreview.label.creator=\u4f5c\u6210\u8005 -UIPageNodeWizardPreview.label.accessPermission=\u30a2\u30af\u30bb\u30b9\u30d1\u30fc\u30df\u30b7\u30e7\u30f3 +UIPageNodeWizardPreview.label.creator=\u4f5c\u8005 +UIPageNodeWizardPreview.label.accessPermission=\u30a2\u30af\u30bb\u30b9\u6a29\u9650 UIPageNodeWizardPreview.label.editPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u7de8\u96c6 UIPageNodeWizardPreview.label.pageReference=\u30da\u30fc\u30b8\u53c2\u7167 -UIPageTemplateOptions.UIDropDown.title=\u30da\u30fc\u30b8\u69cb\u6210 -UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=\u30da\u30fc\u30b8\u69cb\u6210 +UIPageTemplateOptions.UIDropDown.title=\u30da\u30fc\u30b8\u306e\u69cb\u6210 +UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=\u30da\u30fc\u30b8\u306e\u69cb\u6210 UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=\u30ab\u30e9\u30e0\u30da\u30fc\u30b8\u69cb\u6210 UIPageTemplateOptions.UIDropDown.label.mixPageConfigs=\u30df\u30c3\u30af\u30b9\u30da\u30fc\u30b8\u69cb\u6210 UIPageTemplateOptions.UIDropDown.label.rowPageConfigs=\u30ed\u30a6\u30da\u30fc\u30b8\u69cb\u6210 @@ -738,7 +738,7 @@ UIPortlet.label.description=GateIn \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 UIPortlet.label.portletContent=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u8aac\u660e UIPortlet.label.View=\u30d3\u30e5\u30fc -UIPortlet.lable.information=\u6e08\u307f +UIPortlet.lable.information=\u5b8c\u4e86 UIPortlet.deletePortlet=\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u524a\u9664\u3057\u307e\u3059\u304b? UIPortlet.tooltip.PortletMode=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30e2\u30fc\u30c9 UIPortlet.tooltip.Minimize=\u6700\u5c0f\u5316 @@ -801,7 +801,7 @@ # org.exoplatform.portal.component.customization.UIPortalBrowser # ############################################################################# -UIPortalBrowser.header.creator=\u4f5c\u6210\u8005 +UIPortalBrowser.header.creator=\u4f5c\u8005 UIPortalBrowser.header.editPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u7de8\u96c6 UIPortalBrowser.header.accessPermissions=\u30a2\u30af\u30bb\u30b9\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 UIPortalBrowser.header.name=#{word.name} @@ -855,16 +855,16 @@ UILogged.label.RollBack=\u30ed\u30fc\u30eb\u30d0\u30c3\u30af UILogged.label.Save=\u4fdd\u5b58 UILogged.label.Finish=\u7d42\u4e86 -UILogged.label.Abort=\u4e2d\u6b62 +UILogged.label.Abort=\u4e2d\u65ad ############################################################################ # org.exoplatform.portal.component.widget.UILoginForm # ############################################################################ UIPortalComponentLogin.label.password=\u30d1\u30b9\u30ef\u30fc\u30c9 -UIPortalComponentLogin.label.username=\u30e6\u30fc\u30b6\u540d +UIPortalComponentLogin.label.username=\u30e6\u30fc\u30b6\u30fc\u540d UIForgetPasswordWizard.title=\u306a\u305c\u30ed\u30b0\u30a4\u30f3\u3067\u304d\u306a\u3044\u304b -UIForgetPasswordWizard.action.Next=\u9032\u3080 +UIForgetPasswordWizard.action.Next=\u6b21\u3078 UIForgetPasswordWizard.action.Back=\u623b\u308b UIForgetPasswordWizard.info=\u5f53\u30b5\u30a4\u30c8\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u305a\u3054\u8ff7\u60d1\u3092\u304a\u304b\u3051\u3057\u3066\u7533\u3057\u8a33\u3042\u308a\u307e\u305b\u3093\u3002 \u8fc5\u901f\u306a\u89e3\u6c7a\u306e\u305f\u3081\u3001\u4ee5\u4e0b\u306e\u30c8\u30e9\u30d6\u30eb\u30b7\u30e5\u30fc\u30c6\u30a3\u30f3\u30b0\u306e\u30b9\u30c6\u30c3\u30d7\u306b\u5f93\u3063\u3066\u304f\u3060\u3055\u3044\u3002 1. \u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5fd8\u308c\u305f\u5834\u5408: \u30e6\u30fc\u30b6\u30fc\u540d\u3092\u5165\u529b\u3057\u3001\u9001\u4fe1\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 2. \u30e6\u30fc\u30b6\u540d\u3092\u5fd8\u308c\u305f\u5834\u5408: \u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3001\u9001\u4fe1\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 UIForgetPasswordWizard.label.forgotpassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5fd8\u308c\u305f @@ -878,7 +878,7 @@ UIForgetPassword.action.Send=\u9001\u4fe1 UIForgetPassword.action.Back=\u623b\u308b UIForgetPassword.label.username=\u30e6\u30fc\u30b6\u30fc\u540d : -UIForgetPassword.label.email=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 : +UIForgetPassword.label.email=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 : UIForgetPassword.msg.user-delete=\u3042\u306a\u305f\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u306f\u7ba1\u7406\u8005\u306b\u3088\u3063\u3066\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002 UIForgetPassword.msg.user-not-exist=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 UIForgetPassword.msg.email-not-exist=\u3053\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 @@ -889,7 +889,6 @@ UIForgetPassword.mail.user=\u3042\u306a\u305f\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u306f : UIForgetPassword.mail.password=\u3042\u306a\u305f\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306f : UIForgetPassword.mail.link=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u306e\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u767a\u884c\u3067\u304d\u307e\u3059\u3002\u3053\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044: - You can then request a new password for the username, please click on this link : UIResetPassword.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4 UIResetPassword.action.Save=\u4fdd\u5b58 UIResetPassword.action.Close=\u9589\u3058\u308b @@ -898,7 +897,7 @@ UIResetPassword.label.changepass=\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9: UIResetPassword.label.newpassword=\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9: UIResetPassword.label.confirmnewpassword=\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u78ba\u8a8d: -UIResetPassword.msg.change-password-successfully=\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u5909\u66f4\u3055\u308c\u307e\u3057\u305f\u3002 +UIResetPassword.msg.change-password-successfully=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f\u3002 UIResetPassword.msg.password-is-not-match=\u5165\u529b\u3055\u308c\u305f\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3068\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u78ba\u8a8d\u306f\u540c\u3058\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 UIResetPassword.msg.Invalid-account=\u30e6\u30fc\u30b6\u30fc\u540d\u3082\u3057\u304f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u9593\u9055\u3063\u3066\u3044\u308b\u304b\u7a7a\u3067\u3059\u3002\u3082\u3046\u4e00\u5ea6\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 @@ -936,7 +935,7 @@ UIContainer.label.Thecontainer=\u30b3\u30f3\u30c6\u30ca\u30fc UIContainer.deleteContainer=\u672c\u5f53\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ca\u30fc\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f UIContainer.tooltip.closeContainer=\u30b3\u30f3\u30c6\u30ca\u30fc\u306e\u524a\u9664 -UIContainer.tooltip.editContainer=\u30b3\u30f3\u30c6\u30ca\u30fc\u306e\u7de8\u96c6 +UIContainer.tooltip.editContainer=\u30b3\u30f3\u30c6\u30ca\u3092\u7de8\u96c6 UIContainer.tooltip.drag=\u3053\u3053\u306b\u30b3\u30f3\u30c6\u30ca\u30fc\u3092\u30c9\u30e9\u30c3\u30b0 ############################################################################ @@ -1002,7 +1001,7 @@ UINavigationNodeSelectorPopupMenu.event.AddNode=\u65b0\u3057\u3044\u30ce\u30fc\u30c9\u3092\u8ffd\u52a0 UINavigationNodeSelectorPopupMenu.event.PasteNode=\u30ce\u30fc\u30c9\u306e\u8cbc\u308a\u4ed8\u3051 -NavigationNodePopupMenu.event.AddNode=\u65b0\u3057\u3044\u30ce\u30fc\u30c9\u306e\u8ffd\u52a0 +NavigationNodePopupMenu.event.AddNode=\u65b0\u3057\u3044\u30ce\u30fc\u30c9\u3092\u8ffd\u52a0 NavigationNodePopupMenu.event.EditPageNode=\u30ce\u30fc\u30c9\u306e\u30da\u30fc\u30b8\u3092\u7de8\u96c6 NavigationNodePopupMenu.event.EditSelectedNode=\u30ce\u30fc\u30c9\u3092\u7de8\u96c6 NavigationNodePopupMenu.event.EditNavigation=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u7de8\u96c6 @@ -1072,7 +1071,7 @@ # UIAccountSettings # tungnd ################################################################################ -UIAccountSetting.tab.label.UIAccountProfiles=\u30a2\u30ab\u30a6\u30f3\u30c8\u30fb\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb +UIAccountSetting.tab.label.UIAccountProfiles=\u30a2\u30ab\u30a6\u30f3\u30c8\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb UIAccountSetting.tab.label.UIAccountChangePass=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4 UIAccountSetting.action.Close=\u9589\u3058\u308b @@ -1084,8 +1083,8 @@ UIAccountProfiles.action.Save=\u4fdd\u5b58 UIAccountProfiles.action.Reset=\u30ea\u30bb\u30c3\u30c8 UIAccountProfiles.label.userName=\u30e6\u30fc\u30b6\u30fc\u540d : -UIAccountProfiles.label.firstName=\u540d\u524d : -UIAccountProfiles.label.lastName=\u82d7\u5b57 : +UIAccountProfiles.label.firstName=\u540d : +UIAccountProfiles.label.lastName=\u59d3 : UIAccountProfiles.label.email=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 : UIAccountProfiles.msg.update.success=\u30a2\u30ab\u30a6\u30f3\u30c8\u60c5\u5831\u304c\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3055\u308c\u307e\u3057\u305f\u3002 UIAccountChangePass.action.Save=\u4fdd\u5b58 @@ -1103,10 +1102,10 @@ UIDropDownControl.title.Empty=\u30c9\u30ed\u30c3\u30d7\u30fb\u30c0\u30a6\u30f3\u30fb\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb UIDropDownPageTemp.item.normalPageConfigs=\u30da\u30fc\u30b8\u306e\u69cb\u6210 -UIDropDownPageTemp.item.columnPageConfigs=\u30ab\u30e9\u30e0\u30fb\u30da\u30fc\u30b8\u306e\u69cb\u6210 -UIDropDownPageTemp.item.mixPageConfigs=\u30df\u30c3\u30af\u30b9\u30fb\u30da\u30fc\u30b8\u306e\u69cb\u6210 -UIDropDownPageTemp.item.rowPageConfigs=\u30ed\u30a6\u30fb\u30da\u30fc\u30b8\u306e\u69cb\u6210 -UIDropDownPageTemp.item.tabsPageConfigs=\u30bf\u30d6\u30fb\u30da\u30fc\u30b8\u306e\u69cb\u6210 +UIDropDownPageTemp.item.columnPageConfigs=\u30ab\u30e9\u30e0\u30da\u30fc\u30b8\u69cb\u6210 +UIDropDownPageTemp.item.mixPageConfigs=\u30df\u30c3\u30af\u30b9\u30da\u30fc\u30b8\u69cb\u6210 +UIDropDownPageTemp.item.rowPageConfigs=\u30ed\u30a6\u30da\u30fc\u30b8\u69cb\u6210 +UIDropDownPageTemp.item.tabsPageConfigs=\u30bf\u30d6\u30da\u30fc\u30b8\u69cb\u6210 ################################################################################ @@ -1117,7 +1116,7 @@ UIGadgetContainerManagement.action.save=#{word.save} UIGadgetContainerManagement.confirm.DeleteContainer=\u672c\u5f53\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ca\u30fc\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f UIGadgetContainerManagement.confirm.DeleteGadget=\u672c\u5f53\u306b\u3053\u306e\u30ac\u30b8\u30a7\u30c3\u30c8\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f -UIGadgetContainerManagement.title.manager=\u304c\u30b8\u30a7\u30c3\u30c8\u30fb\u30b3\u30f3\u30c6\u30ca\u30fc\u306e\u7ba1\u7406 +UIGadgetContainerManagement.title.manager=\u30ac\u30b8\u30a7\u30c3\u30c8\u30fb\u30b3\u30f3\u30c6\u30ca\u30fc\u306e\u7ba1\u7406 UIGadgetContainerManagement.title.containers=\u30b3\u30f3\u30c6\u30ca\u30fc UIGadgetContainerManagement.title.selectedContainer=\u9078\u629e\u3057\u305f\u30ac\u30b8\u30a7\u30c3\u30c8\u30fb\u30b3\u30f3\u30c6\u30ca\u30fc\u306e\u60c5\u5831: UIGadgetContainerManagement.msg.emptyList=\u3053\u306e\u30ab\u30c6\u30b4\u30ea\u30fc\u306b\u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306f\u3042\u308a\u307e\u305b\u3093\u3002 @@ -1203,15 +1202,15 @@ ################################################################################ UIUserSelector.label.option.userName=\u30e6\u30fc\u30b6\u30fc\u540d -UIUserSelector.label.option.lastName=\u82d7\u5b57 -UIUserSelector.label.option.firstName=\u540d\u524d +UIUserSelector.label.option.lastName=\u59d3 +UIUserSelector.label.option.firstName=\u540d UIUserSelector.label.option.email=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 UIUserSelector.label.group=\u30b0\u30eb\u30fc\u30d7 : UIUserSelector.label.searchUser=\u691c\u7d22h : UIUserSelector.label.userName=\u30e6\u30fc\u30b6\u30fc\u540d -UIUserSelector.label.lastName=\u82d7\u5b57 -UIUserSelector.label.firstName=\u540d\u524d -UIUserSelector.label.email=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +UIUserSelector.label.lastName=\u59d3 +UIUserSelector.label.firstName=\u540d +UIUserSelector.label.email=E\u30e1\u30fc\u30eb UIUserSelector.label.action=\u30a2\u30af\u30b7\u30e7\u30f3 UIUserSelector.label.Add=\u8ffd\u52a0 UIUserSelector.label.Close=\u9589\u3058\u308b @@ -1223,7 +1222,7 @@ ################################################################################ UIAddNewApplication.label.AddApplication=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0 -UIAddNewApplication.label.Categories=\u30ab\u30c6\u30b4\u30ea\u30fc +UIAddNewApplication.label.Categories=\u30ab\u30c6\u30b4\u30ea UIAddNewApplication.label.Select=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u9078\u629e UIAddNewApplication.label.NoneApp=\u3053\u306e\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u767b\u9332\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306b\u79fb\u52d5\u3057\u3066\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u3066\u304f\u3060\u3055\u3044\u3002 UIAddNewApplication.label.Type=\u30bf\u30a4\u30d7: @@ -1281,7 +1280,7 @@ UIPopupWindow.title.UINavigationManagement=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u7ba1\u7406 UIPopupWindow.title.UIPageNavigationForm=\u30da\u30fc\u30b8\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30fb\u30d5\u30a9\u30fc\u30e0 -PopupPageSelector2.title.SelectPage=\u30da\u30fc\u30b8\u306e\u9078\u629e +PopupPageSelector2.title.SelectPage=\u30da\u30fc\u30b8\u3092\u5909\u66f4 ############################################################################ # org.exoplatform.navigation.webui.component.UISiteManagement # @@ -1295,7 +1294,7 @@ # org.exoplatform.navigation.webui.component.UIGroupNavigationManagement # ############################################################################ -UIGroupNavigationManagement.Action.Add=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u306e\u8ffd\u52a0 +UIGroupNavigationManagement.Action.Add=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0 UIGroupNavigationManagement.Delete.Confirm=\u672c\u5f53\u306b\u3053\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f UIGroupNavigationManagement.msg.Invalid-deletePermission=\u30e6\u30fc\u30b6\u30fc\u306f\u3053\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002 UIGroupNavigationManagement.msg.navigation-not-exist=\u3053\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u306f\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u524a\u9664\u3055\u308c\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002 @@ -1312,7 +1311,7 @@ # org.exoplatform.navigation.webui.component.UIAddGroupNavigation # ############################################################################ -UIAddGroupNavigation.Action.Add=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u306e\u8ffd\u52a0 +UIAddGroupNavigation.Action.Add=\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0 UIAddGroupNavigation.Label.NoPermission=\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u306f\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002 UIAddGroupNavigation.header.Group=\u30b0\u30eb\u30fc\u30d7

11 years, 10 months

1
0
0 / 0

gatein SVN: r8735 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2012-06-21 07:12:04 -0400 (Thu, 21 Jun 2012) New Revision: 8735 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml Log: Bug 807012 - Remove possibly unused JARs from gatein.ear/lib Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-21 08:41:56 UTC (rev 8734) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-21 11:12:04 UTC (rev 8735) @@ -133,6 +133,16 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>ant</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -219,6 +229,12 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> + <exclusions> + <exclusion> + <artifactId>jsr250-api</artifactId> + <groupId>javax.annotation</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -311,6 +327,10 @@ <artifactId>infinispan-core</artifactId> <groupId>org.infinispan</groupId> </exclusion> + <exclusion> + <artifactId>commons-beanutils</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -369,19 +389,13 @@ <artifactId>activation</artifactId> <groupId>javax.activation</groupId> </exclusion> + <exclusion> + <artifactId>jgroups</artifactId> + <groupId>org.jgroups</groupId> + </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> @@ -402,6 +416,10 @@ <artifactId>jibx-extras</artifactId> <groupId>org.jibx</groupId> </exclusion> + <exclusion> + <artifactId>commons-beanutils</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -424,6 +442,10 @@ <artifactId>jboss-common-core</artifactId> <groupId>org.jboss</groupId> </exclusion> + <exclusion> + <artifactId>jgroups</artifactId> + <groupId>org.jgroups</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -718,6 +740,18 @@ <artifactId>infinispan-cachestore-jdbc</artifactId> <groupId>org.infinispan</groupId> </exclusion> + <exclusion> + <artifactId>concurrent</artifactId> + <groupId>concurrent</groupId> + </exclusion> + <exclusion> + <artifactId>jgroups</artifactId> + <groupId>org.jgroups</groupId> + </exclusion> + <exclusion> + <artifactId>commons-beanutils</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -752,6 +786,10 @@ <artifactId>exo.core.component.script.groovy</artifactId> <groupId>org.exoplatform.core</groupId> </exclusion> + <exclusion> + <artifactId>jsr250-api</artifactId> + <groupId>javax.annotation</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -882,6 +920,10 @@ <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> </exclusion> + <exclusion> + <artifactId>commons-beanutils</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -911,6 +953,14 @@ <artifactId>wci-tomcat</artifactId> <groupId>org.gatein.wci</groupId> </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>org.apache.tomcat</groupId> + </exclusion> + <exclusion> + <artifactId>annotations-api</artifactId> + <groupId>org.apache.tomcat</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -943,6 +993,14 @@ <artifactId>log4j</artifactId> <groupId>log4j</groupId> </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -964,101 +1022,6 @@ </exclusions> </dependency> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  <dependency> <groupId>org.gatein.mop</groupId> <artifactId>mop-api</artifactId> @@ -1112,6 +1075,14 @@ <artifactId>modules</artifactId> <groupId>rome</groupId> </exclusion> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>xerces</groupId> + </exclusion> + <exclusion> + <artifactId>el-api</artifactId> + <groupId>org.apache.tomcat</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1130,6 +1101,26 @@ <artifactId>xpp3_min</artifactId> <groupId>xpp3</groupId> </exclusion> + <exclusion> + <artifactId>el-api</artifactId> + <groupId>org.apache.tomcat</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>commons-beanutils-core</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1152,6 +1143,10 @@ <artifactId>xpp3_min</artifactId> <groupId>xpp3</groupId> </exclusion> + <exclusion> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> </exclusions> </dependency> @@ -1189,6 +1184,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -1238,11 +1239,21 @@ <dependency> <groupId>caja</groupId> <artifactId>caja</artifactId> + <exclusions> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>xerces</groupId> + </exclusion> + <exclusion> + <artifactId>json-simple</artifactId> + <groupId>com.googlecode.json-simple</groupId> + </exclusion> + </exclusions> </dependency> - <dependency> +  @@ -1304,12 +1315,13 @@ <version>1.5.3</version> </dependency> - <dependency> +  + </dependencies> <build> @@ -1392,12 +1404,6 @@ <bundleFileName>integration.war</bundleFileName> <unpack>true</unpack> </webModule> -  -  -  -  -  -  <webModule> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-server</artifactId>

11 years, 10 months

1
0
0 / 0

gatein SVN: r8734 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/src.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2012-06-21 04:41:56 -0400 (Thu, 21 Jun 2012) New Revision: 8734 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/src/assemble.xml Log: Bug 810505 - a4j:push not working in RichFaces demo packaged with EPP Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/src/assemble.xml 2012-06-20 15:33:39 UTC (rev 8733) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/src/assemble.xml 2012-06-21 08:41:56 UTC (rev 8734) @@ -29,7 +29,7 @@ <include>org.jboss.portal.examples:*:war</include> </includes> <outputDirectory>examples</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> </dependencySet> </dependencySets> </assembly>

11 years, 10 months

1
0
0 / 0

gatein SVN: r8733 - in epp/portal/branches/EPP_5_2_Branch/component/portal/src: test/java/org/exoplatform/portal/mop/management/binding/xml and 1 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2012-06-20 11:33:39 -0400 (Wed, 20 Jun 2012) New Revision: 8733 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/AbstractMarshaller.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/Element.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/binding/xml/PageMarshallerTest.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/mop/management/pages-loaded.xml Log: Bug 807279 - Support WSRP applications for Export/Import Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/AbstractMarshaller.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/AbstractMarshaller.java 2012-06-20 11:49:26 UTC (rev 8732) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/AbstractMarshaller.java 2012-06-20 15:33:39 UTC (rev 8733) @@ -34,6 +34,7 @@ import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageBody; import org.exoplatform.portal.config.model.TransientApplicationState; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.gatein.common.xml.stax.writer.StaxWriter; import org.gatein.common.xml.stax.writer.WritableValueTypes; import org.exoplatform.portal.pom.data.ModelDataStorage; @@ -76,7 +77,7 @@ } else if (ApplicationType.WSRP_PORTLET == type) { - throw new XMLStreamException("WSRP portlet marshalling not supported."); + marshalWsrpApplication(writer, safeCast(application, WSRP.class)); } } else if (modelObject instanceof Page) @@ -282,74 +283,30 @@ writer.writeEndElement(); // End of portlet-application } - protected Application<Portlet> unmarshalPortletApplication(StaxNavigator<Element> navigator) throws XMLStreamException + protected Application<?> unmarshalPortletApplication(StaxNavigator<Element> navigator) throws XMLStreamException { - requiresChild(navigator, Element.PORTLET); - ApplicationState<Portlet> state = unmarshalPortletApplicationState(navigator.fork()); - - Application<Portlet> portlet = new Application<Portlet>(ApplicationType.PORTLET); - portlet.setState(state); - - boolean showInfoBarParsed = false; - - Element current = navigator.sibling(); - while (current != null) + Application<?> application; + switch (navigator.child()) { - switch (current) - { - case THEME: - portlet.setTheme(navigator.getContent()); - current = navigator.sibling(); - break; - case TITLE: - portlet.setTitle(navigator.getContent()); - current = navigator.sibling(); - break; - case ACCESS_PERMISSIONS: - portlet.setAccessPermissions(unmarshalAccessPermissions(navigator, true)); - current = navigator.sibling(); - break; - case SHOW_INFO_BAR: - portlet.setShowInfoBar(parseRequiredContent(navigator, ValueType.BOOLEAN)); - showInfoBarParsed = true; - current = navigator.sibling(); - break; - case SHOW_APPLICATION_STATE: - portlet.setShowApplicationState(navigator.parseContent(ValueType.BOOLEAN)); - current = navigator.sibling(); - break; - case SHOW_APPLICATION_MODE: - portlet.setShowApplicationMode(navigator.parseContent(ValueType.BOOLEAN)); - current = navigator.sibling(); - break; - case DESCRIPTION: - portlet.setDescription(navigator.getContent()); - current = navigator.sibling(); - break; - case ICON: - portlet.setIcon(navigator.getContent()); - current = navigator.sibling(); - break; - case WIDTH: - portlet.setWidth(navigator.getContent()); - current = navigator.sibling(); - break; - case HEIGHT: - portlet.setHeight(navigator.getContent()); - current = navigator.sibling(); - break; - case UNKNOWN: - throw unknownElement(navigator); - default: - throw unexpectedElement(navigator); - } + case PORTLET: + ApplicationState<Portlet> state = unmarshalPortletApplicationState(navigator.fork()); + Application<Portlet> portlet = new Application<Portlet>(ApplicationType.PORTLET); + portlet.setState(state); + application = portlet; + break; + case WSRP: + ApplicationState<WSRP> wsrpState = unmarshalWsrpApplicationState(navigator.fork()); + Application<WSRP> wsrp = new Application<WSRP>(ApplicationType.WSRP_PORTLET); + wsrp.setState(wsrpState); + application = wsrp; + break; + case UNKNOWN: + throw unexpectedElement(navigator); + default: + throw unexpectedElement(navigator); } - //TODO: We should raise this exception as soon as we know so location is accurate - if (portlet.getAccessPermissions() == null) throw expectedElement(navigator, Element.ACCESS_PERMISSIONS); - if (!showInfoBarParsed) throw expectedElement(navigator, Element.SHOW_INFO_BAR); - - return portlet; + return unmarshalApplication(navigator, application); } private ApplicationState<Portlet> unmarshalPortletApplicationState(StaxNavigator<Element> navigator) throws XMLStreamException @@ -493,6 +450,102 @@ Application<Gadget> gadget = new Application<Gadget>(ApplicationType.GADGET); gadget.setState(state); + return unmarshalApplication(navigator, gadget); + } + + private ApplicationState<Gadget> unmarshalGadgetApplicationState(StaxNavigator<Element> navigator) throws XMLStreamException + { + requiresChild(navigator, Element.GADGET_REF); + String gadgetRef = getRequiredContent(navigator, true); + + //TODO: Implement userPref unmarshalling when gatein_objects support it + Gadget gadget = null; + + if (navigator.next() != null) + { + throw unexpectedElement(navigator); + } + + return new TransientApplicationState<Gadget>(gadgetRef, gadget); + } + + protected void marshalWsrpApplication(StaxWriter<Element> writer, Application<WSRP> wsrpApplication) throws XMLStreamException + { + writer.writeStartElement(Element.PORTLET_APPLICATION); + + // Marshal application state + String contentId; + ApplicationState<WSRP> state = wsrpApplication.getState(); + if (state instanceof TransientApplicationState) + { + TransientApplicationState<WSRP> tas = (TransientApplicationState<WSRP>) state; + contentId = tas.getContentId(); + } + else + { + // The only way to retrieve the information if the state is not transient is if we're within the portal context + ExoContainer container = ExoContainerContext.getCurrentContainer(); + if (container instanceof PortalContainer) + { + DataStorage dataStorage = (DataStorage) container.getComponentInstanceOfType(DataStorage.class); + try + { + contentId = dataStorage.getId(state); + } + catch (Exception e) + { + throw new XMLStreamException("Could not obtain contentId.", e); + } + } + else + { + throw new XMLStreamException("Cannot marshal application state " + state + " outside the context of the portal."); + } + } + + writer.writeElement(Element.WSRP, contentId); + + marshalApplication(writer, wsrpApplication); + + writer.writeEndElement(); // end portlet-application + } + + private ApplicationState<WSRP> unmarshalWsrpApplicationState(StaxNavigator<Element> navigator) throws XMLStreamException + { + String portletId = getRequiredContent(navigator, true); + if (navigator.next() != null) + { + throw unexpectedElement(navigator); + } + + return new TransientApplicationState<WSRP>(portletId, null); + } + + protected void marshalApplication(StaxWriter<Element> writer, Application<?> application) throws XMLStreamException + { + // Theme, Title + writeOptionalElement(writer, Element.THEME, application.getTheme()); + writeOptionalElement(writer, Element.TITLE, application.getTitle()); + + // Access Permissions + marshalAccessPermissions(writer, application.getAccessPermissions()); + + // common application elements + writeOptionalElement(writer, Element.SHOW_INFO_BAR, String.valueOf(application.getShowInfoBar())); + writeOptionalElement(writer, Element.SHOW_APPLICATION_STATE, String.valueOf(application.getShowApplicationState())); + writeOptionalElement(writer, Element.SHOW_APPLICATION_MODE, String.valueOf(application.getShowApplicationMode())); + + // Description, Icon + writeOptionalElement(writer, Element.DESCRIPTION, application.getDescription()); + writeOptionalElement(writer, Element.ICON, application.getIcon()); + + // Width & Height + writeOptionalElement(writer, Element.WIDTH, application.getWidth()); + writeOptionalElement(writer, Element.HEIGHT, application.getHeight()); + } + + protected <S> Application<S> unmarshalApplication(StaxNavigator<Element> navigator, Application<S> application) throws XMLStreamException + { boolean showInfoBarParsed = false; Element current = navigator.sibling(); @@ -501,44 +554,44 @@ switch (current) { case THEME: - gadget.setTheme(navigator.getContent()); + application.setTheme(navigator.getContent()); current = navigator.sibling(); break; case TITLE: - gadget.setTitle(navigator.getContent()); + application.setTitle(navigator.getContent()); current = navigator.sibling(); break; case ACCESS_PERMISSIONS: - gadget.setAccessPermissions(unmarshalAccessPermissions(navigator, true)); + application.setAccessPermissions(unmarshalAccessPermissions(navigator, true)); current = navigator.sibling(); break; case SHOW_INFO_BAR: - gadget.setShowInfoBar(parseRequiredContent(navigator, ValueType.BOOLEAN)); + application.setShowInfoBar(parseRequiredContent(navigator, ValueType.BOOLEAN)); showInfoBarParsed = true; current = navigator.sibling(); break; case SHOW_APPLICATION_STATE: - gadget.setShowApplicationState(navigator.parseContent(ValueType.BOOLEAN)); + application.setShowApplicationState(navigator.parseContent(ValueType.BOOLEAN)); current = navigator.sibling(); break; case SHOW_APPLICATION_MODE: - gadget.setShowApplicationMode(navigator.parseContent(ValueType.BOOLEAN)); + application.setShowApplicationMode(navigator.parseContent(ValueType.BOOLEAN)); current = navigator.sibling(); break; case DESCRIPTION: - gadget.setDescription(navigator.getContent()); + application.setDescription(navigator.getContent()); current = navigator.sibling(); break; case ICON: - gadget.setIcon(navigator.getContent()); + application.setIcon(navigator.getContent()); current = navigator.sibling(); break; case WIDTH: - gadget.setWidth(navigator.getContent()); + application.setWidth(navigator.getContent()); current = navigator.sibling(); break; case HEIGHT: - gadget.setHeight(navigator.getContent()); + application.setHeight(navigator.getContent()); current = navigator.sibling(); break; case UNKNOWN: @@ -549,51 +602,12 @@ } //TODO: We should raise this exception as soon as we know so location is accurate - if (gadget.getAccessPermissions() == null) throw expectedElement(navigator, Element.ACCESS_PERMISSIONS); + if (application.getAccessPermissions() == null) throw expectedElement(navigator, Element.ACCESS_PERMISSIONS); if (!showInfoBarParsed) throw expectedElement(navigator, Element.SHOW_INFO_BAR); - return gadget; + return application; } - private ApplicationState<Gadget> unmarshalGadgetApplicationState(StaxNavigator<Element> navigator) throws XMLStreamException - { - requiresChild(navigator, Element.GADGET_REF); - String gadgetRef = getRequiredContent(navigator, true); - - //TODO: Implement userPref unmarshalling when gatein_objects support it - Gadget gadget = null; - - if (navigator.next() != null) - { - throw unexpectedElement(navigator); - } - - return new TransientApplicationState<Gadget>(gadgetRef, gadget); - } - - protected void marshalApplication(StaxWriter<Element> writer, Application<?> application) throws XMLStreamException - { - // Theme, Title - writeOptionalElement(writer, Element.THEME, application.getTheme()); - writeOptionalElement(writer, Element.TITLE, application.getTitle()); - - // Access Permissions - marshalAccessPermissions(writer, application.getAccessPermissions()); - - // common application elements - writeOptionalElement(writer, Element.SHOW_INFO_BAR, String.valueOf(application.getShowInfoBar())); - writeOptionalElement(writer, Element.SHOW_APPLICATION_STATE, String.valueOf(application.getShowApplicationState())); - writeOptionalElement(writer, Element.SHOW_APPLICATION_MODE, String.valueOf(application.getShowApplicationMode())); - - // Description, Icon - writeOptionalElement(writer, Element.DESCRIPTION, application.getDescription()); - writeOptionalElement(writer, Element.ICON, application.getIcon()); - - // Width & Height - writeOptionalElement(writer, Element.WIDTH, application.getWidth()); - writeOptionalElement(writer, Element.HEIGHT, application.getHeight()); - } - protected void marshalAccessPermissions(StaxWriter<Element> writer, String[] accessPermissions) throws XMLStreamException { writeOptionalElement(writer, Element.ACCESS_PERMISSIONS, DelimitedValueType.SEMI_COLON, accessPermissions); Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/Element.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/Element.java 2012-06-20 11:49:26 UTC (rev 8732) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/binding/xml/Element.java 2012-06-20 15:33:39 UTC (rev 8733) @@ -76,6 +76,7 @@ PORTLET("portlet"), GADGET_REF("gadget-ref"), GADGET("gadget"), + WSRP("wsrp"), THEME("theme"), SHOW_INFO_BAR("show-info-bar"), SHOW_APPLICATION_STATE("show-application-state"), Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/binding/xml/PageMarshallerTest.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/binding/xml/PageMarshallerTest.java 2012-06-20 11:49:26 UTC (rev 8732) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/binding/xml/PageMarshallerTest.java 2012-06-20 15:33:39 UTC (rev 8733) @@ -37,6 +37,7 @@ import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.Preference; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -292,31 +293,56 @@ assertEquals("Everyone", Utils.join(";", container3.getAccessPermissions())); assertNull(container3.getFactoryId()); { - // Verify site map application + // Verify site map & wsrp application assertNotNull(container3.getChildren()); - assertEquals(1, container3.getChildren().size()); - ModelObject sitemapcomponent = container3.getChildren().get(0); - assertTrue(sitemapcomponent instanceof Application); - @SuppressWarnings("unchecked") - Application<Portlet> application = (Application<Portlet>) sitemapcomponent; - assertTrue(application.getType() == ApplicationType.PORTLET); - ApplicationState<Portlet> state = application.getState(); - assertNotNull(state); - assertTrue(state instanceof TransientApplicationState); - TransientApplicationState<Portlet> tas = (TransientApplicationState<Portlet>) state; - assertEquals("web/SiteMapPortlet", tas.getContentId()); - assertNull(tas.getContentState()); + assertEquals(2, container3.getChildren().size()); + { + ModelObject sitemapcomponent = container3.getChildren().get(0); + assertTrue(sitemapcomponent instanceof Application); + @SuppressWarnings("unchecked") + Application<Portlet> application = (Application<Portlet>) sitemapcomponent; + assertTrue(application.getType() == ApplicationType.PORTLET); + ApplicationState<Portlet> state = application.getState(); + assertNotNull(state); + assertTrue(state instanceof TransientApplicationState); + TransientApplicationState<Portlet> tas = (TransientApplicationState<Portlet>) state; + assertEquals("web/SiteMapPortlet", tas.getContentId()); + assertNull(tas.getContentState()); - assertEquals("Default:DefaultTheme::Vista:VistaTheme::Mac:MacTheme", application.getTheme()); - assertEquals("SiteMap", application.getTitle()); - assertEquals("*:/platform/users", Utils.join(";", application.getAccessPermissions())); - assertTrue(application.getShowInfoBar()); - assertTrue(application.getShowApplicationState()); - assertFalse(application.getShowApplicationMode()); - assertEquals("SiteMap", application.getDescription()); - assertNull(application.getIcon()); - assertNull(application.getWidth()); - assertNull(application.getHeight()); + assertEquals("Default:DefaultTheme::Vista:VistaTheme::Mac:MacTheme", application.getTheme()); + assertEquals("SiteMap", application.getTitle()); + assertEquals("*:/platform/users", Utils.join(";", application.getAccessPermissions())); + assertTrue(application.getShowInfoBar()); + assertTrue(application.getShowApplicationState()); + assertFalse(application.getShowApplicationMode()); + assertEquals("SiteMap", application.getDescription()); + assertNull(application.getIcon()); + assertNull(application.getWidth()); + assertNull(application.getHeight()); + } + { + ModelObject wsrpcomponent = container3.getChildren().get(1); + assertTrue(wsrpcomponent instanceof Application); + @SuppressWarnings("unchecked") + Application<WSRP> application = (Application<WSRP>) wsrpcomponent; + assertTrue(application.getType() == ApplicationType.WSRP_PORTLET); + ApplicationState<WSRP> state = application.getState(); + assertNotNull(state); + assertTrue(state instanceof TransientApplicationState); + TransientApplicationState<WSRP> tas = (TransientApplicationState<WSRP>) state; + assertEquals("selfv2./portletApplicationName.portletName", tas.getContentId()); + assertNull(tas.getContentState()); + + assertEquals("WSRP", application.getTitle()); + assertEquals("Someone", Utils.join(";", application.getAccessPermissions())); + assertFalse(application.getShowInfoBar()); + assertTrue(application.getShowApplicationState()); + assertTrue(application.getShowApplicationMode()); + assertNull(application.getDescription()); + assertNull(application.getIcon()); + assertNull(application.getWidth()); + assertNull(application.getHeight()); + } } } Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/mop/management/pages-loaded.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/mop/management/pages-loaded.xml 2012-06-20 11:49:26 UTC (rev 8732) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/mop/management/pages-loaded.xml 2012-06-20 15:33:39 UTC (rev 8733) @@ -117,7 +117,13 @@ <show-application-mode>false</show-application-mode> <description>SiteMap</description> </portlet-application> + <portlet-application> + <wsrp>selfv2./portletApplicationName.portletName</wsrp> + <title>WSRP</title> + <access-permissions>Someone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> </container> </container> </page> -</page-set> \ No newline at end of file +</page-set>

11 years, 10 months

1
0
0 / 0

gatein SVN: r8732 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples.

by do-not-reply＠jboss.org

Author: mposolda Date: 2012-06-20 07:49:26 -0400 (Wed, 20 Jun 2012) New Revision: 8732 Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml Log: Bug 793425 Option allowNotCaseSensitiveSearch introduced in LDAP config files. Switching it to true can be used to avoid case-sensitivity errors in LDAP. Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2012-06-19 14:21:47 UTC (rev 8731) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2012-06-20 11:49:26 UTC (rev 8732) @@ -382,6 +382,10 @@ <name>cache.providerRegistryName</name> <value>storeCacheProvider</value> </option> + <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> </options> </identity-store> </identity-stores> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2012-06-19 14:21:47 UTC (rev 8731) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2012-06-20 11:49:26 UTC (rev 8732) @@ -343,6 +343,10 @@ <name>cache.providerRegistryName</name> <value>storeCacheProvider</value> </option> + <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> </options> </identity-store> </identity-stores> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-06-19 14:21:47 UTC (rev 8731) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-06-20 11:49:26 UTC (rev 8732) @@ -387,6 +387,10 @@ <name>cache.providerRegistryName</name> <value>storeCacheProvider</value> </option> + <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> </options> </identity-store> </identity-stores> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-06-19 14:21:47 UTC (rev 8731) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-06-20 11:49:26 UTC (rev 8732) @@ -341,6 +341,10 @@ <name>cache.providerRegistryName</name> <value>storeCacheProvider</value> </option> + <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> </options> </identity-store> </identity-stores> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2012-06-19 14:21:47 UTC (rev 8731) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2012-06-20 11:49:26 UTC (rev 8732) @@ -397,6 +397,10 @@ <name>cache.providerRegistryName</name> <value>storeCacheProvider</value> </option> + <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> </options> </identity-store> </identity-stores> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2012-06-19 14:21:47 UTC (rev 8731) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2012-06-20 11:49:26 UTC (rev 8732) @@ -357,6 +357,10 @@ <name>cache.providerRegistryName</name> <value>storeCacheProvider</value> </option> + <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> </options> </identity-store> </identity-stores>

11 years, 10 months

1
0
0 / 0

gatein SVN: r8731 - in epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm: examples and 1 other directory.

by do-not-reply＠jboss.org

Author: mposolda Date: 2012-06-19 10:21:47 -0400 (Tue, 19 Jun 2012) New Revision: 8731 Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml Log: Bug 812657 option 'allowNotCaseSensitiveSearch' added with default value to false (backward-compatibility). It can be swithced to true to avoid MySQL case-sensitivity error Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2012-06-19 11:51:51 UTC (rev 8730) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2012-06-19 14:21:47 UTC (rev 8731) @@ -137,6 +137,10 @@ <value>true</value> </option> <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> + <option> <name>isRealmAware</name> <value>true</value> </option> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2012-06-19 11:51:51 UTC (rev 8730) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2012-06-19 14:21:47 UTC (rev 8731) @@ -132,6 +132,10 @@ <value>true</value> </option> <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> + <option> <name>isRealmAware</name> <value>true</value> </option> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-06-19 11:51:51 UTC (rev 8730) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-06-19 14:21:47 UTC (rev 8731) @@ -131,6 +131,10 @@ <value>true</value> </option> <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> + <option> <name>isRealmAware</name> <value>true</value> </option> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-06-19 11:51:51 UTC (rev 8730) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-06-19 14:21:47 UTC (rev 8731) @@ -136,6 +136,10 @@ <value>true</value> </option> <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> + <option> <name>isRealmAware</name> <value>true</value> </option> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2012-06-19 11:51:51 UTC (rev 8730) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2012-06-19 14:21:47 UTC (rev 8731) @@ -137,6 +137,10 @@ <value>true</value> </option> <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> + <option> <name>isRealmAware</name> <value>true</value> </option> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2012-06-19 11:51:51 UTC (rev 8730) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2012-06-19 14:21:47 UTC (rev 8731) @@ -132,6 +132,10 @@ <value>true</value> </option> <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> + <option> <name>isRealmAware</name> <value>true</value> </option> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2012-06-19 11:51:51 UTC (rev 8730) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2012-06-19 14:21:47 UTC (rev 8731) @@ -95,6 +95,10 @@ <value>true</value> </option> <option> + <name>allowNotCaseSensitiveSearch</name> + <value>false</value> + </option> + <option> <name>isRealmAware</name> <value>true</value> </option>

11 years, 10 months

1
0
0 / 0

gatein SVN: r8730 - in epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src: main/resources/eap and 1 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2012-06-19 07:51:51 -0400 (Tue, 19 Jun 2012) New Revision: 8730 Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-2377/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-2377/CVE-2012-2377_jgroups-channelfactory-stacks.xml.patch Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml Log: Bug 823392 - (CVE-2012-2377) CVE-2012-2377 JGroups diagnostics service enabled by default with no authentication when a JGroups channel is started Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-06-19 09:47:38 UTC (rev 8729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-06-19 11:51:51 UTC (rev 8730) @@ -78,7 +78,7 @@ </zip> </target> - <target name="finalTasks" depends="modifyStartupMessage,jbossws-native-PATCH,patch-RESTEasy-CVE-2012-081,patch-JBossWeb-CVE-2011-4610,patch-JBossWeb-CVE-2012-1154"> + <target name="finalTasks" depends="modifyStartupMessage,jbossws-native-PATCH,patch-RESTEasy-CVE-2012-081,patch-JBossWeb-CVE-2011-4610,patch-JBossWeb-CVE-2012-1154,patch-CVE-2012-2377"> </target>  @@ -156,4 +156,23 @@ <copy overwrite="true" file="${mod-cluster_resource_jar}" tofile="${epp.path}/mod_cluster/mod-cluster.sar/mod-cluster-1.0.10.GA_CP02.jar"/> <copy overwrite="true" file="${mod-cluster_resource_jar}" tofile="${epp.path}/mod_cluster/JBossWeb-Tomcat/lib/mod-cluster.jar"/> </target> + + <target name="patch-CVE-2012-2377"> + <echo>Patch for CVE-2012-2377 mod_cluster.jar</echo> + <patch + originalfile="${epp.path}/jboss-as/server/all/deploy/cluster/jgroups-channelfactory.sar/META-INF/jgroups-channelfactory-stacks.xml" + patchfile="${basedir}/src/main/resources/eap/CVE-2012-2377/CVE-2012-2377_jgroups-channelfactory-stacks.xml.patch" + failonerror="${patch.failonerror}" + /> + <patch + originalfile="${epp.path}/jboss-as/server/production/deploy/cluster/jgroups-channelfactory.sar/META-INF/jgroups-channelfactory-stacks.xml" + patchfile="${basedir}/src/main/resources/eap/CVE-2012-2377/CVE-2012-2377_jgroups-channelfactory-stacks.xml.patch" + failonerror="${patch.failonerror}" + /> + <patch + originalfile="${epp.path}/jboss-as/server/web/deploy/cluster/jgroups-channelfactory.sar/META-INF/jgroups-channelfactory-stacks.xml" + patchfile="${basedir}/src/main/resources/eap/CVE-2012-2377/CVE-2012-2377_jgroups-channelfactory-stacks.xml.patch" + failonerror="${patch.failonerror}" + /> + </target> </project> \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-2377/CVE-2012-2377_jgroups-channelfactory-stacks.xml.patch =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-2377/CVE-2012-2377_jgroups-channelfactory-stacks.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2012-2377/CVE-2012-2377_jgroups-channelfactory-stacks.xml.patch 2012-06-19 11:51:51 UTC (rev 8730) @@ -0,0 +1,56 @@ +--- jgroups-channelfactory-stacks.xml 2012-06-19 12:48:22.000000000 +0200 ++++ jgroups-channelfactory-stacks-patch.xml 2012-06-19 12:51:58.000000000 +0200 +@@ -20,7 +20,7 @@ + ip_ttl="${jgroups.udp.ip_ttl:2}" + thread_naming_pattern="cl" + timer.num_threads="12" +- enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" ++ enable_diagnostics="${jboss.jgroups.enable_diagnostics:false}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" + diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" + +@@ -123,7 +123,7 @@ + ip_ttl="${jgroups.udp.ip_ttl:2}" + thread_naming_pattern="cl" + timer.num_threads="12" +- enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" ++ enable_diagnostics="${jboss.jgroups.enable_diagnostics:false}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" + diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" + +@@ -191,7 +191,7 @@ + discard_incompatible_packets="true" + enable_bundling="false" + ip_ttl="${jgroups.udp.ip_ttl:2}" +- enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" ++ enable_diagnostics="${jboss.jgroups.enable_diagnostics:false}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" + diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" + +@@ -257,7 +257,7 @@ + sock_conn_timeout="300" + skip_suspected_members="true" + timer.num_threads="12" +- enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" ++ enable_diagnostics="${jboss.jgroups.enable_diagnostics:false}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" + diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" + +@@ -336,7 +336,7 @@ + use_send_queues="false" + sock_conn_timeout="300" + skip_suspected_members="true" +- enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" ++ enable_diagnostics="${jboss.jgroups.enable_diagnostics:false}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" + diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" + +@@ -447,7 +447,7 @@ + use_send_queues="false" + sock_conn_timeout="300" + skip_suspected_members="true" +- enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" ++ enable_diagnostics="${jboss.jgroups.enable_diagnostics:false}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" + diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" +

11 years, 10 months

1
0
0 / 0

gatein SVN: r8729 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2012-06-19 05:47:38 -0400 (Tue, 19 Jun 2012) New Revision: 8729 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml Log: Bug 820049 - Xerces instances vulnerable to CVE-2009-2625 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-19 07:00:56 UTC (rev 8728) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-19 09:47:38 UTC (rev 8729) @@ -1303,6 +1303,13 @@ <type>jar</type> <version>1.5.3</version> </dependency> + + <dependency> + <artifactId>xercesImpl</artifactId> + <groupId>apache-xerces</groupId> + <type>jar</type> + <version>2.9.1</version> + </dependency> </dependencies> <build>

11 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits June 2012