Cache Module and Spring 3.0

[Rob]

Hi

I've just found this project whilst searching for solutions to the
problem that spring-modules-cache is not compatible with Spring 3.0
(at least annotation driven caching doesn't work). This seems to be
down to the fact that several static references are made to the class
org.springframework.metadata.Attributes which is no longer in the API
as of Spring 3.0.

Some time ago I wrote a plugin for the Grails framework that
integrates spring-modules-cache, providing Grails-y configuration
hooks, setting up the cache manager and autoproxies etc. - see
http://github.com/robfletcher/grails-springcache. However now that the
latest versions of Grails are based on Spring 3.0 the plugin no longer
works.

The original bug against the now abandoned spring modules project is
http://jira.springframework.org/browse/MOD-507. Unfortunately it looks
like the Spring documentation on autoproxies and metadata is yet to be
updated as it still makes references to the removed classes in the
org.springframework.metadata package.

I'd love to help if I can and have just cloned the Git repository for
this project. I wanted to make sure first that:

1 - This fork is still active.
2 - The solution to this problem is not already under development.

Cheers,
Rob

[Antony Stubbs]

1) It is still active - I've just had a couple of hits (family crisis stuff) out of left field which have bumped this down the priority list... however things are better under control now and there is light at the end of the tunnel!

2) not that I'm aware of... but I don't think anyone on this list is working on that...?

> --
>
> You received this message because you are subscribed to the Google Groups "spring-modules-fork" group.
> To post to this group, send email to spring-mo...@googlegroups.com.
> To unsubscribe from this group, send email to spring-modules-...@googlegroups.com.
> For more options, visit this group at http://groups.google.com/group/spring-modules-fork?hl=en.
>
>

[David Karlsen]

I could be interested in the same.
have anybody started this - because I cannot see any branches for this work at: http://github.com/astubbs/spring-modules/network

2009/12/7 Antony Stubbs <antony...@gmail.com>

[davidkarlsen]

Thought I'd write to the public group instead of directly.

I have a few branches:
mvneclipseclean: some config to generate .project, .settings
and .classpath by using the profile "eclipse": mvn -Peclipse
eclipse:clean eclipse:eclipse + gitignoring these and removing the
ones checked in + maven best practices (more to come).
libupgrades: upgrades of a few libraries
bugfix: A bugfix for the reflective hashcode generator test while
operating on maps (iteration order has impact)
collectionsmultikeygen: a keygenerator implementation by using commons-
collections

astubbs: how about creating a spring30 feature branch for the whole of
springmodules?

[davidkarlsen]

Also I noticed some tests are called *Tests which aren't caught by
surefire by default (see:http://jira.codehaus.org/browse/
SUREFIRE-587 ) so I've added a pattern for it - so that more tests are
picked up - and some failing.
I reorganized files a little so resources are now found, that fixed
quite a lot, some libs seems to be missing.
Down to:
Tests run: 689, Failures: 0, Errors: 59, Skipped: 0
If I downgrade easymock to 1.1 (which it seemed to use in the old
build) this is further down to 23 failing.

It would be cool to get the old tests going again (all of them) before
we start to refactor and upgrade stuff.
These changes are on my mvneclipseclean branch

[davidkarlsen]

I've now got it up and running with all the tests:
http://davidkarlsen.com/hudson/job/spring-modules/ .
I noticed that the sharca hudson instance fails with some errors I
cannot reproduce.
I have some questions about the environment:
-which maven version is it running (preferably 2.2.1) or 3.0.alpha
-which JDK - preferably 1.6.up18.

can yo pull my main into the original?

Also I had to update gigaspaces as the license was expired. We now
support the latest released version, 7.0.2.ga.
Can you import the libraries?

Thanks.

[Antony Stubbs]

Yup - I'll have a crack at it on Monday...

[Antony Stubbs]

On 23/01/2010, at 10:45 AM, davidkarlsen wrote:

> -which maven version is it running (preferably 2.2.1) or 3.0.alpha

astubbs@psynikal:~$ mvn --version
Maven version: 2.0.8
Java version: 1.6.0_07
OS name: "linux" version: "2.6.24-22-xen" arch: "amd64" Family: "unix"

lolz - time for an upgrade?

> -which JDK - preferably 1.6.up18.

