portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r924324 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/site/ resources/org/apache/jetspeed/portlets/site/ resources/org/apache/jetspeed/portlets/site/resources/
Date Wed, 17 Mar 2010 15:04:59 GMT
Author: woonsan
Date: Wed Mar 17 15:04:58 2010
New Revision: 924324

URL: http://svn.apache.org/viewvc?rev=924324&view=rev
Log:
JS2-1078: Reviewing and fixing copyIds argument usages when invoking PageManager#copy... methods.

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ca.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_es.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_fr.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_hu.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh_TW.properties

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Wed Mar 17 15:04:58 2010
@@ -1144,6 +1144,8 @@ public class PortalSiteManager extends A
         private FileUpload fileUpload;
 
         private ExportJetspeedObject exportObject;
+        
+        private boolean copyIdsOnImport = true;
 
         /**
          * @return the recursively
@@ -1178,7 +1180,17 @@ public class PortalSiteManager extends A
         {
             this.fileUpload = fileUploadField;
         }
-
+        
+        public boolean getCopyIdsOnImport()
+        {
+            return copyIdsOnImport;
+        }
+        
+        public void setCopyIdsOnImport(boolean copyIdsOnImport)
+        {
+            this.copyIdsOnImport = copyIdsOnImport;
+        }
+        
         public ImportDataTab(String id, JetspeedDocument jetspeeeDoc)
         {
             super(id, jetspeeeDoc);
@@ -1243,6 +1255,7 @@ public class PortalSiteManager extends A
                 // Add one file input field
                 uploadForm.add(new FileUploadField("fileInput",
                         new PropertyModel(this, "fileUploadField")));
+                uploadForm.add(new CheckBox("copyIdsOnImport", new PropertyModel(this, "copyIdsOnImport")));
                 uploadForm.add(new Button("uploadFile")
                 {
 
@@ -1265,6 +1278,7 @@ public class PortalSiteManager extends A
                         String fileName;
                         String pathSeparator = System
                                 .getProperty("file.separator");
+                        boolean copyIds = getCopyIdsOnImport();
                         boolean success = false;
                         if (upload != null)
                         {
@@ -1308,7 +1322,8 @@ public class PortalSiteManager extends A
                                         }
                                         page = pageManager.copyPage(source,
                                                 destPath + pathSeparator
-                                                        + fileName);
+                                                        + fileName,
+                                                        copyIds);
                                         pageManager.updatePage(page);
                                         success = true;
                                     } else if (fileType.equalsIgnoreCase("tpsml"))
@@ -1325,7 +1340,8 @@ public class PortalSiteManager extends A
                                         }
                                         pageTemplate = pageManager.copyPageTemplate(source,
                                                 destPath + pathSeparator
-                                                + fileName);
+                                                + fileName,
+                                                copyIds);
                                         pageManager.updatePageTemplate(pageTemplate);
                                         success = true;
                                     } else if (fileType.equalsIgnoreCase("dpsml"))
@@ -1342,7 +1358,8 @@ public class PortalSiteManager extends A
                                         }
                                         dynamicPage = pageManager.copyDynamicPage(source,
                                                 destPath + pathSeparator
-                                                + fileName);
+                                                + fileName,
+                                                copyIds);
                                         pageManager.updateDynamicPage(dynamicPage);
                                         success = true;
                                     } else if (fileType.equalsIgnoreCase("fpsml"))
@@ -1359,7 +1376,8 @@ public class PortalSiteManager extends A
                                         }
                                         fragmentDefinition = pageManager.copyFragmentDefinition(source,
                                                 destPath + pathSeparator
-                                                + fileName);
+                                                + fileName,
+                                                copyIds);
                                         pageManager.updateFragmentDefinition(fragmentDefinition);
                                         success = true;
                                     } else if (fileType
@@ -1394,7 +1412,7 @@ public class PortalSiteManager extends A
                                                 pageManager,
                                                 getServiceLocator()
                                                         .getCastorPageManager(),
-                                                folder, userName, destPath);
+                                                folder, userName, destPath, copyIds);
                                         success = true;
                                     }
                                 }
@@ -2536,7 +2554,9 @@ public class PortalSiteManager extends A
         String docName;
 
         String docPath;
-
+        
+        boolean copyIds;
+        
         /**
          * @return the docPath
          */
@@ -2578,7 +2598,17 @@ public class PortalSiteManager extends A
         {
             return docType;
         }
