1:49 p.m.
Author: chris.laprun(a)jboss.com
Date: 2009-01-31 14:49:19 -0500 (Sat, 31 Jan 2009)
New Revision: 12755
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties
branches/JBoss_Portal_Branch_2_7/security/build.xml
Log:
- Forbid filenames and folders with < > ( )
- Fixed regex
- Updated error handling
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-01-31
19:08:32 UTC (rev 12754)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-01-31
19:49:19 UTC (rev 12755)
@@ -107,7 +107,7 @@
private ApprovePublish approvePublish;
private AuthorizationManager authorizationManager;
private ResourceBundle resources = null;
- private static final Pattern CHECK_FOR_XSS_PATTERN =
Pattern.compile("^[<>\\(\\)=]");
+ private static final Pattern CHECK_FOR_XSS_PATTERN =
Pattern.compile("[^<>\\(\\)=]*");
private static final String SLASH = "/";
@@ -1428,6 +1428,10 @@
Boolean bExists = null;
try
{
+ if (!CHECK_FOR_XSS_PATTERN.matcher(content.getBasePath()).matches())
+ {
+ throw new CMSException(content.getBasePath() + " is not a legal
path element");
+ }
bExists = (Boolean)CMSService.execute(existsCMD);
}
catch (CMSException cme)
@@ -1484,7 +1488,7 @@
sMakeLive = "on";
}
- if (!"".equals(sFilePath))
+ if (!"".equals(sFilePath) &&
!CHECK_FOR_XSS_PATTERN.matcher(sFilePath).matches())
{
String sContent = aReq.getParameter("elm1");
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2009-01-31
19:08:32 UTC (rev 12754)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2009-01-31
19:49:19 UTC (rev 12755)
@@ -1,6 +1,6 @@
################################################################################
# JBoss, a division of Red Hat #
-# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# Copyright 2009, Red Hat Middleware, LLC, and individual #
# contributors as indicated by the @authors tag. See the #
# copyright.txt in the distribution for a full listing of #
# individual contributors. #
@@ -21,77 +21,7 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-## CMS ADMIN PORTLET
-TITLE_HEAD=CMS Admin
-TITLE_BROWSE=Directory Browser
-TITLE_FILEBROWSE=File Browser
-TITLE_DELETECONFIRM=Confirm Delete
-TITLE_CREATECOLLCONFIRM=Confirm Directory Creation
-TITLE_COPYCONFIRM=Confirm Resource Copy
-TITLE_MOVECONFIRM=Confirm Resource Move
-TITLE_VIEWFILE=Viewing File Properties
-TITLE_EDIT=Edit File
-TITLE_CREATE=Create File
-TITLE_UPLOAD=Upload File
-TITLE_SECURECONFIRM=Secure Node
-
-CMS_SEARCH=Search
-CMS_SEARCHNORESULT=No result for this search
-CMS_MENU=Action Menu
-CMS_ACTION=Action
-CMS_NAME=Name
-CMS_TYPE=Type
-CMS_CREATED=Created
-CMS_MODIFIED=Modified
-CMS_DESCRIPTION=Description
-CMS_VIEW=View
-CMS_COPY=Copy
-CMS_MOVE=Move
-CMS_DELETE=Delete
-CMS_FOLDER=Folder
-CMS_FILE=File
-CMS_CREATE=Create
-CMS_CANCEL=Cancel
-CMS_EDIT=Edit
-CMS_UPLOAD=Upload
-CMS_MODIFY=Modify
-CMS_CREATEFOLDER= Create Folder
-CMS_CREATEFILE=Create File
-CMS_UPLOADARCHIVE=Upload Archive
-CMS_UPLOADARCHIVE_ASYNC=Process Asynchronously
-CMS_BACKTOBROWSER=Back to Directory Browser
-CMS_TRANSFER=Import/Export
-CMS_EXPORTARCHIVE=Export Folder
-CMS_SECURE=Secure
-CMS_PREVIEW=Preview
-CMS_GO=Go
-
-CMS_CREATEFILEINDIR=Creating File in Directory
-CMS_FILENAME=FileName
-CMS_TITLE=Title
-CMS_LANGUAGE=Language
-
-CMS_DELETEPATH=Confirm Deletion of
-CMS_DELETEWARN1=WARNING! You will not be able to undo these change\!
-CMS_DELETEWARN2=Are you sure you want to delete this resource\?
-
-CMS_DESTINATION=Destination
-CMS_SOURCE=Source
-
-CMS_EDITING=Editing File
-CMS_LIVE=Make \"Live\"
-CMS_VERSION=Version
-CMS_WYSIWYG=WYSIWYG Editor
-
-CMS_LIVEVERSION=Live Version
-CMS_SIZE=Size
-
-CMS_CONTENT_DIR=Content Directory
-CMS_CONTENT_DIR_USE=Use the directory tree to navigate the portal folder structure.
-CMS_MAIN_USE=Use the CMS Administration portlet to manage the content of your portal.
-CMS_MANAGE=Manage Content
-
-CMS_CREATED_BY=Created By
+ATED_BY=Created By
CMS_APPROVE=Approve
CMS_DENY=Deny
CMS_APPROVAL=Pending Items
@@ -141,8 +71,8 @@
CMS_MISSING_DOCUMENT=404 - Page Not Found
CMS_MISSING_DOCUMENT_DESCRIPTION=The document you tried to access is not available
-CMS_FILENAME_INVALID=File Name is invalid. It may not contain illegal characters such as
'.', '/', ':', '[', ']', '*',
''', '"', '|' or any whitespace character.
-CMS_FOLDERNAME_INVALID=Folder Name is invalid. It may not contain illegal characters such
as '.', '/', ':', '[', ']', '*',
''', '"', '|' or any whitespace character.
+CMS_FILENAME_INVALID=File Name is invalid. It may not contain illegal characters such as
'.', '/', ':', '[', ']', '*',
''', '"', '>', ,'<', '(',
')', '|' or any whitespace character.
+CMS_FOLDERNAME_INVALID=Folder Name is invalid. It may not contain illegal characters such
as '.', '/', ':', '[', ']', '*',
''', '"', '>', ,'<', '(',
')', '|' or any whitespace character.
CMS_MSG_DESTINATION_ALREADY_EXISTS=The command was not performed, because the destination
already exists.
CMS_CANT_MOVE_SAME_DESTINATION=You cannot move a folder to the same location
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2009-01-31
19:08:32 UTC (rev 12754)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2009-01-31
19:49:19 UTC (rev 12755)
@@ -1,6 +1,6 @@
################################################################################
# JBoss, a division of Red Hat #
-# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# Copyright 2009, Red Hat Middleware, LLC, and individual #
# contributors as indicated by the @authors tag. See the #
# copyright.txt in the distribution for a full listing of #
# individual contributors. #
@@ -21,72 +21,7 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-## CMS ADMIN PORTLET
-TITLE_HEAD=Amministrazione CMS
-TITLE_BROWSE=Navigatore delle Directory
-TITLE_FILEBROWSE=Navigatore dei File
-TITLE_DELETECONFIRM=Conferma di Cancellazione
-TITLE_CREATECOLLCONFIRM=Conferma di creazione della Directory
-TITLE_COPYCONFIRM=Conferma di Copia della Risorsa
-TITLE_MOVECONFIRM=Conferma di Spostamento della Risorsa
-TITLE_VIEWFILE=Visualizzazione delle Propriet\u00e0 dei File
-TITLE_EDIT=Modifica File
-TITLE_CREATE=Creazione File
-TITLE_UPLOAD=Caricamento File
-TITLE_SECURECONFIRM=Sicurezza sul Nodo
-
-CMS_SEARCH=Ricerca
-CMS_SEARCHNORESULT=Nessun risultato per questa ricerca
-CMS_MENU=Menu delle Azioni
-CMS_ACTION=Azione
-CMS_NAME=Nome
-CMS_TYPE=Tipo
-CMS_CREATED=Creato
-CMS_MODIFIED=Modificato
-CMS_DESCRIPTION=Descrizione
-CMS_VIEW=Visualizza
-CMS_COPY=Copia
-CMS_MOVE=Sposta
-CMS_DELETE=Cancella
-CMS_FOLDER=Cartella
-CMS_FILE=File
-CMS_CREATE=Crea
-CMS_CANCEL=Annulla
-CMS_EDIT=Edita
-CMS_UPLOAD=Caricamento
-CMS_MODIFY=Modifica
-CMS_CREATEFOLDER= Crea Cartella
-CMS_CREATEFILE=Crea File
-CMS_UPLOADARCHIVE=Carica Archivio
-CMS_UPLOADARCHIVE_ASYNC=Processione asincrona
-CMS_BACKTOBROWSER=Torna al Navigatore delle Directory
-CMS_TRANSFER=Importa/Esporta
-CMS_EXPORTARCHIVE=Esporta Cartella
-CMS_SECURE=Rendi sicuro
-CMS_PREVIEW=Anteprima
-CMS_GO=Vai
-
-CMS_CREATEFILEINDIR=Crea File nella Directory
-CMS_FILENAME=Nome del File
-CMS_TITLE=Titolo
-CMS_LANGUAGE=Lingua
-
-CMS_DELETEPATH=Conferma la Cancellazione di
-CMS_DELETEWARN1=ATTENZIONE! Non ti \u00e8 permesso tornare alla vecchia configurazione\!
-CMS_DELETEWARN2=Sei sicuro di voler cancellare questa risorsa\?
-
-CMS_DESTINATION=Destinazione
-CMS_SOURCE=Sorgente
-
-CMS_EDITING=Editaggio del File
-CMS_LIVE=Rendi \"Dal Vivo\"
-CMS_VERSION=Versione
-CMS_WYSIWYG=Editor WYSIWYG
-
-CMS_LIVEVERSION=Versione dal vivo
-CMS_SIZE=Grandezza
-
-CMS_CONTENT_DIR=Contenuto della Directory
+Contenuto della Directory
CMS_CONTENT_DIR_USE=Usa l\'albero delle directory per navigare nella struttura a
cartelle del portale.
CMS_MAIN_USE=Usa la portlet di Amministrazione CMS per gestire il contenuto del tuo
portale.
CMS_MANAGE=Gestione dei contenuti
@@ -140,10 +75,10 @@
CMS_MISSING_DOCUMENT=404 - Pagina non trovata
CMS_MISSING_DOCUMENT_DESCRIPTION=Il documento a cui hai tentato di accedere non \u00e8
disponibile
-CMS_FILENAME_INVALID=Il nome del File non \u00e8 valido. Non sono permessi caratteri
quali '.', '/', ':', '[', ']', '*',
''', '"', '|' o lo spazio.
-CMS_FOLDERNAME_INVALID=Il nome della cartella non \u00e8 valido. Non sono permessi
caratteri quali '.', '/', ':', '[', ']',
'*', ''', '"', '|' o lo spazio.
+CMS_FILENAME_INVALID=Il nome del File non \u00e8 valido. Non sono permessi caratteri
quali '.', '/', ':', '[', ']', '*',
''', '"', '>', ,'<', '(',
')', '|' o lo spazio.
+CMS_FOLDERNAME_INVALID=Il nome della cartella non \u00e8 valido. Non sono permessi
caratteri quali '.', '/', ':', '[', ']',
'*', ''', '"', '>', ,'<',
'(', ')', '|' o lo spazio.
-CMS_MSG_DESTINATION_ALREADY_EXISTS=Il comando non pu\u00F2 essere eseguito, perch\u00e8
la destinazione esiste gi\u00e0.
+CMS_MSG_DESTINATION_ALREADY_EXISTS=Il comando non pu\u00f2 essere eseguito, perch\u00e8
la destinazione esiste gi\u00e0.
CMS_CANT_MOVE_SAME_DESTINATION=Non puoi spostare la cartella nella stessa destinazione
CMS_DATE_PATTERN=MM/dd/yy HH:mm
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties 2009-01-31
19:08:32 UTC (rev 12754)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties 2009-01-31
19:49:19 UTC (rev 12755)
@@ -1,6 +1,6 @@
################################################################################
# JBoss, a division of Red Hat #
-# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# Copyright 2009, Red Hat Middleware, LLC, and individual #
# contributors as indicated by the @authors tag. See the #
# copyright.txt in the distribution for a full listing of #
# individual contributors. #
@@ -21,91 +21,7 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-org.jboss.portal.object.name.admin.CMS=\u30b3\u30f3\u30c6\u30f3\u30c4\u7ba1\u7406
-
-## CMS ADMIN PORTLET
-TITLE_HEAD=CMS \u7ba1\u7406
-TITLE_BROWSE=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea \u30d6\u30e9\u30a6\u30b6
-TITLE_FILEBROWSE=\u30d5\u30a1\u30a4\u30eb \u30d6\u30e9\u30a6\u30b6
-TITLE_DELETECONFIRM=\u524a\u9664\u78ba\u8a8d
-TITLE_CREATECOLLCONFIRM=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4f5c\u6210\u78ba\u8a8d
-TITLE_COPYCONFIRM=\u30ea\u30bd\u30fc\u30b9\u30b3\u30d4\u30fc\u78ba\u8a8d
-TITLE_MOVECONFIRM=\u30ea\u30bd\u30fc\u30b9\u79fb\u52d5\u78ba\u8a8d
-TITLE_VIEWFILE=\u89b3\u89a7\u30d5\u30a1\u30a4\u30eb\u30d7\u30ed\u30d1\u30c6\u30a3
-TITLE_EDIT=\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6
-TITLE_CREATE=\u30d5\u30a1\u30a4\u30eb\u4f5c\u6210
-TITLE_UPLOAD=\u30d5\u30a1\u30a4\u30eb\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
-TITLE_SECURECONFIRM=\u30bb\u30ad\u30e5\u30a2\u30ce\u30fc\u30c9
-
-CMS_SEARCH=\u691c\u7d22
-CMS_SEARCHNORESULT=\u691c\u7d22\u7d50\u679c\u304c\u3042\u308a\u307e\u305b\u3093
-CMS_MENU=\u30a2\u30af\u30b7\u30e7\u30f3\u30e1\u30cb\u30e5\u30fc
-CMS_ACTION=\u30a2\u30af\u30b7\u30e7\u30f3
-CMS_NAME=\u540d\u524d
-CMS_TYPE=\u30bf\u30a4\u30d7
-CMS_CREATED=\u4f5c\u6210
-CMS_MODIFIED=\u4fee\u6b63
-CMS_DESCRIPTION=\u8aac\u660e
-CMS_VIEW=\u89b3\u89a7
-CMS_COPY=\u30b3\u30d4\u30fc
-CMS_MOVE=\u79fb\u52d5
-CMS_DELETE=\u524a\u9664
-CMS_FOLDER=\u30d5\u30a9\u30eb\u30c0
-CMS_FILE=\u30d5\u30a1\u30a4\u30eb
-CMS_CREATE=\u4f5c\u6210
-CMS_CANCEL=\u30ad\u30e3\u30f3\u30bb\u30eb
-CMS_EDIT=\u7de8\u96c6
-CMS_UPLOAD=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
-CMS_MODIFY=\u4fee\u6b63
-CMS_CREATEFOLDER= \u30d5\u30a9\u30eb\u30c0\u4f5c\u6210
-CMS_CREATEFILE=\u30d5\u30a1\u30a4\u30eb\u4f5c\u6210
-CMS_UPLOADARCHIVE=\u30a2\u30fc\u30ab\u30a4\u30d6\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
-CMS_UPLOADARCHIVE_ASYNC=\u975e\u540c\u671f\u30d7\u30ed\u30bb\u30b9
-CMS_BACKTOBROWSER=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d6\u30e9\u30a6\u30b6\u306b\u623b\u308b
-CMS_TRANSFER=\u30a4\u30f3\u30dd\u30fc\u30c8/\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
-CMS_EXPORTARCHIVE=\u30d5\u30a9\u30eb\u30c0\u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
-CMS_SECURE=\u30bb\u30ad\u30e5\u30a2
-CMS_PREVIEW=\u30d7\u30ec\u30d3\u30e5\u30fc
-CMS_GO=Go
-
-CMS_CREATEFILEINDIR=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210
-CMS_FILENAME=\u30d5\u30a1\u30a4\u30eb\u540d
-CMS_TITLE=\u30bf\u30a4\u30c8\u30eb
-CMS_LANGUAGE=\u8a00\u8a9e
-
-CMS_DELETEPATH=\u524a\u9664\u5bfe\u8c61\u306e\u78ba\u8a8d:
-CMS_DELETEWARN1=\u8b66\u544a!
\u3053\u306e\u5909\u66f4\u3092\u3082\u3068\u306b\u623b\u3059\u3053\u3068\u306f\u51fa\u6765\u307e\u305b\u3093\!
-CMS_DELETEWARN2=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3092\u672c\u5f53\u306b\u524a\u9664\u3057\u307e\u3059\u304b\?
-
-CMS_DESTINATION=\u5834\u6240
-CMS_SOURCE=\u30bd\u30fc\u30b9
-
-CMS_EDITING=\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6
-CMS_LIVE=Make \"Live\"
-CMS_VERSION=\u30d0\u30fc\u30b8\u30e7\u30f3
-CMS_WYSIWYG=WYSIWYG \u30a8\u30c7\u30a3\u30bf
-
-CMS_LIVEVERSION=Live \u30d0\u30fc\u30b8\u30e7\u30f3
-CMS_SIZE=\u30b5\u30a4\u30ba
-
-CMS_CONTENT_DIR=\u30b3\u30f3\u30c6\u30f3\u30c4\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
-CMS_CONTENT_DIR_USE=\u30dd\u30fc\u30bf\u30eb\u30d5\u30a9\u30eb\u30c0\u69cb\u9020\u3092\u64cd\u4f5c\u3059\u308b\u305f\u3081\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30c4\u30ea\u30fc\u3092\u5229\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-CMS_MAIN_USE=\u30dd\u30fc\u30bf\u30eb\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306bCMS\u7ba1\u7406\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u5229\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-CMS_MANAGE=\u7ba1\u7406\u30b3\u30f3\u30c6\u30f3\u30c4
-
-CMS_CREATED_BY=Created By
-CMS_APPROVE=\u627f\u8a8d
-CMS_DENY=\u5426\u8a8d
-CMS_APPROVAL=\u30da\u30f3\u30c7\u30a3\u30f3\u30b0\u30a2\u30a4\u30c6\u30e0
-CMS_PATH=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
-
-CMS_EMPTY_FOLDER=\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306f\u7a7a\u3067\u3059\u3002
-
-CMS_ERROR_UPLOADARCHIVE_ASYNC=\u30a2\u30fc\u30ab\u30a4\u30d6\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u300e\u975e\u540c\u671f\u30d7\u30ed\u30bb\u30b9\u300f\u3092\u8d77\u52d5\u3055\u305b\u3082\u3046\u4e00\u5ea6\u305f\u3081\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-CMS_MSG_UPLOADARCHIVE_ASYNC=\u30a2\u30fc\u30ab\u30a4\u30d6\u306f\u51e6\u7406\u4e2d\u3067\u3059\u3002\u51e6\u7406\u304c\u7d42\u308f\u308b\u3068\u30ea\u30bd\u30fc\u30b9\u3092\u30d5\u30a9\u30eb\u30c0\u5185\u306b\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002
-
-CMS_REQUIRED=\u5fc5\u9808
-CMS_LINK_TO_RESOURCES=\u30dd\u30fc\u30bf\u30eb\u5185\u306e\u30ea\u30bd\u30fc\u30b9\u30ea\u30f3\u30af\u306f\u53b3\u5bc6\u306b\u8a18\u8ff0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u4f8b\u3048\u3070
default/images/back.gif\u306b\u914d\u7f6e\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u30ea\u30f3\u30af\u306f\u3053\u3053\u3067\u793a\u3055\u308c\u3066\u3044\u308b\u901a\u308a\u306b\u30bf\u30a4\u30d7\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3064\u307e\u308a\u30b9\u30e9\u30c3\u30b7\u30e5(/)\u3092\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9\u306e\u5148\u982d\u306b\u8a18\u8ff0\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u3002\u3042\u306a\u305f\u306f\u30a8\u30c7\u30a3\u30bf\u306ePreview\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3053\u3068\u3067\u30ea\u30f3\u30af\u304c\u6b63\u3057\u3044\u304b\u3092\u78ba\u8a8d\u3059\u308b\u4e8b\u304c\u3067\u304d\u307e\u3059\u3002
+ges/back.gif\u306b\u914d\u7f6e\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u30ea\u30f3\u30af\u306f\u3053\u3053\u3067\u793a\u3055\u308c\u3066\u3044\u308b\u901a\u308a\u306b\u30bf\u30a4\u30d7\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3064\u307e\u308a\u30b9\u30e9\u30c3\u30b7\u30e5(/)\u3092\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9\u306e\u5148\u982d\u306b\u8a18\u8ff0\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u3002\u3042\u306a\u305f\u306f\u30a8\u30c7\u30a3\u30bf\u306ePreview\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3053\u3068\u3067\u30ea\u30f3\u30af\u304c\u6b63\u3057\u3044\u304b\u3092\u78ba\u8a8d\u3059\u308b\u4e8b\u304c\u3067\u304d\u307e\u3059\u3002
CMS_ERROR_PROCESSING=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
CMS_ERROR_EXPORT=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30d5\u30a9\u30eb\u30c0\u304c\u7a7a\u3067\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
CMS_YOUR_EXPORT_0=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0:
@@ -143,8 +59,8 @@
CMS_MISSING_DOCUMENT=404 -
\u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
CMS_MISSING_DOCUMENT_DESCRIPTION=\u3042\u306a\u305f\u304c\u30a2\u30af\u30bb\u30b9\u3057\u3088\u3046\u3068\u3057\u305f\u6587\u66f8\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
-CMS_FILENAME_INVALID=\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u7121\u52b9\u3067\u3059\u3002\u7121\u52b9\u306a\u6587\u5b57\u5217\uff08
'.', '/', ':', '[', ']', '*',
''', '"',
'|'\uff09\u3084\u30b9\u30da\u30fc\u30b9\u304c\u4f7f\u308f\u308c\u3066\u3044\u306a\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-CMS_FOLDERNAME_INVALID=\u30d5\u30a9\u30eb\u30c0\u540d\u304c\u7121\u52b9\u3067\u3059\u3002\u7121\u52b9\u306a\u6587\u5b57\u5217\uff08
'.', '/', ':', '[', ']', '*',
''', '"',
'|'\uff09\u3084\u30b9\u30da\u30fc\u30b9\u304c\u4f7f\u308f\u308c\u3066\u3044\u306a\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+CMS_FILENAME_INVALID=\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u7121\u52b9\u3067\u3059\u3002\u7121\u52b9\u306a\u6587\u5b57\u5217\uff08
'.', '/', ':', '[', ']', '*',
''', '"', '>', ,'<', '(',
')',
'|'\uff09\u3084\u30b9\u30da\u30fc\u30b9\u304c\u4f7f\u308f\u308c\u3066\u3044\u306a\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+CMS_FOLDERNAME_INVALID=\u30d5\u30a9\u30eb\u30c0\u540d\u304c\u7121\u52b9\u3067\u3059\u3002\u7121\u52b9\u306a\u6587\u5b57\u5217\uff08
'.', '/', ':', '[', ']', '*',
''', '"', '>', ,'<', '(',
')',
'|'\uff09\u3084\u30b9\u30da\u30fc\u30b9\u304c\u4f7f\u308f\u308c\u3066\u3044\u306a\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
CMS_MSG_DESTINATION_ALREADY_EXISTS=\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u5b9f\u884c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002
CMS_CANT_MOVE_SAME_DESTINATION=\u540c\u3058\u30d5\u30a9\u30eb\u30c0\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u79fb\u52d5\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
Modified: branches/JBoss_Portal_Branch_2_7/security/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/security/build.xml 2009-01-31 19:08:32 UTC (rev
12754)
+++ branches/JBoss_Portal_Branch_2_7/security/build.xml 2009-01-31 19:49:19 UTC (rev
12755)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -206,6 +206,9 @@
</target>
<target name="tests" depends="init">
+ <property name="build.testlog"
value="${module.output}/log"/>
+ <echo message="testlog: ${build.testlog}"/>
+ <mkdir dir="${build.testlog}"/>
<execute-tests>
<x-test>
<test todir="${test.reports}"
name="org.jboss.portal.test.security.SimpleTestCase"/>