astubbs@psynikal:~$ java -version
java version "1.6.0_07"
Java(TM) SE Runtime Environment (build 1.6.0_07-b06)
Java HotSpot(TM) 64-Bit Server VM (build 10.0-b23, mixed mode)

[Antony Stubbs]

Ok, half way there:
astubbs@psynikal:~$ mvn -version
Maven version: 2.0.8
Java version: 1.6.0_17

OS name: "linux" version: "2.6.24-22-xen" arch: "amd64" Family: "unix"

but the debian maven package is old? :/
http://packages.debian.org/lenny/maven2

bugga - debian consider 2.2.1-2 unstable? doh
http://packages.debian.org/sid/maven2

On 23/01/2010, at 10:51 AM, da...@davidkarlsen.com wrote:

> definately. Tons of bugfixes has gone into the mainland since 2.0.8.
>
> --
> David J. M. Karlsen - +47 90 68 22 43
> http://www.davidkarlsen.com
> http://mp3.davidkarlsen.com
> Sent from my bog-standard SMTP client

[Antony Stubbs]

tried being a good boy and downloaded the .deb packages, but i still got in trouble : :(

I'll ignore the libmaven dep and just do what you said - download and extract it somewhere and add it to hudson and see if that plays nicely... :) But will have to do it later... ttl!

astubbs@psynikal:~$ sudo dpkg -i maven2_2.2.1-2_all.deb
(Reading database ... 26234 files and directories currently installed.)
Preparing to replace maven2 2.0.8-3 (using maven2_2.2.1-2_all.deb) ...
Unpacking replacement maven2 ...
dpkg: dependency problems prevent configuration of maven2:
maven2 depends on libmaven2-core-java; however:
Package libmaven2-core-java is not installed.
dpkg: error processing maven2 (--install):
dependency problems - leaving unconfigured
Errors were encountered while processing:
maven2
astubbs@psynikal:~$ wget http://ftp.us.debian.org/debian/pool/main/m/maven2-core/libmaven2-core-java_2.2.1-1_all.deb
--22:44:36-- http://ftp.us.debian.org/debian/pool/main/m/maven2-core/libmaven2-core-java_2.2.1-1_all.deb
=> `libmaven2-core-java_2.2.1-1_all.deb'
Resolving ftp.us.debian.org... 35.9.37.225, 64.50.236.52, 128.30.2.36, ...
Connecting to ftp.us.debian.org|35.9.37.225|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 705,480 (689K) [application/octet-stream]

100%[=============================================================================================================>] 705,480 475.79K/s

22:44:38 (475.76 KB/s) - `libmaven2-core-java_2.2.1-1_all.deb' saved [705480/705480]

astubbs@psynikal:~$ sudo dpkg -i libmaven2-core-java_2.2.1-1_all.deb
Selecting previously deselected package libmaven2-core-java.
(Reading database ... 26220 files and directories currently installed.)
Unpacking libmaven2-core-java (from libmaven2-core-java_2.2.1-1_all.deb) ...
dpkg: dependency problems prevent configuration of libmaven2-core-java:
libmaven2-core-java depends on libcommons-cli-java (>= 1.1); however:
Version of libcommons-cli-java on system is 1.0-11.
libmaven2-core-java depends on libslf4j-java (>= 1.5.6); however:
Package libslf4j-java is not installed.
libmaven2-core-java depends on libdoxia-java (>= 1.1); however:
Version of libdoxia-java on system is 1.0-alpha-7-1.
libmaven2-core-java depends on libmodello-java (>= 1.0.1); however:
Package libmodello-java is not installed.
libmaven2-core-java depends on libplexus-archiver-java; however:
Package libplexus-archiver-java is not installed.
libmaven2-core-java depends on libplexus-sec-dispatcher-java (>= 1.3); however:
Package libplexus-sec-dispatcher-java is not installed.
libmaven2-core-java depends on libplexus-ant-factory-java; however:
Package libplexus-ant-factory-java is not installed.
libmaven2-core-java depends on libplexus-bsh-factory-java; however:
Package libplexus-bsh-factory-java is not installed.
libmaven2-core-java depends on libplexus-interpolation-java (>= 1.11); however:
Package libplexus-interpolation-java is not installed.
libmaven2-core-java depends on libplexus-utils-java (>= 1:1.5.15); however:
Version of libplexus-utils-java on system is 1:1.4.8-1.
libmaven2-core-java depends on libbackport-util-concurrent-java (>= 3.1); however:
Package libbackport-util-concurrent-java is not installed.
dpkg: error processing libmaven2-core-java (--install):
dependency problems - leaving unconfigured
Errors were encountered while processing:
libmaven2-core-java

On 23/01/2010, at 11:39 AM, da...@davidkarlsen.com wrote:

> On Sat, 23 Jan 2010, Antony Stubbs wrote:
>
>> Ok, half way there:
>> astubbs@psynikal:~$ mvn -version
>> Maven version: 2.0.8
>> Java version: 1.6.0_17
>> OS name: "linux" version: "2.6.24-22-xen" arch: "amd64" Family: "unix"
>>
>> but the debian maven package is old? :/
>> http://packages.debian.org/lenny/maven2

> the debian packaging will always lag quite a lot - I simply download the lastest from maven.apache.org, unpack it somewhere suiteable, and create a symlink maven2 so that I can add that to my system configuration.
>
> Besides it'spossible do define several installations in hudson, and select a specific one for a given maven job.

[Antony Stubbs]

Well fancy that! - Isn't hudson cool!

[da...@davidkarlsen.com]

On Sat, 23 Jan 2010, Antony Stubbs wrote:

> Well fancy that! - Isn't hudson cool!

:)
But as you see the graph of tests is going down, so I think we're mixing
the different maven pom's (which all have the same GAV (groupId,
artifactId and version).

