ApacheWave 2nd commit