-
+        
+        public boolean getCopyIds()
+        {
+            return copyIds;
+        }
+        
+        public void setCopyIds(boolean copyIds)
+        {
+            this.copyIds = copyIds;
+        }
+        
         public CopyMoveWindow(String id, final String docType, String docName,
                 String docPath, final boolean copyFlag)
         {
@@ -2628,6 +2658,16 @@ public class PortalSiteManager extends A
                     this, "docName"));
             nameField.setRequired(true);
             copyForm.add(nameField);
+            
+            AjaxCheckBox copyIdsChkBox = new AjaxCheckBox("copyIds", new PropertyModel(this,
"copyIds")) 
+            {
+                @Override
+                protected void onUpdate(AjaxRequestTarget target)
+                {
+                }
+            };
+            copyForm.add(copyIdsChkBox);
+            
             AjaxButton copyButton = new AjaxButton("copy",new ResourceModel("common.copy"),copyForm)
             {
 
@@ -2635,7 +2675,7 @@ public class PortalSiteManager extends A
                 protected void onSubmit(AjaxRequestTarget target, Form<?> form)
                 {
                     docAction(true, docOldName, getDocName(), docOldPath,
-                            getDocPath());
+                            getDocPath(), getCopyIds());
                     ((ModalWindow) CopyMoveWindow.this.getParent())
                             .close(target);
                 }
@@ -2654,7 +2694,7 @@ public class PortalSiteManager extends A
                 protected void onSubmit(AjaxRequestTarget target, Form<?> form)
                 {
                     docAction(false, docOldName, getDocName(), docOldPath,
-                            getDocPath());
+                            getDocPath(), getCopyIds());
                     ((ModalWindow) CopyMoveWindow.this.getParent())
                             .close(target);
                 }
@@ -2717,9 +2757,9 @@ public class PortalSiteManager extends A
             add(copyTree);
             add(copyForm);
         }
-
+        
         private void docAction(boolean copy, String oldName, String newName,
-                String oldPath, String newPath)
+                String oldPath, String newPath, boolean copyIds)
         {
             FileType docType = getUserSelectedNode().getDocType();
             if (getUserSelectedNode().getDocType() == FileType.Folder)
@@ -2749,7 +2789,8 @@ public class PortalSiteManager extends A
                 {
                     newPage = getServiceLocator().getPageManager()
                             .copyPage(tmpPage,
-                                    newPath + JETSPEED_PATH_SEPRATOR + newName);
+                                    newPath + JETSPEED_PATH_SEPRATOR + newName,
+                                    copyIds);
                     PageAction(newPage, SAVE_ACTION);
                     if (!copy)
                     {
@@ -3536,7 +3577,7 @@ public class PortalSiteManager extends A
                     {
                         PortalSiteManagerUtil
                                 .importFolder(castorPageManager, folder,
-                                        userName, getRealPath(folder.getPath()));
+                                        userName, getRealPath(folder.getPath()), true);
                     } else
                     {
                         Folder destFolder = castorPageManager.copyFolder(
@@ -3553,7 +3594,8 @@ public class PortalSiteManager extends A
                     Page page = folder.getPage(siteNode.getNodeName());
                     Page destPage = castorPageManager.copyPage(page,
                             PortalSiteManagerUtil.getUserFolder(userName, true)
-                                    + siteNode.getNodeName());
+                                    + siteNode.getNodeName(),
+                                    true);
                     castorPageManager.updatePage(destPage);
                 } else if (siteNode.getDocType() == SiteTreeNode.FileType.Link)
                 {
@@ -3647,7 +3689,7 @@ public class PortalSiteManager extends A
 
     private Folder importFolders(PageManager pageManager,
             PageManager castorPageManager, Folder srcFolder, String userName,
-            String destination) throws JetspeedException
+            String destination, boolean copyIds) throws JetspeedException
     {
         Folder dstFolder = lookupFolder(castorPageManager, srcFolder.getPath());
         dstFolder = pageManager.copyFolder(srcFolder, destination);
@@ -3659,7 +3701,7 @@ public class PortalSiteManager extends A
             Page srcPage = (Page) pages.next();
             Page dstPage = lookupPage(castorPageManager, srcPage.getPath());
             newPath = destination + getRealPath(srcPage.getPath());
-            dstPage = pageManager.copyPage(srcPage, newPath);
+            dstPage = pageManager.copyPage(srcPage, newPath, copyIds);
             pageManager.updatePage(dstPage);
         }
         Iterator links = srcFolder.getLinks().iterator();
@@ -3677,7 +3719,7 @@ public class PortalSiteManager extends A
             Folder folder = (Folder) folders.next();
             newPath = destination + getRealPath(folder.getPath());
             importFolders(pageManager, castorPageManager, folder, userName,
-                    newPath);
+                    newPath, copyIds);
         }
         return dstFolder;
     }

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
Wed Mar 17 15:04:58 2010
@@ -66,9 +66,14 @@ public class PortalSiteManagerUtil
         }
         return link;
     }