A way to avoid stepping on each other toes is to sleect "use private maven
repository" inside each job, they will then isolate their produced and
consumed artifacts).

I'd also appreciate if I could work directly at your master, as well as
having access to the issuemanager - quite a few of them can be closed.

[da...@davidkarlsen.com]

On Sat, 23 Jan 2010, Antony Stubbs wrote:

> Well fancy that! - Isn't hudson cool!

I download them and unpack them myself (jdks and maven), then press add
maven or add jdk.

Also remember to pick those installations while configuring the jobs.

AFAIK hudson prints the maven version, go into the console output of the
build and it should be somewhere near the top of the page.

[da...@davidkarlsen.com]

On Sat, 23 Jan 2010, Antony Stubbs wrote:

definately. Tons of bugfixes has gone into the mainland since 2.0.8.

--

[da...@davidkarlsen.com]

On Sat, 23 Jan 2010, Antony Stubbs wrote:

> Ok, half way there:
> astubbs@psynikal:~$ mvn -version
> Maven version: 2.0.8
> Java version: 1.6.0_17
> OS name: "linux" version: "2.6.24-22-xen" arch: "amd64" Family: "unix"
>
> but the debian maven package is old? :/
> http://packages.debian.org/lenny/maven2

the debian packaging will always lag quite a lot - I simply download the
lastest from maven.apache.org, unpack it somewhere suiteable, and create a
symlink maven2 so that I can add that to my system configuration.

Besides it'spossible do define several installations in hudson, and select
a specific one for a given maven job.

--

[Ian]

I made progress today on getting spring 3 to work with spring-modules-
cache using the cache annotations. To do this I simply removed the
references to org.springframework.metadata.Attributes in

org.springmodules.cache.interceptor.caching.MetadataCachingInterceptor
org.springmodules.cache.interceptor.caching.MetadataCachingAttributeSource
org.springmodules.cache.interceptor.flush.MetadataFlushingAttributeSource
org.springmodules.cache.interceptor.flush.MetadataFlushingInterceptor

however in doing so I simply removed the method setAttributes
(Attributes attributes) method in the Interceptor classes. I can't
work out what this setAttributes method was used for and what used to
call it. I wouldn't like to suggest the removal of this method as a
fix to this unless I understand what this method was for and what the
impact of its removal is. For my purposes it works with it removed
- but other usages probably rely on it.

Any ideas what the purpose of this setAttributes method is?

[Antony Stubbs]

On 25/01/2010, at 11:14 PM, da...@davidkarlsen.com wrote:

