Author: dongxu
Date: Thu Sep 12 03:19:23 2013
New Revision: 1522187
URL: http://svn.apache.org/r1522187
Log:
remove both of gwt-representer and gwt-dispatch dependencies, add license
headers to all new files
Modified:
james/hupa/trunk/mock/pom.xml
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
Modified: james/hupa/trunk/mock/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1522187&r1=1522186&r2=1522187&view=diff
==============================================================================
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Thu Sep 12 03:19:23 2013
@@ -117,6 +117,7 @@
<dependency>
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -129,6 +130,8 @@
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> 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>
Modified:
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java?rev=1522187&r1=1522186&r2=1522187&view=diff
==============================================================================
---
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
(original)
+++
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
Thu Sep 12 03:19:23 2013
@@ -23,6 +23,7 @@ import java.util.Properties;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.data.UserImpl;
@@ -32,6 +33,8 @@ import com.google.inject.AbstractModule;
>>>>>>> first commit
import net.customware.gwt.dispatch.server.guice.ActionHandlerModule;
+=======
+>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add
license headers to all new files
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.data.UserImpl;
@@ -89,6 +92,7 @@ import com.google.inject.name.Named;
*/
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public abstract class AbstractGuiceTestModule extends AbstractModule{
protected static class TestUser extends UserImpl {
@@ -97,6 +101,9 @@ public abstract class AbstractGuiceTestM
=======
>>>>>>> first commit
public abstract class AbstractGuiceTestModule extends ActionHandlerModule {
+=======
+public abstract class AbstractGuiceTestModule {
+>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add
license headers to all new files
protected static class TestUser extends UserImpl {
private static final long serialVersionUID = 1L;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
