Author: vmassol
Date: 2007-11-25 07:13:03 +0100 (Sun, 25 Nov 2007)
New Revision: 6065
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroLoader.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroRepository.java
Log:
Add Radeox copyright license headers + explain why we've copied these 2 classes
from Radeox
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroLoader.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroLoader.java
2007-11-24 17:02:26 UTC (rev 6064)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroLoader.java
2007-11-25 06:13:03 UTC (rev 6065)
@@ -19,11 +19,43 @@
*
*/
-
+/*
+ * This file is part of "SnipSnap Radeox Rendering Engine".
+ *
+ * Copyright (c) 2002 Stephan J. Schmidt, Matthias L. Jugel
+ * All Rights Reserved.
+ *
+ * Please visit http://radeox.org/ for updates and contact.
+ *
+ * --LICENSE NOTICE--
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * --LICENSE NOTICE--
+ */
package com.xpn.xwiki.render.macro;
-public class MacroLoader extends org.radeox.macro.MacroLoader {
- public Class getLoadClass() {
+/**
+ * This class has been copied from Radeox. The reason is because the class
returned getLoadClass() is used to load
+ * the service providers. We are passing our own XWikiMacro class so that the
+ * META-INF/com.xpn.xwiki.render.macro.XWikiMacro file is used to load the
Macros instead of the default macro list
+ * provided in the Radeox JAR. Since we need to pass this MacroLoader class to
the MacroRepository class we have
+ * also copied the MacroRepository class.
+ */
+public class MacroLoader extends org.radeox.macro.MacroLoader
+{
+ public Class getLoadClass()
+ {
return XWikiMacro.class;
}
}
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroRepository.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroRepository.java
2007-11-24 17:02:26 UTC (rev 6064)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/macro/MacroRepository.java
2007-11-25 06:13:03 UTC (rev 6065)
@@ -19,7 +19,30 @@
*
*/
-
+/*
+ * This file is part of "SnipSnap Radeox Rendering Engine".
+ *
+ * Copyright (c) 2002 Stephan J. Schmidt, Matthias L. Jugel
+ * All Rights Reserved.
+ *
+ * Please visit http://radeox.org/ for updates and contact.
+ *
+ * --LICENSE NOTICE--
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * --LICENSE NOTICE--
+ */
package com.xpn.xwiki.render.macro;
import org.apache.commons.logging.Log;
@@ -29,6 +52,9 @@
import java.util.*;
+/**
+ * See [EMAIL PROTECTED] MacroLoader} for why we have copied this class from
Radeox.
+ */
public class MacroRepository extends org.radeox.macro.PluginRepository {
protected static Log log = LogFactory.getLog(MacroRepository.class);
protected InitialRenderContext context;
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