> On Sat, 23 Jan 2010, Antony Stubbs wrote:
>
>> Well fancy that! - Isn't hudson cool!
> :)
> But as you see the graph of tests is going down, so I think we're mixing the different maven pom's (which all have the same GAV (groupId, artifactId and version).
>
> A way to avoid stepping on each other toes is to sleect "use private maven repository" inside each job, they will then isolate their produced and consumed artifacts).

Have changed that and also changed build targets to "clean install".

> I'd also appreciate if I could work directly at your master, as well as having access to the issuemanager - quite a few of them can be closed.

Yup - I am going to sort that out soon, once we get this bit of work done.

[Antony Stubbs]

On 3/02/2010, at 6:57 PM, Antony Stubbs wrote:

> On 25/01/2010, at 11:14 PM, da...@davidkarlsen.com wrote:
>
>> On Sat, 23 Jan 2010, Antony Stubbs wrote:
>>
>>> Well fancy that! - Isn't hudson cool!
>> :)
>> But as you see the graph of tests is going down, so I think we're mixing the different maven pom's (which all have the same GAV (groupId, artifactId and version).
>>
>> A way to avoid stepping on each other toes is to sleect "use private maven repository" inside each job, they will then isolate their produced and consumed artifacts).
>
> Have changed that and also changed build targets to "clean install".

Are you talking about the "maven.repo.local" setting? Having it separate for each project?

Again, I thought the reactor builds managed this ok. Can you be more precise about why you think this problem is occurring?

Thanks!

[Antony Stubbs]

I suggest you have at with your proposed changes, commit to your repo,
and post here so we can check out your changes on github. :)

> --
> You received this message because you are subscribed to the Google Groups "spring-modules-fork" group.
> To post to this group, send email to spring-mo...@googlegroups.com.
> To unsubscribe from this group, send email to spring-modules-...@googlegroups.com.
> For more options, visit this group at http://groups.google.com/group/spring-modules-fork?hl=en.
>
>

--
___________________________
http://stubbisms.wordpress.com/

[Ian Homer]

Yes - I will do (just got myself set up on github)

--
Ian Homer
mobile ... made simple
http://bemoko.com | http://twitter.com/ianhomer

[rossputin]

Very interested to hear how things go with this, looking forward to
plugging the cache module and annotations back into my code for Spring
3.0 :-)

-- Ross

On Feb 3, 10:13 am, Ian Homer <ian.ho...@gmail.com> wrote:
> Yes - I will do (just got myself set up on github)
>
> On 3 Feb 2010, at 06:06, Antony Stubbs wrote:
>
>
>
>
>
> > I suggest you have at with your proposed changes, commit to your repo,
> > and post here so we can check out your changes on github. :)
>

> > On 28 January 2010 11:06, Ian <ian.ho...@gmail.com> wrote:
> >> I made progress today on getting spring 3 to work with spring-modules-
> >> cache using the cache annotations.   To do this I simply removed the
> >> references to org.springframework.metadata.Attributes in
>
> >> org.springmodules.cache.interceptor.caching.MetadataCachingInterceptor
> >> org.springmodules.cache.interceptor.caching.MetadataCachingAttributeSource
> >> org.springmodules.cache.interceptor.flush.MetadataFlushingAttributeSource
> >> org.springmodules.cache.interceptor.flush.MetadataFlushingInterceptor
>
> >> however in doing so I simply removed the method setAttributes
> >> (Attributes attributes) method in the Interceptor classes.  I can't
> >> work out what this setAttributes method was used for and what used to
> >> call it.  I wouldn't like to suggest the removal of this method as a
> >> fix to this unless I understand what this method was for and what the
> >> impact of its removal is.    For my purposes it works with it removed
> >> - but other usages probably rely on it.
>
> >> Any ideas what the purpose of this setAttributes method is?
>
> >> --
> >> You received this message because you are subscribed to the Google Groups "spring-modules-fork" group.
> >> To post to this group, send email to spring-mo...@googlegroups.com.
> >> To unsubscribe from this group, send email to spring-modules-...@googlegroups.com.

> >> For more options, visit this group athttp://groups.google.com/group/spring-modules-fork?hl=en.

[Antony Stubbs]

You guys who are working on 3.0 support, feel free to create a spring3.0 branch and I'll start pulling it into the main repo (as a branch).

[jeroen]

Hi Ian,

