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/07 15:17:49 UTC
svn commit: r1511297 - in /jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/filters/ jspwiki-war/src/m...
Author: gmazza
Date: Wed Aug 7 13:17:48 2013
New Revision: 1511297
URL: http://svn.apache.org/r1511297
Log:
Upgrade from Jetty 7.6.7 to 9.0.4
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/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1511297&r1=1511296&r2=1511297&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Wed Aug 7 13:17:48 2013
@@ -1,3 +1,9 @@
+2013-08-07 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-34
+
+ * Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4
+
2013-08-06 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.0-svn-33
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=1511297&r1=1511296&r2=1511297&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 Wed Aug 7 13:17:48 2013
@@ -1,5 +1,33 @@
Title: Changelog
+#### 2013-08-07 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-34
+
+* Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4
+
+#### 2013-08-06 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+* 2.10.0-svn-33
+
+* [JSPWIKI 799][JIRA-799]: jenkins build fails because of SearchManagerTest. It was reusing the same page directory
+ as other tests, indexing pages created on other tests, depending on the test execution order.
+
+* Use of Lucene 4.4 *Fields on LuceneSearchProvider to instantiate Fields, instead of using deprecated
+ constructor + Field.Index
+
+#### 2013-08-04 Harry Metske (metskem@apache.org)
+
+* 2.10.0-svn-32
+
+* first guess in fixing [JSPWIKI 799][JIRA-799] TestEngine.emptyWorkdir() cleans another directory the the one used by the test ?
+
+#### 2013-08-03 Harry Metske (metskem@apache.org)
+
+* 2.10.0-svn-31
+
+* refixed [JSPWIKI 791][JIRA-791] NoClassDefFoundError for org.apache.lucene.analysis.standard.ClassicAnalyzer
+
#### 2013-08-03 Harry Metske (metskem@apache.org)
* 2.10.0-svn-30
@@ -1082,6 +1110,9 @@ and propagated the change to all plugins
* 2.9.0-svn-1
* release bump because of package rename
+ [JIRA-799]: https://issues.apache.org/jira/browse/JSPWIKI-799
+ [JIRA-799]: https://issues.apache.org/jira/browse/JSPWIKI-799
+ [JIRA-791]: https://issues.apache.org/jira/browse/JSPWIKI-791
[JIRA-789]: https://issues.apache.org/jira/browse/JSPWIKI-789
[JIRA-790]: https://issues.apache.org/jira/browse/JSPWIKI-790
[JIRA-761]: https://issues.apache.org/jira/browse/JSPWIKI-761
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=1511297&r1=1511296&r2=1511297&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Wed Aug 7 13:17:48 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-30
\ No newline at end of file
+JSPWiki v2.10.0-svn-33
\ No newline at end of file
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=1511297&r1=1511296&r2=1511297&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 Wed Aug 7 13:17:48 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 = "33";
+ public static final String BUILD = "34";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java?rev=1511297&r1=1511296&r2=1511297&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java Wed Aug 7 13:17:48 2013
@@ -42,7 +42,7 @@ import org.apache.xmlrpc.XmlRpcClient;
public class PingWeblogsComFilter
extends BasicPageFilter
{
- static Logger log = Logger.getLogger( PingWeblogsComFilter.class );
+ private static final Logger log = Logger.getLogger( PingWeblogsComFilter.class );
private String m_pingURL;
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=1511297&r1=1511296&r2=1511297&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 Wed Aug 7 13:17:48 2013
@@ -21,10 +21,7 @@ package org.apache.wiki.render;
import java.io.IOException;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiEngine;
-import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.parser.WikiDocument;
-import org.apache.wiki.util.TextUtil;
/**
* Provides an interface to the basic rendering engine.
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java?rev=1511297&r1=1511296&r2=1511297&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java Wed Aug 7 13:17:48 2013
@@ -44,7 +44,7 @@ import org.eclipse.jetty.server.Connecto
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.*;
import org.eclipse.jetty.util.security.Password;
import org.eclipse.jetty.webapp.WebAppContext;
@@ -239,10 +239,10 @@ public class TestContainer
server.setStopAtShutdown( true );
// Create HTTP listener
- SocketConnector connector = new SocketConnector();
+ ServerConnector connector = new ServerConnector(server);
connector.setHost( "localhost" );
connector.setPort( HTTP_PORT );
- connector.setMaxIdleTime( 60000 );
+ connector.setIdleTimeout( 60000 );
server.setConnectors( new Connector[] {connector} );
log.info( "added HTTP listener for port " + HTTP_PORT );
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1511297&r1=1511296&r2=1511297&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Wed Aug 7 13:17:48 2013
@@ -221,7 +221,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
- <version>7.6.7.v20120910</version>
+ <version>9.0.4.v20130625</version>
</dependency>
<dependency>
Re: svn commit: r1511297 - in /jspwiki/trunk: ./ jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/ jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/filters/ jspwiki-war/src/m...
Posted by Glen Mazza <gl...@gmail.com>.
Oops, OK, I'll revert it to 8.xxx then. I recently upgraded Roller from
Jetty 6 to Jetty 9 and no Jenkins problem, but forgot that Jetty isn't
used during the unit tests with Roller.
Glen
On 08/07/2013 10:19 AM, Harry Metske wrote:
> http://www.eclipse.org/jetty/documentation/current/what-jetty-version.html
>
> the build servers are running Java 6 I guess, so :
> UnsupportedClassVersionError:
> org/eclipse/jetty/jndi/InitialContextFactory : Unsupported major.minor
> version 51.0
>
> to be continued :-)
>
> regards,
> Harry
>
>
>
> On 7 August 2013 15:17, <gm...@apache.org> wrote:
>
>> Author: gmazza
>> Date: Wed Aug 7 13:17:48 2013
>> New Revision: 1511297
>>
>> URL: http://svn.apache.org/r1511297
>> Log:
>> Upgrade from Jetty 7.6.7 to 9.0.4
>>
>> 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/src/main/java/org/apache/wiki/Release.java
>>
>> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
>>
>> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java
>>
>> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
>> jspwiki/trunk/pom.xml
>>
>> Modified: jspwiki/trunk/ChangeLog
>> URL:
>> http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1511297&r1=1511296&r2=1511297&view=diff
>>
>> ==============================================================================
>> --- jspwiki/trunk/ChangeLog (original)
>> +++ jspwiki/trunk/ChangeLog Wed Aug 7 13:17:48 2013
>> @@ -1,3 +1,9 @@
>> +2013-08-07 Glen Mazza (gmazza AT apache DOT org)
>> +
>> + * 2.10.0-svn-34
>> +
>> + * Upgrade from Jetty used in unit test cases from v. 7.6.7 to v.
>> 9.0.4
>> +
>> 2013-08-06 Juan Pablo Santos (juanpablo AT apache DOT org)
>>
>> * 2.10.0-svn-33
>>
>> 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=1511297&r1=1511296&r2=1511297&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
>> Wed Aug 7 13:17:48 2013
>> @@ -1,5 +1,33 @@
>> Title: Changelog
>>
>> +#### 2013-08-07 Glen Mazza (gmazza AT apache DOT org)
>> +
>> +* 2.10.0-svn-34
>> +
>> +* Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4
>> +
>> +#### 2013-08-06 Juan Pablo Santos (juanpablo AT apache DOT org)
>> +
>> +* 2.10.0-svn-33
>> +
>> +* [JSPWIKI 799][JIRA-799]: jenkins build fails because of
>> SearchManagerTest. It was reusing the same page directory
>> + as other tests, indexing pages created on other tests, depending on the
>> test execution order.
>> +
>> +* Use of Lucene 4.4 *Fields on LuceneSearchProvider to instantiate
>> Fields, instead of using deprecated
>> + constructor + Field.Index
>> +
>> +#### 2013-08-04 Harry Metske (metskem@apache.org)
>> +
>> +* 2.10.0-svn-32
>> +
>> +* first guess in fixing [JSPWIKI 799][JIRA-799] TestEngine.emptyWorkdir()
>> cleans another directory the the one used by the test ?
>> +
>> +#### 2013-08-03 Harry Metske (metskem@apache.org)
>> +
>> +* 2.10.0-svn-31
>> +
>> +* refixed [JSPWIKI 791][JIRA-791] NoClassDefFoundError for
>> org.apache.lucene.analysis.standard.ClassicAnalyzer
>> +
>> #### 2013-08-03 Harry Metske (metskem@apache.org)
>>
>> * 2.10.0-svn-30
>> @@ -1082,6 +1110,9 @@ and propagated the change to all plugins
>> * 2.9.0-svn-1
>>
>> * release bump because of package rename
>> + [JIRA-799]: https://issues.apache.org/jira/browse/JSPWIKI-799
>> + [JIRA-799]: https://issues.apache.org/jira/browse/JSPWIKI-799
>> + [JIRA-791]: https://issues.apache.org/jira/browse/JSPWIKI-791
>> [JIRA-789]: https://issues.apache.org/jira/browse/JSPWIKI-789
>> [JIRA-790]: https://issues.apache.org/jira/browse/JSPWIKI-790
>> [JIRA-761]: https://issues.apache.org/jira/browse/JSPWIKI-761
>>
>> 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=1511297&r1=1511296&r2=1511297&view=diff
>>
>> ==============================================================================
>> --- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
>> (original)
>> +++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Wed
>> Aug 7 13:17:48 2013
>> @@ -1 +1 @@
>> -JSPWiki v2.10.0-svn-30
>> \ No newline at end of file
>> +JSPWiki v2.10.0-svn-33
>> \ No newline at end of file
>>
>> 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=1511297&r1=1511296&r2=1511297&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
>> Wed Aug 7 13:17:48 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 = "33";
>> + public static final String BUILD = "34";
>>
>> /**
>> * This is the generic version string you should use
>>
>> Modified:
>> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
>> URL:
>> http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java?rev=1511297&r1=1511296&r2=1511297&view=diff
>>
>> ==============================================================================
>> ---
>> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
>> (original)
>> +++
>> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
>> Wed Aug 7 13:17:48 2013
>> @@ -42,7 +42,7 @@ import org.apache.xmlrpc.XmlRpcClient;
>> public class PingWeblogsComFilter
>> extends BasicPageFilter
>> {
>> - static Logger log = Logger.getLogger( PingWeblogsComFilter.class );
>> + private static final Logger log = Logger.getLogger(
>> PingWeblogsComFilter.class );
>>
>> private String m_pingURL;
>>
>>
>> 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=1511297&r1=1511296&r2=1511297&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
>> Wed Aug 7 13:17:48 2013
>> @@ -21,10 +21,7 @@ package org.apache.wiki.render;
>> import java.io.IOException;
>>
>> import org.apache.wiki.WikiContext;
>> -import org.apache.wiki.WikiEngine;
>> -import org.apache.wiki.parser.MarkupParser;
>> import org.apache.wiki.parser.WikiDocument;
>> -import org.apache.wiki.util.TextUtil;
>>
>> /**
>> * Provides an interface to the basic rendering engine.
>>
>> Modified:
>> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
>> URL:
>> http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java?rev=1511297&r1=1511296&r2=1511297&view=diff
>>
>> ==============================================================================
>> ---
>> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
>> (original)
>> +++
>> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
>> Wed Aug 7 13:17:48 2013
>> @@ -44,7 +44,7 @@ import org.eclipse.jetty.server.Connecto
>> import org.eclipse.jetty.server.Handler;
>> import org.eclipse.jetty.server.Request;
>> import org.eclipse.jetty.server.Server;
>> -import org.eclipse.jetty.server.bio.SocketConnector;
>> +import org.eclipse.jetty.server.ServerConnector;
>> import org.eclipse.jetty.server.handler.*;
>> import org.eclipse.jetty.util.security.Password;
>> import org.eclipse.jetty.webapp.WebAppContext;
>> @@ -239,10 +239,10 @@ public class TestContainer
>> server.setStopAtShutdown( true );
>>
>> // Create HTTP listener
>> - SocketConnector connector = new SocketConnector();
>> + ServerConnector connector = new ServerConnector(server);
>> connector.setHost( "localhost" );
>> connector.setPort( HTTP_PORT );
>> - connector.setMaxIdleTime( 60000 );
>> + connector.setIdleTimeout( 60000 );
>>
>> server.setConnectors( new Connector[] {connector} );
>> log.info( "added HTTP listener for port " + HTTP_PORT );
>>
>> Modified: jspwiki/trunk/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1511297&r1=1511296&r2=1511297&view=diff
>>
>> ==============================================================================
>> --- jspwiki/trunk/pom.xml (original)
>> +++ jspwiki/trunk/pom.xml Wed Aug 7 13:17:48 2013
>> @@ -221,7 +221,7 @@
>> <dependency>
>> <groupId>org.eclipse.jetty.aggregate</groupId>
>> <artifactId>jetty-all</artifactId>
>> - <version>7.6.7.v20120910</version>
>> + <version>9.0.4.v20130625</version>
>> </dependency>
>>
>> <dependency>
>>
>>
>>
Re: svn commit: r1511297 - in /jspwiki/trunk: ./ jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/ jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/filters/ jspwiki-war/src/m...
Posted by Harry Metske <ha...@gmail.com>.
http://www.eclipse.org/jetty/documentation/current/what-jetty-version.html
the build servers are running Java 6 I guess, so :
UnsupportedClassVersionError:
org/eclipse/jetty/jndi/InitialContextFactory : Unsupported major.minor
version 51.0
to be continued :-)
regards,
Harry
On 7 August 2013 15:17, <gm...@apache.org> wrote:
> Author: gmazza
> Date: Wed Aug 7 13:17:48 2013
> New Revision: 1511297
>
> URL: http://svn.apache.org/r1511297
> Log:
> Upgrade from Jetty 7.6.7 to 9.0.4
>
> 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/src/main/java/org/apache/wiki/Release.java
>
> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
>
> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java
>
> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
> jspwiki/trunk/pom.xml
>
> Modified: jspwiki/trunk/ChangeLog
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1511297&r1=1511296&r2=1511297&view=diff
>
> ==============================================================================
> --- jspwiki/trunk/ChangeLog (original)
> +++ jspwiki/trunk/ChangeLog Wed Aug 7 13:17:48 2013
> @@ -1,3 +1,9 @@
> +2013-08-07 Glen Mazza (gmazza AT apache DOT org)
> +
> + * 2.10.0-svn-34
> +
> + * Upgrade from Jetty used in unit test cases from v. 7.6.7 to v.
> 9.0.4
> +
> 2013-08-06 Juan Pablo Santos (juanpablo AT apache DOT org)
>
> * 2.10.0-svn-33
>
> 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=1511297&r1=1511296&r2=1511297&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
> Wed Aug 7 13:17:48 2013
> @@ -1,5 +1,33 @@
> Title: Changelog
>
> +#### 2013-08-07 Glen Mazza (gmazza AT apache DOT org)
> +
> +* 2.10.0-svn-34
> +
> +* Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4
> +
> +#### 2013-08-06 Juan Pablo Santos (juanpablo AT apache DOT org)
> +
> +* 2.10.0-svn-33
> +
> +* [JSPWIKI 799][JIRA-799]: jenkins build fails because of
> SearchManagerTest. It was reusing the same page directory
> + as other tests, indexing pages created on other tests, depending on the
> test execution order.
> +
> +* Use of Lucene 4.4 *Fields on LuceneSearchProvider to instantiate
> Fields, instead of using deprecated
> + constructor + Field.Index
> +
> +#### 2013-08-04 Harry Metske (metskem@apache.org)
> +
> +* 2.10.0-svn-32
> +
> +* first guess in fixing [JSPWIKI 799][JIRA-799] TestEngine.emptyWorkdir()
> cleans another directory the the one used by the test ?
> +
> +#### 2013-08-03 Harry Metske (metskem@apache.org)
> +
> +* 2.10.0-svn-31
> +
> +* refixed [JSPWIKI 791][JIRA-791] NoClassDefFoundError for
> org.apache.lucene.analysis.standard.ClassicAnalyzer
> +
> #### 2013-08-03 Harry Metske (metskem@apache.org)
>
> * 2.10.0-svn-30
> @@ -1082,6 +1110,9 @@ and propagated the change to all plugins
> * 2.9.0-svn-1
>
> * release bump because of package rename
> + [JIRA-799]: https://issues.apache.org/jira/browse/JSPWIKI-799
> + [JIRA-799]: https://issues.apache.org/jira/browse/JSPWIKI-799
> + [JIRA-791]: https://issues.apache.org/jira/browse/JSPWIKI-791
> [JIRA-789]: https://issues.apache.org/jira/browse/JSPWIKI-789
> [JIRA-790]: https://issues.apache.org/jira/browse/JSPWIKI-790
> [JIRA-761]: https://issues.apache.org/jira/browse/JSPWIKI-761
>
> 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=1511297&r1=1511296&r2=1511297&view=diff
>
> ==============================================================================
> --- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
> (original)
> +++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Wed
> Aug 7 13:17:48 2013
> @@ -1 +1 @@
> -JSPWiki v2.10.0-svn-30
> \ No newline at end of file
> +JSPWiki v2.10.0-svn-33
> \ No newline at end of file
>
> 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=1511297&r1=1511296&r2=1511297&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
> Wed Aug 7 13:17:48 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 = "33";
> + public static final String BUILD = "34";
>
> /**
> * This is the generic version string you should use
>
> Modified:
> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java?rev=1511297&r1=1511296&r2=1511297&view=diff
>
> ==============================================================================
> ---
> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
> (original)
> +++
> jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
> Wed Aug 7 13:17:48 2013
> @@ -42,7 +42,7 @@ import org.apache.xmlrpc.XmlRpcClient;
> public class PingWeblogsComFilter
> extends BasicPageFilter
> {
> - static Logger log = Logger.getLogger( PingWeblogsComFilter.class );
> + private static final Logger log = Logger.getLogger(
> PingWeblogsComFilter.class );
>
> private String m_pingURL;
>
>
> 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=1511297&r1=1511296&r2=1511297&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
> Wed Aug 7 13:17:48 2013
> @@ -21,10 +21,7 @@ package org.apache.wiki.render;
> import java.io.IOException;
>
> import org.apache.wiki.WikiContext;
> -import org.apache.wiki.WikiEngine;
> -import org.apache.wiki.parser.MarkupParser;
> import org.apache.wiki.parser.WikiDocument;
> -import org.apache.wiki.util.TextUtil;
>
> /**
> * Provides an interface to the basic rendering engine.
>
> Modified:
> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java?rev=1511297&r1=1511296&r2=1511297&view=diff
>
> ==============================================================================
> ---
> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
> (original)
> +++
> jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
> Wed Aug 7 13:17:48 2013
> @@ -44,7 +44,7 @@ import org.eclipse.jetty.server.Connecto
> import org.eclipse.jetty.server.Handler;
> import org.eclipse.jetty.server.Request;
> import org.eclipse.jetty.server.Server;
> -import org.eclipse.jetty.server.bio.SocketConnector;
> +import org.eclipse.jetty.server.ServerConnector;
> import org.eclipse.jetty.server.handler.*;
> import org.eclipse.jetty.util.security.Password;
> import org.eclipse.jetty.webapp.WebAppContext;
> @@ -239,10 +239,10 @@ public class TestContainer
> server.setStopAtShutdown( true );
>
> // Create HTTP listener
> - SocketConnector connector = new SocketConnector();
> + ServerConnector connector = new ServerConnector(server);
> connector.setHost( "localhost" );
> connector.setPort( HTTP_PORT );
> - connector.setMaxIdleTime( 60000 );
> + connector.setIdleTimeout( 60000 );
>
> server.setConnectors( new Connector[] {connector} );
> log.info( "added HTTP listener for port " + HTTP_PORT );
>
> Modified: jspwiki/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1511297&r1=1511296&r2=1511297&view=diff
>
> ==============================================================================
> --- jspwiki/trunk/pom.xml (original)
> +++ jspwiki/trunk/pom.xml Wed Aug 7 13:17:48 2013
> @@ -221,7 +221,7 @@
> <dependency>
> <groupId>org.eclipse.jetty.aggregate</groupId>
> <artifactId>jetty-all</artifactId>
> - <version>7.6.7.v20120910</version>
> + <version>9.0.4.v20130625</version>
> </dependency>
>
> <dependency>
>
>
>