james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r1525515 [9/13] - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ioc/ cli...
Date Mon, 23 Sep 2013 07:04:13 GMT
Modified: james/hupa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Mon Sep 23 07:04:08 2013
@@ -17,86 +17,25 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 <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">
-=======
-=======
->>>>>>> first commit
-<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">
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-<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">
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
-<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">
->>>>>>> constantly changed by manolo
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
         <version>1.8.1</version>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
         <relativePath />
     </parent>
     <groupId>org.apache.james.hupa</groupId>
     <artifactId>hupa-parent</artifactId>
-<<<<<<< HEAD
-    <version>0.0.3-SNAPSHOT</version>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-        <relativePath></relativePath>
-    </parent>
-    <groupId>org.apache.hupa</groupId>
-    <artifactId>hupa-parent</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
     <version>0.0.5-SNAPSHOT</version>
->>>>>>> Set snapshot version higger than the current hupa in svn repo
     <packaging>pom</packaging>
     <name>Apache James Hupa Parent</name>
     <description>Hupa is a GWT based Webmail</description>
     <url>http://james.apache.org/hupa</url>
     <inceptionYear>2009</inceptionYear>
     <modules>
-<<<<<<< HEAD
-<<<<<<< HEAD
         <module>shared</module>
         <module>mock</module>
-=======
-        <module>mock</module>
-        <module>shared</module>
->>>>>>> first commit
-=======
-        <module>mock</module>
-        <module>shared</module>
->>>>>>> first commit
         <module>server</module>
         <module>widgets</module>
         <module>client</module>
@@ -117,20 +56,8 @@
         </site>
     </distributionManagement>
     <properties>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
         <gwtVersion>2.5.1</gwtVersion>
         <gwtMavenVersion>2.5.1</gwtMavenVersion>
-=======
-        <gwtVersion>2.5.0</gwtVersion>
-        <gwtMavenVersion>2.5.0</gwtMavenVersion>
->>>>>>> update to the latest 2.5.0 version of gwt
-=======
-        <gwtVersion>2.5.1</gwtVersion>
-        <gwtMavenVersion>2.5.1</gwtMavenVersion>
->>>>>>> upgrade gwt to 2.5.1
         <gwt.moduleSuffix />
         <gwt.logLevel>ERROR</gwt.logLevel>
         <jettyVersion>7.3.0.v20110203</jettyVersion>
@@ -186,123 +113,16 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-=======
-        <gwtVersion>2.4.0</gwtVersion>
-        <gwtMavenVersion>2.4.0</gwtMavenVersion>
-        <gwt.moduleSuffix />
-        <gwt.logLevel>ERROR</gwt.logLevel>
-        <jettyVersion>7.3.0.v20110203</jettyVersion>
-        <mock.scope>test</mock.scope>
-    </properties>
-
-    <profiles>
-      <profile>
-        <!-- Agressive js compression. Compile for all browsers and languages -->
-        <id>prod</id>
-        <properties>
-          <gwt.moduleSuffix>Prod</gwt.moduleSuffix>
-          <gwt.disableClassMetadata>true</gwt.disableClassMetadata>
-          <gwt.disableCastChecking>true</gwt.disableCastChecking>
-          <gwt.logLevel>TRACE</gwt.logLevel>
-        </properties>
-      </profile>
-      <profile>
-        <id>demo</id>
-        <properties>
-          <mock.scope />
-        </properties>
-      </profile>
-      <profile>
-        <!-- Deliver Hupa with Demo stuff -->
-        <id>pretty</id>
-        <properties>
-          <gwt.moduleSuffix>Prod</gwt.moduleSuffix>
-          <gwt.style>PRETTY</gwt.style>
-          <mock.scope />
-          <gwt.logLevel>TRACE</gwt.logLevel>
-        </properties>
-      </profile>
-    </profiles>
-
-=======
-        <gwtVersion>2.4.0</gwtVersion>
-        <gwtMavenVersion>2.4.0</gwtMavenVersion>
-        <gwt.moduleSuffix />
-        <gwt.logLevel>ERROR</gwt.logLevel>
-        <jettyVersion>7.3.0.v20110203</jettyVersion>
-        <mock.scope>test</mock.scope>
-    </properties>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-
-    <profiles>
-      <profile>
-        <!-- Agressive js compression. Compile for all browsers and languages -->
-        <id>prod</id>
-        <properties>
-          <gwt.moduleSuffix>Prod</gwt.moduleSuffix>
-          <gwt.disableClassMetadata>true</gwt.disableClassMetadata>
-          <gwt.disableCastChecking>true</gwt.disableCastChecking>
-          <gwt.logLevel>TRACE</gwt.logLevel>
-        </properties>
-      </profile>
-      <profile>
-        <!-- Deliver Hupa with Demo stuff -->
-        <id>demo</id>
-        <properties>
-          <mock.scope />
-        </properties>
-      </profile>
-    </profiles>
-
->>>>>>> constantly changed by manolo
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.hupa</groupId>
-                <artifactId>hupa-mock</artifactId>
-                <version>${project.version}</version>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-                <scope>${mock.scope}</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
-=======
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
                 <artifactId>hupa-server</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
                 <groupId>${project.groupId}</groupId>
-=======
-                <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
-=======
-                <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
                 <artifactId>hupa-shared</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
                 <groupId>${project.groupId}</groupId>
-=======
-                <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
-=======
-                <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
                 <artifactId>hupa-widgets</artifactId>
                 <version>${project.version}</version>
                 <scope>provided</scope>

Modified: james/hupa/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Mon Sep 23 07:04:08 2013
@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
@@ -77,23 +69,6 @@
             <artifactId>mail</artifactId>
         </dependency>
         <dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> constantly changed by manolo
