+ * The connector will receive a request if, and only if, the request was valid + * in terms of valid and reasonable parameters up to an abstract point which is + * independent from a specific connector implementation. + *
+ * Helpful classes and methods: + *
-
+ *
- If you need to access the request instance itself and/or the context + * parameters sent from the File Browser, take a look at the + * {@link ThreadLocalData} class. + *
- Use + * {@link RequestCycleHandler#getUserFilesAbsolutePath(javax.servlet.http.HttpServletRequest) + * RequestCycleHandler.getUserFilesAbsolutePath}, + * {@link AbstractLocalFileSystemConnector#getRealUserFilesAbsolutePath(java.lang.String) + * AbstractLocalFileSystemConnector.getRealUserFilesAbsolutePath} (if use it) to + * resolve the real path or simply do it yourself. + *
+ * It serves files and folders against a specific local directory which is
+ * resolved in a subclass. You cannot use this class directly, instead you have
+ * to subclass it and implement the abstract methods and override methods if
+ * necessary.
+ *
+ * @version $Id$
+ */
+public abstract class AbstractLocalFileSystemConnector implements Connector {
+
+ protected ServletContext servletContext;
+
+ public String fileUpload(final ResourceType type,
+ final String currentFolder, final String fileName,
+ final InputStream inputStream)
+ throws InvalidCurrentFolderException, WriteException {
+ String absolutePath = getRealUserFilesAbsolutePath(RequestCycleHandler
+ .getUserFilesAbsolutePath(ThreadLocalData.getRequest()));
+ File typeDir = getOrCreateResourceTypeDir(absolutePath, type);
+ File currentDir = new File(typeDir, currentFolder);
+ if (!currentDir.exists() || !currentDir.isDirectory())
+ throw new InvalidCurrentFolderException();
+
+ File newFile = new File(currentDir, fileName);
+ File fileToSave = UtilsFile.getUniqueFile(newFile.getAbsoluteFile());
+
+ try {
+ IOUtils.copyLarge(inputStream, new FileOutputStream(fileToSave));
+ } catch (IOException e) {
+ throw new WriteException();
+ }
+ return fileToSave.getName();
+ }
+
+ public void createFolder(final ResourceType type,
+ final String currentFolder, final String newFolder)
+ throws InvalidCurrentFolderException,
+ InvalidNewFolderNameException, FolderAlreadyExistsException {
+ String absolutePath = getRealUserFilesAbsolutePath(RequestCycleHandler
+ .getUserFilesAbsolutePath(ThreadLocalData.getRequest()));
+ File typeDir = getOrCreateResourceTypeDir(absolutePath, type);
+ File currentDir = new File(typeDir, currentFolder);
+ if (!currentDir.exists() || !currentDir.isDirectory())
+ throw new InvalidCurrentFolderException();
+
+ File newDir = new File(currentDir, newFolder);
+ if (newDir.exists())
+ throw new FolderAlreadyExistsException();
+ if (!newDir.mkdir())
+ throw new InvalidNewFolderNameException();
+ }
+
+ public List
+ * Though, this connector has some drawbacks:
+ *
+ *
+ *
ServletContext.getRealPath(String) against the
+ * local filesystem (real path). If it fails, it will emit helpful log
+ * messages and will throw an exception too.
+ */
+ public void init(final ServletContext servletContext) throws Exception {
+ this.servletContext = servletContext;
+ String defaultAbsolutePath = getRealUserFilesAbsolutePath(PropertiesLoader
+ .getUserFilesPath());
+
+ if (defaultAbsolutePath == null) {
+ logger.error("The context root cannot be resolved against the local filesystem");
+ logger.info("Your servlet container/application server does not expand deployed war files");
+ logger.debug("Use another Connector implementation (e.g. LocalConnector) and consult http://www.fckeditor.net/forums/viewtopic.php?f=6&t=11568");
+ throw new NullPointerException(
+ "The real context root cannot be resolved against the local filesystem");
+ }
+ }
+
+ /**
+ * Resolves the userfiles absolute path against the current context real
+ * path.
+ */
+ @Override
+ protected String getRealUserFilesAbsolutePath(String userFilesAbsolutePath) {
+ return servletContext.getRealPath(userFilesAbsolutePath);
+ }
+
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/connector/impl/LocalConnector.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/connector/impl/LocalConnector.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/connector/impl/LocalConnector.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,63 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.connector.impl;
+
+import javax.servlet.ServletContext;
+
+import net.fckeditor.requestcycle.impl.ServerRootPathBuilder;
+
+/**
+ * Real local filesystem backend connector. The file access is translated as-is
+ * to the local filesystem.
+ * + * This maybe interesting for those who serve userfiles + *
-
+ *
- from a static context of a servlet container/application + * server, + *
- from virtual servers with Apache HTTPd on different
+ * domains, e.g.
http://userfiles.mydomain.com, or
+ * - on a per-user basis, e.g. uploading to
+ *
/home/$USERNAME/public_html/fckeditorand an Apache HTTPd serves + * as/~$USERNAME/fckeditor.
+ *
+ * The sequence diagram below depicts the interaction between interfaces and
+ * classes:
+ * 
+ *
GET and POST commands.+ * The File Browser sends a specific command for each and every request. This + * class is intended to reflect these in an Enum-like manner. + *
+ * The commands are for GET:
+ *
-
+ *
- GetFolders + *
- GetFoldersAndFiles + *
- CreateFolder + *
POST:
+ * -
+ *
- FileUpload + *
- QuickUpload + *
GetFolders */
+ public static final Command GET_FOLDERS = new Command("GetFolders");
+ /** GET command GetFoldersAndFiles */
+ public static final Command GET_FOLDERS_AND_FILES = new Command(
+ "GetFoldersAndFiles");
+ /** GET command CreateFolder */
+ public static final Command CREATE_FOLDER = new Command("CreateFolder");
+ /** POST command FileUpload */
+ public static final Command FILE_UPLOAD = new Command("FileUpload");
+ /** POST command QuickUpload */
+ public static final Command QUICK_UPLOAD = new Command("QuickUpload");
+
+ static {
+ // initialize the get commands
+ getCommands.put(GET_FOLDERS.getName(), GET_FOLDERS);
+ getCommands.put(GET_FOLDERS_AND_FILES.getName(), GET_FOLDERS_AND_FILES);
+ getCommands.put(CREATE_FOLDER.getName(), CREATE_FOLDER);
+
+ // initialize the post commands
+ postCommands.put(FILE_UPLOAD.getName(), FILE_UPLOAD);
+ postCommands.put(QUICK_UPLOAD.getName(), QUICK_UPLOAD);
+ }
+
+ /**
+ * Constructs a command with the given name.
+ *
+ * @param name
+ * the name of the new command
+ */
+ private Command(final String name) {
+ this.name = name;
+ }
+
+ /**
+ * Returns the name of this command.
+ *
+ * @return the name of this command
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Returns the command constant with the specified name.
+ *
+ * @param name
+ * the name of the constant to return
+ * @return the command constant with the specified name
+ * @throws IllegalArgumentException
+ * if this class has no constant with the specified name
+ * @throws NullPointerException
+ * if name is null or empty
+ */
+ public static Command valueOf(final String name) {
+ if (Utils.isEmpty(name))
+ throw new NullPointerException("Name is null or empty");
+
+ Command command = getCommands.get(name);
+ if (command == null)
+ command = postCommands.get(name);
+ if (command == null)
+ throw new IllegalArgumentException("No command const " + name);
+
+ return command;
+ }
+
+ /**
+ * Returns true if name represents a valid GET
+ * command constant.
+ *
+ * @param name
+ * the command to check
+ * @return true if name represents a valid command, else
+ * false
+ */
+ public static boolean isValidForGet(final String name) {
+ return getCommands.containsKey(name);
+ }
+
+ /**
+ * Returns true if name represents a valid POST
+ * command constant.
+ *
+ * @param name
+ * the command to check
+ * @return true if name represents a valid command, else
+ * false
+ */
+ public static boolean isValidForPost(final String name) {
+ return postCommands.containsKey(name);
+ }
+
+ /**
+ * Returns the command constant with the specified name. In contrast to
+ * {@link #valueOf(String)} it returns a null instead of throwing an
+ * exception if a command constant was not found.
+ *
+ * @param name
+ * the name of the constant to return
+ * @return the command constant with the specified name, else
+ * null
+ */
+ public static Command getCommand(final String name) {
+ try {
+ return Command.valueOf(name);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /**
+ * Compares the specified object with this command for equality. The
+ * comparison is based on class and name only.
+ *
+ * @param obj
+ * Object to be compared with this command.
+ * @return true if the specified object is equal to this
+ * command
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+
+ if (obj == null || this.getClass() != obj.getClass())
+ return false;
+
+ final Command command = (Command) obj;
+ return name.equals(command.getName());
+ }
+
+ /**
+ * Returns the hash code value for this command. The hash code equals the
+ * hash code of the name field.
+ *
+ * @return the hash code value for this command
+ */
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ /**
+ * Returns a string representation of this command.
+ *
+ * @return a string representation of this command
+ * @see #getName()
+ */
+ @Override
+ public String toString() {
+ return name;
+ }
+}
Index: 3rdParty_sources/ckeditor/net/fckeditor/handlers/PropertiesLoader.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/handlers/PropertiesLoader.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/handlers/PropertiesLoader.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,307 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.handlers;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Manages FCKeditor.Java properties files.
+ * + * It manages/loads the properties files in the following order: + *
-
+ *
- the default properties as defined here, + *
- the user-defined properties (
fckeditor.properties) if + * present. + *
+ * Moreover, you can set properties programmatically too but make sure to
+ * override them before the first call of that specific property.
+ *
+ * @version $Id$
+ */
+public class PropertiesLoader {
+ private static final Logger logger = LoggerFactory
+ .getLogger(PropertiesLoader.class);
+ private static final String DEFAULT_FILENAME = "default.properties";
+ private static final String LOCAL_PROPERTIES = "/fckeditor.properties";
+ private static Properties properties = new Properties();
+
+ static {
+
+ // 1. load library defaults
+ InputStream in = PropertiesLoader.class
+ .getResourceAsStream(DEFAULT_FILENAME);
+
+ if (in == null) {
+ logger.error("{} not found", DEFAULT_FILENAME);
+ throw new RuntimeException(DEFAULT_FILENAME + " not found");
+ } else {
+ if (!(in instanceof BufferedInputStream))
+ in = new BufferedInputStream(in);
+
+ try {
+ properties.load(in);
+ in.close();
+ logger.debug("{} loaded", DEFAULT_FILENAME);
+ } catch (Exception e) {
+ logger.error("Error while processing {}", DEFAULT_FILENAME);
+ throw new RuntimeException("Error while processing "
+ + DEFAULT_FILENAME, e);
+ }
+ }
+
+ // 2. load user defaults if present
+ InputStream in2 = PropertiesLoader.class
+ .getResourceAsStream(LOCAL_PROPERTIES);
+
+ if (in2 == null) {
+ logger.info("{} not found", LOCAL_PROPERTIES);
+ } else {
+
+ if (!(in2 instanceof BufferedInputStream))
+ in2 = new BufferedInputStream(in2);
+
+ try {
+ properties.load(in2);
+ in2.close();
+ logger.debug("{} loaded", LOCAL_PROPERTIES);
+ } catch (Exception e) {
+ logger.error("Error while processing {}", LOCAL_PROPERTIES);
+ throw new RuntimeException("Error while processing "
+ + LOCAL_PROPERTIES, e);
+ }
+
+ }
+ }
+
+ /**
+ * Searches for the property with the specified key in this property list.
+ *
+ * @see Properties#getProperty(String)
+ */
+ public static String getProperty(final String key) {
+ return properties.getProperty(key);
+ }
+
+ /**
+ * Sets the property with the specified key in this property list.
+ *
+ * @see Properties#setProperty(String, String)
+ */
+ public static void setProperty(final String key, final String value) {
+ properties.setProperty(key, value);
+ }
+
+ /**
+ * Returns fckeditor.toolbarSet property
+ */
+ public static String getEditorToolbarSet() {
+ return properties.getProperty("fckeditor.toolbarSet");
+ }
+
+ /**
+ * Returns fckeditor.width property
+ */
+ public static String getEditorWidth() {
+ return properties.getProperty("fckeditor.width");
+ }
+
+ /**
+ * Returns fckeditor.height property
+ */
+ public static String getEditorHeight() {
+ return properties.getProperty("fckeditor.height");
+ }
+
+ /**
+ * Returns fckeditor.basePath property
+ */
+ public static String getEditorBasePath() {
+ return properties.getProperty("fckeditor.basePath");
+ }
+
+ /**
+ * Returns connector.resourceType.file.path property
+ */
+ public static String getFileResourceTypePath() {
+ return properties.getProperty("connector.resourceType.file.path");
+ }
+
+ /**
+ * Returns connector.resourceType.flash.path property
+ */
+ public static String getFlashResourceTypePath() {
+ return properties.getProperty("connector.resourceType.flash.path");
+ }
+
+ /**
+ * Returns connector.resourceType.image.path property
+ */
+ public static String getImageResourceTypePath() {
+ return properties.getProperty("connector.resourceType.image.path");
+ }
+
+ /**
+ * Returns connector.resourceType.media.path property
+ */
+ public static String getMediaResourceTypePath() {
+ return properties.getProperty("connector.resourceType.media.path");
+ }
+
+ /**
+ * Returns connector.resourceType.file.extensions.allowed
+ * property
+ */
+ public static String getFileResourceTypeAllowedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.file.extensions.allowed");
+ }
+
+ /**
+ * Returns connector.resourceType.file.extensions.denied
+ * property
+ */
+ public static String getFileResourceTypeDeniedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.file.extensions.denied");
+ }
+
+ /**
+ * Returns connector.resourceType.flash.extensions.allowed
+ * property
+ */
+ public static String getFlashResourceTypeAllowedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.flash.extensions.allowed");
+ }
+
+ /**
+ * Returns connector.resourceType.flash.extensions.denied
+ * property
+ */
+ public static String getFlashResourceTypeDeniedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.flash.extensions.denied");
+ }
+
+ /**
+ * Returns connector.resourceType.image.extensions.allowed
+ * property
+ */
+ public static String getImageResourceTypeAllowedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.image.extensions.allowed");
+ }
+
+ /**
+ * Returns connector.resourceType.image.extensions.denied
+ * property
+ */
+ public static String getImageResourceTypeDeniedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.image.extensions.denied");
+ }
+
+ /**
+ * Returns connector.resourceType.media.extensions.allowed
+ * property
+ */
+ public static String getMediaResourceTypeAllowedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.media.extensions.allowed");
+ }
+
+ /**
+ * Returns connector.resourceType.media.extensions.denied
+ * property
+ */
+ public static String getMediaResourceTypeDeniedExtensions() {
+ return properties
+ .getProperty("connector.resourceType.media.extensions.denied");
+ }
+
+ /**
+ * Returns connector.userFilesPath property
+ */
+ public static String getUserFilesPath() {
+ return properties.getProperty("connector.userFilesPath");
+ }
+
+ /**
+ * Returns connector.userFilesAbsolutePath property
+ */
+ public static String getUserFilesAbsolutePath() {
+ return properties.getProperty("connector.userFilesAbsolutePath");
+ }
+
+ /**
+ * Returns connector.forceSingleExtension property
+ */
+ public static boolean isForceSingleExtension() {
+ return Boolean.valueOf(properties
+ .getProperty("connector.forceSingleExtension"));
+ }
+
+ /**
+ * Returns connector.secureImageUploads property
+ */
+ public static boolean isSecureImageUploads() {
+ return Boolean.valueOf(properties
+ .getProperty("connector.secureImageUploads"));
+ }
+
+ /**
+ * Returns connector.impl property
+ */
+ public static String getConnectorImpl() {
+ return properties.getProperty("connector.impl");
+ }
+
+ /**
+ * Returns connector.userActionImpl property
+ */
+ public static String getUserActionImpl() {
+ return properties.getProperty("connector.userActionImpl");
+ }
+
+ /**
+ * Returns connector.userPathBuilderImpl property
+ */
+ public static String getUserPathBuilderImpl() {
+ return properties.getProperty("connector.userPathBuilderImpl");
+ }
+
+ /**
+ * Returns connector.localeResolverImpl property
+ */
+ public static String getLocaleResolverImpl() {
+ return properties.getProperty("localization.localeResolverImpl");
+ }
+}
Index: 3rdParty_sources/ckeditor/net/fckeditor/handlers/RequestCycleHandler.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/handlers/RequestCycleHandler.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/handlers/RequestCycleHandler.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,147 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.handlers;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.connector.Connector;
+import net.fckeditor.requestcycle.UserAction;
+import net.fckeditor.requestcycle.UserPathBuilder;
+import net.fckeditor.tool.Utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Handles the {@link UserAction} and {@link UserPathBuilder} interfaces.
+ * This class instantiates the the chosen implementations and acts as a proxy
+ * for their methods/access.
+ *
+ * @version $Id$
+ */
+public class RequestCycleHandler {
+ private static final Logger logger = LoggerFactory
+ .getLogger(RequestCycleHandler.class);
+ private static UserAction userAction = null;
+ private static UserPathBuilder userPathBuilder = null;
+
+ static {
+ // If there are more objects to instantiate in future, we could solve
+ // the following by reflection!
+
+ // 1. try to instantiate the UserAction object
+ String className = PropertiesLoader.getUserActionImpl();
+ if (Utils.isEmpty(className))
+ logger.error("Empty UserAction implementation class name provided");
+ else {
+ try {
+ Class clazz = Class.forName(className);
+ userAction = (UserAction) clazz.newInstance();
+ logger.info("UserAction initialized to {}", className);
+ } catch (Throwable e) {
+ logger.error("UserAction implementation {} could not be instantiated", className);
+ throw new RuntimeException("UserAction implementation " + className + " could not be instantiated", e); //$NON-NLS-1$
+ }
+ }
+
+ // 2. try to instantiate the UserPathBuilder object
+ className = PropertiesLoader.getUserPathBuilderImpl();
+ if (Utils.isEmpty(className))
+ logger.error("Empty UserPathBuilder implementation class name provided");
+ else {
+ try {
+ Class clazz = Class.forName(className);
+ userPathBuilder = (UserPathBuilder) clazz.newInstance();
+ logger.info("UserPathBuilder initialized to {}", className);
+ } catch (Throwable e) {
+ logger.error("UserPathBuilder implementation {} could not be instantiated", className);
+ throw new RuntimeException("UserPathBuilder implementation " + className + " could not be instantiated", e); //$NON-NLS-1$
+ }
+ }
+ }
+
+ /**
+ * Returns true if user is allowed to list resources. The
+ * behavior is specified by the current UserAction instance.
+ *
+ * @param request
+ * current user request instance
+ * @return true if user is allowed to list resources, false otherwise
+ * @see UserAction#isEnabledForFileBrowsing(HttpServletRequest)
+ */
+ public static boolean isGetResourcesEnabled(final HttpServletRequest request) {
+ return userAction.isEnabledForFileBrowsing(request);
+ }
+
+ /**
+ * Returns true if user is allowed to upload files. The
+ * behavior is specified by the current UserAction instance.
+ *
+ * @param request
+ * current user request instance
+ * @return true if user is allowed to upload files, false otherwise
+ * @see UserAction#isEnabledForFileUpload(HttpServletRequest)
+ */
+ public static boolean isFileUploadEnabled(HttpServletRequest request) {
+ return userAction.isEnabledForFileUpload(request);
+ }
+
+ /**
+ * Returns true if user is allowed to create folders. The
+ * behavior is specified by the current UserAction instance.
+ *
+ * @param request
+ * current user request instance
+ * @return true if user is allowed to create folders, false otherwise
+ * @see UserAction#isEnabledForFileBrowsing(HttpServletRequest)
+ */
+ public static boolean isCreateFolderEnabled(final HttpServletRequest request) {
+ return userAction.isCreateFolderEnabled(request);
+ }
+
+ /**
+ * Returns the current userfiles path. The path is specified by the current
+ * UserPathBuilder instance.
+ *
+ * @param request
+ * current user request instance
+ * @return current userfiles path
+ * @see UserPathBuilder#getUserFilesPath(HttpServletRequest)
+ */
+ public static String getUserFilesPath(final HttpServletRequest request) {
+ return userPathBuilder.getUserFilesPath(request);
+ }
+
+ /**
+ * Returns the current absolute userfiles path. The path is specified by the
+ * current UserPathBuilder instance.
+ * Note that the path is absolute to the underlying system of the current
+ * {@link Connector} instance.
+ *
+ * @param request
+ * current user request instance
+ * @return current absolute userfiles path
+ * @see UserPathBuilder#getUserFilesAbsolutePath(HttpServletRequest)
+ */
+ public static String getUserFilesAbsolutePath(final HttpServletRequest request) {
+ return userPathBuilder.getUserFilesAbsolutePath(request);
+ }
+}
Index: 3rdParty_sources/ckeditor/net/fckeditor/handlers/ResourceType.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/handlers/ResourceType.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/handlers/ResourceType.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,302 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.handlers;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import net.fckeditor.tool.Utils;
+
+/**
+ * File Browser resource types. The File Browser provides a specific resource
+ * type for each and every request. This class is intended to reflect these in
+ * an Enum-like manner.
+ *
+ * The resource types are: + *
-
+ *
- File + *
- Flash + *
- Image + *
- Media + *
File */
+ public static final ResourceType FILE = new ResourceType("File",
+ PropertiesLoader.getFileResourceTypePath(), Utils
+ .getSet(PropertiesLoader
+ .getFileResourceTypeAllowedExtensions()), Utils
+ .getSet(PropertiesLoader
+ .getFileResourceTypeDeniedExtensions()));
+ /** Resource type Flash */
+ public static final ResourceType FLASH = new ResourceType("Flash",
+ PropertiesLoader.getFlashResourceTypePath(), Utils
+ .getSet(PropertiesLoader
+ .getFlashResourceTypeAllowedExtensions()), Utils
+ .getSet(PropertiesLoader
+ .getFlashResourceTypeDeniedExtensions()));
+ /** Resource type Image */
+ public static final ResourceType IMAGE = new ResourceType("Image",
+ PropertiesLoader.getImageResourceTypePath(), Utils
+ .getSet(PropertiesLoader
+ .getImageResourceTypeAllowedExtensions()), Utils
+ .getSet(PropertiesLoader
+ .getImageResourceTypeDeniedExtensions()));
+ /** Resource type Media */
+ public static final ResourceType MEDIA = new ResourceType("Media",
+ PropertiesLoader.getMediaResourceTypePath(), Utils
+ .getSet(PropertiesLoader
+ .getMediaResourceTypeAllowedExtensions()), Utils
+ .getSet(PropertiesLoader
+ .getMediaResourceTypeDeniedExtensions()));
+
+ static {
+ types.put(FILE.getName(), FILE);
+ types.put(FLASH.getName(), FLASH);
+ types.put(IMAGE.getName(), IMAGE);
+ types.put(MEDIA.getName(), MEDIA);
+ }
+
+ /**
+ * This constructor has been made intentionally made private to provide
+ * pre-defined types only.
+ *
+ * @param name
+ * the name of the new resource type
+ * @param path
+ * the absolute path of the new resource type
+ * @param allowedEextensions
+ * the allowed extensions set of the new resource type
+ * @param deniedExtensions
+ * the denied extensions set of the new resource type
+ * @throws IllegalArgumentException
+ * if both sets are empty
+ * @throws IllegalArgumentException
+ * if both sets contain extensions
+ */
+ private ResourceType(final String name, final String path,
+ final Setname is null or empty
+ */
+ public static ResourceType valueOf(final String name) {
+ if (Utils.isEmpty(name))
+ throw new NullPointerException("Name is null or empty");
+
+ ResourceType rt = types.get(name);
+ if (rt == null)
+ throw new IllegalArgumentException("No resource type const " + name);
+ return rt;
+ }
+
+ /**
+ * Returns true if name represents a valid resource type
+ * constant.
+ *
+ * @param name
+ * the resource type to check
+ * @return true if name represents a valid resource type, else
+ * false
+ */
+ public static boolean isValidType(final String name) {
+ // HashMap permits null keys, so it will return false in that case
+ return types.containsKey(name);
+ }
+
+ /**
+ * Returns the resource type constant with the specified name. In contrast
+ * to {@link #valueOf(String)} it returns a null instead of throwing an
+ * exception if a resource type constant was not found.
+ *
+ * @param name
+ * the name of the constant to return
+ * @return the resource type constant with the specified name, else
+ * null
+ */
+ public static ResourceType getResourceType(final String name) {
+ try {
+ return ResourceType.valueOf(name);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the resource type constant with the specified name. In contrast
+ * to {@link #getResourceType(String)} it returns {@link #FILE} instead of
+ * returning null.
+ *
+ * @param name
+ * the name of the constant to return
+ * @return the resource type constant with the specified name, else
+ * FILE
+ */
+ public static ResourceType getDefaultResourceType(final String name) {
+ ResourceType rt = getResourceType(name);
+ return rt == null ? FILE : rt;
+ }
+
+ /**
+ * Returns true if extension is allowed. Denied extensions set
+ * takes precedence over allowed extensions set, in other words a negative
+ * check is made against denied set and if this fails, allowed set is
+ * checked.
+ *
+ * @param extension
+ * the extension to check, empty will fail
+ * @return true if extension is allowed, else
+ * false
+ */
+ public boolean isAllowedExtension(final String extension) {
+ if (Utils.isEmpty(extension))
+ return false;
+ String ext = extension.toLowerCase();
+ if (allowedEextensions.isEmpty())
+ return !deniedExtensions.contains(ext);
+ if (deniedExtensions.isEmpty())
+ return allowedEextensions.contains(ext);
+ return false;
+ }
+
+ /**
+ * Returns true if extension is denied. This method simply
+ * negates {@link #isAllowedExtension(String)}.
+ *
+ * @param extension
+ * the extension to check, empty will fail
+ * @return true if extension is denied, else false
+ */
+ public boolean isDeniedExtension(final String extension) {
+ return !isAllowedExtension(extension);
+ }
+
+ /**
+ * Compares the specified object with this resource type for equality. The
+ * comparison is based on class and name only.
+ *
+ * @param obj
+ * Object to be compared with this resource type.
+ * @return true if the specified object is equal to this
+ * resource type
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+
+ if (obj == null || this.getClass() != obj.getClass())
+ return false;
+
+ final ResourceType rt = (ResourceType) obj;
+ return name.equals(rt.getName());
+ }
+
+ /**
+ * Returns the hash code value for this resource type. The hash code equals
+ * the hash code of the name field.
+ *
+ * @return the hash code value for this resource type
+ */
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+}
Index: 3rdParty_sources/ckeditor/net/fckeditor/handlers/package-info.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/handlers/package-info.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/handlers/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+/**
+ * Different handlers for various purposes used in the entire system.
+ *
+ * @version $Id$
+ */
+package net.fckeditor.handlers;
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/localization/LocaleResolver.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/localization/LocaleResolver.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/localization/LocaleResolver.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,48 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.localization;
+
+import java.util.Locale;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * An interface for user locale resolution.
+ * + * Note: You are free to implement this interface the way you + * need it, in other words your return values can be global, regardless of the + * request, or on a per-request basis. + *
+ * @version $Id$ + */ +public interface LocaleResolver { + + /** + * Returns the locale of a given request. + * + * @param request + * the current request instance + * @return the locale of the request,null if the locale
+ * couldn't be resolved
+ */
+ public Locale resolveLocale(final HttpServletRequest request);
+
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/localization/LocalizedMessages.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/localization/LocalizedMessages.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/localization/LocalizedMessages.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,316 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.localization;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.handlers.PropertiesLoader;
+import net.fckeditor.tool.Utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides access to localized messages (properties).
+ * + * Localized messages are loaded for a particular locale from a HTTP request. + * The locale is resolved by the current {@link LocaleResolver} + * instance/singleton. If a locale or a bundle for a locale cannot be found, + * default messages are used. + *
+ *+ * Note: Loaded messages are cached per locale, any subsequent call of the same + * locale will be served by the cache instead of another resource bundle + * retrieval. + *
+ * + * @version $Id$ + */ +public class LocalizedMessages { + + private static final MapLocalizedMessages for a given
+ * request. This method automatically determines the locale of this request
+ * and loads the appropriate bundle. If locale is null or not available,
+ * the default locale will be used.
+ *
+ * @param request
+ * the current request instance
+ * @return instance with localized messages
+ */
+ public static LocalizedMessages getInstance(HttpServletRequest request) {
+
+ if (request == null)
+ throw new NullPointerException("the request cannot be null");
+
+ Locale locale = getLocaleResolverInstance().resolveLocale(request);
+
+ if (locale == null)
+ locale = NEUTRAL;
+
+ synchronized (LocalizedMessages.class) {
+ if (!prototypes.containsKey(locale))
+ prototypes.put(locale, new LocalizedMessages(locale));
+ }
+
+ // for now we don't need any cloning since the values are accessed
+ // read-only
+ return prototypes.get(locale);
+
+ }
+
+ /**
+ * Returns the locale resolver instance. The implementation class name is
+ * provided by {@link PropertiesLoader#getLocaleResolverImpl()}.
+ *
+ * @return the locale resolver instance
+ */
+ private synchronized static LocaleResolver getLocaleResolverInstance() {
+
+ if (localeResolver == null) {
+ String className = PropertiesLoader.getLocaleResolverImpl();
+
+ if (Utils.isEmpty(className))
+ logger.error("Empty LocaleResolver implementation class name provided"); //$NON-NLS-1$
+ else
+ try {
+ Class clazz = Class.forName(className);
+ localeResolver = (LocaleResolver) clazz.newInstance();
+ logger.info("LocaleResolver initialized to {}", className); //$NON-NLS-1$
+ } catch (Throwable e) {
+ logger.error("LocaleResolver implementation {} could not be instantiated", className); //$NON-NLS-1$
+ throw new RuntimeException("LocaleResolver implementation " + className + " could not be instantiated", e); //$NON-NLS-1$
+ }
+ }
+
+ return localeResolver;
+ }
+
+ /**
+ * Loads the localized messages for the given locale. This constructor loads
+ * the resource bundle for this locale and only for this, in other words it
+ * short-circuits the default resource bundle load mechanism in order to
+ * prevent the loading of the system default locale which may result in a
+ * completely different resource bundle.
+ *
+ * @param locale
+ * the locale of the new localized messages
+ */
+ private LocalizedMessages(Locale locale) {
+
+ properties = new Properties(defaultProperties);
+
+ ResourceBundle localized = null;
+ try {
+ localized = ResourceBundle.getBundle(LOCAL_PROPERTIES, locale,
+ Thread.currentThread().getContextClassLoader());
+ } catch (Exception e) {
+ ; // do nothing
+ }
+
+ if (localized != null
+ && localized.getLocale().getLanguage().equals(
+ locale.getLanguage())) {
+ Enumerationeditor.compatibleBrowser.yes property. */
+ public String getCompatibleBrowserYes() {
+ return getMessage("editor.compatibleBrowser.yes"); //$NON-NLS-1$
+ }
+
+ /** Returns localized editor.compatibleBrowser.no property. */
+ public String getCompatibleBrowserNo() {
+ return getMessage("editor.compatibleBrowser.no"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.fileUpload.enabled property. */
+ public String getFileUploadEnabled() {
+ return getMessage("connector.fileUpload.enabled"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.fileUpload.disabled property. */
+ public String getFileUploadDisabled() {
+ return getMessage("connector.fileUpload.disabled"); //$NON-NLS-1$
+ }
+
+ /**
+ * Returns localized connector.file_renamed_warning property.
+ *
+ * @param newFileName
+ * the new filename of the warning
+ * @return localized message with new filename
+ */
+ public String getFileRenamedWarning(String newFileName) {
+ return MessageFormat.format(getMessage("connector.fileUpload.file_renamed_warning"), newFileName); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.fileUpload.invalid_file_type_specified property. */
+ public String getInvalidFileTypeSpecified() {
+ return getMessage("connector.fileUpload.invalid_file_type_specified"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.fileUpload.write_error property. */
+ public String getFileUploadWriteError() {
+ return getMessage("connector.fileUpload.write_error"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.getResources.enabled property. */
+ public String getGetResourcesEnabled() {
+ return getMessage("connector.getResources.enabled"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.getResources.disabled property. */
+ public String getGetResourcesDisabled() {
+ return getMessage("connector.getResources.disabled"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.getResources.read_error property. */
+ public String getGetResourcesReadError() {
+ return getMessage("connector.getResources.read_error"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.createFolder.enabled property. */
+ public String getCreateFolderEnabled() {
+ return getMessage("connector.createFolder.enabled"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.createFolder.disabled property. */
+ public String getCreateFolderDisabled() {
+ return getMessage("connector.createFolder.disabled"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.invalid_command_specified property. */
+ public String getInvalidCommandSpecified() {
+ return getMessage("connector.invalid_command_specified"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.createFolder.folder_already_exists_error property. */
+ public String getFolderAlreadyExistsError() {
+ return getMessage("connector.createFolder.folder_already_exists_error"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.createFolder.invalid_new_folder_name_specified property. */
+ public String getInvalidNewFolderNameSpecified() {
+ return getMessage("connector.createFolder.invalid_new_folder_name_specified"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.createFolder.write_error property. */
+ public String getCreateFolderWriteError() {
+ return getMessage("connector.createFolder.write_error"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.invalid_resource_type_specified property. */
+ public String getInvalidResouceTypeSpecified() {
+ return getMessage("connector.invalid_resource_type_specified"); //$NON-NLS-1$
+ }
+
+ /** Returns localized connector.invalid_current_folder_specified property. */
+ public String getInvalidCurrentFolderSpecified() {
+ return getMessage("connector.invalid_current_folder_specified"); //$NON-NLS-1$
+ }
+
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/AcceptLanguageHeaderResolver.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/AcceptLanguageHeaderResolver.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/AcceptLanguageHeaderResolver.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,48 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.localization.impl;
+
+import java.util.Locale;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.localization.LocaleResolver;
+import net.fckeditor.tool.Utils;
+
+/**
+ * HTTP header implementation of the locale resolver. It resolves the current
+ * user locale by calling {@link ServletRequest#getLocale()} if and only if the
+ * Accept-Language header is not empty.
+ *
+ * @version $Id$
+ */
+public class AcceptLanguageHeaderResolver implements LocaleResolver {
+
+ public Locale resolveLocale(final HttpServletRequest request) {
+
+ if (Utils.isNotEmpty(request.getHeader("Accept-Language")))
+ return request.getLocale();
+ else
+ return null;
+ }
+
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/JstlResolver.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/JstlResolver.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/JstlResolver.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,47 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.localization.impl;
+
+import java.util.Locale;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.jstl.core.Config;
+
+import net.fckeditor.localization.LocaleResolver;
+
+/**
+ * JSTL implementation of the locale resolver. It resolves the locale against
+ * the user session.
+ *
+ * @version $Id$
+ */
+public class JstlResolver implements LocaleResolver {
+
+ public JstlResolver() {
+ Config.class.hashCode();
+ }
+
+ public Locale resolveLocale(final HttpServletRequest request) {
+
+ return (Locale) Config.get(request.getSession(), Config.FMT_LOCALE);
+ }
+
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/package-info.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/package-info.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/localization/impl/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+/**
+ * Default implementations for the locale resolver interface.
+ *
+ * @version $Id$
+ */
+package net.fckeditor.localization.impl;
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/localization/package-info.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/localization/package-info.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/localization/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+/**
+ * Interfaces and classes for the locale resolution and localized messages.
+ *
+ * @version $Id$
+ */
+package net.fckeditor.localization;
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/package-info.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/package-info.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+/**
+ * Core objects to manage the FCKeditor text input form.
+ *
+ * @version $Id$
+ */
+package net.fckeditor;
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/Context.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/Context.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/Context.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,142 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.requestcycle;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.connector.Dispatcher;
+import net.fckeditor.handlers.Command;
+import net.fckeditor.handlers.ResourceType;
+import net.fckeditor.tool.Utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Maintains base/common request parameters from the File Browser. The gain of
+ * this class is to provide abstracted and pre-processed access to common
+ * request parameters.
+ * + * In the regular case, you will use an already created instance of this class. + *
+ * + * @version $Id$ + */ +public class Context { + // This is just a helper class which has no relevance for the logger + private static final Logger logger = LoggerFactory.getLogger(Dispatcher.class); + + private String typeStr; + private String commandStr; + private String currentFolderStr; + + /** + * Sole class constructor. Takes in a request instance, processes parameters + * and populates private fields which can be accessed through getters.+ * This class will only be instantiated in {@link ThreadLocalData}. + * + * @param request + * current user request instance + */ + protected Context(final HttpServletRequest request) { + commandStr = request.getParameter("Command"); + typeStr = request.getParameter("Type"); + currentFolderStr = request.getParameter("CurrentFolder"); + + // if this is a QuickUpload request, 'commandStr', 'currentFolderStr' + // are empty and 'typeStr' maybe empty too + if (Utils.isEmpty(commandStr) && Utils.isEmpty(currentFolderStr)) { + commandStr = "QuickUpload"; + currentFolderStr = "/"; + if (Utils.isEmpty(typeStr)) + typeStr = "File"; + } + + // checks to meet specs in http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Server_Side_Integration#File_Browser_Requests + if (currentFolderStr != null && !currentFolderStr.startsWith("/")) + currentFolderStr = "/".concat(currentFolderStr); + } + + /** + * Returns the type parameter of this context. + * + * @return the type parameter of this context + */ + public String getTypeStr() { + return typeStr; + } + + /** + * Returns a default resource type instance for the type parameter. + * + * @see ResourceType#getDefaultResourceType(String) + * @return default resource type instance + */ + public ResourceType getDefaultResourceType() { + return ResourceType.getDefaultResourceType(typeStr); + } + + /** + * Returns a resource type instance for the type parameter. + * + * @see ResourceType#getResourceType(String) + * @return resource type instance + */ + public ResourceType getResourceType() { + return ResourceType.getResourceType(typeStr); + } + + /** + * Returns the command parameter of this context. + * + * @return the command parameter of this context + */ + public String getCommandStr() { + return commandStr; + } + + /** + * Returns a command instance for the command parameter. + * + * @see Command#getCommand(String) + * @return command instance + */ + public Command getCommand() { + return Command.getCommand(commandStr); + } + + /** + * Returns the current folder parameter of this context. + * + * @return the current folder parameter of this context + */ + public String getCurrentFolderStr() { + return currentFolderStr; + } + + /** Logs base/common request parameters. */ + public void logBaseParameters() { + logger.debug("Parameter Command: {}", commandStr); + logger.debug("Parameter Type: {}", typeStr); + logger.debug("Parameter CurrentFolder: {}", currentFolderStr); + } + +} Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/ThreadLocalData.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/ThreadLocalData.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/ThreadLocalData.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,78 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle; + +import javax.servlet.http.HttpServletRequest; + +/** + * Maintains current {@link Context context} and {@link HttpServletRequest + * request} instances. This container relies on {@link ThreadLocal} and provides + * static access to the aforementioned objects for the current File Browse + * request. This means that this class is thread-safe. + * + * @version $Id$ + */ +public class ThreadLocalData { + private static ThreadLocal
+ * Important: To prevent memory leaks, make sure that this + * method is called at the end of the current request cycle! + */ + public static void endRequest() { + // ThreadLocal#remove is not available in Java 1.4 + request.set(null); + context.set(null); + } +} Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/UserAction.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/UserAction.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/UserAction.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,79 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.handlers.Command; + +/** + * An interface for user action control. In particular, this interface gives + * you fine-grained control over the File Browser {@link Command commands}. + *
+ * Note: You are free to implement this interface the way you + * need it, in other words your return values can be global, regardless of the + * request, or on a per-request basis. + *
+ * + * @version $Id$ + */ +public interface UserAction { + + /** + * Checks if file upload is enabled/allowed. This method maps to + * {@link Command#FILE_UPLOAD FileUpload} and {@link Command#QUICK_UPLOAD + * QuickUpload}.+ * Note: This method may be renamed to {@code + * isFileUploadEnabled} in future versions. + * + * @param request + * current user request instance + * @return {@code true} if file upload is enabled/allowed, else {@code + * false} + */ + public boolean isEnabledForFileUpload(final HttpServletRequest request); + + /** + * Checks if resource retrieval/listing is enabled/allowed. This method maps + * to {@link Command#GET_FOLDERS GetFolders} and + * {@link Command#GET_FOLDERS_AND_FILES GetFoldersAndFiles}.
+ * Note: This method may be renamed to {@code + * isGetResourcesEnabled} in future versions. + * + * @param request + * current user request instance + * @return {@code true} if resource retrieval/listing is enabled/allowed, + * else {@code false} + */ + public boolean isEnabledForFileBrowsing(final HttpServletRequest request); + + /** + * Checks if folder creation is enabled/allowed. This method maps to + * {@link Command#CREATE_FOLDER CreateFolder}. + * + * @param request + * current user request instance + * @return {@code true} if folder creation is enabled/allowed, else {@code + * false} + */ + public boolean isCreateFolderEnabled(final HttpServletRequest request); + +} \ No newline at end of file Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/UserPathBuilder.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/UserPathBuilder.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/UserPathBuilder.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,64 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle; + +import javax.servlet.http.HttpServletRequest; + +/** + * An interface for userfiles path construction. In particular, this interface + * gives you the ability to construct the {@code connector.userFilesPath} and + * {@code connector.userFilesAbsolutePath} properties dynamically. See configuration for more + * details. + *
+ * Note: You are free to implement this interface the way you + * need it, in other words your return values can be global, regardless of the + * request, or on a per-request basis. + *
+ * + * @version $Id$ + */ +public interface UserPathBuilder { + + /** + * Returns the constructed server-side userfiles absolute path. This method + * is the dynamic constructor of the {@code connector.userFilesAbsolutePath} + * property. A concrete connector implementation will use this value to + * resolve the server-side location of resources. + * + * @param request + * current user request instance + * @return the constructed server-side userfiles absolute path + */ + public String getUserFilesAbsolutePath(final HttpServletRequest request); + + /** + * Returns the constructed client-side userfiles path. This method is the + * dynamic constructor of the {@code connector.userFilesPath} property. A + * browser will use this value to resolve the url-side location of resources + * on the server. + * + * @param request + * current user request instance + * @return the constructed client-side userfiles path + */ + public String getUserFilesPath(final HttpServletRequest request); +} Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/ContextPathBuilder.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/ContextPathBuilder.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/ContextPathBuilder.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,40 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle.impl; + +import javax.servlet.http.HttpServletRequest; + +/** + * UserPathBuilder implementation which always returns static userfiles paths + * with prepended context path. In particular it returns the {@code + * connector.userFiles*Path} properties and prepend the current context path to + * {@link #getUserFilesPath(HttpServletRequest)} only. + * + * @version $Id$ + */ +public class ContextPathBuilder extends ServerRootPathBuilder { + + @Override + public String getUserFilesPath(final HttpServletRequest request) { + return request.getContextPath().concat(super.getUserFilesPath(request)); + } + +} \ No newline at end of file Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/DisabledUserAction.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/DisabledUserAction.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/DisabledUserAction.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,45 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle.impl; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.requestcycle.UserAction; + +/** + * UserAction implementation which always returns {@code false}. + * + * @version $Id$ + */ +public class DisabledUserAction implements UserAction { + + public boolean isEnabledForFileBrowsing(final HttpServletRequest request) { + return false; + } + + public boolean isEnabledForFileUpload(final HttpServletRequest request) { + return false; + } + + public boolean isCreateFolderEnabled(final HttpServletRequest request) { + return false; + } +} \ No newline at end of file Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/EnabledUserAction.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/EnabledUserAction.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/EnabledUserAction.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,45 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle.impl; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.requestcycle.UserAction; + +/** + * UserAction implementation which always returns {@code true}. + * + * @version $Id$ + */ +public class EnabledUserAction implements UserAction { + + public boolean isEnabledForFileBrowsing(final HttpServletRequest request) { + return true; + } + + public boolean isEnabledForFileUpload(final HttpServletRequest request) { + return true; + } + + public boolean isCreateFolderEnabled(final HttpServletRequest request) { + return true; + } +} \ No newline at end of file Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/ServerRootPathBuilder.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/ServerRootPathBuilder.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/ServerRootPathBuilder.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,45 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle.impl; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.handlers.PropertiesLoader; +import net.fckeditor.requestcycle.UserPathBuilder; + +/** + * UserPathBuilder implementation which always returns static userfiles paths. + * In particular it returns the {@code connector.userFiles*Path} properties + * as-is. + * + * @version $Id$ + */ +public class ServerRootPathBuilder implements UserPathBuilder { + + public String getUserFilesAbsolutePath(final HttpServletRequest request) { + return PropertiesLoader.getUserFilesAbsolutePath(); + } + + public String getUserFilesPath(final HttpServletRequest request) { + return PropertiesLoader.getUserFilesPath(); + } + +} \ No newline at end of file Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/UserActionImpl.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/UserActionImpl.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/UserActionImpl.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,60 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ +package net.fckeditor.requestcycle.impl; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.requestcycle.UserAction; + +/** + * Standard implementation for {@link UserAction}. It always returns + *true.+ * + * @see EnabledUserAction + * @version $Id$ + * @deprecated Class will be removed in FCKeditor.Java 2.6, functionality now + * served by {@link EnabledUserAction}. + */ +@Deprecated +public class UserActionImpl implements UserAction { + + /* (non-Javadoc) + * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileBrowsing(javax.servlet.http.HttpServletRequest) + */ + public boolean isEnabledForFileBrowsing(final HttpServletRequest request) { + return true; + } + + /* (non-Javadoc) + * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileUpload(javax.servlet.http.HttpServletRequest) + */ + public boolean isEnabledForFileUpload(final HttpServletRequest request) { + return true; + } + + /* + * (non-Javadoc) + * @see net.fckeditor.requestcycle.UserAction#isEnabledForFolderCreation(javax.servlet.http.HttpServletRequest) + */ + public boolean isCreateFolderEnabled(final HttpServletRequest request) { + return true; + } +} Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/package-info.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/package-info.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/impl/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,27 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +/** + * Default implementations for the request life cycle interfaces. + * + * @version $Id$ + */ +package net.fckeditor.requestcycle.impl; \ No newline at end of file Index: 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/package-info.java =================================================================== diff -u --- 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/package-info.java (revision 0) +++ 3rdParty_sources/ckeditor/net/fckeditor/requestcycle/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116) @@ -0,0 +1,34 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2004-2010 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +/** + * Supplemental request life cycle interfaces and classes for the + * {@link net.fckeditor.connector connector} package. They are essential to + * control user actions and userfiles path. + *
+ * The sequence diagram below depicts the interaction between interfaces and
+ * classes:
+ *
+ *
GET
+ * requests.
+ *
+ * @version $Id$
+ */
+public class GetResponse {
+
+ /** Underlying DOM document */
+ protected Document document;
+ /** Error element, in case of an invalid request */
+ protected Element errorElement;
+ /** Folders element, in case of a GetResources request */
+ protected Element foldersElement;
+ /** Files element, in case of a GetResources request */
+ protected Element filesElement;
+
+ /** Error number OK */
+ public static final int EN_OK = 0;
+
+ /** Error number CUSTOM ERROR */
+ public static final int EN_CUSTOM_ERROR = 1;
+
+ /** Error number FOLDER ALREADY EXISTS */
+ public static final int EN_FOLDER_ALREADY_EXISTS_ERROR = 101;
+
+ /** Error number INVALID NEW FOLDER NAME */
+ public static final int EN_INVALID_NEW_FOLDER_NAME_ERROR = 102;
+
+ /** Error number SECURITY ERROR */
+ public static final int EN_CREATE_FOLDER_SECURITY_ERROR = 103;
+
+ /** Error number UNKNOWN ERROR */
+ public static final int EN_UKNOWN_CREATE_FOLDER_ERROR = 110;
+
+ /**
+ * Constructs a response with a specific error number and message.
+ *
+ * @param number
+ * the error number of the new get response
+ * @param message
+ * the specific message of the new get response
+ * @throws RuntimeException
+ * if creation of the underlying DOM document failed
+ */
+ public GetResponse(int number, String message) {
+ try {
+ DocumentBuilderFactory factory = DocumentBuilderFactory
+ .newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ document = builder.newDocument();
+ } catch (ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+
+ Element root = document.createElement("Connector");
+ document.appendChild(root);
+ setError(number, message);
+ }
+
+ /**
+ * Constructs a successful response for a specific command and resource
+ * type.
+ *
+ * @param command
+ * the current command of the new get response
+ * @param type
+ * the current resource type of the new get response
+ * @param currentFolder
+ * the current folder of the new get response
+ * @param constructedUrl
+ * the final URL of the new get response
+ * @throws RuntimeException
+ * if creation of the underlying DOM document failed
+ */
+ public GetResponse(Command command, ResourceType type,
+ String currentFolder, String constructedUrl) {
+
+ try {
+ DocumentBuilderFactory factory = DocumentBuilderFactory
+ .newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ document = builder.newDocument();
+ } catch (ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+
+ Element root = document.createElement("Connector");
+ document.appendChild(root);
+ root.setAttribute("command", command.getName());
+ root.setAttribute("resourceType", type.getName());
+
+ Element currentFolderElement = document.createElement("CurrentFolder");
+ currentFolderElement.setAttribute("path", currentFolder);
+
+ currentFolderElement.setAttribute("url", constructedUrl);
+ root.appendChild(currentFolderElement);
+
+ }
+
+ /**
+ * Constructs a response with a specific error number only.
+ *
+ * @param number
+ * the error number of the new get response
+ * @throws RuntimeException
+ * if creation of the underlying DOM document failed
+ */
+ public GetResponse(int number) {
+ this(number, null);
+ }
+
+ /**
+ * Sets the error number and specific message of this get response.
+ *
+ * @param number
+ * the error number of this get response
+ * @param message
+ * the specific message of this get response
+ */
+ public void setError(int number, String message) {
+
+ if (errorElement == null) {
+ errorElement = document.createElement("Error");
+ document.getDocumentElement().appendChild(errorElement);
+ }
+
+ errorElement.setAttribute("number", String.valueOf(number));
+ if (Utils.isNotEmpty(message))
+ errorElement.setAttribute("text", message);
+
+ }
+
+ /**
+ * Sets the error number of this get response.
+ *
+ * @param number
+ * the error number of this get response
+ */
+ public void setError(int number) {
+ setError(number, null);
+ }
+
+ /**
+ * Sets the folders of this get response.
+ *
+ * @see Connector#getFolders(ResourceType, String)
+ * @param folders
+ * the folders of this get response
+ */
+ public void setFolders(final ListOK response. */
+ public static GetResponse getOK() {
+ return new GetResponse(EN_OK);
+ }
+
+ /** Creates an INVALID COMMAND error. */
+ public static GetResponse getInvalidCommandError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_CUSTOM_ERROR, lm.getInvalidCommandSpecified());
+ }
+
+ /** Creates an INVALID RESOURCE TYPE error. */
+ public static GetResponse getInvalidResourceTypeError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_CUSTOM_ERROR, lm
+ .getInvalidResouceTypeSpecified());
+ }
+
+ /** Creates an INVALID CURRENT FOLDER error. */
+ public static GetResponse getInvalidCurrentFolderError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_CUSTOM_ERROR, lm
+ .getInvalidCurrentFolderSpecified());
+ }
+
+ /** Creates a GET RESOURCES DISABLED error. */
+ public static GetResponse getGetResourcesDisabledError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_CUSTOM_ERROR, lm.getGetResourcesDisabled());
+ }
+
+ /** Creates a GET RESOURCES READ error. */
+ public static GetResponse getGetResourcesReadError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_CUSTOM_ERROR, lm.getGetResourcesReadError());
+ }
+
+ /** Creates a CREATE FOLDER DISABLED error. */
+ public static GetResponse getCreateFolderDisabledError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_CUSTOM_ERROR, lm.getCreateFolderDisabled());
+ }
+
+ /** Creates an INVALID NEW FOLDER NAME error. */
+ public static GetResponse getInvalidNewFolderNameError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_INVALID_NEW_FOLDER_NAME_ERROR, lm
+ .getInvalidNewFolderNameSpecified());
+ }
+
+ /** Creates a FOLDER ALREADY EXISTS error. */
+ public static GetResponse getFolderAlreadyExistsError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_FOLDER_ALREADY_EXISTS_ERROR, lm
+ .getFolderAlreadyExistsError());
+ }
+
+ /** Creates a CREATE FOLDER WRITE error. */
+ public static GetResponse getCreateFolderWriteError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new GetResponse(EN_UKNOWN_CREATE_FOLDER_ERROR, lm
+ .getCreateFolderWriteError());
+ }
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/response/UploadResponse.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/response/UploadResponse.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/response/UploadResponse.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,222 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.response;
+
+import net.fckeditor.localization.LocalizedMessages;
+import net.fckeditor.requestcycle.ThreadLocalData;
+import net.fckeditor.tool.Utils;
+
+/**
+ * Represents the HTML/JS response for the File Browser POST
+ * requests.
+ * + * This class utilizes varags to reflect the JavaScript callback function in an + * optimal way. However, varargs can be tricky. You can always omit passed + * parameters from right to left but any violation may result in an exception or + * a failed callback. + *
+ *
+ * For example: window.parent.OnUploadCompleted(101,'some/url/file.img','file.img','no error') can be mapped with
+ *
+ * UploadResponse ur = new UploadResponse(SC_SOME_ERROR,"/some/url/file.img","file.img","no error")
+ * .
+ *
+ * But window.parent.OnUploadCompleted(101,'some/url/file.img','no error') is an illegal callback and
+ * will fail.
+ *
+ * Use the predefined error numbers or upload responses, if possible. If you + * need to set error number and message only, use this constructor with the + * first argument only and call + * {@link UploadResponse#setCustomMessage(String)}. + *
+ * + * @param arguments + * possible argument order: + *int errorNumber, String fileUrl, String filename, String customMessage
+ * . Omit from right to left.
+ * @throws IllegalArgumentException
+ * if amount of arguments is less than 1 and above 4
+ * @throws IllegalArgumentException
+ * if the first argument is not an error number (int)
+ */
+ public UploadResponse(Object... arguments) {
+ if (arguments.length < 1 || arguments.length > 4)
+ throw new IllegalArgumentException(
+ "The amount of arguments has to be between 1 and 4");
+
+ parameters = new Object[arguments.length];
+
+ if (!(arguments[0] instanceof Integer))
+ throw new IllegalArgumentException(
+ "The first argument has to be an error number (int)");
+
+ System.arraycopy(arguments, 0, parameters, 0, arguments.length);
+ }
+
+ /**
+ * Sets the custom message of this upload response.
+ *
+ * Methods automatically determines how many arguments are set and puts the
+ * message at the end.
+ *
+ * @param customMassage
+ * the custom message of this upload response
+ */
+ public void setCustomMessage(final String customMassage) {
+ if (Utils.isNotEmpty(customMassage)) {
+ if (parameters.length == 1) {
+ Object errorNumber = parameters[0];
+ parameters = new Object[4];
+ parameters[0] = errorNumber;
+ parameters[1] = null;
+ parameters[2] = null;
+ }
+ parameters[3] = customMassage;
+ }
+ }
+
+ /** Creates an OK response. */
+ public static UploadResponse getOK(String fileUrl) {
+ return new UploadResponse(EN_OK, fileUrl);
+ }
+
+ /** Creates a FILE RENAMED warning. */
+ public static UploadResponse getFileRenamedWarning(String fileUrl,
+ String newFileName) {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new UploadResponse(EN_FILE_RENAMED_WARNING, fileUrl,
+ newFileName, lm.getFileRenamedWarning(newFileName));
+ }
+
+ /** Creates a INVALID FILE TYPE error. */
+ public static UploadResponse getInvalidFileTypeError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new UploadResponse(EN_INVALID_FILE_TYPE_ERROR, lm
+ .getInvalidFileTypeSpecified());
+ }
+
+ /** Creates a INVALID COMMAND error. */
+ public static UploadResponse getInvalidCommandError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new UploadResponse(EN_CUSTOM_ERROR, null, null, lm
+ .getInvalidCommandSpecified());
+ }
+
+ /** Creates a INVALID RESOURCE TYPE error. */
+ public static UploadResponse getInvalidResourceTypeError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new UploadResponse(EN_CUSTOM_ERROR, null, null, lm
+ .getInvalidResouceTypeSpecified());
+ }
+
+ /** Creates a INVALID CURRENT FOLDER error. */
+ public static UploadResponse getInvalidCurrentFolderError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new UploadResponse(EN_CUSTOM_ERROR, null, null, lm
+ .getInvalidCurrentFolderSpecified());
+ }
+
+ /** Creates a FILE UPLOAD DISABLED error. */
+ public static UploadResponse getFileUploadDisabledError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new UploadResponse(EN_SECURITY_ERROR, null, null, lm
+ .getFileUploadDisabled());
+ }
+
+ /** Creates a FILE UPLOAD WRITE error. */
+ public static UploadResponse getFileUploadWriteError() {
+ LocalizedMessages lm = LocalizedMessages.getInstance(ThreadLocalData
+ .getRequest());
+ return new UploadResponse(EN_CUSTOM_ERROR, null, null, lm
+ .getFileUploadWriteError());
+ }
+
+ /**
+ * Creates the HTML/JS representation of this upload response.
+ *
+ * @return HTML/JS representation of this upload response
+ */
+ @Override
+ public String toString() {
+ StringBuffer sb = new StringBuffer(400);
+ sb.append("");
+
+ return sb.toString();
+ }
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/response/package-info.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/response/package-info.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/response/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+/**
+ * Response objects for {@code GET} and {@code POST} requests.
+ *
+ * @version $Id$
+ */
+package net.fckeditor.response;
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/tags/CheckTag.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/tags/CheckTag.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/tags/CheckTag.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,139 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.tags;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+/*import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;*/
+
+import net.fckeditor.handlers.RequestCycleHandler;
+import net.fckeditor.localization.LocalizedMessages;
+import net.fckeditor.tool.Compatibility;
+
+/**
+ * Displays information about browser and user capabilities.
+ * + * There are four available commands: + *
-
+ *
CompatibleBrowser
+ * CreateFolder
+ * FileUpload
+ * GetResources
+ *
true if compatible, else false
+ */
+ public static boolean check(final String userAgentString) {
+ if (Utils.isEmpty(userAgentString))
+ return false;
+
+ String userAgentStr = userAgentString.toLowerCase();
+
+ // IE 5.5+, check special keys like 'Opera' and 'mac', because there are
+ // some
+ // other browsers, containing 'MSIE' in there agent string!
+ if (userAgentStr.indexOf("opera") < 0
+ && userAgentStr.indexOf("mac") < 0
+ && getBrowserVersion(userAgentStr, ".*msie ([\\d]+.[\\d]+).*") >= 5.5f)
+ return true;
+
+ // for all gecko based browsers
+ if (getBrowserVersion(userAgentStr, ".*rv:([\\d]+.[\\d]+).*") > 1.7f)
+ return true;
+
+ // Opera 9.5+
+ if (getBrowserVersion(userAgentStr, "opera/([\\d]+.[\\d]+).*") >= 9.5f
+ || getBrowserVersion(userAgentStr, ".*opera ([\\d]+.[\\d]+)") >= 9.5f)
+ return true;
+
+ // Safari 3+
+ if (getBrowserVersion(userAgentStr, ".*applewebkit/([\\d]+).*") >= 522f)
+ return true;
+
+ return false;
+ }
+
+ /**
+ * Returns true if a browser is compatible by its request
+ * user-agent header.
+ *
+ * @see #check(String)
+ * @param request
+ * current user request instance
+ * @return true if a browser is compatible, else
+ * false
+ */
+ public static boolean isCompatibleBrowser(final HttpServletRequest request) {
+ return (request == null) ? false : check(request
+ .getHeader("user-agent"));
+ }
+
+ /**
+ * Helper method to get the browser version from 'userAgent' with regex. The
+ * first matching group has to be the version number!
+ *
+ * @param userAgentString
+ * the user agent string of a browser
+ * @param regex
+ * the pattern to retrieve the browser version
+ * @return the browser version, or -1f if version can't be determined
+ */
+ private static float getBrowserVersion(final String userAgentString,
+ final String regex) {
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(userAgentString);
+ if (matcher.matches()) {
+ try {
+ return Float.parseFloat(matcher.group(1));
+ } catch (NumberFormatException e) {
+ return -1f;
+ }
+ }
+ return -1f;
+ }
+
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/tool/Utils.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/tool/Utils.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/tool/Utils.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,139 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.tool;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+/**
+ * Static helper methods for strings.
+ *
+ * @version $Id$
+ */
+public class Utils {
+
+ /** The empty string {@code ""}. */
+ public static final String EMPTY_STRING = "";
+
+ /**
+ * Constructs a set of lower-cased strings from a delimiter-separated
+ * string.
+ *
+ * @param stringList
+ * strings separated with a delimiter
+ * @param delimiter
+ * separating delimiter
+ * @return a lower-cased set, empty set if stringList is empty
+ * @throws IllegalArgumentException
+ * if delimiter is empty
+ */
+ public static Set| (pipe)
+ * delimited string.
+ *
+ * @see #getSet(String, String)
+ * @param stringList
+ * strings separated with a delimiter
+ * @return a lower-cased set, empty set if stringList is empty
+ * @throws IllegalArgumentException
+ * if delimiter is empty
+ */
+ public static Settrue if the string is null or empty,
+ * else false
+ */
+ public static boolean isEmpty(final String str) {
+ return str == null || str.length() == 0;
+ }
+
+ /**
+ * Checks if a string is not empty ("") and not null.
+ *
+ * @param str
+ * string to check, may be null
+ * @return true if the string is not empty and not
+ * null, else false
+ */
+ public static boolean isNotEmpty(final String str) {
+ return !isEmpty(str);
+ }
+
+ /**
+ * Checks if a string is whitespace, empty ("") or null. Whitespace is
+ * checked by {@link Character#isWhitespace(char)}.
+ *
+ * @param str
+ * string to check, may be null
+ * @return true if the string is null, empty or
+ * whitespace
+ */
+ public static boolean isBlank(final String str) {
+
+ if (isEmpty(str))
+ return true;
+
+ for (char c : str.toCharArray()) {
+ if (!Character.isWhitespace(c))
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Checks if a string is not empty (""), not null and not whitespace.
+ *
+ * @param str
+ * string to check, may be null
+ * @return true if the string is not null, not
+ * empty and not whitespace.
+ */
+ public static boolean isNotBlank(final String str) {
+ return !isBlank(str);
+ }
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/tool/UtilsFile.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/tool/UtilsFile.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/tool/UtilsFile.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,177 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.tool;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.regex.Pattern;
+
+import net.fckeditor.handlers.PropertiesLoader;
+
+import org.apache.commons.io.FilenameUtils;
+import org.devlib.schmidt.imageinfo.ImageInfo;
+
+/**
+ * Static helper methods for files.
+ *
+ * @version $Id$
+ */
+public class UtilsFile {
+
+ protected static final Pattern ILLEGAL_CURRENT_FOLDER_PATTERN = Pattern
+ .compile("^[^/]|[^/]$|/\\.{1,2}|\\\\|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}");
+
+ /**
+ * Sanitizes a filename from certain chars.+ * + * This method enforces the
forceSingleExtension property and
+ * then replaces all occurrences of \, /, |, :, ?, *, ", <, >,
+ * control chars by _ (underscore).
+ *
+ * @param filename
+ * a potentially 'malicious' filename
+ * @return sanitized filename
+ */
+ public static String sanitizeFileName(final String filename) {
+
+ if (Utils.isEmpty(filename))
+ return filename;
+
+ String name = (PropertiesLoader.isForceSingleExtension()) ? UtilsFile
+ .forceSingleExtension(filename) : filename;
+
+ // Remove \ / | : ? * " < > 'Control Chars' with _
+ return name.replaceAll("\\\\|/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}", "_");
+ }
+
+ /**
+ * Sanitizes a folder name from certain chars.+ * + * This method replaces all occurrences of \, /, |, :, ?, *, ", <, + * >, control chars by _ (underscore). + * + * @param folderName + * a potentially 'malicious' folder name + * @return sanitized folder name + */ + public static String sanitizeFolderName(final String folderName) { + + if (Utils.isEmpty(folderName)) + return folderName; + + // Remove . \ / | : ? * " < > 'Control Chars' with _ + return folderName.replaceAll( + "\\.|\\\\|/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}", "_"); + } + + /** + * Checks if the underlying input stream contains an image. + * + * @param in + * input stream of an image + * @return
true if the underlying input stream contains an
+ * image, else false
+ */
+ public static boolean isImage(final InputStream in) {
+ ImageInfo ii = new ImageInfo();
+ ii.setInput(in);
+ return ii.check();
+ }
+
+ /**
+ * Checks whether a path complies with the FCKeditor File Browser rules.
+ *
+ * @param path
+ * a potentially 'malicious' path
+ * @return true if path complies with the rules, else
+ * false
+ */
+ public static boolean isValidPath(final String path) {
+ if (Utils.isEmpty(path))
+ return false;
+
+ if (ILLEGAL_CURRENT_FOLDER_PATTERN.matcher(path).find())
+ return false;
+
+ return true;
+ }
+
+ /**
+ * Replaces all dots in a filename with underscores except the last one.
+ *
+ * @param filename
+ * filename to sanitize
+ * @return string with a single dot only
+ */
+ public static String forceSingleExtension(final String filename) {
+ return filename.replaceAll("\\.(?![^.]+$)", "_");
+ }
+
+ /**
+ * Checks if a filename contains more than one dot.
+ *
+ * @param filename
+ * filename to check
+ * @return true if filename contains severals dots, else
+ * false
+ */
+ public static boolean isSingleExtension(final String filename) {
+ return filename.matches("[^\\.]+\\.[^\\.]+");
+ }
+
+ /**
+ * Checks a directory for existence and creates it if non-existent.
+ *
+ * @param dir
+ * directory to check/create
+ */
+ public static void checkDirAndCreate(File dir) {
+ if (!dir.exists())
+ dir.mkdirs();
+ }
+
+ /**
+ * Iterates over a base name and returns the first non-existent file.+ * This method extracts a file's base name, iterates over it until the first + * non-existent appearance with
basename(n).ext. Where n is a
+ * positive integer starting from one.
+ *
+ * @param file
+ * base file
+ * @return first non-existent file
+ */
+ public static File getUniqueFile(final File file) {
+ if (!file.exists())
+ return file;
+
+ File tmpFile = new File(file.getAbsolutePath());
+ File parentDir = tmpFile.getParentFile();
+ int count = 1;
+ String extension = FilenameUtils.getExtension(tmpFile.getName());
+ String baseName = FilenameUtils.getBaseName(tmpFile.getName());
+ do {
+ tmpFile = new File(parentDir, baseName + "(" + count++ + ")."
+ + extension);
+ } while (tmpFile.exists());
+ return tmpFile;
+ }
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/tool/UtilsResponse.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/tool/UtilsResponse.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/tool/UtilsResponse.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,71 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.tool;
+
+import net.fckeditor.handlers.ResourceType;
+
+/**
+ * Static helper methods for the servlet response.
+ *
+ * @version $Id$
+ */
+public class UtilsResponse {
+
+ /**
+ * Assembles a URL with omitted filename.
+ *
+ * @see #fileUrl(String, ResourceType, String, String)
+ */
+ public static String getUrl(String userFilesPath, ResourceType type,
+ String currentFolder) {
+ return fileUrl(userFilesPath, type, currentFolder, null);
+ }
+
+ /**
+ *
+ * Assembles a file URL for the File Browser. Simply appends parameters to a
+ * string buffer with reasonable parameter checking.
+ *
+ * @param userFilesPath
+ * the current userfiles path (may be null)
+ * @param type
+ * the current resource type
+ * @param currentFolder
+ * the selected current folder
+ * @param filename
+ * the current chosen file (may be null)
+ * @return assembled url for the File Browser
+ */
+ public static String fileUrl(String userFilesPath, ResourceType type,
+ String currentFolder, String filename) {
+
+ StringBuffer sb = new StringBuffer();
+ if (Utils.isNotEmpty(userFilesPath))
+ sb.append(userFilesPath);
+ sb.append(type.getPath());
+ sb.append(currentFolder);
+ if (Utils.isNotEmpty(filename))
+ sb.append(filename);
+
+ return sb.toString();
+ }
+
+}
Index: 3rdParty_sources/ckeditor/net/fckeditor/tool/XHtmlTagTool.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/tool/XHtmlTagTool.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/tool/XHtmlTagTool.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,144 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+package net.fckeditor.tool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Java representation of an XHTML tag.
+ * + * Usage: + *
+ * XHtmlTagTool tag = XHtmlTagTool("a", "link");
+ * tag.addAttribute("href", "http://google.com");
+ * tag.toString();: <a href="http://google.com">link</a>
+ *
+ *
+ * Note:
+ * -
+ *
- Attributes are not ordered. + *
- If you want to avoid self-closing tags without supplying a value, set + * {@link #SPACE} as the tag's value. + *
name is empty
+ */
+ public XHtmlTagTool(final String name) {
+ if (Utils.isEmpty(name))
+ throw new IllegalArgumentException(
+ "Parameter 'name' shouldn't be empty!");
+ this.name = name;
+ }
+
+ /**
+ * Class constructor with name and value.
+ *
+ * @param name
+ * the tag name of the new XHtmlTagTool
+ * @param value
+ * the tag value of the new XHtmlTagTool which is the tag body
+ * @throws IllegalArgumentException
+ * if name is empty
+ */
+ public XHtmlTagTool(final String name, final String value) {
+ this(name);
+ this.value = value;
+ }
+
+ /**
+ * Sets the tag value.
+ *
+ * @param value
+ * the tag value which is the tag body
+ */
+ public void setValue(final String value) {
+ this.value = value;
+ }
+
+ /**
+ * Adds an attribute to this tag.
+ *
+ * @param name
+ * attribute name
+ * @param value
+ * attribute value
+ * @throws IllegalArgumentException
+ * if name is empty
+ */
+ public void addAttribute(final String name, final String value) {
+ if (Utils.isEmpty(name))
+ throw new IllegalArgumentException("Name is null or empty");
+ attributes.put(name, value);
+ }
+
+ /**
+ * Creates the HTML representation of this tag. It follows the XHTML
+ * standard.
+ *
+ * @return HTML representation of this tag
+ */
+ @Override
+ public String toString() {
+ StringBuffer tag = new StringBuffer();
+
+ // open tag
+ tag.append("<").append(name);
+
+ // add attributes
+ for (String key : attributes.keySet()) {
+ String val = attributes.get(key);
+ tag.append(' ').append(key).append('=').append('\"').append(val)
+ .append('\"');
+ }
+
+ // close the tag
+ if (Utils.isNotEmpty(value)) {
+ tag.append(">").append(value).append("');
+ } else
+ tag.append(" />");
+
+ return tag.toString();
+ }
+
+}
\ No newline at end of file
Index: 3rdParty_sources/ckeditor/net/fckeditor/tool/package-info.java
===================================================================
diff -u
--- 3rdParty_sources/ckeditor/net/fckeditor/tool/package-info.java (revision 0)
+++ 3rdParty_sources/ckeditor/net/fckeditor/tool/package-info.java (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+/**
+ * Various tool classes.
+ *
+ * @version $Id$
+ */
+package net.fckeditor.tool;
\ No newline at end of file
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/a11yhelp/lang/en.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/a11yhelp/lang/he.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/a11yhelp/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/about/dialogs/about.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/about/dialogs/logo_ckeditor.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/about/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/adobeair/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/ajax/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/autogrow/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/basicstyles/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/bbcode/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/bidi/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/blockquote/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/button/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/clipboard/dialogs/paste.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/clipboard/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/colorbutton/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/colordialog/dialogs/colordialog.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/colordialog/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/contextmenu/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/devtools/lang/en.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/devtools/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/dialog/dialogDefinition.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/dialog/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/dialogadvtab/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/dialogui/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/div/dialogs/div.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/div/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/docprops/dialogs/docprops.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/docprops/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/domiterator/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/editingblock/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/elementspath/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/enterkey/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/entities/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/fakeobjects/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/filebrowser/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/find/dialogs/find.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/find/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/flash/dialogs/flash.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/flash/images/placeholder.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/flash/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/floatpanel/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/font/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/format/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/button.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/checkbox.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/form.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/hiddenfield.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/radio.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/select.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/textarea.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/dialogs/textfield.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/forms/images/hiddenfield.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/forms/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/horizontalrule/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/htmldataprocessor/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/htmlwriter/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/iframe/dialogs/iframe.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/iframe/images/placeholder.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/iframe/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/iframedialog/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/image/dialogs/image.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/image/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/indent/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/justify/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/keystrokes/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/link/dialogs/anchor.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/link/dialogs/link.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/link/images/anchor.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/link/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/list/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/listblock/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/liststyle/dialogs/liststyle.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/liststyle/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/maximize/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/menu/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/menubutton/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/newpage/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/pagebreak/images/pagebreak.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/pagebreak/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/panel/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/panelbutton/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/pastefromword/filter/default.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/pastefromword/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/pastetext/dialogs/pastetext.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/pastetext/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/placeholder/dialogs/placeholder.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/placeholder/lang/en.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/placeholder/lang/he.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/placeholder/placeholder.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/placeholder/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/popup/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/preview/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/print/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/removeformat/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/resize/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/richcombo/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/save/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/scayt/dialogs/options.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/scayt/dialogs/toolbar.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/scayt/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/selection/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_address.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_blockquote.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_div.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_h1.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_h2.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_h3.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_h4.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_h5.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_h6.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_p.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/showblocks/images/block_pre.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/showblocks/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/showborders/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/smiley/dialogs/smiley.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/angel_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/angry_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/broken_heart.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/confused_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/cry_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/devil_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/embaressed_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/envelope.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/heart.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/kiss.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/lightbulb.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/omg_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/regular_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/sad_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/shades_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/teeth_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/thumbs_down.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/thumbs_up.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/tounge_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/smiley/images/wink_smile.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/smiley/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/sourcearea/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/specialchar/dialogs/specialchar.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/specialchar/lang/en.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/specialchar/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/styles/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/styles/styles/default.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/stylescombo/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/stylesheetparser/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/tab/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/table/dialogs/table.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/table/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/tableresize/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/tabletools/dialogs/tableCell.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/tabletools/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/templates/dialogs/templates.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/templates/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/templates/templates/default.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/templates/templates/images/template1.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/templates/templates/images/template2.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/templates/templates/images/template3.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/toolbar/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/uicolor/dialogs/uicolor.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/uicolor/lang/en.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/uicolor/lang/he.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/uicolor/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/plugins/uicolor/uicolor.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/uicolor/yui/assets/yui.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/uicolor/yui/yui.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/undo/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/wsc/dialogs/ciframe.html'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/wsc/dialogs/tmpFrameset.html'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/wsc/dialogs/wsc.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/wsc/dialogs/wsc.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/wsc/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/wysiwygarea/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/plugins/xml/plugin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/dialog.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/editor.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/elementspath.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/icons.css'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/skins/kama/icons.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/icons_rtl.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/dialog_sides.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/dialog_sides.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/dialog_sides_rtl.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/mini.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/noimage.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/sprites.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/sprites_ie6.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/kama/images/toolbar_start.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/mainui.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/menu.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/panel.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/presets.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/reset.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/richcombo.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/skin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/templates.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/kama/toolbar.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/dialog.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/editor.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/elementspath.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/icons.css'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/skins/office2003/icons.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/icons_rtl.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/images/dialog_sides.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/images/dialog_sides.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/images/dialog_sides_rtl.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/images/mini.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/images/noimage.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/images/sprites.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/office2003/images/sprites_ie6.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/mainui.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/menu.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/panel.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/presets.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/reset.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/richcombo.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/skin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/templates.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/office2003/toolbar.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/dialog.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/editor.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/elementspath.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/icons.css'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/ckeditor/skins/v2/icons.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/icons_rtl.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/dialog_sides.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/dialog_sides.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/dialog_sides_rtl.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/mini.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/noimage.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/sprites.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/sprites_ie6.png
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Index: 3rdParty_sources/ckeditor/skins/v2/images/toolbar_start.gif
===================================================================
diff -u -re02ca4f2e9a802f43deb72a9dfefe2c92f4b6181 -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
Binary files differ
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/mainui.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/menu.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/panel.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/presets.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/reset.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/richcombo.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/skin.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/templates.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/skins/v2/toolbar.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f08f6c4324d6ce0ca8dc43b875a498d89dd91116 refers to a dead (removed) revision in file `3rdParty_sources/ckeditor/themes/default/theme.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: 3rdParty_sources/versions.txt
===================================================================
diff -u -r1844238a2f60615475db8855871a1488d04e629b -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
--- 3rdParty_sources/versions.txt (.../versions.txt) (revision 1844238a2f60615475db8855871a1488d04e629b)
+++ 3rdParty_sources/versions.txt (.../versions.txt) (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -9,7 +9,7 @@
batik 1.7.0
-CKEditor 3.6.2
+CKEditor Java 2.6
Commons HttpClient 3.0
Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -r1844238a2f60615475db8855871a1488d04e629b -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116
--- lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 1844238a2f60615475db8855871a1488d04e629b)
+++ lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
@@ -20,7 +20,7 @@