-
+    
     public static Folder importFolder(PageManager castorPageManager, Folder srcFolder, String
userName, String destination) throws JetspeedException
     {
+        return importFolder(castorPageManager, srcFolder, userName, destination, true);
+    }
+    
+    public static Folder importFolder(PageManager castorPageManager, Folder srcFolder, String
userName, String destination, boolean copyIds) throws JetspeedException
+    {
         String newPath = "";
         Folder dstFolder = lookupFolder(castorPageManager,srcFolder.getPath());
         dstFolder = castorPageManager.copyFolder(srcFolder, getUserFolder(userName, true)
+ destination);
@@ -79,7 +84,7 @@ public class PortalSiteManagerUtil
             Page srcPage = (Page) pages.next();
             Page dstPage = lookupPage(castorPageManager,srcPage.getPath());
             newPath = getUserFolder(userName, true) + destination + getRealPath(srcPage.getPath());
-            dstPage = castorPageManager.copyPage(srcPage, newPath);
+            dstPage = castorPageManager.copyPage(srcPage, newPath, copyIds);
             castorPageManager.updatePage(dstPage);
         }
         Iterator pageTemplates = srcFolder.getPageTemplates().iterator();
@@ -88,7 +93,7 @@ public class PortalSiteManagerUtil
             PageTemplate srcPageTemplate = (PageTemplate) pageTemplates.next();
             PageTemplate dstPageTemplate = lookupPageTemplate(castorPageManager,srcPageTemplate.getPath());
             newPath = getUserFolder(userName, true) + destination + getRealPath(srcPageTemplate.getPath());
-            dstPageTemplate = castorPageManager.copyPageTemplate(srcPageTemplate, newPath);
+            dstPageTemplate = castorPageManager.copyPageTemplate(srcPageTemplate, newPath,
copyIds);
             castorPageManager.updatePageTemplate(dstPageTemplate);
         }        
         Iterator dynamicPages = srcFolder.getDynamicPages().iterator();
@@ -97,7 +102,7 @@ public class PortalSiteManagerUtil
             DynamicPage srcDynamicPage = (DynamicPage) dynamicPages.next();
             DynamicPage dstDynamicPage = lookupDynamicPage(castorPageManager,srcDynamicPage.getPath());
             newPath = getUserFolder(userName, true) + destination + getRealPath(srcDynamicPage.getPath());
-            dstDynamicPage = castorPageManager.copyDynamicPage(srcDynamicPage, newPath);
+            dstDynamicPage = castorPageManager.copyDynamicPage(srcDynamicPage, newPath, copyIds);
             castorPageManager.updateDynamicPage(dstDynamicPage);
         }
         Iterator fragmentDefinitions = srcFolder.getFragmentDefinitions().iterator();
@@ -106,7 +111,7 @@ public class PortalSiteManagerUtil
             FragmentDefinition srcFragmentDefinition = (FragmentDefinition) fragmentDefinitions.next();
             FragmentDefinition dstFragmentDefinition = lookupFragmentDefinition(castorPageManager,srcFragmentDefinition.getPath());
             newPath = getUserFolder(userName, true) + destination + getRealPath(srcFragmentDefinition.getPath());
-            dstFragmentDefinition = castorPageManager.copyFragmentDefinition(srcFragmentDefinition,
newPath);
+            dstFragmentDefinition = castorPageManager.copyFragmentDefinition(srcFragmentDefinition,
newPath, copyIds);
             castorPageManager.updateFragmentDefinition(dstFragmentDefinition);
         }
         Iterator links = srcFolder.getLinks().iterator();
@@ -123,7 +128,7 @@ public class PortalSiteManagerUtil
         {
             Folder folder = (Folder) folders.next();
             newPath = destination + getRealPath(folder.getPath());
-            importFolder(castorPageManager,folder, userName, newPath);
+            importFolder(castorPageManager,folder, userName, newPath, copyIds);
         }
         return dstFolder;
     }

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24CopyMoveWindow.html?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
Wed Mar 17 15:04:58 2010
@@ -40,6 +40,10 @@
 						<td class="portlet-section-subheader"><label wicket:id="docName-label">[Docment
Name]</label></td>
 						<td class="portlet-section-body"><input type="text" wicket:id="docName"/></td>
 					</tr>
