You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/08/03 11:16:28 UTC
svn commit: r1509948 - in /jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/ jspwiki-war/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/render/ jspwi...
Author: gmazza
Date: Sat Aug 3 09:16:27 2013
New Revision: 1509948
URL: http://svn.apache.org/r1509948
Log:
Removed unused variables reported by Sonar and 'incubating' references in POMs
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
jspwiki/trunk/jspwiki-war/pom.xml
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1509948&r1=1509947&r2=1509948&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sat Aug 3 09:16:27 2013
@@ -1,3 +1,12 @@
+2013-08-03 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-28
+
+ * Removed unused variables as reported by Sonar, as information is obtainable
+ by other means when needed.
+
+ * Removed "incubating" references in pom.xml
+
2013-08-01 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.0-svn-27
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1509948&r1=1509947&r2=1509948&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Sat Aug 3 09:16:27 2013
@@ -1,11 +1,37 @@
Title: Changelog
-#### 2013-07-28 Glen Mazza (gmazza AT apache DOT org)
+#### 2013-08-01 Dirk Frederickx (brushed AT apache DOT org)
+
+* 2.10.0-svn-27
+
+* [JSPWIKI 761][JIRA-761] : Implementing the WRO4J ( Web Resource Optimizer for Java ) Build-time solution
+through the wro4j maven plugin.
+ - replacing YUI-Compressor for JS by UglifyJS (better compression)
+ - introducing the LESS CSS preprocessor supporting advanced css authoring capabilities (variables, mixins, ...)
+ - merging JS and CSS files to reduce the number of resources needed at page-load.
+
+You can now build with or without minification of the JS and CSS files to ease development
+by using -Dminimize = true | false. (ref. mvn_cheat-sheet.txt)
+
+#### 2013-08-01 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+* 2.10.0-svn-26
+
+* Removed org.apache.wiki.WikiException in favour of org.apache.wiki.api.exceptions.WikiException
+
+#### 2013-07-31 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-25
+
+* Added missing Lucene dependency for testing, changed location of
+ userdatabase.xml and groupdatabase.xml to get more of the Selenium
+ tests running.
+
+#### 2013-07-30 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-24
* [JSPWIKI 791][JIRA-791]: Upgrade Lucene from 3.6.0 to 4.4.0
-
#### 2013-07-28 Harry Metske (metskem@apache.org)
@@ -1035,6 +1061,7 @@ and propagated the change to all plugins
* 2.9.0-svn-1
* release bump because of package rename
+ [JIRA-761]: https://issues.apache.org/jira/browse/JSPWIKI-761
[JIRA-791]: https://issues.apache.org/jira/browse/JSPWIKI-791
[JIRA-784]: https://issues.apache.org/jira/browse/JSPWIKI-784
[JIRA-772]: https://issues.apache.org/jira/browse/JSPWIKI-772
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1509948&r1=1509947&r2=1509948&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Sat Aug 3 09:16:27 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-24
\ No newline at end of file
+JSPWiki v2.10.0-svn-27
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1509948&r1=1509947&r2=1509948&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Sat Aug 3 09:16:27 2013
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jspwiki-war</artifactId>
- <name>Apache JSPWiki (Incubating) Main War</name>
+ <name>Apache JSPWiki Main War</name>
<packaging>war</packaging>
<dependencies>
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=1509948&r1=1509947&r2=1509948&view=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 Sat Aug 3 09:16:27 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "27";
+ public static final String BUILD = "28";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java?rev=1509948&r1=1509947&r2=1509948&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java Sat Aug 3 09:16:27 2013
@@ -39,8 +39,7 @@ public abstract class WikiRenderer
{
protected WikiContext m_context;
protected WikiDocument m_document;
- protected boolean m_enablePlugins = true;
-
+
/**
* Create a WikiRenderer.
*
@@ -52,23 +51,6 @@ public abstract class WikiRenderer
m_context = context;
m_document = doc;
doc.setContext( context ); // Make sure it is set
-
- //
- // Do some sane defaults
- //
- WikiEngine engine = m_context.getEngine();
- String runplugins = engine.getVariable( m_context, MarkupParser.PROP_RUNPLUGINS );
- if( runplugins != null ) enablePlugins( TextUtil.isPositive(runplugins));
- }
-
- /**
- * Can be used to turn on plugin execution on a translator-reader basis.
- *
- * @param toggle True, if plugins are to be enabled. False, if disabled.
- */
- public void enablePlugins( boolean toggle )
- {
- m_enablePlugins = toggle;
}
/**
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java?rev=1509948&r1=1509947&r2=1509948&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java Sat Aug 3 09:16:27 2013
@@ -45,9 +45,6 @@ public class DefaultURLConstructor
{
protected WikiEngine m_engine;
- /** Are URL styles relative or absolute? */
- protected boolean m_useRelativeURLStyle = true;
-
/**
* Contains the absolute path of the JSPWiki Web application without the
* actual servlet (which is the m_urlPrefix).
@@ -63,9 +60,6 @@ public class DefaultURLConstructor
{
m_engine = engine;
- m_useRelativeURLStyle = "relative".equals( properties.getProperty( WikiEngine.PROP_REFSTYLE,
- "relative" ) );
-
String baseurl = engine.getBaseURL();
if( baseurl != null && baseurl.length() > 0 )
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1509948&r1=1509947&r2=1509948&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Sat Aug 3 09:16:27 2013
@@ -27,7 +27,7 @@
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
<modelVersion>4.0.0</modelVersion>
- <name>Apache JSPWiki (Incubating)</name>
+ <name>Apache JSPWiki</name>
<version>2.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
@@ -601,26 +601,25 @@
<mailingLists>
<mailingList>
<name>Apache JSPWiki-dev List</name>
- <subscribe>jspwiki-dev-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>jspwiki-dev-unsubscribe@incubator.apache.org</unsubscribe>
- <post>jspwiki-dev@incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/</archive>
+ <subscribe>dev-subscribe@jspwiki.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@jspwiki.apache.org</unsubscribe>
+ <post>dev@jspwiki.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/jspwiki-dev/</archive>
</mailingList>
<mailingList>
<name>Apache JSPWiki-user List</name>
- <subscribe>jspwiki-user-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>jspwiki-user-unsubscribe@incubator.apache.org</unsubscribe>
- <post>jspwiki-user@incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/</archive>
+ <subscribe>user-subscribe@jspwiki.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@jspwiki.apache.org</unsubscribe>
+ <post>user@jspwiki.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/jspwiki-user/</archive>
</mailingList>
<mailingList>
<name>Apache JSPWiki-commits List</name>
- <subscribe>jspwiki-commits-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>jspwiki-commits-unsubscribe@incubator.apache.org</unsubscribe>
- <post>jspwiki-commits@incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-commits/</archive>
+ <subscribe>commits-subscribe@jspwiki.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@jspwiki.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/jspwiki-commits/</archive>
</mailingList>
</mailingLists>