+
-
+
@@ -54,6 +54,8 @@
+
+
@@ -64,6 +66,13 @@
+
+
+
+
+
+
+
@@ -212,6 +221,13 @@
includes="org/opencms/**" >
+
+
+
+
+
+
+
@@ -342,7 +358,17 @@
-
+
+
+
+
+
+
@@ -436,7 +462,7 @@
-
+
@@ -523,7 +549,6 @@
-
@@ -561,7 +586,14 @@
jarfile="${opencms.output.jars}/opencms-setup.jar"
basedir="${opencms.output}/build/setup"
includes="org/opencms/**" />
-
+
+
+
+
+
+
+
+
@@ -658,6 +690,184 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: src/org/opencms/workplace/list/CmsListResourceTypeIconAction.java
===================================================================
RCS file: /usr/local/cvs/opencms/src/org/opencms/workplace/list/CmsListResourceTypeIconAction.java,v
retrieving revision 1.8
diff -u -r1.8 CmsListResourceTypeIconAction.java
--- src/org/opencms/workplace/list/CmsListResourceTypeIconAction.java 18 Jan 2010 10:02:15 -0000 1.8
+++ src/org/opencms/workplace/list/CmsListResourceTypeIconAction.java 24 Jun 2010 19:19:48 -0000
@@ -31,7 +31,9 @@
package org.opencms.workplace.list;
+import org.apache.commons.logging.Log;
import org.opencms.i18n.CmsMessageContainer;
+import org.opencms.main.CmsLog;
import org.opencms.main.OpenCms;
import org.opencms.util.CmsStringUtil;
import org.opencms.workplace.CmsWorkplace;
@@ -49,6 +51,9 @@
*/
public class CmsListResourceTypeIconAction extends CmsListExplorerDirectAction {
+ /** The log object for this class. */
+ private static final Log LOG = CmsLog.getLog(CmsListResourceTypeIconAction.class);
+
/**
* Default Constructor.
*
@@ -148,7 +153,7 @@
html.append(name);
html.append("'");
html.append(" style='display: block; width: 20px; height: 20px;'>");
- if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(iconPath)) {
+ if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(iconPath) && hasFileExtension(iconPath)) {
html.append("![](");
html.append(CmsWorkplace.getSkinUri());
if (!enabled) {
@@ -195,4 +200,12 @@
}
return html.toString();
}
+
+ private boolean hasFileExtension(String iconPath) {
+ boolean hasFileExtension = iconPath.indexOf()
/dev/null
-# get path to tomcat home
+# get path to tomcat home
if [ -z "$TOMCAT_HOME" ]; then
[ -n "$CATALINA_HOME" ] && TOMCAT_HOME="$CATALINA_HOME"
[ -z "$TOMCAT_HOME" ] && TOMCAT_HOME="$OPENCMS_BASE"/../../..
Index: webapp/WEB-INF/cmsshell.bat
===================================================================
RCS file: /usr/local/cvs/opencms/webapp/WEB-INF/cmsshell.bat,v
retrieving revision 1.15
diff -u -r1.15 cmsshell.bat
--- webapp/WEB-INF/cmsshell.bat 29 Oct 2008 12:46:48 -0000 1.15
+++ webapp/WEB-INF/cmsshell.bat 24 Jun 2010 19:19:49 -0000
@@ -66,23 +66,15 @@
:okTomcatHome
rem Guess OPENCMS_LIB if not defined
-if not "%OPENCMS_LIB%" == "" goto gotLib
+if not "%OPENCMS_LIB%" == "" goto gotHome
set OPENCMS_LIB=%OPENCMS_HOME%\lib
:gotHome
if exist "%OPENCMS_LIB%\opencms.jar" goto okLib
+if exist "%OPENCMS_LIB%\opencms-core.jar" goto okLib
echo The OPENCMS_LIB environment variable is not defined correctly
echo This environment variable is needed to run this program
goto end
:okLib
-rem Add all jars in lib dir to OPENCMS_CP variable (will include a initial semicolon ";")
-for %%i in ("%OPENCMS_LIB%\*.jar") do call "%OPENCMS_HOME%\cpappend.bat" %%i
-
-rem Check for Tomcat libs
-rem Add all jars in TOMCAT_HOME\common\lib dir to TOMCAT_LIB variable (will include a initial semicolon ";")
-for %%i in ("%TOMCAT_HOME%\common\lib\*.jar") do call "%OPENCMS_HOME%\tlappend.bat" %%i
-rem also support different tomcat folder structure
-for %%i in ("%TOMCAT_HOME%\lib\*.jar") do call "%OPENCMS_HOME%\tlappend.bat" %%i
-:okLib
rem ----- Execute The Requested Command ---------------------------------------
echo Using JAVA_HOME: %JAVA_HOME%
@@ -95,18 +87,13 @@
rem Get command line arguments and save them in
rem the CMD_LINE_ARGS environment variable
-set CMD_LINE_ARGS=
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-:doneSetArgs
+set CMD_LINE_ARGS=%*
@rem set opencms arguments
set CMD_LINE_ARGS=%CMD_LINE_ARGS% -base="%CD%"
+echo %CMD_LINE_ARGS%
rem execute OPENCMS
-%_RUNJAVA% %JAVA_OPTS% -classpath "%OPENCMS_HOME%\classes%CLASSPATH%%OPENCMS_CP%%TOMCAT_LIB%" %MAINCLASS% %CMD_LINE_ARGS%
+%_RUNJAVA% %JAVA_OPTS% -Djava.ext.dirs=%OPENCMS_LIB%;%TOMCAT_HOME%\common\lib;%TOMCAT_HOME%\lib -classpath "%OPENCMS_HOME%\classes%CLASSPATH%" %MAINCLASS% %CMD_LINE_ARGS%
:end
\ No newline at end of file
Index: modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_fs.jsp
===================================================================
RCS file: /usr/local/cvs/opencms/modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_fs.jsp,v
retrieving revision 1.5
diff -u -r1.5 tree_fs.jsp
--- modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_fs.jsp 6 Jul 2007 09:52:13 -0000 1.5
+++ modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_fs.jsp 24 Jun 2010 19:19:43 -0000
@@ -30,6 +30,13 @@
params.append("=true");
}
+ if (wp.getResourcetypeIds() != null) {
+ params.append("&");
+ params.append(CmsTree.PARAM_RESOURCETYPE_IDS);
+ params.append("=");
+ params.append(wp.getResourcetypeIds());
+ }
+
String frameRows = "*,0";
String frameSiteSelector = "";
if (wp.showSiteSelector()) {
Index: modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_siteselector.jsp
===================================================================
RCS file: /usr/local/cvs/opencms/modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_siteselector.jsp,v
retrieving revision 1.5
diff -u -r1.5 tree_siteselector.jsp
--- modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_siteselector.jsp 9 Jun 2008 13:41:54 -0000 1.5
+++ modules/org.opencms.workplace.explorer/resources/system/workplace/views/explorer/tree_siteselector.jsp 24 Jun 2010 19:19:43 -0000
@@ -32,8 +32,9 @@
Index: modules/org.opencms.editors/resources/system/workplace/editors/xmlcontent/editor_form.jsp
===================================================================
RCS file: /usr/local/cvs/opencms/modules/org.opencms.editors/resources/system/workplace/editors/xmlcontent/editor_form.jsp,v
retrieving revision 1.15
diff -u -r1.15 editor_form.jsp
--- modules/org.opencms.editors/resources/system/workplace/editors/xmlcontent/editor_form.jsp 9 Jun 2009 12:21:36 -0000 1.15
+++ modules/org.opencms.editors/resources/system/workplace/editors/xmlcontent/editor_form.jsp 24 Jun 2010 19:19:41 -0000
@@ -298,9 +298,80 @@
//-->
+
+
+
+
+
| %>buttons/exit.png){kind=small}