Index: xwiki-platform-plugins/jodatime/pom.xml
===================================================================
--- xwiki-platform-plugins/jodatime/pom.xml	(revision 0)
+++ xwiki-platform-plugins/jodatime/pom.xml	(revision 0)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>xwiki-plugins</artifactId>
+    <groupId>com.xpn.xwiki.platform.plugins</groupId>
+    <version>2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>xwiki-plugin-jodatime</artifactId>
+  <name>XWiki Platform - Plugins - Joda Time</name>
+  <version>0.1-SNAPSHOT</version>
+  <description>XWiki Platform - Plugins - Joda Time</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki.platform</groupId>
+      <artifactId>xwiki-core</artifactId>
+      <version>1.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.4</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: xwiki-platform-plugins/jodatime/src/main/java/com/xpn/xwiki/plugin/jodatime/JodaTimePlugin.java
===================================================================
--- xwiki-platform-plugins/jodatime/src/main/java/com/xpn/xwiki/plugin/jodatime/JodaTimePlugin.java	(revision 0)
+++ xwiki-platform-plugins/jodatime/src/main/java/com/xpn/xwiki/plugin/jodatime/JodaTimePlugin.java	(revision 0)
@@ -0,0 +1,81 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package com.xpn.xwiki.plugin.jodatime;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.api.Api;
+import com.xpn.xwiki.plugin.XWikiDefaultPlugin;
+import com.xpn.xwiki.plugin.XWikiPluginInterface;
+
+/**
+ * Plugin for manipulating dates from velocity scripts inside xwiki documents. It is based on the
+ * JodaTime framework ({@link http://joda-time.sourceforge.net/}), a quality replacement for the
+ * Java date and time classes.
+ * 
+ * @see JodaTimePluginApi
+ */
+public class JodaTimePlugin extends XWikiDefaultPlugin
+{
+    private static Log log =
+        LogFactory.getFactory().getInstance(com.xpn.xwiki.plugin.jodatime.JodaTimePlugin.class);
+
+    public JodaTimePlugin(String name, String className, XWikiContext context)
+    {
+        super(name, className, context);
+        init(context);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getName()
+    {
+        log.debug("getName()");
+        return "jodatime";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Api getPluginApi(XWikiPluginInterface plugin, XWikiContext context)
+    {
+        return new JodaTimePluginApi((JodaTimePlugin) plugin, context);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void flushCache()
+    {
+        super.flushCache();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void init(XWikiContext context)
+    {
+        super.init(context);
+    }
+}
Index: xwiki-platform-plugins/jodatime/src/main/java/com/xpn/xwiki/plugin/jodatime/JodaTimePluginApi.java
===================================================================
--- xwiki-platform-plugins/jodatime/src/main/java/com/xpn/xwiki/plugin/jodatime/JodaTimePluginApi.java	(revision 0)
+++ xwiki-platform-plugins/jodatime/src/main/java/com/xpn/xwiki/plugin/jodatime/JodaTimePluginApi.java	(revision 0)
@@ -0,0 +1,144 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package com.xpn.xwiki.plugin.jodatime;
+
+import java.util.Locale;
+
+import org.joda.time.DateTime;
+import org.joda.time.MutableDateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.api.Api;
+
+/**
+ * Api for the JodaTimePlugin
+ */
+public class JodaTimePluginApi extends Api
+{
+    /**
+     * the plugin instance
+     */
+    private JodaTimePlugin plugin;
+
+    public JodaTimePluginApi(JodaTimePlugin plugin, XWikiContext context)
+    {
+        super(context);
+        setPlugin(plugin);
+    }
+
+    /**
+     * @see #plugin
+     */
+    public JodaTimePlugin getPlugin()
+    {
+        return plugin;
+    }
+
+    /**
+     * @see #plugin
+     */
+    public void setPlugin(JodaTimePlugin plugin)
+    {
+        this.plugin = plugin;
+    }
+
+    /**
+     * @see org.joda.time.DateTime#DateTime()
+     */
+    public DateTime getDateTime()
+    {
+        return new DateTime();
+    }
+
+    /**
+     * @see org.joda.time.DateTime#DateTime(int, int, int, int, int, int, int)
+     */
+    public DateTime getDateTime(int year, int monthOfYear, int dayOfMonth, int hourOfDay,
+        int minuteOfHour, int secondOfMinute, int millisOfSecond)
+    {
+        return new DateTime(year,
+            monthOfYear,
+            dayOfMonth,
+            hourOfDay,
+            minuteOfHour,
+            secondOfMinute,
+            millisOfSecond);
+    }
+
+    /**
+     * @see org.joda.time.DateTime#DateTime(long)
+     */
+    public DateTime getDateTime(long instant)
+    {
+        return new DateTime(instant);
+    }
+
+    /**
+     * @see org.joda.time.MutableDateTime#MutableDateTime()
+     */
+    public MutableDateTime getMutableDateTime()
+    {
+        return new MutableDateTime();
+    }
+
+    /**
+     * @see org.joda.time.MutableDateTime#MutableDateTime(int, int, int, int, int, int, int)
+     */
+    public MutableDateTime getMutableDateTime(int year, int monthOfYear, int dayOfMonth,
+        int hourOfDay, int minuteOfHour, int secondOfMinute, int millisOfSecond)
+    {
+        return new MutableDateTime(year,
+            monthOfYear,
+            dayOfMonth,
+            hourOfDay,
+            minuteOfHour,
+            secondOfMinute,
+            millisOfSecond);
+    }
+
+    /**
+     * @see org.joda.time.MutableDateTime#MutableDateTime(long)
+     */
+    public MutableDateTime getMutableDateTime(long instant)
+    {
+        return new MutableDateTime(instant);
+    }
+
+    /**
+     * @see org.joda.time.format.DateTimeFormat#forPattern(String)
+     */
+    public DateTimeFormatter getDateTimeFormatterForPattern(String pattern)
+    {
+        return DateTimeFormat.forPattern(pattern).withLocale(
+            (Locale) getXWikiContext().get("locale"));
+    }
+
+    /**
+     * @see org.joda.time.format.DateTimeFormat#forStyle(String)
+     */
+    public DateTimeFormatter getDateTimeFormatterForStyle(String style)
+    {
+        return DateTimeFormat.forStyle(style)
+            .withLocale((Locale) getXWikiContext().get("locale"));
+    }
+}
Index: xwiki-platform-plugins/pom.xml
===================================================================
--- xwiki-platform-plugins/pom.xml	(revision 5451)
+++ xwiki-platform-plugins/pom.xml	(working copy)
@@ -52,6 +52,7 @@
         <module>adwords</module>
         <module>alexa</module>
         <module>exoplatform</module>
+        <module>jodatime</module>
         <module>scheduler</module>
         <module>application-manager</module>
         <module>wiki-manager</module>