On Jan 27, 11:06 pm, Ian <ian.ho...@gmail.com> wrote:
> I made progress today on getting spring 3 to work with spring-modules-
> cache using the cache annotations.   To do this I simply removed the
> references to org.springframework.metadata.Attributes in
>
> org.springmodules.cache.interceptor.caching.MetadataCachingInterceptor
> org.springmodules.cache.interceptor.caching.MetadataCachingAttributeSource
> org.springmodules.cache.interceptor.flush.MetadataFlushingAttributeSource
> org.springmodules.cache.interceptor.flush.MetadataFlushingInterceptor

Do you have a compiled jar available for download spring-modules-
cache.jar with your changes incorporated? I would like to check it
out.

Thanks and best regards,

Jeroen

[Antony Stubbs]

yes please push your spring3 changes up into your github fork so we can see/use/fork them ;)

and so Jeroen here can pull and compile them.

[Ian]

My changes to get spring modules running against Spring v3 are
committed at

http://github.com/ianhomer/spring-modules

Note that this is a pretty crude fix in that I've simply removed
commented out references to org.springframework.metadata.Attributes
and org.springframework.metadata.commons.CommonsAttributes (and any
test cases which used this approach). I've commented it out instead
of removing it in case anyone fancies getting this attributes approach
working with spring v3.0

For our projects we use the annotations approach which works fine with
all this stuff commented out.

Thanks,

Ian

[rossputin]

Excellent, good news Ian. I hope to find time to try it out soon as
my projects allow. In fact, I would hopefully be able to use it in
one of them :-)

-- Ross

[Antony Stubbs]

Great! But would you be able to move iit out of master and into a
branch? I'll pull it into my repo but as "spring30" branch.

Which modules did you manage to test w spring3?

Regards,
Antony Stubbs
Technical Architect - Prototyping
Telecom Retail

[Ian Homer]

Now moved to "spring30" branch - http://github.com/ianhomer/spring-modules/tree/spring30

I've only tested spring-modules-cache against spring v3.

Thanks,

Ian

>> For more options, visit this group at http://groups.google.com/group/spring-modules-fork?hl=en.
>>

--
Ian Homer

[Antony Stubbs]

Could you send me a pull request?

hmm, a lot of these changes look like white space changes?
http://github.com/ianhomer/spring-modules/commit/78a28c9769dd3e18510954d7bb6e8e8d276ce394
may only be the projects/spring-modules-cache/src/test/java/org/springmodules/cache/util/ReflectionsTest.java file. Can you take the whitespace changes out of the commit?

[Ian Homer]

Apologies - I had code formatting enabled. I'll redo the changes.

Ian

[Ian Homer]

White space changes removed and sent you a pull request.

Ian

On 18 Mar 2010, at 00:53, Antony Stubbs wrote:

[Antony Stubbs]

Thanks Ian. Could you squash the two commits together? Otherwise I'll
do it.

git checkout spring30
"git rebase -i HEAD^^^^"

Regards,
Antony Stubbs
Technical Architect - Prototyping
Telecom Retail

>>>>
>>>>>>>> org.springmodules.cache.interceptor.caching.MetadataCachingAttributeSource

>>>>
>>>>>>>> org.springmodules.cache.interceptor.flush.MetadataFlushingAttributeSource

>>>>
>>>>>>>> org.springmodules.cache.interceptor.flush.MetadataFlushingInterceptor

[Antony Stubbs]

Ok, how does this look?

http://github.com/astubbs/spring-modules/commit/154370612d47d7e7d128be208882af3b8d690ef1

