Return-Path: Delivered-To: apmail-incubator-jspwiki-dev-archive@locus.apache.org Received: (qmail 36421 invoked from network); 31 Dec 2008 18:15:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Dec 2008 18:15:57 -0000 Received: (qmail 28513 invoked by uid 500); 31 Dec 2008 18:15:57 -0000 Delivered-To: apmail-incubator-jspwiki-dev-archive@incubator.apache.org Received: (qmail 28496 invoked by uid 500); 31 Dec 2008 18:15:57 -0000 Mailing-List: contact jspwiki-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-dev@incubator.apache.org Received: (qmail 28485 invoked by uid 99); 31 Dec 2008 18:15:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Dec 2008 10:15:57 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of Janne.Jalkanen@ecyrd.com designates 193.64.5.122 as permitted sender) Received: from [193.64.5.122] (HELO mail.ecyrd.com) (193.64.5.122) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Dec 2008 18:15:48 +0000 Received: from [192.168.0.10] (cs181005170.pp.htv.fi [82.181.5.170]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.ecyrd.com (Postfix) with ESMTPSA id 7FA5D97C10D for ; Wed, 31 Dec 2008 20:15:12 +0200 (EET) Mime-Version: 1.0 (Apple Message framework v753.1) In-Reply-To: <20081231173537.4861E238889E@eris.apache.org> References: <20081231173537.4861E238889E@eris.apache.org> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <6EEC4717-C5C7-423C-8DBB-0A2DF2A3B7C2@ecyrd.com> Content-Transfer-Encoding: 7bit From: Janne Jalkanen Subject: Re: svn commit: r730422 - in /incubator/jspwiki/trunk/src/org/apache/jspwiki/api: PageFilter.java WikiContext.java WikiPlugin.java WikiRenderer.java Date: Wed, 31 Dec 2008 20:15:10 +0200 To: jspwiki-dev@incubator.apache.org X-Mailer: Apple Mail (2.753.1) X-Virus-Checked: Checked by ClamAV on apache.org Thanks. I was using that WikiContext. Now my merges are *totally* broken. /Janne On Dec 31, 2008, at 19:35 , ajaquith@apache.org wrote: > Author: ajaquith > Date: Wed Dec 31 09:35:36 2008 > New Revision: 730422 > > URL: http://svn.apache.org/viewvc?rev=730422&view=rev > Log: > Bug fix: to prevent potential name clashes, removed API version of > WikiContext until we figure out what we're doing. In the interim, > there should be only one. > > Removed: > incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiContext.java > Modified: > incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PageFilter.java > incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiPlugin.java > incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiRenderer.java > > Modified: incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > PageFilter.java > URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/ > apache/jspwiki/api/PageFilter.java? > rev=730422&r1=730421&r2=730422&view=diff > ====================================================================== > ======== > --- incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > PageFilter.java (original) > +++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > PageFilter.java Wed Dec 31 09:35:36 2008 > @@ -22,6 +22,8 @@ > > import java.util.Properties; > > +import com.ecyrd.jspwiki.WikiContext; > + > > /** > * Provides a definition for a page filter. A page filter is a > class > > Modified: incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiPlugin.java > URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/ > apache/jspwiki/api/WikiPlugin.java? > rev=730422&r1=730421&r2=730422&view=diff > ====================================================================== > ======== > --- incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiPlugin.java (original) > +++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiPlugin.java Wed Dec 31 09:35:36 2008 > @@ -22,6 +22,8 @@ > > import java.util.Map; > > +import com.ecyrd.jspwiki.WikiContext; > + > /** > * Defines an interface for plugins. Any instance of a wiki plugin > * should implement this interface. > > Modified: incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiRenderer.java > URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/ > apache/jspwiki/api/WikiRenderer.java? > rev=730422&r1=730421&r2=730422&view=diff > ====================================================================== > ======== > --- incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiRenderer.java (original) > +++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ > WikiRenderer.java Wed Dec 31 09:35:36 2008 > @@ -22,6 +22,8 @@ > > import java.io.InputStream; > > +import com.ecyrd.jspwiki.WikiContext; > + > /** > * The WikiRenderer interface provides access to the JSPWiki > rendering > * engine. The job of the WikiRenderer is to grab content in a >