Author: metskem
Date: Sat Mar 28 15:17:36 2009
New Revision: 759483
URL: http://svn.apache.org/viewvc?rev=759483&view=rev
Log:
3.0.0-svn-87 tried to make the webtests running again, see Changelog
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/StripesURLConstructor.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ClassUtil.java
incubator/jspwiki/trunk/tests/etc/selenium/readme.txt
incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Mar 28 15:17:36 2009
@@ -1,3 +1,18 @@
+2009-03-28 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-87
+
+ * tried to make the webtests running again:
+ - removed some remaining DAV stuff from web.xml
+ - correct parameters to log statements in WikiEngine, ClassUtil
+ - build.xml: selenium-server-1.0-beta1.jar =>
selenium-server-1.0b2.jar
+ and some more cleanup
+ - AdminBeanManager got an extra try catch block for
AccessControlException
+ for some reason this exception is thrown when running webtests in
jetty
+ - provide a null check in StripesURLConstructor (it looks like
initing the Servlet filters
+ in Jetty is different than in Tomcat for example, this is bit of
kludge, we should not be
+ dependent on the order of filter initing)
+
2009-03-19 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-86
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sat Mar 28 15:17:36 2009
@@ -120,7 +120,7 @@
<property name="webtests.port" value="10024" />
<property name="webtests.shutdown" value="19041" />
<property name="webtests.temp" value="${java.io.tmpdir}/webtests" />
- <property name="selenium-rc.jar"
value="${tests}/lib/selenium-server-1.0-beta1.jar" />
+ <property name="selenium-rc.jar"
value="${tests}/lib/selenium-server-1.0b2.jar" />
<!-- The place where the javadocs are created -->
@@ -896,8 +896,6 @@
<!-- Copy the WEB-INF files -->
<copy toDir="@{context.dir}/webapp/WEB-INF">
<fileset dir="etc">
- <include name="dtd/**" />
- <include name="commons-logging.properties" />
<include name="jspwiki.policy" />
</fileset>
<fileset dir="${tests}/etc" includes="userdatabase.xml
groupdatabase.xml" />
@@ -974,6 +972,7 @@
</classpath>
<sysproperty key="java.io.tmpdir" value="${webtests.temp}" />
<sysproperty key="log4j.configuration" value="log4j.properties" />
+ <sysproperty key="log4j.debug" value="yesplease" />
<!--
<jvmarg value="-Xdebug" />
<jvmarg
value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" />
@@ -993,7 +992,7 @@
<arg line="-htmlSuite" />
<arg line='"${webtests.browser}"' />
<arg line='"http://localhost:${webtests.port}";' />
- <arg
line="${basedir}/${webtests.build}/@{context}/selenium/TestSuite.html" />
+ <arg line="${webtests.build}/@{context}/selenium/TestSuite.html" />
<arg line="${webtests.reports}/@{context}.html" />
</java>
</sequential>
Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml Sat Mar 28 15:17:36
2009
@@ -106,10 +106,6 @@
</filter-mapping>
<filter-mapping>
<filter-name>WikiServletFilter</filter-name>
- <url-pattern>/dav/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>WikiServletFilter</filter-name>
<url-pattern>/RPCU/</url-pattern>
</filter-mapping>
<filter-mapping>
@@ -214,11 +210,6 @@
-->
</servlet>
- <servlet>
- <servlet-name>DAVServlet</servlet-name>
- <servlet-class>org.apache.wiki.dav.WikiDavServlet</servlet-class>
- </servlet>
-
<!--
Attachment exchange handler.
-->
@@ -282,13 +273,6 @@
<url-pattern>/wiki/*</url-pattern>
</servlet-mapping>
- <!-- Remove to enable WebDav. EXPERIMENTAL FEATURE!
- <servlet-mapping>
- <servlet-name>DAVServlet</servlet-name>
- <url-pattern>/dav/*</url-pattern>
- </servlet-mapping>
- -->
-
<servlet-mapping>
<servlet-name>org.jabsorb.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Mar 28
15:17:36 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "86";
+ public static final String BUILD = "87";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Sat Mar 28
15:17:36 2009
@@ -601,22 +601,22 @@
catch( RuntimeException e )
{
// RuntimeExceptions may occur here, even if they shouldn't.
- log.error( "Failed to start managers.", e );
+ log.error( "%1$s %2$s", "Failed to start managers.", e );
throw new WikiException( "Failed to start managers:
"+e.getMessage() );
}
catch (ClassNotFoundException e)
{
- log.error( "JSPWiki could not start, URLConstructor was not found:
",e );
+ log.error( "%1$s %2$s", "JSPWiki could not start, URLConstructor
was not found: ", e );
throw new WikiException(e.getMessage());
}
catch (InstantiationException e)
{
- log.error( "JSPWiki could not start, URLConstructor could not be
instantiated: ",e );
+ log.error( "%1$s %2$s", "JSPWiki could not start, URLConstructor
could not be instantiated: ", e );
throw new WikiException(e.getMessage());
}
catch (IllegalAccessException e)
{
- log.error( "JSPWiki could not start, URLConstructor cannot be
accessed: ",e );
+ log.error( "%1$s %2$s", "JSPWiki could not start, URLConstructor
cannot be accessed: ", e );
throw new WikiException(e.getMessage());
}
catch( Exception e )
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java
Sat Mar 28 15:17:36 2009
@@ -78,8 +78,10 @@
*/
public void init( FilterConfig config ) throws ServletException
{
+ log.info( "servlet filter " + this.getClass().getName() + "
initializing" );
ServletContext context = config.getServletContext();
m_engine = WikiEngine.getInstance( context, null );
+ log.warn( "servlet filter " + this.getClass().getName() + "
initialized" );
}
/**
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java
Sat Mar 28 15:17:36 2009
@@ -21,6 +21,7 @@
package org.apache.wiki.ui.admin;
import java.lang.management.ManagementFactory;
+import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -56,7 +57,7 @@
private MBeanServer m_mbeanServer = null;
- private static Logger log =
LoggerFactory.getLogger(AdminBeanManager.class);
+ private static final Logger log =
LoggerFactory.getLogger(AdminBeanManager.class);
public AdminBeanManager( WikiEngine engine )
{
@@ -146,6 +147,11 @@
{
log.error("Evil NPE occurred",e);
}
+ catch( AccessControlException e )
+ {
+ //FIXME catching this unchecked exception seems necessary when
running webtests in Jetty
+ log.error( "Evil AccessControlException occurred", e );
+ }
}
private ObjectName getObjectName(AdminBean ab) throws
MalformedObjectNameException
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java
Sat Mar 28 15:17:36 2009
@@ -44,7 +44,7 @@
{
public static final String STRIPES_CONFIGURATION =
"WikiRuntimeConfiguration";
- private Logger log =
LoggerFactory.getLogger(WikiRuntimeConfiguration.class);
+ private static final Logger log =
LoggerFactory.getLogger(WikiRuntimeConfiguration.class);
private WikiEngine m_engine = null;
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/StripesURLConstructor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/url/StripesURLConstructor.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/StripesURLConstructor.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/url/StripesURLConstructor.java
Sat Mar 28 15:17:36 2009
@@ -174,14 +174,17 @@
// Load the Stripes UrlBindingFactory
Configuration stripesConfig
=(Configuration)engine.getServletContext().getAttribute(
WikiRuntimeConfiguration.STRIPES_CONFIGURATION );
- ActionResolver resolver = stripesConfig.getActionResolver();
- if ( resolver instanceof AnnotatedClassActionResolver )
+ if( stripesConfig != null )
{
- m_urlBindingFactory = UrlBindingFactory.getInstance();
- }
- else
- {
- throw new RuntimeException( "Stripes ActionResolver was not
AnnotatedClassActionResolver! Fatal error." );
+ ActionResolver resolver = stripesConfig.getActionResolver();
+ if( resolver instanceof AnnotatedClassActionResolver )
+ {
+ m_urlBindingFactory = UrlBindingFactory.getInstance();
+ }
+ else
+ {
+ throw new RuntimeException( "Stripes ActionResolver was not
AnnotatedClassActionResolver! Fatal error." );
+ }
}
// Load the URL patterns from the config file
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ClassUtil.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ClassUtil.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ClassUtil.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ClassUtil.java Sat
Mar 28 15:17:36 2009
@@ -291,27 +291,26 @@
}
catch( InstantiationException e )
{
- log.info( "Cannot instantiate requested class "+requestedClass, e
);
+ log.info( "%1$s %2$s", "Cannot instantiate requested class " +
requestedClass, e );
throw new WikiException("Failed to instantiate class
"+requestedClass);
}
catch (IllegalAccessException e)
{
- log.info( "Cannot access requested class "+requestedClass, e );
+ log.info( "%1$s %2$s", "Cannot access requested class " +
requestedClass, e );
throw new WikiException("Failed to instantiate class
"+requestedClass);
}
catch (IllegalArgumentException e)
{
- log.info( "Illegal arguments when constructing new object", e );
+ log.info( "%1$s %2$s", "Illegal arguments when constructing new
object", e );
throw new WikiException("Failed to instantiate class
"+requestedClass);
}
catch (InvocationTargetException e)
{
- log.info( "You tried to instantiate an abstract class
"+requestedClass, e );
-
- throw new WikiException("Failed to instantiate class
"+requestedClass + ", reason: " + e.getCause());
+ log.info( "%1$s %2$s", "Failed to invoke class " + requestedClass,
e.getCause() );
+ throw new WikiException("Failed to invoke class "+requestedClass +
", reason: " + e.getCause());
}
}
Modified: incubator/jspwiki/trunk/tests/etc/selenium/readme.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/readme.txt?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/readme.txt (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/readme.txt Sat Mar 28 15:17:36
2009
@@ -22,7 +22,7 @@
Start the Selenium server...
-java -jar tests/lib/selenium-server-1.0-beta1.jar -interactive
+java -jar tests/lib/selenium-server-1.0b2.jar -interactive
Open Firefox.
Set the browser proxy to localhost:4444
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java?rev=759483&r1=759482&r2=759483&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java
Sat Mar 28 15:17:36 2009
@@ -127,7 +127,7 @@
container.server.addService( dss );
dss.getDataSource( "jdbc/GroupDatabase" );
- System.out.println( "Configured datasources." );
+ log.error( "Configured datasources." );
// Start the server
try
@@ -138,10 +138,10 @@
catch( Throwable t )
{
t.printStackTrace();
- System.err.println( t.getMessage() );
+ log.error( t.getMessage() );
System.exit( 1 );
}
- System.out.println( "Started." );
+ log.error( "Started." );
}