One last thing - could you add (or just tell me, and I'll update), why the following test is ignored? i.e. @Ignore("CachingAttributeWithNotCacheableMethod isn't applicable in Spring 3.0 because we don't have non-cacheable methods anymore.") or something...

@@ -87,17 +85,18 @@ public final class MetadataCachingAttributeSourceTests extends TestCase {


0
    * returns <code>null</code> if the return value of the specified method is


0
    * <code>void</code>.


0
    */


0
+  @Ignore


0
   public void testGetCachingAttributeWithNotCacheableMethod() throws Exception {


0
     setUpTargetClassAndNonCacheableMethod();


0
     assertNull(source.attribute(method, targetClass));


0
   }

projects/spring-modules-cache/src/test/java/org/springmodules/cache/interceptor/caching/MetadataCachingAttributeSourceTests.java

Btw, I'm not sure how you ended up with cherry pick issues? My work flow was literally:

501  cd Workspaces/spring-modules/spring-modules

502  git remote add ianhomer git://github.com/ianhomer/spring-modules.git

503  git fetch ianhomer

504  gitx

505  git checkout -b spring30 ianhomer/spring30-experimental 

506  gitx projects/spring-modules-cache/src/main/java/org/springmodules/cache/config/CommonsAttributesParser.java

507  git lp projects/spring-modules-cache/src/main/java/org/springmodules/cache/config/CommonsAttributesParser.java

# Squashing the two commits

508  git rebase -i HEAD^^^

# Checking results

509  gitx

514  git lp ianhomer/spring30-experimental  projects/spring-modules-cache/src/main/java/org/springmodules/cache/config/CommonsAttributesParser.java

515  gitx

# Removing another whitespace change I noticed (introduced a space in the javadoc)

# Mark commit to edit

518  git rebase -i HEAD^^

# open file and edit it

519  open projects/spring-modules-cache/src/test/java/org/springmodules/cache/config/CacheNamespaceHandlerTests.java

# add edited file

523  git add projects/spring-modules-cache/src/test/java/org/springmodules/cache/config/CacheNamespaceHandlerTests.java

# apply

524  git commit --amend

# Continue rebase

525  git rebase --continue

527  git push origin spring30

Let me know if you have any questions - Always happy to spread the git love! :)

On 22 March 2010 21:16, Ian Homer <ian....@gmail.com> wrote:

Sorry - having a problem doing this.  Getting cherry-pick conflicts.  Would you be able to do it?

Thanks,

Ian

On 22 Mar 2010, at 02:52, Antony Stubbs wrote:

> Thanks Ian. Could you squash the two commits together? Otherwise I'll do it.
>
> git checkout spring30
> "git rebase -i HEAD^^^^"
>
> Regards,
> Antony Stubbs
> Technical Architect - Prototyping
> Telecom Retail
>
> On 22/03/2010, at 8:37 AM, Ian Homer <ian....@gmail.com> wrote:
>
>> White space changes removed and sent you a pull request.
>>
>> Ian
>>
>> On 18 Mar 2010, at 00:53, Antony Stubbs wrote:
>>
>>> Could you send me a pull request?
>>>
>>> hmm, a lot of these changes look like white space changes?
>>> http://github.com/ianhomer/spring-modules/commit/78a28c9769dd3e18510954d7bb6e8e8d276ce394

>>> may only be the projects/spring-modules-cache/src/test/java/org/springmodules/cache/util/ReflectionsTest.java file. Can you take the whitespace changes out of the commit?

>>>>>> For more options, visit this group at http://groups.google.com/group/spring-modules-fork?hl=en.
>>>>>>
>>>>
>>>> --
>>>> Ian Homer
>>>> mobile ... made simple
>>>> http://bemoko.com | http://twitter.com/ianhomer
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>
>>

--
Ian Homer
mobile ... made simple
http://bemoko.com | http://twitter.com/ianhomer

--
___________________________
http://stubbisms.wordpress.com/

[Ian Homer]

Yes - that looks good.   The test is ignored because I couldn't work out how to migrate the caching with commons attributes functionality.   I didn't want to simply remove the test as it might be something that some people still need and something that someone else can chip in and fix.

Thanks for sending over your git history (and patience with my inexperienced git) - I'm slowly getting to grips with it.

Ian

[Antony Stubbs]

Ok, I've added that little comment in - thanks.

Make sure you continue spring30 work off of the branch thats in my repp now, as your ones are superseded. Eg.

git add remote myrepo url

git branch -d spring30

git checkout -b spring30 astubbs.git/spring30 or whatever my url is :)

git push -f (-f to overwrite your spring30 branch on github)

[Antony Stubbs]

No problem!

btw - I have some aliases setup in my gitconfig - that was why you saw the "git lp":

[alias]
        lp = log -p --color
        l = log --color --stat
        st = status
        s = status
        co = checkout
        df = !git diff | mate
        d = diff --color
        lg = log --graph --color --pretty=oneline

btw, don't forget to base any further development off the branches I've now uploaded!

On 23/03/2010, at 6:21 PM, Ian Homer wrote: