Property changes on: server
___________________________________________________________________
Modified: svn:ignore
   - target
war
.settings

   + target
war
.settings
.classpath
.project



Property changes on: server/src/main/java
___________________________________________________________________
Added: svn:ignore
   + META-INF


Index: server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
===================================================================
--- server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java	(revision 1073718)
+++ server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java	(working copy)
@@ -46,309 +46,431 @@
     public List<Message> messages = new ArrayList<Message>();
     private boolean closed = true;
     private boolean exists;
-    
+
     public MockIMAPFolder(String fullName, IMAPStore store) {
-        super(fullName, (DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER.equals(fullName) ? '\0' : SEPARATOR), store);
+	super(fullName, (DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER
+		.equals(fullName) ? '\0' : SEPARATOR), store, false);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] addMessages(Message[] mArray)
-            throws MessagingException {
-        checkExists();
-        messages.addAll(Arrays.asList(mArray));
-        return mArray;
+	    throws MessagingException {
+	checkExists();
+	messages.addAll(Arrays.asList(mArray));
+	return mArray;
     }
-    
+
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void appendMessages(Message[] msgs) throws MessagingException {
-        addMessages(msgs);
+	addMessages(msgs);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized void close(boolean expunge) throws MessagingException {
-        checkExists();
-        if (expunge) {
-            expunge();
-        }
-        closed = true;
+	checkExists();
+	if (expunge) {
+	    expunge();
+	}
+	closed = true;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Folder[] list() throws MessagingException {
-        List<MockIMAPFolder> folders = ((MockIMAPStore) store).getChilds(this);
-        return folders.toArray(new Folder[folders.size()]);
+	List<MockIMAPFolder> folders = ((MockIMAPStore) store).getChilds(this);
+	return folders.toArray(new Folder[folders.size()]);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized void copyMessages(Message[] messages, Folder folder)
-            throws MessagingException {
-        checkExists();
-        ((MockIMAPFolder) folder).addMessages(messages);
+	    throws MessagingException {
+	checkExists();
+	((MockIMAPFolder) folder).addMessages(messages);
 
     }
-    
+
     public void loadDemoMessages(Session session) throws MessagingException {
-        if (!exists()) {
-            create(IMAPFolder.HOLDS_MESSAGES);
-            open(Folder.READ_WRITE);
-        }
-        for(int i=0;;i++) {
-            String name = DemoModeConstants.DEMO_MODE_MESSAGES_LOCATION + i + ".msg";
-            InputStream is =  Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
-            if (is == null) break;
-            addMessages(new Message[]{new MimeMessage(session, is)});
-        }
+	if (!exists()) {
+	    create(IMAPFolder.HOLDS_MESSAGES);
+	    open(Folder.READ_WRITE);
+	}
+	for (int i = 0;; i++) {
+	    String name = DemoModeConstants.DEMO_MODE_MESSAGES_LOCATION + i
+		    + ".msg";
+	    InputStream is = Thread.currentThread().getContextClassLoader()
+		    .getResourceAsStream(name);
+	    if (is == null)
+		break;
+	    addMessages(new Message[] { new MimeMessage(session, is) });
+	}
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized boolean create(int type) throws MessagingException {
-        if (exists()) {
-            throw new MessagingException("Folder already exists!");
-        }
-        exists = true;
-        return ((MockIMAPStore) store).save(this);
+	if (exists()) {
+	    throw new MessagingException("Folder already exists!");
+	}
+	exists = true;
+	return ((MockIMAPStore) store).save(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized boolean delete(boolean recursive)
-            throws MessagingException {
-        exists = false;
-        return ((MockIMAPStore) store).delete(this, recursive);
+	    throws MessagingException {
+	exists = false;
+	return ((MockIMAPStore) store).delete(this, recursive);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized boolean exists() throws MessagingException {
-        return exists;
+	return exists;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized void fetch(Message[] msgs, FetchProfile fp)
-            throws MessagingException {
-        checkExists();
+	    throws MessagingException {
+	checkExists();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized int getDeletedMessageCount() throws MessagingException {
-        return 0;
+	return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Folder getFolder(String name) throws MessagingException {
-        return super.getFolder(name);
+	return super.getFolder(name);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized String getFullName() {
-        return fullName;
+	return fullName;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message getMessage(int msgnum)
-            throws MessagingException {
-        checkExists();
-        if (messages.size() <= msgnum) {
-            throw new MessagingException();
-        }
-        return messages.get(msgnum);
+	    throws MessagingException {
+	checkExists();
+	if (messages.size() <= msgnum) {
+	    throw new MessagingException();
+	}
+	return messages.get(msgnum);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message getMessageByUID(long uid)
-            throws MessagingException {
-        checkExists();
-        return getMessage(new Long(uid).intValue());
+	    throws MessagingException {
+	checkExists();
+	return getMessage(new Long(uid).intValue());
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized int getMessageCount() throws MessagingException {
-        checkExists();
-        return messages.size();
+	checkExists();
+	return messages.size();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] getMessagesByUID(long uidstart, long uidend)
-            throws MessagingException {
-        checkExists();
-        return getMessages(new Long(uidstart).intValue(), new Long(uidend)
-                .intValue());
+	    throws MessagingException {
+	checkExists();
+	return getMessages(new Long(uidstart).intValue(),
+		new Long(uidend).intValue());
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] getMessagesByUID(long[] uids)
-            throws MessagingException {
-        checkExists();
-        int ints[] = new int[uids.length];
-        for (int i = 0; i < uids.length; i++) {
-            ints[i] = new Long(uids[i]).intValue();
-        }
-        return getMessages(ints);
+	    throws MessagingException {
+	checkExists();
+	int ints[] = new int[uids.length];
+	for (int i = 0; i < uids.length; i++) {
+	    ints[i] = new Long(uids[i]).intValue();
+	}
+	return getMessages(ints);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized String getName() {
-        return name;
+	return name;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized int getNewMessageCount() throws MessagingException {
-        checkExists();
-        return 0;
+	checkExists();
+	return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Folder getParent() throws MessagingException {
-        return ((MockIMAPStore) store).getParent(this);
+	return ((MockIMAPStore) store).getParent(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void idle() throws MessagingException {
-        checkExists();
+	checkExists();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized boolean isOpen() {
-        return closed == false;
+	return closed == false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized boolean isSubscribed() {
-        return true;
+	return true;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized void open(int arg0) throws MessagingException {
-        checkExists();
-        closed = false;
+	checkExists();
+	closed = false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized boolean renameTo(Folder f) throws MessagingException {
-        checkExists();
-        return false;
+	checkExists();
+	return false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] search(SearchTerm arg0, Message[] arg1)
-            throws MessagingException {
-        checkExists();
-        return arg1;
+	    throws MessagingException {
+	checkExists();
+	return arg1;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] expunge() throws MessagingException {
-        checkExists();
-        return expunge(messages.toArray(new Message[messages.size()]));
+	checkExists();
+	return expunge(messages.toArray(new Message[messages.size()]));
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] expunge(Message[] msgs)
-            throws MessagingException {
-        checkExists();
-        List<Message> mList = new ArrayList<Message>();
-        for (int i = 0; i < msgs.length; i++) {
-            Message m = msgs[i];
-            if (m.getFlags().contains(Flag.DELETED)) {
-                if (messages.remove(m)) {
-                    mList.add(m);
-                }
-            }
-        }
-        return mList.toArray(new Message[mList.size()]);
+	    throws MessagingException {
+	checkExists();
+	List<Message> mList = new ArrayList<Message>();
+	for (int i = 0; i < msgs.length; i++) {
+	    Message m = msgs[i];
+	    if (m.getFlags().contains(Flag.DELETED)) {
+		if (messages.remove(m)) {
+		    mList.add(m);
+		}
+	    }
+	}
+	return mList.toArray(new Message[mList.size()]);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] search(SearchTerm arg0)
-            throws MessagingException {
-        checkExists();
-        return getMessages();
+	    throws MessagingException {
+	checkExists();
+	return getMessages();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized void setFlags(Message[] mArray, Flags flags,
-            boolean value) throws MessagingException {
-        checkExists();
-        for (int i = 0; i < mArray.length; i++) {
-            Message m = mArray[i];
-            for (int a = 0; a < messages.size(); a++) {
-                Message m2 = messages.get(a);
-                if (m2.equals(m)) {
-                    m2.setFlags(flags, value);
-                    break;
-                }
-            }
-        }
+	    boolean value) throws MessagingException {
+	checkExists();
+	for (int i = 0; i < mArray.length; i++) {
+	    Message m = mArray[i];
+	    for (int a = 0; a < messages.size(); a++) {
+		Message m2 = messages.get(a);
+		if (m2.equals(m)) {
+		    m2.setFlags(flags, value);
+		    break;
+		}
+	    }
+	}
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] getMessages() throws MessagingException {
-        checkExists();
-        return messages.toArray(new Message[messages.size()]);
+	checkExists();
+	return messages.toArray(new Message[messages.size()]);
 
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] getMessages(int start, int end)
-            throws MessagingException {
-        checkExists();
-        Message[] array = new Message[end- --start];
-        for (int i=0; start<end; i++,start++) 
-            array[i] = messages.get(start);
-        return array;
+	    throws MessagingException {
+	checkExists();
+	Message[] array = new Message[end - --start];
+	for (int i = 0; start < end; i++, start++)
+	    array[i] = messages.get(start);
+	return array;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized Message[] getMessages(int[] ints)
-            throws MessagingException {
-        checkExists();
-        Message[] array = new Message[ints.length];
+	    throws MessagingException {
+	checkExists();
+	Message[] array = new Message[ints.length];
 
-        for (int i = 0; i < ints.length; i++) {
-            int mInt = ints[i] - 1;
-            if (mInt > messages.size() || mInt < messages.size()) {
-                throw new MessagingException();
-            }
-            array[i] = messages.get(i);
-        }
-        return array;
+	for (int i = 0; i < ints.length; i++) {
+	    int mInt = ints[i] - 1;
+	    if (mInt > messages.size() || mInt < messages.size()) {
+		throw new MessagingException();
+	    }
+	    array[i] = messages.get(i);
+	}
+	return array;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Store getStore() {
-        return store;
+	return store;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized void setFlags(int arg0, int arg1, Flags arg2,
-            boolean arg3) throws MessagingException {
-        checkExists();
+	    boolean arg3) throws MessagingException {
+	checkExists();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized void setFlags(int[] arg0, Flags arg1, boolean arg2)
-            throws MessagingException {
-        checkExists();
+	    throws MessagingException {
+	checkExists();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized long getUID(Message message) throws MessagingException {
-        checkExists();
-        return messages.indexOf(message);
+	checkExists();
+	return messages.indexOf(message);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public synchronized int getUnreadMessageCount() throws MessagingException {
-        int ret = getMessageCount();
-        for (Message msg: messages) {
-            if (msg.getFlags().contains(Flag.SEEN))
-                ret --;
-        }
-        return ret;
+	int ret = getMessageCount();
+	for (Message msg : messages) {
+	    if (msg.getFlags().contains(Flag.SEEN))
+		ret--;
+	}
+	return ret;
     }
 
-    private void checkExists() throws MessagingException {
-        if (exists() == false) {
-            throw new MessagingException("Folder not exists");
-        }
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void checkExists() throws MessagingException {
+	if (exists() == false) {
+	    throw new MessagingException("Folder not exists");
+	}
     }
 
 }
Index: server/src/main/webapp/WEB-INF/conf/config.properties
===================================================================
--- server/src/main/webapp/WEB-INF/conf/config.properties	(revision 1073718)
+++ server/src/main/webapp/WEB-INF/conf/config.properties	(working copy)
@@ -1,5 +1,5 @@
 # The IP or domainname of the IMAP server
-IMAPServerAddress=imap.gmail.com
+IMAPServerAddress=demo-mode
 # The port of the IMAP server
 IMAPServerPort=993
 # Set the connections amount which will get maximal opened per user for processing requests
@@ -22,7 +22,7 @@
 SessionDebug=true
 
 # The IP or domainname of the SMTP server
-SMTPServerAddress=smtp.gmail.com
+SMTPServerAddress=demo-mode
 # The port of the SMTP server
 SMTPServerPort=465
 # Use AUTH for SMTP
@@ -30,7 +30,3 @@
 # Use SSL/TLS to connect to the SMTP server
 SMTPS=true
 
-## Remove these lines to use Gmail IMAP AND SMTP
-IMAPServerAddress=demo-mode
-SMTPServerAddress=demo-mode
-
Index: server/src/site/site.xml
===================================================================
--- server/src/site/site.xml	(revision 1073718)
+++ server/src/site/site.xml	(working copy)
@@ -19,8 +19,6 @@
 -->
 <project name="Hupa">
   <body>
-    <!-- This is a "dummy" site because of this bug:   -->
-    <!-- http://jira.codehaus.org/browse/MSITE-345     -->
     <menu ref="parent"/>
     <menu ref="reports"/>
   </body>
Index: server/pom.xml
===================================================================
--- server/pom.xml	(revision 1073718)
+++ server/pom.xml	(working copy)
@@ -1,113 +1,113 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
     <groupId>org.apache.hupa</groupId>
-    <artifactId>hupa-server</artifactId>
-    <name>hupa-server</name>
+    <artifactId>hupa-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <description>Servercode implementation to access IMAP Mailbox</description>
-    <packaging>jar</packaging>
+  </parent>
 
+  <groupId>org.apache.hupa</groupId>
+  <artifactId>hupa-server</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
 
-    <parent>
-      <groupId>org.apache.hupa</groupId>
-      <artifactId>hupa-parent</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </parent>
-  
-    <build>
-        <outputDirectory>war/WEB-INF/classes</outputDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-               <configuration>
-                      <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
-                      <webResources>    
-                        <resource>
-                            <directory>war</directory>
-                            <excludes>
-                                <exclude>**/hupa/*</exclude>
-                            </excludes>
-                        </resource>
-                    </webResources>
-                    <warName>${project.name}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <name>hupa-server</name>
+  <description>Servercode implementation to access IMAP Mailbox</description>
 
-    <dependencies>
+  <build>
+    <outputDirectory>war/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+          <webResources>
+            <resource>
+              <directory>war</directory>
+              <excludes>
+                <exclude>**/hupa/*</exclude>
+              </excludes>
+            </resource>
+          </webResources>
+          <warName>${project.name}</warName>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
     <dependency>
-        <groupId>org.apache.hupa</groupId>
-        <artifactId>hupa-shared</artifactId>
+      <groupId>org.apache.hupa</groupId>
+      <artifactId>hupa-shared</artifactId>
     </dependency>
     <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <exclusions>
-            <exclusion>
-                <groupId>logkit</groupId>
-                <artifactId>logkit</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>avalon-framework</groupId>
-                <artifactId>avalon-framework</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-            </exclusion>
-        </exclusions>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
     </dependency>
 
     <dependency>
-        <groupId>net.customware.gwt.dispatch
+      <groupId>net.customware.gwt.dispatch
         </groupId>
-        <artifactId>gwt-dispatch</artifactId>
+      <artifactId>gwt-dispatch</artifactId>
     </dependency>
 
     <dependency>
-        <groupId>gwtupload</groupId>
-        <artifactId>gwtupload</artifactId>
+      <groupId>gwtupload</groupId>
+      <artifactId>gwtupload</artifactId>
     </dependency>
     <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
     </dependency>
     <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.google.code.guice</groupId>
-        <artifactId>guice</artifactId>
+      <groupId>com.google.code.guice</groupId>
+      <artifactId>guice</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.google.code.guice</groupId>
-        <artifactId>guice-servlet</artifactId>
+      <groupId>com.google.code.guice</groupId>
+      <artifactId>guice-servlet</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.google.gwt</groupId>
-        <artifactId>gwt-user</artifactId>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.google.gwt</groupId>
-        <artifactId>gwt-servlet</artifactId>
-        <scope>runtime</scope>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-servlet</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <scope>test</scope>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
-</dependencies>
+  </dependencies>
 </project>

Property changes on: shared
___________________________________________________________________
Modified: svn:ignore
   - target
.settings

   + target
.settings
.classpath
.project



Property changes on: shared/src/main/java
___________________________________________________________________
Added: svn:ignore
   + META-INF


Index: shared/src/site/site.xml
===================================================================
--- shared/src/site/site.xml	(revision 1073718)
+++ shared/src/site/site.xml	(working copy)
@@ -19,8 +19,6 @@
 -->
 <project name="Hupa">
   <body>
-    <!-- This is a "dummy" site because of this bug:   -->
-    <!-- http://jira.codehaus.org/browse/MSITE-345     -->
     <menu ref="parent"/>
     <menu ref="reports"/>
   </body>
Index: shared/pom.xml
===================================================================
--- shared/pom.xml	(revision 1073718)
+++ shared/pom.xml	(working copy)
@@ -1,47 +1,49 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
     <groupId>org.apache.hupa</groupId>
-    <artifactId>hupa-shared</artifactId>
-    <name>hupa-shared</name>
+    <artifactId>hupa-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <description>Shared code for the client and server</description>
-    <parent>
-        <groupId>org.apache.hupa</groupId>
-        <artifactId>hupa-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
+  </parent>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>gwt-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <groupId>org.apache.hupa</groupId>
+  <artifactId>hupa-shared</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-user</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.customware.gwt.dispatch</groupId>
-            <artifactId>gwt-dispatch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <name>hupa-shared</name>
+  <description>Shared code for the client and server</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>gwt-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.customware.gwt.dispatch</groupId>
+      <artifactId>gwt-dispatch</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
\ No newline at end of file

Property changes on: widgets
___________________________________________________________________
Modified: svn:ignore
   - target

   + target
.classpath
.project



Property changes on: widgets/src/main/java
___________________________________________________________________
Added: svn:ignore
   + META-INF


Index: widgets/pom.xml
===================================================================
--- widgets/pom.xml	(revision 1073718)
+++ widgets/pom.xml	(working copy)
@@ -1,20 +1,21 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
     <groupId>org.apache.hupa</groupId>
-    <artifactId>hupa-widgets</artifactId>
-    <name>hupa-widgets</name>
+    <artifactId>hupa-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <description>Collection of reusable widgets</description>
+  </parent>
 
-    <parent>
-        <groupId>org.apache.hupa</groupId>
-        <artifactId>hupa-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
+  <groupId>org.apache.hupa</groupId>
+  <artifactId>hupa-widgets</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
 
-    <build>
+  <name>hupa-widgets</name>
+  <description>Collection of reusable widgets</description>
+
+  <build>
     <resources>
       <resource>
         <directory>src/main/java</directory>
@@ -30,21 +31,20 @@
         </includes>
       </resource>
     </resources>
+  </build>
 
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-user</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-incubator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.cobogw.gwt</groupId>
-            <artifactId>cobogw</artifactId>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-incubator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.cobogw.gwt</groupId>
+      <artifactId>cobogw</artifactId>
+    </dependency>
+  </dependencies>
 </project>

Property changes on: widgets/.settings
___________________________________________________________________
Added: svn:ignore
   + org.eclipse.wst.common.component
org.eclipse.wst.common.project.facet.core.xml
org.maven.ide.eclipse.prefs


Index: widgets/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- widgets/.settings/org.eclipse.jdt.core.prefs	(revision 1073718)
+++ widgets/.settings/org.eclipse.jdt.core.prefs	(working copy)
@@ -1,5 +1,9 @@
-#Sun Feb 14 17:36:42 CET 2010
+#Wed Feb 23 10:04:09 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
Index: pom.xml
===================================================================
--- pom.xml	(revision 1073718)
+++ pom.xml	(working copy)
@@ -1,360 +1,521 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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">
-    <!--
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements. See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to you under the Apache License, Version
-        2.0 (the "License"); you may not use this file except in compliance
-        with the License. You may obtain a copy of the License at
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. 
+  The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+  See the License for the specific language governing permissions and limitations under the License. -->
+<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">
 
-        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-        applicable law or agreed to in writing, software distributed under the
-        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-        CONDITIONS OF ANY KIND, either express or implied. See the License for
-        the specific language governing permissions and limitations under the
-        License.
-    -->
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.hupa</groupId>
-    <artifactId>hupa-parent</artifactId>
-    <name>hupa-parent</name>
-    <version>0.0.1-SNAPSHOT</version>
-    <description>
-        Hupa is a GWT based Webmail
-    </description>
-    <url>http://james.apache.org/hupa</url>
-    <inceptionYear>2009</inceptionYear>
-    <packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.james</groupId>
-        <artifactId>james-project</artifactId>
-        <version>1.3</version>
-    </parent>
+  <parent>
+    <groupId>org.apache.james</groupId>
+    <artifactId>james-project</artifactId>
+    <version>1.5</version>
+  </parent>
 
-    <modules>
-        <module>shared</module>
-        <module>client</module>
-        <module>server</module>
-        <module>widgets</module>
-    </modules>
+  <groupId>org.apache.hupa</groupId>
+  <artifactId>hupa-parent</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <distributionManagement>
-        <site>
-            <id>hupa-website</id>
-            <url>scp://people.apache.org/www/james.apache.org/hupa/</url>
-        </site>
-    </distributionManagement>
+  <name>hupa-parent</name>
+  <description> Hupa is a GWT based Webmail</description>
+  <url>http://james.apache.org/hupa</url>
+  <inceptionYear>2009</inceptionYear>
 
-    <issueManagement>
-        <system>JIRA</system>
-        <url>http://issues.apache.org/jira/browse/Hupa</url>
-    </issueManagement>
+  <prerequisites>
+    <maven>3.0.2</maven>
+  </prerequisites>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/james/hupa/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/hupa/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/james/hupa/trunk/</url>
-    </scm>
+  <modules>
+    <module>shared</module>
+    <module>client</module>
+    <module>server</module>
+    <module>widgets</module>
+  </modules>
 
-    <ciManagement>
-        <system>Hudson</system>
-        <url>http://hudson.zones.apache.org/hudson/view/James/job/hupa-trunk/</url>
-    </ciManagement>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/hupa/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/hupa/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/james/hupa/trunk/</url>
+  </scm>
 
-    <repositories>
-        <repository>
-            <id>maven-repos</id>
-            <url>http://repo2.maven.org/maven2/</url>
-        </repository>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net Repository for Maven</name>
-            <url>http://download.java.net/maven/2/
-            </url>
-        </repository>
-        <repository>
-            <id>gwtupload</id>
-            <name>GWT Upload repository at googlecode</name>
-            <url>http://gwtupload.googlecode.com/svn/mavenrepo
-            </url>
-        </repository>
-        <repository>
-            <id>gwt-dispatch</id>
-            <name>GWT Dispatch repository at googlecode</name>
-            <url>http://gwt-dispatch.googlecode.com/svn/maven2
-            </url>
-        </repository>
-        <repository>
-            <id>gwt-presenter</id>
-            <name>GWT Presenter repository at googlecode</name>
-            <url>http://gwt-presenter.googlecode.com/svn/maven2
-            </url>
-        </repository>
-        <repository>
-            <id>cobogw</id>
-            <name>Cobogw repository at googlecode</name>
-            <url>http://cobogw.googlecode.com/svn/maven2
-            </url>
-        </repository>
-        <repository>
-            <id>guice</id>
-            <name>Guice repository at googlecode</name>
-            <url>http://guice-maven.googlecode.com/svn/trunk
-            </url>
-        </repository>
-        <repository>
-            <id>lib-repo</id>
-            <name>lib-m2-repository</name>
-            <url>http://svn.apache.org/repos/asf/james/hupa/lib</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-    </repositories>
-    <properties>
-        <gwtVersion>2.0.3</gwtVersion>
-    </properties>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://issues.apache.org/jira/browse/Hupa</url>
+  </issueManagement>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>2.0-beta-7</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jxr-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.4</version>
-                    <configuration>
-                        <targetjdk>1.4</targetjdk>
-                        <rulesets>
-                            <ruleset>/rulesets/basic.xml</ruleset>
-                            <ruleset>/rulesets/controversial.xml</ruleset>
-                        </rulesets>
-                        <format>xml</format>
-                        <linkXref>true</linkXref>
-                        <sourceEncoding>utf-8</sourceEncoding>
-                        <minimumTokens>100</minimumTokens>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>rat-maven-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                        <encoding>iso8859-1</encoding>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.3</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.4.3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>emma-maven-plugin</artifactId>
-                    <inherited>true</inherited>
-                    <configuration>
-                        <filters>
-                            <filter>-com.*</filter>
-                            <filter>-gwt*</filter>
-                            <filter>-gwt.*</filter>
-                            <filter>-org.apache.hupa.widgets.*</filter>
-                            <filter>-org.apache.hupa.client.widgets.*</filter>
-                        </filters>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.hupa</groupId>
-                <artifactId>hupa-server</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hupa</groupId>
-                <artifactId>hupa-shared</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hupa</groupId>
-                <artifactId>hupa-widgets</artifactId>
-                <version>${project.version}</version>
-            </dependency>
+  <ciManagement>
+    <system>Hudson</system>
+    <url>http://hudson.zones.apache.org/hudson/view/James/job/hupa-trunk/</url>
+  </ciManagement>
 
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.1.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>logkit</groupId>
-                        <artifactId>logkit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>avalon-framework</groupId>
-                        <artifactId>avalon-framework</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.13</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.cobogw.gwt</groupId>
-                <artifactId>cobogw</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>net.customware.gwt.dispatch
-                </groupId>
-                <artifactId>gwt-dispatch</artifactId>
-                <version>1.0.0</version>
-                <exclusions>
-                   <exclusion>
-                     <groupId>com.google.gwt.inject</groupId>
-                     <artifactId>gin</artifactId>
-                   </exclusion>
-                 </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.googlecode.gwt.inject
-                </groupId>
-                <artifactId>gin</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>net.customware.gwt.presenter
-                </groupId>
-                <artifactId>gwt-presenter</artifactId>
-                <version>1.1.0-replace-SNAPSHOT</version>
-                <exclusions>
-                   <exclusion>
-                     <groupId>com.google.gwt.inject</groupId>
-                     <artifactId>gin</artifactId>
-                   </exclusion>
-                 </exclusions>                
-            </dependency>
-            <dependency>
-                <groupId>com.google.gwt</groupId>
-                <artifactId>gwt-incubator</artifactId>
-                <version>20100204-r1747</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.gwt-dnd</groupId>
-                <artifactId>gwt-dnd</artifactId>
-                <version>2.6.5</version>
-            </dependency>
-            <dependency>
-                <groupId>eu.maydu.gwt</groupId>
-                <artifactId>gwt-vl</artifactId>
-                <version>0.8b</version>
-            </dependency>
-            <dependency>
-                <groupId>gwtupload</groupId>
-                <artifactId>gwtupload</artifactId>
-                <version>0.5.8-M5</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.2.1</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.guice</groupId>
-                <artifactId>guice</artifactId>
-                <version>2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.guice</groupId>
-                <artifactId>guice-servlet</artifactId>
-                <version>2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.gwt</groupId>
-                <artifactId>gwt-servlet</artifactId>
-                <version>${gwtVersion}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.google.gwt</groupId>
-                <artifactId>gwt-user</artifactId>
-                <version>${gwtVersion}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.google.gwt</groupId>
-                <artifactId>gwt-dev</artifactId>
-                <version>${gwtVersion}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>2.5.2</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <distributionManagement>
+    <site>
+      <id>hupa-website</id>
+      <url>scp://people.apache.org/www/james.apache.org/hupa/</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <gwtVersion>2.1.1</gwtVersion>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.hupa</groupId>
+        <artifactId>hupa-server</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hupa</groupId>
+        <artifactId>hupa-shared</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hupa</groupId>
+        <artifactId>hupa-widgets</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.1.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>logkit</groupId>
+            <artifactId>logkit</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>avalon-framework</groupId>
+            <artifactId>avalon-framework</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.13</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.mail</groupId>
+        <artifactId>mail</artifactId>
+        <version>1.4.4</version>
+      </dependency>
+      <dependency>
+        <groupId>org.cobogw.gwt</groupId>
+        <artifactId>cobogw</artifactId>
+        <version>1.3</version>
+      </dependency>
+      <dependency>
+        <groupId>net.customware.gwt.dispatch</groupId>
+        <artifactId>gwt-dispatch</artifactId>
+        <version>1.0.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.gwt.inject</groupId>
+            <artifactId>gin</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.googlecode.gwt.inject</groupId>
+        <artifactId>gin</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>net.customware.gwt.presenter</groupId>
+        <artifactId>gwt-presenter</artifactId>
+        <version>1.1.0-replace-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.gwt.inject</groupId>
+            <artifactId>gin</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.google.gwt</groupId>
+        <artifactId>gwt-incubator</artifactId>
+        <version>20100204-r1747</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.gwt-dnd</groupId>
+        <artifactId>gwt-dnd</artifactId>
+        <version>2.6.5</version>
+      </dependency>
+      <dependency>
+        <groupId>eu.maydu.gwt</groupId>
+        <artifactId>gwt-vl</artifactId>
+        <version>0.8b</version>
+      </dependency>
+      <dependency>
+        <groupId>gwtupload</groupId>
+        <artifactId>gwtupload</artifactId>
+        <version>0.5.8-M5</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>1.2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.guice</groupId>
+        <artifactId>guice</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.guice</groupId>
+        <artifactId>guice-servlet</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.gwt</groupId>
+        <artifactId>gwt-servlet</artifactId>
+        <version>${gwtVersion}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.gwt</groupId>
+        <artifactId>gwt-user</artifactId>
+        <version>${gwtVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.gwt</groupId>
+        <artifactId>gwt-dev</artifactId>
+        <version>${gwtVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.2</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>3.0</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <repositories>
+    <repository>
+      <id>maven2-repository.dev.java.net</id>
+      <name>Java.net Repository for Maven</name>
+      <url>http://download.java.net/maven/2/</url>
+    </repository>
+    <repository>
+      <id>gwtupload</id>
+      <name>GWT Upload repository at googlecode</name>
+      <url>http://gwtupload.googlecode.com/svn/mavenrepo</url>
+    </repository>
+    <repository>
+      <id>gwt-dispatch</id>
+      <name>GWT Dispatch repository at googlecode</name>
+      <url>http://gwt-dispatch.googlecode.com/svn/maven2</url>
+    </repository>
+    <repository>
+      <id>gwt-presenter</id>
+      <name>GWT Presenter repository at googlecode</name>
+      <url>http://gwt-presenter.googlecode.com/svn/maven2</url>
+    </repository>
+    <repository>
+      <id>cobogw</id>
+      <name>Cobogw repository at googlecode</name>
+      <url>http://cobogw.googlecode.com/svn/maven2</url>
+    </repository>
+    <repository>
+      <id>guice</id>
+      <name>Guice repository at googlecode</name>
+      <url>http://guice-maven.googlecode.com/svn/trunk</url>
+    </repository>
+  </repositories>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.0-beta-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>2.5</version>
+          <configuration>
+            <targetJdk>1.5</targetJdk>
+            <rulesets>
+              <ruleset>/rulesets/basic.xml</ruleset>
+              <ruleset>/rulesets/controversial.xml</ruleset>
+            </rulesets>
+            <format>xml</format>
+            <linkXref>true</linkXref>
+            <sourceEncoding>utf-8</sourceEncoding>
+            <minimumTokens>100</minimumTokens>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>rat-maven-plugin</artifactId>
+          <version>1.0-alpha-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+            <encoding>iso8859-1</encoding>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.7.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-report-plugin</artifactId>
+          <version>2.7.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>emma-maven-plugin</artifactId>
+          <inherited>true</inherited>
+          <configuration>
+            <filters>
+              <filter>-com.*</filter>
+              <filter>-gwt*</filter>
+              <filter>-gwt.*</filter>
+              <filter>-org.apache.hupa.widgets.*</filter>
+              <filter>-org.apache.hupa.client.widgets.*</filter>
+            </filters>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>gwt-maven-plugin</artifactId>
+          <version>2.1.0-1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.0-beta-3</version>
+        <configuration>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <version>2.2</version>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <version>2.3.1</version>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>cim</report>
+                    <report>dependencies</report>
+                    <report>dependency-convergence</report>
+                    <report>dependency-management</report>
+                    <report>distribution-management</report>
+                    <report>help</report>
+                    <report>index</report>
+                    <report>issue-tracking</report>
+                    <report>license</report>
+                    <report>mailing-list</report>
+                    <report>modules</report>
+                    <report>plugin-management</report>
+                    <report>plugins</report>
+                    <report>project-team</report>
+                    <report>scm</report>
+                    <report>summary</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-pmd-plugin</artifactId>
+              <configuration>
+                <linkXref>true</linkXref>
+                <sourceEncoding>utf-8</sourceEncoding>
+                <minimumTokens>100</minimumTokens>
+                <targetJdk>1.5</targetJdk>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-report-plugin</artifactId>
+              <configuration>
+                <argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.rat</groupId>
+              <artifactId>apache-rat-plugin</artifactId>
+              <configuration>
+                <excludeSubProjects>false</excludeSubProjects>
+                <excludes>
+                  <!-- MAVEN_DEFAULT_EXCLUDES -->
+                  <exclude>**/target/**/*</exclude>
+                  <exclude>**/cobertura.ser</exclude>
+                  <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+                  <exclude>**/.classpath</exclude>
+                  <exclude>**/.project</exclude>
+                  <exclude>**/.settings/**/*</exclude>
+                  <!-- IDEA_DEFAULT_EXCLUDES -->
+                  <exclude>**/*.iml</exclude>
+                  <exclude>**/*.ipr</exclude>
+                  <exclude>**/*.iws</exclude>
+                  <!-- MANIFEST_MF_EXCLUDES -->
+                  <exclude>**/MANIFEST.MF</exclude>
+                </excludes>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>versions-maven-plugin</artifactId>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>dependency-updates-report</report>
+                    <report>plugin-updates-report</report>
+                    <report>property-updates-report</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>findbugs-maven-plugin</artifactId>
+              <configuration>
+                <xrefLocation>${project.reporting.outputDirectory}/../xref</xrefLocation>
+                <xrefTestLocation>${project.reporting.outputDirectory}/../xref-test</xrefTestLocation>
+                <!-- required by dashboard plugin and hudson -->
+                <xmlOutput>true</xmlOutput>
+                <effort>Max</effort>
+                <findbugsXmlOutput>true</findbugsXmlOutput>
+                <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>versions-maven-plugin</artifactId>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>dependency-updates-report</report>
+                    <report>plugin-updates-report</report>
+                    <report>property-updates-report</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>cobertura-maven-plugin</artifactId>
+              <configuration>
+                <instrumentation>
+                  <excludes>
+                  </excludes>
+                </instrumentation>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.7</version>
+              <configuration>
+                <minmemory>512m</minmemory>
+                <maxmemory>1g</maxmemory>
+                <linksource>true</linksource>
+                <tags>
+                  <tag>
+                    <name>note</name>
+                    <placement>a</placement>
+                    <head>NOTE</head>
+                  </tag>
+                  <tag>
+                    <name>todo</name>
+                    <placement>a</placement>
+                    <head>TODO</head>
+                  </tag>
+                  <tag>
+                    <name>warning</name>
+                    <placement>a</placement>
+                    <head>WARNING</head>
+                  </tag>
+                </tags>
+                <source>1.5</source>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>aggregate</report>
+                    <report>test-aggregate</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>dashboard-maven-plugin</artifactId>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Property changes on: client
___________________________________________________________________
Modified: svn:ignore
   - target
.gwt-tmp
tomcat

   + target
.gwt-tmp
tomcat
.settings
.classpath
.project


Index: client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java
===================================================================
--- client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java	(revision 0)
+++ client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java	(revision 0)
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.gen2.event.shared;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.gen2.event.shared.AbstractEvent.Type;
+
+/**
+ * Manager responsible for adding handlers to event sources and firing those
+ * handlers on passed in events.
+ * 
+ * @deprecated use the com.google.gwt.event.shared classes instead
+ */
+@Deprecated
+public class HandlerManager extends com.google.gwt.event.shared.HandlerManager {
+  // Used to optimize the JavaScript handler container structure.
+  static int EXPECTED_HANDLERS = 5;
+
+  private static final boolean useJs = GWT.isScript();
+  private static int index = -EXPECTED_HANDLERS;
+
+  static int createKeyIndex() {
+    // Need to leave space for the size and the unflattened list if we end up
+    // needing it.
+    index += EXPECTED_HANDLERS + 2;
+    return index;
+  }
+
+  // Only one of JsHandlerRegistry and JavaHandlerRegistry are live at once.
+  private final JsHandlerRegistry javaScriptRegistry;
+  private final JavaHandlerRegistry javaRegistry;
+
+  // 
+  private final Object source;
+
+  /**
+   * Creates a handler manager with the given source.
+   * 
+   * @param source the event source
+   */
+  public HandlerManager(Object source) {
+    super(source);
+    if (useJs) {
+      javaScriptRegistry = JsHandlerRegistry.create();
+      javaRegistry = null;
+    } else {
+      javaRegistry = new JavaHandlerRegistry();
+      javaScriptRegistry = null;
+    }
+    this.source = source;
+  }
+
+  /**
+   * Adds a handle.
+   * 
+   * @param <HandlerType> The type of handler.
+   * @param type the event type associated with this handler
+   * @param handler the handler
+   * @return the handler registration, can be stored in order to remove the
+   *         handler later
+   */
+  public <HandlerType extends EventHandler> HandlerRegistration addHandler(
+      AbstractEvent.Type<?, HandlerType> type, final HandlerType handler) {
+    if (useJs) {
+      javaScriptRegistry.addHandler(type, handler);
+    } else {
+      javaRegistry.addHandler(type, handler);
+    }
+    return new HandlerRegistration(this, type, handler);
+  }
+
+  /**
+   * Clears all the handlers associated with the given type.
+   * 
+   * @param type the type
+   */
+  public void clearHandlers(Type<?, ?> type) {
+    if (useJs) {
+      javaScriptRegistry.clearHandlers(type);
+    } else {
+      javaRegistry.clearHandlers(type);
+    }
+  }
+
+  /**
+   * Fires the given event to the handlers listening to the event's type.
+   * 
+   * @param event the event
+   */
+  public void fireEvent(AbstractEvent event) {
+    Object oldSource = event.getSource();
+    event.setSource(source);
+    if (useJs) {
+      javaScriptRegistry.fireEvent(event);
+    } else {
+      javaRegistry.fireEvent(event);
+    }
+    if (oldSource == null) {
+      // This was my event, so I should kill it now that I'm done.
+      event.kill();
+    } else {
+      // Restoring the source for the next handler to use.
+      event.setSource(oldSource);
+    }
+  }
+
+  /**
+   * Gets the handler at the given index.
+   * 
+   * @param <HandlerType> the event handler type
+   * @param index the index
+   * @param type the handler's event type
+   * @return the given handler
+   */
+  public <HandlerType extends EventHandler> HandlerType getHandler(
+      AbstractEvent.Type<?, HandlerType> type, int index) {
+    if (useJs) {
+      return (HandlerType) javaScriptRegistry.getHandler(type, index);
+    } else {
+      return (HandlerType) javaRegistry.getHandler(type, index);
+    }
+  }
+
+  /**
+   * Gets the number of handlers listening to the event type.
+   * 
+   * @param type the event type
+   * @return the number of registered handlers
+   */
+  public int getHandlerCount(Type type) {
+    if (useJs) {
+      return javaScriptRegistry.getHandlerCount(type);
+    } else {
+      return javaRegistry.getHandlerCount(type);
+    }
+  }
+
+  /**
+   * Gets the source for events fired from this manager.
+   * 
+   * @return the source
+   */
+  public Object getSource() {
+    return source;
+  }
+
+  /**
+   * Are there handlers in this manager listening to the given event type?
+   * 
+   * @param type the event type
+   * @return are handlers listening on the given event type
+   */
+  public boolean isEventHandled(Type type) {
+    return getHandlerCount(type) > 0;
+  }
+
+  /**
+   * Removes the given handler from the specified event type. Normally,
+   * applications should call {@link HandlerRegistration#removeHandler()}
+   * instead. This method is provided primary to support deprecated APIS.
+   * 
+   * @param <HandlerType> handler type
+   * 
+   * @param type the event type
+   * @param handler the handler
+   */
+  public <HandlerType extends EventHandler> void removeHandler(
+      AbstractEvent.Type<?, HandlerType> type, final HandlerType handler) {
+    if (useJs) {
+      javaScriptRegistry.removeHandler(type, handler);
+    } else {
+      javaRegistry.removeHandler(type, handler);
+    }
+  }
+}

Property changes on: client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java
___________________________________________________________________
Added: svn:eol-style
   + native

Index: client/src/main/webapp/WEB-INF/web.xml
===================================================================
--- client/src/main/webapp/WEB-INF/web.xml	(revision 1073718)
+++ client/src/main/webapp/WEB-INF/web.xml	(working copy)
@@ -5,11 +5,6 @@
 
 <web-app>
 
-	<!-- Default page to serve -->
-	<welcome-file-list>
-		<welcome-file>Hupa.html</welcome-file>
-	</welcome-file-list>
-
 	<!-- Max size of the upload request (10MB) -->
 	<context-param>
 		<param-name>maxSize</param-name>
@@ -23,6 +18,20 @@
 	    </context-param>
         -->
 	
+    <filter>
+        <filter-name>guiceFilter</filter-name>
+        <filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>guiceFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <listener>
+        <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
+    </listener>
+
 	<!-- servlet for incubator gwt stuff -->
 	<servlet>
   		<servlet-name>remoteLoggingService</servlet-name>
@@ -34,17 +43,9 @@
   		<url-pattern>/hupa/logging</url-pattern>
 	</servlet-mapping>
 
-	<filter>
-		<filter-name>guiceFilter</filter-name>
-		<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
-	</filter>
+    <!-- Default page to serve -->
+    <welcome-file-list>
+        <welcome-file>Hupa.html</welcome-file>
+    </welcome-file-list>
 
-	<filter-mapping>
-		<filter-name>guiceFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<listener>
-		<listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
-	</listener>
 </web-app>
Index: client/src/site/site.xml
===================================================================
--- client/src/site/site.xml	(revision 1073718)
+++ client/src/site/site.xml	(working copy)
@@ -19,8 +19,6 @@
 -->
 <project name="Hupa">
   <body>
-    <!-- This is a "dummy" site because of this bug:   -->
-    <!-- http://jira.codehaus.org/browse/MSITE-345     -->
     <menu ref="parent"/>
     <menu ref="reports"/>
   </body>
Index: client/war/WEB-INF/web.xml
===================================================================
--- client/war/WEB-INF/web.xml	(revision 1073718)
+++ client/war/WEB-INF/web.xml	(working copy)
@@ -5,11 +5,6 @@
 
 <web-app>
 
-	<!-- Default page to serve -->
-	<welcome-file-list>
-		<welcome-file>Hupa.html</welcome-file>
-	</welcome-file-list>
-
 	<!-- Max size of the upload request (10MB) -->
 	<context-param>
 		<param-name>maxSize</param-name>
@@ -23,6 +18,20 @@
 	    </context-param>
         -->
 	
+    <filter>
+        <filter-name>guiceFilter</filter-name>
+        <filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>guiceFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <listener>
+        <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
+    </listener>
+
 	<!-- servlet for incubator gwt stuff -->
 	<servlet>
   		<servlet-name>remoteLoggingService</servlet-name>
@@ -34,17 +43,9 @@
   		<url-pattern>/hupa/logging</url-pattern>
 	</servlet-mapping>
 
-	<filter>
-		<filter-name>guiceFilter</filter-name>
-		<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
-	</filter>
+    <!-- Default page to serve -->
+    <welcome-file-list>
+        <welcome-file>Hupa.html</welcome-file>
+    </welcome-file-list>
 
-	<filter-mapping>
-		<filter-name>guiceFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<listener>
-		<listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
-	</listener>
 </web-app>
Index: client/pom.xml
===================================================================
--- client/pom.xml	(revision 1073718)
+++ client/pom.xml	(working copy)
@@ -1,143 +1,138 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
     <groupId>org.apache.hupa</groupId>
-    <artifactId>hupa-client</artifactId>
-    <name>hupa</name>
+    <artifactId>hupa-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
-    <description>A GWT based IMAP webmail</description>
-    <parent>
-        <groupId>org.apache.hupa</groupId>
-        <artifactId>hupa-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <build>
-        <outputDirectory>war/WEB-INF/classes
-        </outputDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>gwt-maven-plugin</artifactId>
-                <configuration>
-                     <runTarget>Hupa.html</runTarget>
-                     <extraJvmArgs>
-                         -Dhupa.config.file=${project.parent.basedir}/server/src/main/webapp/WEB-INF/conf/config.properties
-                     </extraJvmArgs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <useSystemClassLoader>false</useSystemClassLoader>
-                    <additionalClasspathElements>
-                        <additionalClasspathElement>${basedir}/src/test/java</additionalClasspathElement>
-                        <additionalClasspathElement>${basedir}/src/main/java</additionalClasspathElement>
-                    </additionalClasspathElements>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>src/main/webapp/WEB-INF/web.xml
-                    </webXml>
-                    <webResources>
-                        <resource>
-                            <directory>war</directory>
-                            <excludes>
-                                <exclude>**/hupa/*</exclude>
-                            </excludes>
-                        </resource>
-                        <!-- this is a ugly hack but I'm not sure howto solve it -->
-                        <!-- This take care of including the config file within the war -->
-                        <resource>
-                            <directory>../server/src/main/webapp/</directory>
-                        </resource>
-                    </webResources>
-                    <warName>${project.name}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.hupa</groupId>
-            <artifactId>hupa-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hupa</groupId>
-            <artifactId>hupa-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hupa</groupId>
-            <artifactId>hupa-widgets</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.cobogw.gwt</groupId>
-            <artifactId>cobogw</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.customware.gwt.dispatch
-            </groupId>
-            <artifactId>gwt-dispatch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.gwt.inject
-            </groupId>
-            <artifactId>gin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.customware.gwt.presenter
-            </groupId>
-            <artifactId>gwt-presenter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gwt-dnd</groupId>
-            <artifactId>gwt-dnd</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>eu.maydu.gwt</groupId>
-            <artifactId>gwt-vl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>gwtupload</groupId>
-            <artifactId>gwtupload</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-servlet</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-user</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-dev</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <groupId>org.apache.hupa</groupId>
+  <artifactId>hupa-client</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <name>hupa-client</name>
+  <description>A GWT based IMAP webmail</description>
+  <build>
+    <outputDirectory>war/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>gwt-maven-plugin</artifactId>
+        <configuration>
+          <runTarget>Hupa.html</runTarget>
+          <extraJvmArgs>-Dhupa.config.file=${project.parent.basedir}/server/src/main/webapp/WEB-INF/conf/config.properties</extraJvmArgs>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <useSystemClassLoader>false</useSystemClassLoader>
+          <additionalClasspathElements>
+            <additionalClasspathElement>${basedir}/src/test/java</additionalClasspathElement>
+            <additionalClasspathElement>${basedir}/src/main/java</additionalClasspathElement>
+          </additionalClasspathElements>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+          <webResources>
+            <resource>
+              <directory>war</directory>
+              <excludes>
+                <exclude>**/hupa/*</exclude>
+              </excludes>
+            </resource>
+            <!-- this is a ugly hack but I'm not sure howto solve it -->
+            <!-- This take care of including the config file within the war -->
+            <resource>
+              <directory>../server/src/main/webapp/</directory>
+            </resource>
+          </webResources>
+          <warName>${project.name}</warName>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hupa</groupId>
+      <artifactId>hupa-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hupa</groupId>
+      <artifactId>hupa-shared</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hupa</groupId>
+      <artifactId>hupa-widgets</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.cobogw.gwt</groupId>
+      <artifactId>cobogw</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.customware.gwt.dispatch</groupId>
+      <artifactId>gwt-dispatch</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.gwt.inject</groupId>
+      <artifactId>gin</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.customware.gwt.presenter</groupId>
+      <artifactId>gwt-presenter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gwt-dnd</groupId>
+      <artifactId>gwt-dnd</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>eu.maydu.gwt</groupId>
+      <artifactId>gwt-vl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>gwtupload</groupId>
+      <artifactId>gwtupload</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-servlet</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-dev</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
Index: client/README.txt
===================================================================
--- client/README.txt	(revision 0)
+++ client/README.txt	(revision 0)
@@ -0,0 +1,2 @@
+About the com.google.gwt.gen2.event.shared.HandlerManager:
+See http://code.google.com/p/google-web-toolkit-incubator/issues/detail?id=340
\ No newline at end of file

Property changes on: client/README.txt
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native