incubator-jspwiki-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dirk Frederickx <dirk.frederi...@gmail.com>
Subject Re: svn commit: r787835 - in /incubator/jspwiki/trunk: ./ etc/ src/WebContent/ src/WebContent/WEB-INF/ src/WebContent/WEB-INF/classes/ src/WebContent/WEB-INF/lib/ src/WebContent/admin/ src/WebContent/applets/ src/WebContent/error/ src/WebContent/imag
Date Wed, 24 Jun 2009 18:02:38 GMT
Janne,

1)
The 'revert'-log is pretty extensive while I would expect only one
line : delete the JSSpec directory  ?
I hope nothing else has been reverted too ?


2)
JSSpec is a supporting library to run unit-tests on the javascripts.
It is not included in the end JSPWiki product.
How come that this is a problem ?

Would it be ok just to remove the JSSpec library and point to the
google-code-repository instead of including it in the svn ?

How can we resolve this ?


dirk


On Tue, Jun 23, 2009 at 11:08 PM, <jalkanen@apache.org> wrote:
> Author: jalkanen
> Date: Tue Jun 23 21:08:22 2009
> New Revision: 787835
>
> URL: http://svn.apache.org/viewvc?rev=787835&view=rev
> Log:
> Reverted back to 3.0.0-svn-132 due to GPL dependency introduced in -133.
>
> Removed:
>    incubator/jspwiki/trunk/tests/JSSpec/
> Modified:
>    incubator/jspwiki/trunk/ChangeLog
>    incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Captcha.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Comment.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/CookieError.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Delete.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Diff.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Edit.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Error.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Group.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Install.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Login.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Logout.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Message.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/PageModified.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Preview.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Rename.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Search.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/oscache.properties   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/geronimo-web.xml   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/groupdatabase.xml   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki-container.policy   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/README   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/activation.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/akismet-java-1.02.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-codec-1.3.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
  (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-httpclient-3.0.1.jar
  (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-io-1.4.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-lang-2.3.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/ecs.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.60.jar
  (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jabsorb-1.3.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-tablibs-standard-1.1.2.jar
  (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-taglibs-jstl-1.1.2.jar
  (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jaxen.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcr-1.0.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jdom.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jrcs-diff.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jsp-api.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jul-to-slf4j-1.5.6.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/log4j-1.2.14.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/lucene-highlighter.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/lucene.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/mail.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/nekohtml.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/oscache.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/sandler.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/servlet-api.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/slf4j-api-1.5.6.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.6.jar   (props
changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/xmlrpc.jar   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/WEB-INF/userdatabase.xml   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Wiki.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/Workflow.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/admin/   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/applets/   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/atom.css   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/error/   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/images/   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/rss.jsp   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/scripts/   (props changed)
>    incubator/jspwiki/trunk/src/WebContent/templates/   (props changed)
>    incubator/jspwiki/trunk/src/java/org/   (props changed)
>    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
>    incubator/jspwiki/trunk/tests/java/SamplePlugin2.java   (props changed)
>    incubator/jspwiki/trunk/tests/java/TranslationsCheck.java   (props changed)
>    incubator/jspwiki/trunk/tests/java/com/   (props changed)
>    incubator/jspwiki/trunk/tests/java/stress/   (props changed)
>
> Modified: incubator/jspwiki/trunk/ChangeLog
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=787835&r1=787834&r2=787835&view=diff
> ==============================================================================
> --- incubator/jspwiki/trunk/ChangeLog (original)
> +++ incubator/jspwiki/trunk/ChangeLog Tue Jun 23 21:08:22 2009
> @@ -1,12 +1,3 @@
> -2009-06-22 Dirk Frederickx <brushed AT apache DOT org>
> -
> -        * 3.0.0-svn-133
> -
> -        * Added javascript unit-tests based on JSSpec. Not all tests are running
> -        yet and the test-suite definitely needs further expansions.
> -        Just open tests/JSSpec/JSSpec-index.html in your browser to run the test-suite.
> -
> -
>  2009-06-07 Janne Jalkanen <jalkanen@apache.org>
>
>         * 3.0.0-svn-132
>
> Propchange: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Captcha.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Comment.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/CookieError.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Delete.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Diff.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Edit.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Error.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Group.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Install.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Login.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Logout.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Message.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/PageModified.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Preview.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Rename.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Search.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/oscache.properties
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/geronimo-web.xml
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/groupdatabase.xml
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki-container.policy
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/README
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/activation.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/akismet-java-1.02.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-codec-1.3.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-httpclient-3.0.1.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-io-1.4.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-lang-2.3.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/ecs.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.60.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jabsorb-1.3.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-tablibs-standard-1.1.2.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-taglibs-jstl-1.1.2.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jaxen.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcr-1.0.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jdom.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jrcs-diff.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jsp-api.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jul-to-slf4j-1.5.6.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/log4j-1.2.14.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/lucene-highlighter.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/lucene.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/mail.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/nekohtml.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/oscache.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/sandler.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/servlet-api.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/slf4j-api-1.5.6.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.6.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/xmlrpc.jar
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/userdatabase.xml
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Wiki.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/Workflow.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/admin/
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/applets/
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/atom.css
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/error/
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/images/
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/rss.jsp
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/scripts/
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/WebContent/templates/
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/src/java/org/
>            ('svn:mergeinfo' removed)
>
> 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=787835&r1=787834&r2=787835&view=diff
> ==============================================================================
> --- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
> +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Tue Jun 23 21:08:22
2009
> @@ -77,7 +77,7 @@
>      *  <p>
>      *  If the build identifier is empty, it is not added.
>      */
> -    public static final String     BUILD         = "133";
> +    public static final String     BUILD         = "132";
>
>     /**
>      *  This is the generic version string you should use
>
> Propchange: incubator/jspwiki/trunk/tests/java/SamplePlugin2.java
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/tests/java/TranslationsCheck.java
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/tests/java/com/
>            ('svn:mergeinfo' removed)
>
> Propchange: incubator/jspwiki/trunk/tests/java/stress/
>            ('svn:mergeinfo' removed)
>
>
>

Mime
View raw message