Author: dongxu
Date: Thu Sep 12 02:47:41 2013
New Revision: 1522141
URL: http://svn.apache.org/r1522141
Log:
constantly changed by manolo
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/mock/pom.xml
james/hupa/trunk/pom.xml
james/hupa/trunk/server/pom.xml
james/hupa/trunk/shared/pom.xml
james/hupa/trunk/src/site/resources/demo/index.html
james/hupa/trunk/src/site/xdoc/index.xml
james/hupa/trunk/widgets/pom.xml
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 02:47:41 2013
@@ -19,6 +19,7 @@
-->
<<<<<<< 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";>
=======
<project
@@ -29,15 +30,22 @@
>>>>>>> constantly changed by manolo
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";>
+>>>>>>> constantly changed by manolo
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<<<<<<< HEAD
+<<<<<<< HEAD
<version>0.0.3-SNAPSHOT</version>
=======
<version>0.0.2-SNAPSHOT</version>
>>>>>>> first commit
+=======
+ <version>0.0.3-SNAPSHOT</version>
+>>>>>>> constantly changed by manolo
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hupa</artifactId>
Modified: james/hupa/trunk/mock/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Thu Sep 12 02:47:41 2013
@@ -20,6 +20,7 @@
<<<<<<< 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";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -39,12 +40,16 @@
>>>>>>> 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.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<version>0.0.2-SNAPSHOT</version>
>>>>>>> first commit
=======
@@ -53,6 +58,9 @@
=======
<version>0.0.2-SNAPSHOT</version>
>>>>>>> first commit
+=======
+ <version>0.0.3-SNAPSHOT</version>
+>>>>>>> constantly changed by manolo
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hupa-mock</artifactId>
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu Sep 12 02:47:41 2013
@@ -20,6 +20,7 @@
<<<<<<< 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";>
=======
=======
@@ -35,6 +36,9 @@
>>>>>>> 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>
@@ -43,6 +47,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
<relativePath />
@@ -51,6 +58,7 @@
<artifactId>hupa-parent</artifactId>
<version>0.0.3-SNAPSHOT</version>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -65,6 +73,8 @@
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
<packaging>pom</packaging>
<name>Apache James Hupa Parent</name>
<description>Hupa is a GWT based Webmail</description>
@@ -194,7 +204,7 @@
=======
<gwtVersion>2.4.0</gwtVersion>
<gwtMavenVersion>2.4.0</gwtMavenVersion>
- <gwt.moduleSuffix></gwt.moduleSuffix>
+ <gwt.moduleSuffix />
<gwt.logLevel>ERROR</gwt.logLevel>
<jettyVersion>7.3.0.v20110203</jettyVersion>
<mock.scope>test</mock.scope>
@@ -218,7 +228,7 @@
<!-- Deliver Hupa with Demo stuff -->
<id>demo</id>
<properties>
- <mock.scope></mock.scope>
+ <mock.scope />
</properties>
</profile>
</profiles>
Modified: james/hupa/trunk/server/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Thu Sep 12 02:47:41 2013
@@ -1,6 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
<?xml version="1.0" encoding="ISO-8859-1"?>
@@ -75,12 +78,18 @@
</dependency>
<dependency>
<<<<<<< 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
<groupId>com.googlecode.gwtupload</groupId>
<artifactId>gwtupload</artifactId>
@@ -116,17 +125,21 @@
</dependency>
<dependency>
<<<<<<< HEAD
+<<<<<<< HEAD
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
</dependency>
<dependency>
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> constantly changed by manolo
<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
@@ -139,6 +152,8 @@
</dependency>
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> constantly changed by manolo
</dependencies>
<build>
<outputDirectory>war/WEB-INF/classes</outputDirectory>
@@ -163,6 +178,7 @@
</build>
</project>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -311,3 +327,5 @@
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
Modified: james/hupa/trunk/shared/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/shared/pom.xml (original)
+++ james/hupa/trunk/shared/pom.xml Thu Sep 12 02:47:41 2013
@@ -1,6 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
<?xml version="1.0" encoding="ISO-8859-1"?>
@@ -41,11 +44,17 @@
</dependency>
<dependency>
<<<<<<< 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
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -68,6 +77,7 @@
</plugins>
</build>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -141,4 +151,6 @@
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
</project>
Modified: james/hupa/trunk/src/site/resources/demo/index.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/index.html?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/src/site/resources/demo/index.html (original)
+++ james/hupa/trunk/src/site/resources/demo/index.html Thu Sep 12 02:47:41 2013
@@ -75,6 +75,9 @@ p {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
.red {
@@ -86,6 +89,7 @@ pre {
font-family: courier;
font-size: 14px;
}
+<<<<<<< HEAD
</style>
<!-- Google Analytics -->
<script type="text/javascript">
@@ -107,6 +111,20 @@ pre {
=======
</style>
>>>>>>> first commit
+=======
+</style>
+ <!-- Google Analytics -->
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-1384591-1']);
+ _gaq.push(['_trackPageview']);
+ (function() {
+ var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script').item(0);
s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
+>>>>>>> constantly changed by manolo
</head>
<body>
@@ -120,6 +138,7 @@ pre {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<p>
<ul>
<li>Hupa in <a href=/hupa.demo>Demo</a> mode:
@@ -138,6 +157,11 @@ pre {
<ul>
<li>Hupa in <b>Demo</b> mode: <a
href=/hupa.demo>http</a>:
>>>>>>> first commit
+=======
+ <p>
+ <ul>
+ <li>Hupa in <a href=/hupa.demo>Demo</a> mode:
+>>>>>>> constantly changed by manolo
<ul>
<li>Username is set to <b>'demo'</b> and the password is
<b>'demo'</b></li>
<li>Uses a collection of example
messages and stub
@@ -146,6 +170,7 @@ pre {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
but emails you send will never
reach the addressee.</li>
</ul></li>
</li>
@@ -187,13 +212,27 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war
=======
but emails you send will never
reach the addressee,
and message search is not
implemented.</li>
+=======
+ but emails you send will never
reach the addressee.</li>
+>>>>>>> constantly changed by manolo
</ul></li>
</li>
- <li>Hupa for <b>Gmail</b>: <a
href=https://james.zones.apache.org/hupa.gmail>https</a> | <a
href=/hupa.gmail>http</a>
+ <li>Hupa for <b>Gmail</b>: <br/><br/>We have
+ <span class='red'>disabled</span> this instance to
avoid risks and legal issues.<br/>Nevertheless you can
+ <a
href="https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war";>
download </a>
+ the last built of Hupa and run it in your system:
+<pre>
+$ java -jar hupa-0.0.2-SNAPSHOT.war
+</pre>
+ Your instance on Hupa:
<ul>
+<<<<<<< HEAD
<li>It will work with any imap enabled
account in gmail.</li>
>>>>>>> first commit
+=======
+ <li>Will work with any imap enabled
account in gmail.</li>
+>>>>>>> constantly changed by manolo
<li>You have to provide a valid gmail
username (don't forget
the domain part) and your
password.</li>
<li>Because this instance and gmail
servers are far away, and
@@ -202,6 +241,7 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<li>You can read your real messages,
search them, and use Hupa to reply and send
messages to your contacts.</li>
<div class='warn'>
@@ -240,18 +280,26 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war
>>>>>>> constantly changed by manolo
=======
<li>You can manage your folders, read
your messages, search them, reply and send
+=======
+ <li>You can read your real messages,
search them, and use Hupa to reply and send
+>>>>>>> constantly changed by manolo
messages to your contacts.</li>
<div class='warn'>
- <p>Like any other email client,
Hupa needs your credentials in order to
- open a secure session with gmail
servers. </p>
- <p>Hupa uses a SSL
- channel to comunicate with gmail;
- in the same way we recomend that
- you use hupa via HTTPS so as the
communication between your browser and Hupa
+ <p>Like any other email client,
Hupa needs your password in order to
+ get a secure session with your
credentials from gmail servers. </p>
+ <p>Hupa uses SSL
+ channel to comunicate with gmail.
</p>
+ <p>In the same way it is recomended
that
+ you use hupa via https so as the
communication between your browser and Hupa
were not compromissed. </p>
+<!--
<p>Because this is a demo instance
we are using a
self-signed certificate.</p>
+<<<<<<< HEAD
>>>>>>> first commit
+=======
+-->
+>>>>>>> constantly changed by manolo
</div>
</ul></li>
</ul>
Modified: james/hupa/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/src/site/xdoc/index.xml (original)
+++ james/hupa/trunk/src/site/xdoc/index.xml Thu Sep 12 02:47:41 2013
@@ -29,6 +29,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
reading, sending and managing messages, but it
still lacks of many features
email clients nowadays have.</p>
=======
@@ -43,6 +44,10 @@
reading, sending and managing messages, but it
lacks of many features
email clients nowadays have like address book
</p>
>>>>>>> first commit
+=======
+ reading, sending and managing messages, but it
still lacks of many features
+ email clients nowadays have.</p>
+>>>>>>> constantly changed by manolo
</section>
<section name="Releases">
@@ -50,6 +55,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
Last release is Hupa 0.0.2:<br/>
@@ -61,6 +69,7 @@
<a
href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.james.hupa$hupa/artifact/org.apache.james.hupa/hupa/0.0.3-SNAPSHOT/hupa-0.0.3-SNAPSHOT.war'>
0.3-SNAPSHOT
<<<<<<< HEAD
+<<<<<<< HEAD
=======
Although there isn't a stable release yet you can download the
latest
<a
href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war'>
@@ -73,6 +82,8 @@
<a
href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war'>
0.2-SNAPSHOT
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
</a>
from our continuous integration server.
</p>
@@ -91,6 +102,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
<h4>Jun/2012 - Hupa 0.2 released</h4>
@@ -98,6 +112,7 @@
First stable version.
</p>
<<<<<<< HEAD
+<<<<<<< HEAD
<h4>Apr/2012 - Hupa evolution accepted</h4>
<p>
We have got a <a
href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1";
@@ -119,6 +134,8 @@
making it better !.
>>>>>>> constantly changed by manolo
=======
+=======
+>>>>>>> constantly changed by manolo
<h4>Apr/2012 - Hupa evolution accepted</h4>
<p>
<<<<<<< HEAD
@@ -154,6 +171,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<h4>Jun/2010 - Hupa 0.0.1</h4>
=======
<h4>Jun/2010 - Hupa 0.1</h4>
@@ -164,6 +182,9 @@
=======
<h4>Jun/2010 - Hupa 0.1</h4>
>>>>>>> first commit
+=======
+ <h4>Jun/2010 - Hupa 0.0.1</h4>
+>>>>>>> constantly changed by manolo
<p>First beta release, with an improved interface and fully
functional (read, edit, send, secure, attachments, etc)</p>
</subsection>
Modified: james/hupa/trunk/widgets/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1522141&r1=1522140&r2=1522141&view=diff
==============================================================================
--- james/hupa/trunk/widgets/pom.xml (original)
+++ james/hupa/trunk/widgets/pom.xml Thu Sep 12 02:47:41 2013
@@ -1,6 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
<?xml version="1.0" encoding="ISO-8859-1"?>
@@ -44,6 +47,7 @@
<artifactId>gwt-incubator</artifactId>
</dependency>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -96,6 +100,8 @@
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
<dependency>
<groupId>org.cobogw.gwt</groupId>
<artifactId>cobogw</artifactId>
@@ -103,6 +109,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
</dependencies>
@@ -124,6 +133,7 @@
</resources>
</build>
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
>>>>>>> first commit
@@ -151,4 +161,6 @@
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
+=======
+>>>>>>> constantly changed by manolo
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
