Author: metskem
Date: Thu Feb 5 19:17:07 2009
New Revision: 741249
URL: http://svn.apache.org/viewvc?rev=741249&view=rev
Log:
more tweaks to build.xml, no more servlet-api.jar,jsp-api.jar in WEB-INF/lib
removed a few com.ecyrd leftovers
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=741249&r1=741248&r2=741249&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Thu Feb 5 19:17:07 2009
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="tests/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM
1.5.0"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache
Tomcat v5.5"/>
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=741249&r1=741248&r2=741249&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Thu Feb 5 19:17:07 2009
@@ -35,18 +35,16 @@
| |___[jspwiki.properties and web.xml]
|
|___src
- | |___webdocs
+ | |___WebContent
| | |___[all .jsp files]
| |
- | |___com
+ | |___java
| |___[...and the rest of the source code files]
|
|___docs
|
- |___lib
- |
|___tests
- |___com
+ |___java
|___[...and the rest of the test source code]
$Id: build.xml,v 1.97 2007-12-22 22:00:31 jalkanen Exp $
@@ -339,8 +337,8 @@
<copy file="${code.i18n}/plugin/PluginResources.properties"
tofile="${code.i18n}/plugin/PluginResources_en.properties"/>
<jar jarfile="${jarfile}" index="true">
<fileset dir="${code.build}" includes="**/*.class" />
- <fileset dir="${code.src}" includes="com/**/*.properties" />
- <fileset dir="${code.src}" includes="templates/**/*.properties" />
+ <fileset dir="${code.src}" includes="org/**/*.properties" />
+ <!--fileset dir="${code.src}" includes="templates/**/*.properties"
/-->
<fileset dir="${code.i18n}" />
<fileset dir="etc" includes="ini/*.xml ini/*.properties" />
<metainf dir="${code.web}/WEB-INF" includes="jspwiki.tld" />
@@ -398,24 +396,14 @@
<delete file="${warfile}" />
<war destfile="${warfile}"
- webxml="${code.web}/WEB-INF/web.xml" >
- <!-- <lib dir="lib" includes="*.jar" excludes="servlet-api.jar
jsp-api.jar"/> -->
+ webxml="${code.web}/WEB-INF/web.xml" duplicate="preserve">
<lib file="${jarfile}" />
<lib file="${code.build}/JSPWiki-jsp.jar" />
<lib file="${code.build}/jasper-runtime-*.jar" />
<lib file="${code.build}/commons-el-*.jar" />
- <fileset dir="${code.web}" includes="**" excludes="**/FCK/jsp" />
<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.js" />
<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.css" />
- <webinf dir="${code.web}/WEB-INF">
- <include name="geronimo-web.xml" />
- <include name="dtd/**" />
- <include name="jsp/**" />
- <include name="jspwiki.policy" />
- <include name="jspwiki.properties" />
- <include name="userdatabase.xml" />
- <include name="groupdatabase.xml" />
- </webinf>
+ <fileset dir="${code.web}" includes="**" excludes="**/servlet-api.jar
**/jsp-api.jar" />
<!--
<classes dir="etc">
<include name="oscache.properties" />
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties?rev=741249&r1=741248&r2=741249&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties
(original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties Thu
Feb 5 19:17:07 2009
@@ -42,8 +42,8 @@
#
# If you want to override one specific package (or just one class), do this as
follows:
#
-#log4j.logger.com.ecyrd.jspwiki.plugin=debug, FileLog
-#log4j.additivity.com.ecyrd.jspwiki.plugin=false
+#log4j.logger.org.apache.wiki.plugin=debug, FileLog
+#log4j.additivity.org.apache.wiki.plugin=false
# Enable if you're using mailing, above.
#log4j.rootCategory=INFO,FileLog,mail
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java?rev=741249&r1=741248&r2=741249&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
Thu Feb 5 19:17:07 2009
@@ -145,10 +145,10 @@
/**
* If the current Authorizer is a
- * {...@link com.ecyrd.jwpwiki.auth.authorize.WebAuthorizer},
+ * {...@link org.apache.wiki.auth.authorize.WebAuthorizer},
* this method iterates through each role returned by the
* authorizer (via
- * {...@link com.ecyrd.jwpwiki.auth.authorize.WebAuthorizer#isUserInRole(
HttpServletRequest, Role)})
+ * {...@link org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(
HttpServletRequest, Role)})
* and injects the appropriate ones into the Subject.
* @param acb the authorizer callback
* @param rcb the HTTP request