-            <groupId>net.customware.gwt.dispatch
-        </groupId>
-            <artifactId>gwt-dispatch</artifactId>
-        </dependency>
-        <dependency>
-<<<<<<< HEAD
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
             <groupId>com.googlecode.gwtupload</groupId>
             <artifactId>gwtupload</artifactId>
         </dependency>
@@ -127,42 +102,14 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-dev</artifactId>
         </dependency>
         <dependency>
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <!-- ECS specific stuff
-            ECS encryption needs oracle crypto extension to work
-                http://www.oracle.com/technetwork/es/java/javase/downloads/jce-6-download-429243.html
-                http://www.oracle.com/technetwork/es/java/javase/downloads/jce-7-download-432124.html
-         -->
-        <dependency>
-             <groupId>org.bouncycastle</groupId>
-             <artifactId>bcprov-ext-jdk14</artifactId>
-             <version>1.49</version>
-        </dependency>
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
     </dependencies>
     <build>
         <outputDirectory>war/WEB-INF/classes</outputDirectory>
@@ -186,155 +133,3 @@
         </plugins>
     </build>
 </project>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.hupa</groupId>
-        <artifactId>hupa-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>hupa-server</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache James Hupa Server</name>
-    <description>Servercode implementation to access IMAP Mailbox</description>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.hupa</groupId>
-            <artifactId>hupa-mock</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hupa</groupId>
-            <artifactId>hupa-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>aopalliance</groupId>
-            <artifactId>aopalliance</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>logkit</groupId>
-                    <artifactId>logkit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.customware.gwt.dispatch
-        </groupId>
-            <artifactId>gwt-dispatch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.gwtupload</groupId>
-            <artifactId>gwtupload</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.guice</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.guice</groupId>
-            <artifactId>guice-assistedinject</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.guice</groupId>
-            <artifactId>guice-servlet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-user</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-servlet</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </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>
-</project>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java Mon Sep 23 07:04:08 2013
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -22,13 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server;
 
 import javax.mail.MessagingException;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java Mon Sep 23 07:04:08 2013
@@ -24,19 +24,7 @@ import javax.mail.NoSuchProviderExceptio
 import javax.mail.Session;
 import javax.mail.Transport;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.domain.User;
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.domain.User;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 
 import com.sun.mail.imap.IMAPStore;
 

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java Mon Sep 23 07:04:08 2013
@@ -29,19 +29,7 @@ import javax.mail.Session;
 import javax.mail.Transport;
 
 import org.apache.commons.logging.Log;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.domain.User;
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.domain.User;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -104,14 +92,6 @@ public class InMemoryIMAPStoreCache impl
      * @see org.apache.hupa.server.IMAPStoreCache#get(org.apache.hupa.shared.data.User)
      */
     public IMAPStore get(User user) throws MessagingException {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
     	IMAPStore ret =  get(user.getName(),user.getPassword());
     	
     	// TODO: this is a hack, we should have a default domain suffix in configuration files
@@ -119,18 +99,6 @@ public class InMemoryIMAPStoreCache impl
     		user.setName(user.getName() + "@gmail.com");
     	}
     	return ret;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-        return get(user.getName(),user.getPassword());
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
-        return get(user.getName(),user.getPassword());
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
     }
     
     /*
@@ -165,17 +133,6 @@ public class InMemoryIMAPStoreCache impl
         if (cstore.getStore().isConnected() == false) {
             try {
                 cstore.getStore().connect(address, port, username, password);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                System.out.println(address +"ImMemory"+ port);
-=======
->>>>>>> first commit
-=======
-                System.out.println(address +"ImMemory"+ port);
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
             } catch (MessagingException e) {
                     throw (e);
             }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java Mon Sep 23 07:04:08 2013
@@ -21,17 +21,6 @@ package org.apache.hupa.server.guice;
 
 
 import org.apache.hupa.server.servlet.DownloadAttachmentServlet;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import org.apache.hupa.server.servlet.HupaDispatchServlet;
->>>>>>> first commit
-=======
-import org.apache.hupa.server.servlet.HupaDispatchServlet;
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 import org.apache.hupa.server.servlet.MessageSourceServlet;
 import org.apache.hupa.server.servlet.UploadAttachmentServlet;
 import org.apache.hupa.shared.SConsts;
@@ -42,17 +31,6 @@ import com.google.inject.servlet.Servlet
 public class DispatchServletModule extends ServletModule{
      @Override
         public void configureServlets() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-             serve("/" + SConsts.HUPA + SConsts.SERVLET_DISPATCH).with(HupaDispatchServlet.class );
->>>>>>> first commit
-=======
-             serve("/" + SConsts.HUPA + SConsts.SERVLET_DISPATCH).with(HupaDispatchServlet.class );
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
              serve("/" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD).with(DownloadAttachmentServlet.class);
              serve("/" + SConsts.HUPA + SConsts.SERVLET_UPLOAD).with(UploadAttachmentServlet.class);
              serve("/" + SConsts.HUPA + SConsts.SERVLET_SOURCE).with(MessageSourceServlet.class);

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java Mon Sep 23 07:04:08 2013
@@ -19,21 +19,8 @@
 
 package org.apache.hupa.server.guice.providers;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.data.SettingsImpl;
 import org.apache.hupa.shared.domain.Settings;
-=======
-import org.apache.hupa.shared.data.Settings;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.Settings;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.SettingsImpl;
-import org.apache.hupa.shared.domain.Settings;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -60,19 +47,7 @@ public class DefaultUserSettingsProvider
      * @see com.google.inject.Provider#get()
      */
     public Settings get() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        Settings settings = new SettingsImpl();
-=======
-        Settings settings = new Settings();
->>>>>>> first commit
-=======
-        Settings settings = new Settings();
->>>>>>> first commit
-=======
         Settings settings = new SettingsImpl();
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
         settings.setInboxFolderName(inboxFolder);
         settings.setSentFolderName(sentFolder);
         settings.setTrashFolderName(trashFolder);

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/HttpSessionProvider.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/HttpSessionProvider.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/HttpSessionProvider.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/HttpSessionProvider.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.guice.providers;
 
 

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java Mon Sep 23 07:04:08 2013
@@ -17,17 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> first commit
-=======
-
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.guice.providers;
 
 import org.apache.commons.logging.Log;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java Mon Sep 23 07:04:08 2013
