svn commit: r1688207 [2/2] - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/api/engine/ main/java/org/apache/wiki/api/filters/ main
Modified:
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java?rev=1688207r1=1688206r2=1688207view=diff
==
---
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
(original)
+++
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
Mon Jun 29 13:29:39 2015
@@ -30,13 +30,13 @@ import java.util.Properties;
import java.util.Set;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiInternalModule;
import org.apache.wiki.WikiSession;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.acl.UnresolvedPrincipal;
import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WorkflowEvent;
-import org.apache.wiki.modules.InternalModule;
/**
@@ -46,7 +46,7 @@ import org.apache.wiki.modules.InternalM
* Workflows.
* /p
*/
-public class WorkflowManager implements WikiEventListener, InternalModule {
+public class WorkflowManager extends WikiInternalModule implements
WikiEventListener {
private final DecisionQueue m_queue = new DecisionQueue();
@@ -106,8 +106,6 @@ public class WorkflowManager implements
return new ArrayListWorkflow( m_completed );
}
-private WikiEngine m_engine = null;
-
/**
* Initializes the WorkflowManager using a specfied WikiEngine and
* properties. Any properties that begin with
@@ -123,9 +121,9 @@ public class WorkflowManager implements
* @param engine the wiki engine to associate with this WorkflowManager
* @param props the wiki engine's properties
*/
-public void initialize( WikiEngine engine, Properties props )
+public void initialize( WikiEngine engine, Properties props ) throws
WikiException
{
-m_engine = engine;
+super.initialize(engine, props);
// Identify the workflows requiring approvals
for ( Iterator? it = props.keySet().iterator(); it.hasNext(); )
Modified:
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml
URL:
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml?rev=1688207r1=1688206r2=1688207view=diff
==
---
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml
(original)
+++
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml
Mon Jun 29 13:29:39 2015
@@ -123,4 +123,20 @@
requestedClassorg.apache.wiki.workflow.WorkflowManager/requestedClass
mappedClassorg.apache.wiki.workflow.WorkflowManager/mappedClass
/mapping
+ mapping
+requestedClassorg.apache.wiki.url.URLConstructor/requestedClass
+mappedClassorg.apache.wiki.url.DefaultURLConstructor/mappedClass
+ /mapping
+ mapping
+requestedClassorg.apache.wiki.content.PageRenamer/requestedClass
+mappedClassorg.apache.wiki.content.PageRenamer/mappedClass
+ /mapping
+ mapping
+requestedClassorg.apache.wiki.PageSorter/requestedClass
+mappedClassorg.apache.wiki.PageSorter/mappedClass
+ /mapping
+ mapping
+requestedClassorg.apache.wiki.rss.RSSGenerator/requestedClass
+mappedClassorg.apache.wiki.rss.RSSGenerator/mappedClass
+ /mapping
/classmappings
Modified:
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java
URL:
http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java?rev=1688207r1=1688206r2=1688207view=diff
==
---
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java
(original)
+++
jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java
Mon Jun 29 13:29:39 2015
@@ -25,6 +25,9 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.log4j.PropertyConfigurator;
+import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.comparators.HumanComparator;
import org.apache.wiki.util.comparators.LocaleComparator;
@@ -36,60 +39,71 @@ import org.apache.wiki.util.comparators.
*/
public class PageSorterTest extends TestCase
{
-public static Test suite()
+private Properties props = TestEngine.getTestProperties();
+
+private TestEngine engine;
+
+
svn commit: r1688207 [1/2] - in /jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/api/engine/ main/java/org/apache/wiki/api/filters/ main
Author: dvittor Date: Mon Jun 29 13:29:39 2015 New Revision: 1688207 URL: http://svn.apache.org/r1688207 Log: More code for the pico container Added: jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/WikiInternalModule.java (with props) Modified: jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageSorter.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/content/PageRenamer.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/modules/InternalModule.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/modules/ModuleManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/ShortURLConstructor.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/resources/ini/classmappings.xml jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java Modified: jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java URL: http://svn.apache.org/viewvc/jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java?rev=1688207r1=1688206r2=1688207view=diff == --- jspwiki/branches/JSPWIKI_2_10_PICO_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java (original) +++
svn commit: r1688357 - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/scripts/wiki-edit/ jspwiki-war/src/main/styles/haddock/default/ jspwiki-war/src/main/styles
Author: brushed
Date: Tue Jun 30 04:54:35 2015
New Revision: 1688357
URL: http://svn.apache.org/r1688357
Log:
2.10.2-svn-21
* [JSPWIKI-892] Haddock editor when launched is always at bottom of
window in Firefox
* Fixing latest update of Icon Styles
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less
Modified: jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1688357r1=1688356r2=1688357view=diff
==
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Jun 30 04:54:35 2015
@@ -1,3 +1,14 @@
+2015-06-30 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.2-svn-21
+
+ HADDOCK Template fixes:
+
+ * JSPWIKI-892 Haddock editor when launched is always at bottom of
window in Firefox
+
+ * Fixing latest update of Icon Styles
+
+
2015-06-28 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.2-svn-20
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1688357r1=1688356r2=1688357view=diff
==
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue
Jun 30 04:54:35 2015
@@ -72,7 +72,7 @@ public final class Release {
* p
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = 20;
+public static final String BUILD = 21;
/**
* This is the generic version string you should use when printing out
the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js?rev=1688357r1=1688356r2=1688357view=diff
==
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js Tue
Jun 30 04:54:35 2015
@@ -225,7 +225,7 @@ Snipe.Sections = new Class({
}
-work.value = ; //FIXME google chrome 43.0.2357.65 bug -- if
omitted, the textarea is displayed EMPTY!! ??
+//work.value = ; //FIXME google chrome 43.0.2357.65 bug -- if
omitted, the textarea is displayed EMPTY!! ??
work.value = main.slice(begin, end);
self.begin = begin;
self.end = end;
Modified:
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less?rev=1688357r1=1688356r2=1688357view=diff
==
---
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
Tue Jun 30 04:54:35 2015
@@ -151,11 +151,12 @@ a.logo {
position: relative;
display:block;
font-family: @wiki-logo-font-family;
-font-size:75%; //@font-size-base* .75
+//font-size:75%; //@font-size-base* .75
font-weight: 200;
letter-spacing: 3px;
text-decoration: none;
-padding:1px 1px @font-size-base 3px;
+//padding:1px 1px @font-size-base 3px;
+padding:1px 1px 20px 3px;
//border:1px solid @white;
//border-radius:.5em;
color:inherit;
Modified:
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less?rev=1688357r1=1688356r2=1688357view=diff
==
---
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
Tue Jun 30 04:54:35 2015
@@ -5,8 +5,8 @@
//@import ../fontawesome/variables;
//@import ../fontawesome/mixins;
-@import path.less;
-@import core.less;
+@import ./path.less;
+@import ./core.less;
//@import ../fontawesome/larger;
//@import ../fontawesome/fixed-width;
//@import ../fontawesome/list;
@@ -14,4 +14,4 @@
//@import ../fontawesome/spinning;
//@import
