[portal-commits] JBoss Portal SVN: r12749 - in modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr: command and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2009-01-31 11:02:05 -0500 (Sat, 31 Jan 2009)
New Revision: 12749
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommand.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
Log:
minor
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommand.java
===================================================================
---
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommand.java 2009-01-31
15:08:15 UTC (rev 12748)
+++
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommand.java 2009-01-31
16:02:05 UTC (rev 12749)
@@ -61,7 +61,7 @@
boolean isValid = NodeUtil.isValidPath(path);
if (!isValid)
{
- throw new CMSException("Path: " + path + " is invalid.");
+ throw new CMSException("Path: " + path + " is not a legal path
element.");
}
}
}
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
---
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2009-01-31
15:08:15 UTC (rev 12748)
+++
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2009-01-31
16:02:05 UTC (rev 12749)
@@ -94,7 +94,6 @@
String itemName = zipEntry.getName();
if(!NodeUtil.CHECK_FOR_XSS_PATTERN.matcher(itemName).matches())
{
- System.out.println("******** itemName = " + itemName);
log.info("Zip file: '" + itemName + "' is not a
valid file name. It will be skipped.");
}
else
@@ -104,7 +103,15 @@
}
else // isDirectory
{
- this.addFolder(zipEntry);
+ String itemName = zipEntry.getName();
+ if(!NodeUtil.CHECK_FOR_XSS_PATTERN.matcher(itemName).matches())
+ {
+ log.info("Zip file: '" + itemName + "' is not a
valid file name. It will be skipped.");
+ }
+ else
+ {
+ this.addFolder(zipEntry);
+ }
}
}