@@ -24,19 +24,7 @@ import java.util.ArrayList;
 import javax.mail.Flags;
 import javax.mail.Flags.Flag;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
-=======
-import org.apache.hupa.shared.data.Message.IMAPFlag;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.Message.IMAPFlag;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
->>>>>>> try to change fetch messages to use RF
 
 /**
  * Util class which helps to convert from hupa internal data representation to javamaill classes

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceListener.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceListener.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceListener.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceListener.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.ioc;
 
 import java.util.ArrayList;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,30 +17,16 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.ioc;
 
 import java.util.Properties;
 
 import javax.mail.Session;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import javax.servlet.http.HttpSession;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
 
 import org.apache.commons.logging.Log;
 import org.apache.hupa.server.IMAPStoreCache;
 import org.apache.hupa.server.InMemoryIMAPStoreCache;
 import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
 import org.apache.hupa.server.guice.providers.LogProvider;
 import org.apache.hupa.server.preferences.InImapUserPreferencesStorage;
@@ -60,75 +42,24 @@ import org.apache.hupa.server.service.De
 import org.apache.hupa.server.service.DeleteMessageAllServiceImpl;
 import org.apache.hupa.server.service.DeleteMessageByUidService;
 import org.apache.hupa.server.service.DeleteMessageByUidServiceImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.server.service.FetchFoldersService;
 import org.apache.hupa.server.service.FetchFoldersServiceImpl;
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
-import org.apache.hupa.server.service.FetchFoldersService;
-import org.apache.hupa.server.service.FetchFoldersServiceImpl;
->>>>>>> Fix issue #15.
 import org.apache.hupa.server.service.FetchMessagesService;
 import org.apache.hupa.server.service.FetchMessagesServiceImpl;
 import org.apache.hupa.server.service.GetMessageDetailsService;
 import org.apache.hupa.server.service.GetMessageDetailsServiceImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
 import org.apache.hupa.server.service.GetMessageRawService;
 import org.apache.hupa.server.service.GetMessageRawServiceImpl;
 import org.apache.hupa.server.service.IdleService;
 import org.apache.hupa.server.service.IdleServiceImpl;
-<<<<<<< HEAD
-=======
-import org.apache.hupa.server.guice.providers.HttpSessionProvider;
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
-import org.apache.hupa.server.guice.providers.LogProvider;
-import org.apache.hupa.server.preferences.InImapUserPreferencesStorage;
-import org.apache.hupa.server.preferences.UserPreferencesStorage;
-import org.apache.hupa.server.service.CheckSessionService;
-import org.apache.hupa.server.service.CheckSessionServiceImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-=======
-import org.apache.hupa.server.service.CreateFolderService;
-import org.apache.hupa.server.service.CreateFolderServiceImpl;
-<<<<<<< HEAD
->>>>>>> Succeed creating new folder
-=======
-import org.apache.hupa.server.service.DeleteFolderService;
-import org.apache.hupa.server.service.DeleteFolderServiceImpl;
->>>>>>> delete and rename folder
-import org.apache.hupa.server.service.FetchMessagesService;
-import org.apache.hupa.server.service.FetchMessagesServiceImpl;
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
->>>>>>> try to get message details, problem is:
-=======
->>>>>>> other RFs
 import org.apache.hupa.server.service.ImapFolderService;
 import org.apache.hupa.server.service.ImapFolderServiceImpl;
 import org.apache.hupa.server.service.LoginUserService;
 import org.apache.hupa.server.service.LoginUserServiceImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
 import org.apache.hupa.server.service.LogoutUserService;
 import org.apache.hupa.server.service.LogoutUserServiceImpl;
 import org.apache.hupa.server.service.MoveMessageService;
 import org.apache.hupa.server.service.MoveMessageServiceImpl;
-<<<<<<< HEAD
 import org.apache.hupa.server.service.RenameFolderService;
 import org.apache.hupa.server.service.RenameFolderServiceImpl;
 import org.apache.hupa.server.service.SendForwardMessageService;
@@ -146,45 +77,16 @@ import org.apache.hupa.shared.data.Creat
 import org.apache.hupa.shared.data.DeleteFolderActionImpl;
 import org.apache.hupa.shared.data.DeleteMessageAllActionImpl;
 import org.apache.hupa.shared.data.DeleteMessageByUidActionImpl;
-=======
-=======
->>>>>>> other RFs
-import org.apache.hupa.server.service.RenameFolderService;
-import org.apache.hupa.server.service.RenameFolderServiceImpl;
-import org.apache.hupa.server.service.SendForwardMessageService;
-import org.apache.hupa.server.service.SendForwardMessageServiceImpl;
-import org.apache.hupa.server.service.SendMessageBaseServiceImpl;
-import org.apache.hupa.server.service.SendMessageService;
-import org.apache.hupa.server.service.SendReplyMessageService;
-import org.apache.hupa.server.service.SendReplyMessageServiceImpl;
-import org.apache.hupa.server.service.SetFlagService;
-import org.apache.hupa.server.service.SetFlagServiceImpl;
-import org.apache.hupa.shared.data.CreateFolderActionImpl;
-import org.apache.hupa.shared.data.DeleteFolderActionImpl;
-<<<<<<< HEAD
->>>>>>> delete and rename folder
-=======
-import org.apache.hupa.shared.data.DeleteMessageAllActionImpl;
-import org.apache.hupa.shared.data.DeleteMessageByUidActionImpl;
->>>>>>> delete messages, make WestActivity Singleton
 import org.apache.hupa.shared.data.FetchMessagesActionImpl;
 import org.apache.hupa.shared.data.FetchMessagesResultImpl;
 import org.apache.hupa.shared.data.GenericResultImpl;
 import org.apache.hupa.shared.data.GetMessageDetailsActionImpl;
 import org.apache.hupa.shared.data.GetMessageDetailsResultImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
 import org.apache.hupa.shared.data.GetMessageRawActionImpl;
 import org.apache.hupa.shared.data.GetMessageRawResultImpl;
 import org.apache.hupa.shared.data.IdleActionImpl;
 import org.apache.hupa.shared.data.IdleResultImpl;
 import org.apache.hupa.shared.data.ImapFolderImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
 import org.apache.hupa.shared.data.LogoutUserActionImpl;
 import org.apache.hupa.shared.data.MailHeaderImpl;
 import org.apache.hupa.shared.data.MessageAttachmentImpl;
@@ -194,122 +96,37 @@ import org.apache.hupa.shared.data.Renam
 import org.apache.hupa.shared.data.SendForwardMessageActionImpl;
 import org.apache.hupa.shared.data.SendMessageActionImpl;
 import org.apache.hupa.shared.data.SendReplyMessageActionImpl;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.data.SetFlagActionImpl;
 import org.apache.hupa.shared.data.SmtpMessageImpl;
-=======
-=======
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.data.MailHeaderImpl;
-import org.apache.hupa.shared.data.MessageAttachmentImpl;
-import org.apache.hupa.shared.data.MessageDetailsImpl;
->>>>>>> try to get message details, problem is:
-import org.apache.hupa.shared.data.RenameFolderActionImpl;
->>>>>>> delete and rename folder
-=======
-=======
-import org.apache.hupa.shared.data.SetFlagActionImpl;
->>>>>>> other RFs
-import org.apache.hupa.shared.data.SmtpMessageImpl;
->>>>>>> forward and reply message to use RF
 import org.apache.hupa.shared.data.TagImpl;
 import org.apache.hupa.shared.data.UserImpl;
 import org.apache.hupa.shared.domain.CreateFolderAction;
 import org.apache.hupa.shared.domain.DeleteFolderAction;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.shared.domain.DeleteMessageAllAction;
-import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
-=======
->>>>>>> delete and rename folder
-=======
 import org.apache.hupa.shared.domain.DeleteMessageAllAction;
 import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
->>>>>>> delete messages, make WestActivity Singleton
 import org.apache.hupa.shared.domain.FetchMessagesAction;
 import org.apache.hupa.shared.domain.FetchMessagesResult;
 import org.apache.hupa.shared.domain.GenericResult;
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;
 import org.apache.hupa.shared.domain.GetMessageDetailsResult;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
 import org.apache.hupa.shared.domain.GetMessageRawAction;
 import org.apache.hupa.shared.domain.GetMessageRawResult;
 import org.apache.hupa.shared.domain.IdleAction;
 import org.apache.hupa.shared.domain.IdleResult;
-<<<<<<< HEAD
-import org.apache.hupa.shared.domain.ImapFolder;
-<<<<<<< HEAD
-import org.apache.hupa.shared.domain.LogoutUserAction;
-import org.apache.hupa.shared.domain.MailHeader;
-import org.apache.hupa.shared.domain.MessageAttachment;
-import org.apache.hupa.shared.domain.MessageDetails;
-import org.apache.hupa.shared.domain.MoveMessageAction;
-=======
-=======
->>>>>>> other RFs
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.LogoutUserAction;
 import org.apache.hupa.shared.domain.MailHeader;
 import org.apache.hupa.shared.domain.MessageAttachment;
 import org.apache.hupa.shared.domain.MessageDetails;
-<<<<<<< HEAD
->>>>>>> try to get message details, problem is:
-import org.apache.hupa.shared.domain.RenameFolderAction;
-import org.apache.hupa.shared.domain.SendForwardMessageAction;
-import org.apache.hupa.shared.domain.SendMessageAction;
-import org.apache.hupa.shared.domain.SendReplyMessageAction;
-import org.apache.hupa.shared.domain.SetFlagAction;
-=======
-=======
 import org.apache.hupa.shared.domain.MoveMessageAction;
->>>>>>> other RFs
 import org.apache.hupa.shared.domain.RenameFolderAction;
-<<<<<<< HEAD
->>>>>>> delete and rename folder
-import org.apache.hupa.shared.domain.Settings;
-import org.apache.hupa.shared.domain.SmtpMessage;
-import org.apache.hupa.shared.domain.Tag;
-=======
-=======
-import org.apache.hupa.shared.data.FetchMessagesActionImpl;
-import org.apache.hupa.shared.data.FetchMessagesResultImpl;
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
-import org.apache.hupa.shared.data.CreateFolderActionImpl;
-import org.apache.hupa.shared.data.FetchMessagesActionImpl;
-import org.apache.hupa.shared.data.FetchMessagesResultImpl;
-import org.apache.hupa.shared.data.GenericResultImpl;
->>>>>>> Succeed creating new folder
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.data.TagImpl;
-import org.apache.hupa.shared.data.UserImpl;
-import org.apache.hupa.shared.domain.CreateFolderAction;
-import org.apache.hupa.shared.domain.FetchMessagesAction;
-import org.apache.hupa.shared.domain.FetchMessagesResult;
-import org.apache.hupa.shared.domain.GenericResult;
-import org.apache.hupa.shared.domain.ImapFolder;
-=======
 import org.apache.hupa.shared.domain.SendForwardMessageAction;
 import org.apache.hupa.shared.domain.SendMessageAction;
 import org.apache.hupa.shared.domain.SendReplyMessageAction;
 import org.apache.hupa.shared.domain.SetFlagAction;
-<<<<<<< HEAD
-import org.apache.hupa.shared.domain.SmtpMessage;
->>>>>>> forward and reply message to use RF
-import org.apache.hupa.shared.domain.Settings;
-<<<<<<< HEAD
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-=======
 import org.apache.hupa.shared.domain.Settings;
 import org.apache.hupa.shared.domain.SmtpMessage;
->>>>>>> fix issue 4
 import org.apache.hupa.shared.domain.Tag;
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
 import org.apache.hupa.shared.domain.User;
 
 import com.google.inject.AbstractModule;
@@ -344,17 +161,11 @@ public class GuiceServerModule extends A
 		bind(ServiceLayerDecorator.class).to(IocRfServiceDecorator.class);
 		bind(IocRfServiceLocator.class);
 		
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> try to get message details, problem is:
 		bind(MailHeader.class).to(MailHeaderImpl.class);
 		
 		bind(User.class).to(UserImpl.class);
 		bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(Singleton.class);
 		bind(ImapFolder.class).to(ImapFolderImpl.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
 		bind(Tag.class).to(TagImpl.class);
 		bind(MessageDetails.class).to(MessageDetailsImpl.class);
 		bind(MessageAttachment.class).to(MessageAttachmentImpl.class);
@@ -373,10 +184,6 @@ public class GuiceServerModule extends A
 		bind(SendMessageAction.class).to(SendMessageActionImpl.class);
 		bind(SendForwardMessageAction.class).to(SendForwardMessageActionImpl.class);
 		bind(SendReplyMessageAction.class).to(SendReplyMessageActionImpl.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
 		bind(GetMessageRawAction.class).to(GetMessageRawActionImpl.class);
 		bind(GetMessageRawResult.class).to(GetMessageRawResultImpl.class);
 		bind(IdleAction.class).to(IdleActionImpl.class);
@@ -384,124 +191,28 @@ public class GuiceServerModule extends A
 		bind(LogoutUserAction.class).to(LogoutUserActionImpl.class);
 		bind(MoveMessageAction.class).to(MoveMessageActionImpl.class);
 		bind(SetFlagAction.class).to(SetFlagActionImpl.class);
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
 		
 		
-=======
-		bind(User.class).to(UserImpl.class);
-		bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(Singleton.class);
-		bind(ImapFolder.class).to(ImapFolderImpl.class);
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-		bind(FetchMessagesAction.class).to(FetchMessagesActionImpl.class);
-		bind(FetchMessagesResult.class).to(FetchMessagesResultImpl.class);
-		bind(Tag.class).to(TagImpl.class);
-<<<<<<< HEAD
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
-=======
-		bind(Tag.class).to(TagImpl.class);
-		bind(MessageDetails.class).to(MessageDetailsImpl.class);
-		bind(MessageAttachment.class).to(MessageAttachmentImpl.class);
->>>>>>> try to get message details, problem is:
-		bind(GenericResult.class).to(GenericResultImpl.class);
-		bind(FetchMessagesAction.class).to(FetchMessagesActionImpl.class);
-		bind(FetchMessagesResult.class).to(FetchMessagesResultImpl.class);
-		bind(CreateFolderAction.class).to(CreateFolderActionImpl.class);
-<<<<<<< HEAD
->>>>>>> Succeed creating new folder
-=======
-		bind(DeleteFolderAction.class).to(DeleteFolderActionImpl.class);
-		bind(RenameFolderAction.class).to(RenameFolderActionImpl.class);
-<<<<<<< HEAD
->>>>>>> delete and rename folder
-=======
-		bind(DeleteMessageAllAction.class).to(DeleteMessageAllActionImpl.class);
-		bind(DeleteMessageByUidAction.class).to(DeleteMessageByUidActionImpl.class);
-<<<<<<< HEAD
->>>>>>> delete messages, make WestActivity Singleton
-=======
-		bind(GetMessageDetailsAction.class).to(GetMessageDetailsActionImpl.class);
-		bind(GetMessageDetailsResult.class).to(GetMessageDetailsResultImpl.class);
-=======
-		
->>>>>>> other RFs
-		
->>>>>>> try to get message details, problem is:
 		
 		bind(CheckSessionService.class).to(CheckSessionServiceImpl.class);
 		bind(LoginUserService.class).to(LoginUserServiceImpl.class);
 		bind(ImapFolderService.class).to(ImapFolderServiceImpl.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-		bind(FetchFoldersService.class).to(FetchFoldersServiceImpl.class);
-		bind(FetchMessagesService.class).to(FetchMessagesServiceImpl.class);
-		bind(CreateFolderService.class).to(CreateFolderServiceImpl.class);
-		bind(DeleteFolderService.class).to(DeleteFolderServiceImpl.class);
-		bind(RenameFolderService.class).to(RenameFolderServiceImpl.class);
-		bind(DeleteMessageAllService.class).to(DeleteMessageAllServiceImpl.class);
-		bind(DeleteMessageByUidService.class).to(DeleteMessageByUidServiceImpl.class);
-		bind(GetMessageDetailsService.class).to(GetMessageDetailsServiceImpl.class);
-		bind(SendMessageService.class).to(SendMessageBaseServiceImpl.class);
-		bind(SendForwardMessageService.class).to(SendForwardMessageServiceImpl.class);
-		bind(SendReplyMessageService.class).to(SendReplyMessageServiceImpl.class);
-		bind(GetMessageRawService.class).to(GetMessageRawServiceImpl.class);
-		bind(IdleService.class).to(IdleServiceImpl.class);
-		bind(LogoutUserService.class).to(LogoutUserServiceImpl.class);
-		bind(MoveMessageService.class).to(MoveMessageServiceImpl.class);
-		bind(SetFlagService.class).to(SetFlagServiceImpl.class);
-		
-		bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class);
-
-        bind(DownloadAttachmentServlet.class).in(Singleton.class);
-        bind(UploadAttachmentServlet.class).in(Singleton.class);
-        bind(MessageSourceServlet.class).in(Singleton.class);
-        
-		bind(Log.class).toProvider(LogProvider.class).in(Singleton.class);
-		bind(Session.class).toProvider(JavaMailSessionProvider.class);
-        bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class);
-=======
-=======
-=======
 		bind(FetchFoldersService.class).to(FetchFoldersServiceImpl.class);
->>>>>>> Fix issue #15.
 		bind(FetchMessagesService.class).to(FetchMessagesServiceImpl.class);
-<<<<<<< HEAD
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
 		bind(CreateFolderService.class).to(CreateFolderServiceImpl.class);
-<<<<<<< HEAD
->>>>>>> Succeed creating new folder
-=======
 		bind(DeleteFolderService.class).to(DeleteFolderServiceImpl.class);
 		bind(RenameFolderService.class).to(RenameFolderServiceImpl.class);
-<<<<<<< HEAD
->>>>>>> delete and rename folder
-=======
 		bind(DeleteMessageAllService.class).to(DeleteMessageAllServiceImpl.class);
 		bind(DeleteMessageByUidService.class).to(DeleteMessageByUidServiceImpl.class);
-<<<<<<< HEAD
->>>>>>> delete messages, make WestActivity Singleton
-=======
 		bind(GetMessageDetailsService.class).to(GetMessageDetailsServiceImpl.class);
-<<<<<<< HEAD
->>>>>>> try to get message details, problem is:
-=======
 		bind(SendMessageService.class).to(SendMessageBaseServiceImpl.class);
 		bind(SendForwardMessageService.class).to(SendForwardMessageServiceImpl.class);
 		bind(SendReplyMessageService.class).to(SendReplyMessageServiceImpl.class);
-<<<<<<< HEAD
->>>>>>> forward and reply message to use RF
-=======
 		bind(GetMessageRawService.class).to(GetMessageRawServiceImpl.class);
 		bind(IdleService.class).to(IdleServiceImpl.class);
 		bind(LogoutUserService.class).to(LogoutUserServiceImpl.class);
 		bind(MoveMessageService.class).to(MoveMessageServiceImpl.class);
 		bind(SetFlagService.class).to(SetFlagServiceImpl.class);
->>>>>>> other RFs
 		
 		bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class);
 
@@ -511,18 +222,8 @@ public class GuiceServerModule extends A
         
 		bind(Log.class).toProvider(LogProvider.class).in(Singleton.class);
 		bind(Session.class).toProvider(JavaMailSessionProvider.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-//		bind(HttpSession.class).toProvider(HttpSessionProvider.class);
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-		bind(Properties.class).toInstance(properties);
-=======
->>>>>>> forward and reply message to use RF
-        bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class);
-=======
 //        bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class);
         bind(UserPreferencesStorage.class).to(InSessionUserPreferencesStorage.class);
->>>>>>> Disable InImapUserPreferencesStorage
 		bind(Properties.class).toInstance(properties);
 	}
 

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.ioc;
 
 import org.apache.hupa.server.servlet.DownloadAttachmentServlet;
@@ -32,25 +27,6 @@ import org.apache.hupa.shared.SConsts;
 import com.google.inject.Singleton;
 import com.google.inject.servlet.ServletModule;
 
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.ioc;
-
-import org.apache.hupa.server.servlet.DownloadAttachmentServlet;
-import org.apache.hupa.server.servlet.MessageSourceServlet;
-import org.apache.hupa.server.servlet.UploadAttachmentServlet;
-import org.apache.hupa.shared.SConsts;
-
-import com.google.inject.Singleton;
-import com.google.inject.servlet.ServletModule;
-
-<<<<<<< HEAD
-/**
- */
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 public class GuiceWebModule extends ServletModule {
   
   @Override
@@ -58,17 +34,8 @@ public class GuiceWebModule extends Serv
 
     bind(IocRfServlet.class).in(Singleton.class);
     serve("/gwtRequest").with(IocRfServlet.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-    serve("/" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD).with(DownloadAttachmentServlet.class);
-    serve("/" + SConsts.HUPA + SConsts.SERVLET_UPLOAD).with(UploadAttachmentServlet.class);
-    serve("/" + SConsts.HUPA + SConsts.SERVLET_SOURCE).with(MessageSourceServlet.class);
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
     serve("/" + SConsts.HUPA + SConsts.SERVLET_DOWNLOAD).with(DownloadAttachmentServlet.class);
     serve("/" + SConsts.HUPA + SConsts.SERVLET_UPLOAD).with(UploadAttachmentServlet.class);
     serve("/" + SConsts.HUPA + SConsts.SERVLET_SOURCE).with(MessageSourceServlet.class);
->>>>>>> fix issue 4
   }
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceDecorator.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceDecorator.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceDecorator.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceDecorator.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.ioc;
 
 import com.google.inject.Inject;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceLocator.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceLocator.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceLocator.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceLocator.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.ioc;
 
 import com.google.inject.Inject;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServlet.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServlet.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServlet.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServlet.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.ioc;
 
 import com.google.inject.Inject;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java Mon Sep 23 07:04:08 2013
@@ -48,19 +48,7 @@ import org.apache.commons.io.output.Byte
 import org.apache.commons.logging.Log;
 import org.apache.hupa.server.IMAPStoreCache;
 import org.apache.hupa.server.utils.MessageUtils;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.domain.User;
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.data.User;
->>>>>>> first commit
-=======
-import org.apache.hupa.shared.domain.User;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 import org.apache.hupa.shared.rpc.ContactsResult.Contact;
 
 import com.google.inject.Inject;
@@ -74,21 +62,7 @@ import com.sun.mail.imap.IMAPStore;
  * @author manolo
  */
 public class InImapUserPreferencesStorage extends UserPreferencesStorage {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	
-=======
->>>>>>> first commit
-=======
-	
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
 	
->>>>>>> constantly changed by manolo
 
     // User preferences are saved in IMAP but there is a delay between a new
     // contact is added an the save action. It saves number of operations in

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java Mon Sep 23 07:04:08 2013
@@ -23,20 +23,6 @@ import org.apache.hupa.shared.rpc.Contac
 
 import java.util.Arrays;
 import java.util.List;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import java.util.regex.Pattern;
->>>>>>> first commit
-=======
->>>>>>> constant changed by manolo
-=======
-import java.util.regex.Pattern;
->>>>>>> first commit
-=======
->>>>>>> constant changed by manolo
 
 /**
  *
@@ -73,15 +59,7 @@ public abstract class UserPreferencesSto
     final public void addContact(List<String> mails) {
         if (mails != null) {
             for (String mail: mails) {
-<<<<<<< HEAD
-<<<<<<< HEAD
             	if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) {
-=======
-            	if (!mail.matches(REGEX_OMITTED_EMAILS)) {
->>>>>>> first commit
-=======
-            	if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) {
->>>>>>> constant changed by manolo
                     Contact contact = new Contact(mail);
                     addContact(contact);
             	}

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import javax.servlet.http.HttpSession;
@@ -34,68 +25,25 @@ import org.apache.commons.logging.Log;
 import org.apache.hupa.server.IMAPStoreCache;
 import org.apache.hupa.shared.SConsts;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> re-add server unit tests
 import org.apache.hupa.shared.exception.HupaException;
 import org.apache.hupa.shared.exception.InvalidSessionException;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-<<<<<<< HEAD
-=======
-
-import com.google.inject.Inject;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> fix issue 5,6,8:
 
 public abstract class AbstractService {
 	
     @Inject protected IMAPStoreCache cache;
-<<<<<<< HEAD
-<<<<<<< HEAD
-    @Inject protected Provider<HttpSession> httpSessionProvider;
-    @Inject protected Log logger;
-
-	protected User getUser() throws HupaException{
-
-        User user = (User) httpSessionProvider.get().getAttribute(SConsts.USER_SESS_ATTR);
-        if (user == null) {
-            throw new InvalidSessionException(getClass()+"User not found in session with id " + httpSessionProvider.get().getId());
-        } else {
-            return user;
-        }
-=======
-    @Inject protected HttpSession httpSession;
-=======
     @Inject protected Provider<HttpSession> httpSessionProvider;
->>>>>>> fix issue 5,6,8:
     @Inject protected Log logger;
 
 	protected User getUser() throws HupaException{
 
-<<<<<<< HEAD
-	protected HttpSession getHttpSession() {
-		return httpSession;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
         User user = (User) httpSessionProvider.get().getAttribute(SConsts.USER_SESS_ATTR);
-<<<<<<< HEAD
-//        if (user == null) { TODO exception
-//            throw new Exception("User not found in session with id " + httpSessionProvider.get().getId());
-//        } else {
-//            return user;
-//        }
-        return user;
->>>>>>> fix issue 5,6,8:
-=======
         if (user == null) {
             throw new InvalidSessionException(getClass()+"User not found in session with id " + httpSessionProvider.get().getId());
         } else {
             return user;
         }
->>>>>>> re-add server unit tests
 	}
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import org.apache.hupa.shared.domain.User;
@@ -30,21 +25,4 @@ import org.apache.hupa.shared.exception.
 public interface CheckSessionService {
 	public User getUser() throws HupaException;
 	public Boolean isValid() throws HupaException;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface CheckSessionService {
-<<<<<<< HEAD
-	public User getUser();
-	public Boolean isValid();
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-	public User getUser() throws HupaException;
-	public Boolean isValid() throws HupaException;
->>>>>>> re-add server unit tests
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import org.apache.hupa.shared.SConsts;
@@ -36,28 +31,6 @@ public class CheckSessionServiceImpl ext
 	}
 	
 	public Boolean isValid()  throws HupaException{
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import org.apache.hupa.shared.SConsts;
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.exception.HupaException;
-
-public class CheckSessionServiceImpl extends AbstractService implements CheckSessionService {
-	
-	@Override
-	public User getUser() throws HupaException{
-        return (User) httpSessionProvider.get().getAttribute(SConsts.USER_SESS_ATTR);
-	}
-	
-<<<<<<< HEAD
-	public Boolean isValid() {
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-	public Boolean isValid()  throws HupaException{
->>>>>>> re-add server unit tests
 		return getUser() != null && getUser().getAuthenticated();
 	}
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Succeed creating new folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import org.apache.hupa.shared.domain.CreateFolderAction;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Succeed creating new folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import javax.mail.Folder;
@@ -44,10 +35,6 @@ public class CreateFolderServiceImpl ext
 	public GenericResult create(CreateFolderAction action) throws Exception {
 		User user = getUser();
 		ImapFolder folder = action.getFolder();
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> delete and rename folder
 		IMAPStore store = cache.get(user);
 		Folder f = store.getFolder(folder.getFullName());
 		if (f.create(Folder.HOLDS_MESSAGES)) {
@@ -56,28 +43,7 @@ public class CreateFolderServiceImpl ext
 		} else {
 			logger.info("Unable to create folder " + folder + " for user " + user);
 			throw new Exception("Unable to create folder " + folder + " for user " + user);
-<<<<<<< HEAD
 
-=======
-
-		try {
-			IMAPStore store = cache.get(user);
-			Folder f = store.getFolder(folder.getFullName());
-			if (f.create(Folder.HOLDS_MESSAGES)) {
-				logger.info("Successfully create folder " + folder + " for user " + user);
-				return new GenericResultImpl();
-			} else {
-				logger.info("Unable to create folder " + folder + " for user " + user);
-				throw new Exception("Unable to create folder " + folder + " for user " + user);
-
-			}
-		} catch (Exception e) {
-			logger.error("Error while creating folder " + folder + " for user " + user, e);
-			throw new Exception("Error while creating folder " + folder + " for user " + user, e);
->>>>>>> Succeed creating new folder
-=======
-
->>>>>>> delete and rename folder
 		}
 	}
 

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import javax.mail.MessagingException;
@@ -32,22 +27,4 @@ import org.apache.hupa.shared.exception.
 
 public interface DeleteFolderService {
 	GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import javax.mail.MessagingException;
-
-import org.apache.hupa.shared.domain.DeleteFolderAction;
-import org.apache.hupa.shared.domain.GenericResult;
-import org.apache.hupa.shared.exception.HupaException;
-
-public interface DeleteFolderService {
-<<<<<<< HEAD
-	GenericResult delete(DeleteFolderAction action) throws Exception;
->>>>>>> delete and rename folder
-=======
-	GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException;
->>>>>>> re-add server unit tests
 }

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteFolderServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,50 +17,24 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.server.service;
 
 import javax.mail.Folder;
 import javax.mail.MessagingException;
-<<<<<<< HEAD
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.server.service;
-
-import javax.mail.Folder;
->>>>>>> delete and rename folder
-=======
->>>>>>> re-add server unit tests
 
 import org.apache.hupa.shared.data.GenericResultImpl;
 import org.apache.hupa.shared.domain.DeleteFolderAction;
 import org.apache.hupa.shared.domain.GenericResult;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> delete and rename folder
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.sun.mail.imap.IMAPStore;
 
 public class DeleteFolderServiceImpl extends AbstractService implements DeleteFolderService {
 
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException {
-=======
-	public GenericResult delete(DeleteFolderAction action) throws Exception {
->>>>>>> delete and rename folder
-=======
 	public GenericResult delete(DeleteFolderAction action) throws HupaException, MessagingException {
->>>>>>> re-add server unit tests
 		User user = getUser();
 		ImapFolder folder = action.getFolder();
 		IMAPStore store = cache.get(user);
@@ -81,15 +51,7 @@ public class DeleteFolderServiceImpl ext
 			logger.info("Successfully delete folder " + folder + " for user " + user);
 			return new GenericResultImpl();
 		} else {
-<<<<<<< HEAD
-<<<<<<< HEAD
-			throw new HupaException("Unable to delete folder " + folder + " for user " + user);
-=======
-			throw new Exception("Unable to delete folder " + folder + " for user " + user);
->>>>>>> delete and rename folder
-=======
 			throw new HupaException("Unable to delete folder " + folder + " for user " + user);
->>>>>>> re-add server unit tests
 		}
 	}
 

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import org.apache.hupa.shared.domain.DeleteMessageAction;

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import javax.mail.Folder;
@@ -35,14 +26,7 @@ import javax.mail.MessagingException;
 import org.apache.hupa.shared.domain.DeleteMessageAction;
 import org.apache.hupa.shared.domain.DeleteMessageAllAction;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.sun.mail.imap.IMAPFolder;
 import com.sun.mail.imap.IMAPStore;
@@ -50,15 +34,7 @@ import com.sun.mail.imap.IMAPStore;
 public class DeleteMessageAllServiceImpl extends DeleteMessageBaseServiceImpl implements DeleteMessageAllService {
 
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-	protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
-=======
-	protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception {
->>>>>>> delete messages, make WestActivity Singleton
-=======
 	protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException {
->>>>>>> re-add server unit tests
 		DeleteMessageAllAction action = (DeleteMessageAllAction) actionBase;
 		User user = getUser();
 		try {
@@ -72,15 +48,7 @@ public class DeleteMessageAllServiceImpl
 		} catch (MessagingException e) {
 			String errorMsg = "Error while deleting all messages in folder " + action.getFolder() + " for user " + user;
 			logger.error(errorMsg, e);
-<<<<<<< HEAD
-<<<<<<< HEAD
-			throw new HupaException(errorMsg);
-=======
-			throw new Exception(errorMsg);
->>>>>>> delete messages, make WestActivity Singleton
-=======
 			throw new HupaException(errorMsg);
->>>>>>> re-add server unit tests
 
 		}
 

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.server.service;
 
 import javax.mail.Flags;
@@ -37,27 +28,12 @@ import org.apache.hupa.shared.domain.Del
 import org.apache.hupa.shared.domain.DeleteMessageResult;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.exception.HupaException;
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
-import org.apache.hupa.shared.exception.HupaException;
->>>>>>> re-add server unit tests
 
 import com.sun.mail.imap.IMAPStore;
 
 public abstract class DeleteMessageBaseServiceImpl extends AbstractService{
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException {
-=======
-	public DeleteMessageResult delete(DeleteMessageAction action) throws Exception {
->>>>>>> delete messages, make WestActivity Singleton
-=======
 	public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException {
->>>>>>> re-add server unit tests
     	ImapFolder folder = action.getFolder();
         User user = getUser();
         try {
@@ -109,15 +85,7 @@ public abstract class DeleteMessageBaseS
         } catch (MessagingException e) {
             logger.error("Error while deleting messages for user " + user
                     + " in folder" + action.getFolder(), e);
-<<<<<<< HEAD
-<<<<<<< HEAD
             throw new HupaException("Error while deleting messages");
-=======
-            throw new Exception("Error while deleting messages");
->>>>>>> delete messages, make WestActivity Singleton
-=======
-            throw new HupaException("Error while deleting messages");
->>>>>>> re-add server unit tests
         }
     }
 
@@ -128,13 +96,5 @@ public abstract class DeleteMessageBaseS
      * @param action
      * @return messages
      */
-<<<<<<< HEAD
-<<<<<<< HEAD
-    protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException;
-=======
-    protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception;
->>>>>>> delete messages, make WestActivity Singleton
-=======
     protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException;
->>>>>>> re-add server unit tests
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message