+			        <tr>
+			            <td class="portlet-section-subheader"><label><wicket:message
key="import.keep.existing.ids"/></label></td>
+			            <td class="portlet-section-body"><input type="checkbox" wicket:id="copyIds"
/></td>
+			        </tr>
 					<tr>
 						<td class="portlet-section-body" colspan="2">
 							<input type="button" wicket:id="copy"/>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24ImportDataTab.html?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
Wed Mar 17 15:04:58 2010
@@ -44,6 +44,10 @@
 			<td width="20%" class="portlet-section-header"><span>Import File</span></td>
 			<td class="portlet-section-body"><input type="file" wicket:id="fileInput"/></td>
 		</tr>
+        <tr>
+            <td class="portlet-section-header"><span><wicket:message key="import.keep.existing.ids"/></span></td>
+            <td class="portlet-section-body"><input type="checkbox" wicket:id="copyIdsOnImport"
/></td>
+        </tr>
 		<tr>
 			<td  class="portlet-section-body" colspan="2"><input type="submit" wicket:id="uploadFile"
value="Import"/></td>
 		</tr>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
Wed Mar 17 15:04:58 2010
@@ -83,4 +83,6 @@ menu.option=Options
 menu.text=Text
 
 action.delete.confirm = Are sure you want to delete the selected item(s)?
-treeroot=Tree root
\ No newline at end of file
+treeroot=Tree root
+
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ca.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ca.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ca.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ca.properties
Wed Mar 17 15:04:58 2010
@@ -50,3 +50,5 @@ add.link = Add Link
 doc.order = Document Order
 menus = Menus
 security = Security
+
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_en.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_en.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_en.properties
Wed Mar 17 15:04:58 2010
@@ -60,4 +60,6 @@ common.save=Save
 # Resource Strings for MetaData Tab
 metedataTab.name=Name
 metedataTab.language=Language
-metedataTab.value=Value
\ No newline at end of file
+metedataTab.value=Value
+
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_es.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_es.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_es.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_es.properties
Wed Mar 17 15:04:58 2010
@@ -49,3 +49,5 @@ add.link = Add Link
 doc.order = Document Order
 menus = Menus
 security = Security
+
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_fr.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_fr.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_fr.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_fr.properties
Wed Mar 17 15:04:58 2010
@@ -45,3 +45,5 @@ add.link = Add Link
 doc.order = Document Order
 menus = Menus
 security = Security
+
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_hu.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_hu.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_hu.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_hu.properties
Wed Mar 17 15:04:58 2010
@@ -50,3 +50,4 @@ doc.order = Dokumentum sorrendje
 menus = Men\u00fck
 security = Biztons\u00e1g
 
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_it.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_it.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_it.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_it.properties
Wed Mar 17 15:04:58 2010
@@ -51,4 +51,6 @@ remove = Rimuovi
 add.link = Aggiungi Link
 doc.order = Ordine Documento
 menus = Menu
-security = Sicurezza
\ No newline at end of file
+security = Sicurezza
+
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ja.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ja.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ja.properties
Wed Mar 17 15:04:58 2010
@@ -48,3 +48,4 @@ doc.order = \u30c9\u30ad\u30e5\u30e1\u30
 menus = \u30e1\u30cb\u30e5\u30fc
 security = \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3
 
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ko.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ko.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ko.properties
Wed Mar 17 15:04:58 2010
@@ -52,3 +52,4 @@ doc.order = \ubb38\uc11c \uc21c\uc11c
 menus = \uba54\ub274
 security = \ubcf4\uc548
 
+import.keep.existing.ids = \uae30\uc874 ID \uc720\uc9c0

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ua.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ua.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_ua.properties
Wed Mar 17 15:04:58 2010
@@ -50,3 +50,4 @@ doc.order = \u041f\u043ec\u043b\u0456\u0
 menus = \u041c\u0435\u043d\u044e
 security = \u0411\u0435\u0437\u043f\u0435\u043a\u0430
 
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh.properties
Wed Mar 17 15:04:58 2010
@@ -50,3 +50,5 @@ add.link = \u6dfb\u52a0\u94fe\u63a5
 doc.order = \u6587\u6587\u4ef6\u987a\u5e8f
 menus = \u83dc\u5355
 security = \u5b89\u5168
+
+import.keep.existing.ids = Keep the existing IDs

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh_TW.properties?rev=924324&r1=924323&r2=924324&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh_TW.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/resources/SiteResources_zh_TW.properties
Wed Mar 17 15:04:58 2010
@@ -50,3 +50,4 @@ doc.order = \u6587\u6a94\u9806\u5e8f
 menus = \u83dc\u55ae
 security = \u5b89\u5168
 
+import.keep.existing.ids = Keep the existing IDs



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message