Author: dongxu Date: Thu Sep 12 02:05:02 2013 New Revision: 1522111 URL: http://svn.apache.org/r1522111 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=1522111&r1=1522110&r2=1522111&view=diff ============================================================================== --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Thu Sep 12 02:05:02 2013 @@ -17,13 +17,12 @@ 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"> +<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> + <version>0.0.3-SNAPSHOT</version> <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=1522111&r1=1522110&r2=1522111&view=diff ============================================================================== --- james/hupa/trunk/mock/pom.xml (original) +++ james/hupa/trunk/mock/pom.xml Thu Sep 12 02:05:02 2013 @@ -18,6 +18,7 @@ under the License. --> <<<<<<< 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> @@ -29,12 +30,19 @@ 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 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 <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=1522111&r1=1522110&r2=1522111&view=diff ============================================================================== --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Thu Sep 12 02:05:02 2013 @@ -18,6 +18,7 @@ under the License. --> <<<<<<< 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 @@ -25,17 +26,24 @@ 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"> +>>>>>>> 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 +======= +>>>>>>> constantly changed by manolo <relativePath /> </parent> <groupId>org.apache.james.hupa</groupId> <artifactId>hupa-parent</artifactId> <version>0.0.3-SNAPSHOT</version> +<<<<<<< HEAD ======= <relativePath></relativePath> </parent> @@ -43,6 +51,8 @@ <artifactId>hupa-parent</artifactId> <version>0.0.2-SNAPSHOT</version> >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo <packaging>pom</packaging> <name>Apache James Hupa Parent</name> <description>Hupa is a GWT based Webmail</description> @@ -137,7 +147,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> @@ -158,7 +168,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=1522111&r1=1522110&r2=1522111&view=diff ============================================================================== --- james/hupa/trunk/server/pom.xml (original) +++ james/hupa/trunk/server/pom.xml Thu Sep 12 02:05:02 2013 @@ -1,4 +1,7 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -70,6 +73,14 @@ <artifactId>mail</artifactId> </dependency> <dependency> +<<<<<<< HEAD +======= + <groupId>net.customware.gwt.dispatch + </groupId> + <artifactId>gwt-dispatch</artifactId> + </dependency> + <dependency> +>>>>>>> constantly changed by manolo <groupId>com.googlecode.gwtupload</groupId> <artifactId>gwtupload</artifactId> </dependency> @@ -103,14 +114,18 @@ <scope>runtime</scope> </dependency> <dependency> +<<<<<<< HEAD <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> </dependency> <dependency> +======= +>>>>>>> constantly changed by manolo <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> +<<<<<<< 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 @@ -121,6 +136,8 @@ <artifactId>bcprov-ext-jdk14</artifactId> <version>1.49</version> </dependency> +======= +>>>>>>> constantly changed by manolo </dependencies> <build> <outputDirectory>war/WEB-INF/classes</outputDirectory> @@ -144,6 +161,7 @@ </plugins> </build> </project> +<<<<<<< HEAD ======= <?xml version="1.0" encoding="ISO-8859-1"?> <!-- @@ -285,3 +303,5 @@ </build> </project> >>>>>>> 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=1522111&r1=1522110&r2=1522111&view=diff ============================================================================== --- james/hupa/trunk/shared/pom.xml (original) +++ james/hupa/trunk/shared/pom.xml Thu Sep 12 02:05:02 2013 @@ -1,4 +1,7 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -36,6 +39,13 @@ <artifactId>gwt-user</artifactId> </dependency> <dependency> +<<<<<<< HEAD +======= + <groupId>net.customware.gwt.dispatch</groupId> + <artifactId>gwt-dispatch</artifactId> + </dependency> + <dependency> +>>>>>>> constantly changed by manolo <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -56,6 +66,7 @@ </plugin> </plugins> </build> +<<<<<<< HEAD ======= <?xml version="1.0" encoding="ISO-8859-1"?> <!-- @@ -122,4 +133,6 @@ </plugins> </build> >>>>>>> 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=1522111&r1=1522110&r2=1522111&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:05:02 2013 @@ -73,6 +73,9 @@ p { margin-bottom: 0px; } <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo .red { font-weight: bold; color: red; @@ -94,9 +97,12 @@ pre { var s = document.getElementsByTagName('script').item(0); s.parentNode.insertBefore(ga, s); })(); </script> +<<<<<<< HEAD ======= </style> >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo </head> <body> @@ -108,6 +114,7 @@ pre { <div class='text box'> <<<<<<< HEAD +<<<<<<< HEAD <p> <ul> <li>Hupa in <a href=/hupa.demo>Demo</a> mode: @@ -116,12 +123,18 @@ 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 implementations of IMAP and SMTP servers.</li> <li>In this instance you can test almost the Hupa features, <<<<<<< HEAD +<<<<<<< HEAD but emails you send will never reach the addressee.</li> </ul></li> </li> @@ -139,19 +152,34 @@ $ 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 Hupa caching is not enabled, you will notice a latency when using the application.</li> <<<<<<< 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'> @@ -168,18 +196,26 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war --> ======= <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=1522111&r1=1522110&r2=1522111&view=diff ============================================================================== --- james/hupa/trunk/src/site/xdoc/index.xml (original) +++ james/hupa/trunk/src/site/xdoc/index.xml Thu Sep 12 02:05:02 2013 @@ -27,17 +27,25 @@ devloping using GWT good practices (MVP pattern and Unit testing) </p> <p> Hupa is a functional and well designed email client, ready for <<<<<<< HEAD +<<<<<<< HEAD reading, sending and managing messages, but it still lacks of many features email clients nowadays have.</p> ======= 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"> <p> <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo Last release is Hupa 0.0.2:<br/> <a href='http://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war'> binary </a> : ready to run or to deploy in any servlet container.<br/> <a href='http://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2-source-release.zip'> sources </a>. @@ -46,11 +54,14 @@ Current trunk:<br/> <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 ======= 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'> 0.2-SNAPSHOT >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo </a> from our continuous integration server. </p> @@ -67,16 +78,22 @@ <section name="News"> <subsection name="2012"> <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo <h4>Jun/2012 - Hupa 0.2 released</h4> <p> First stable version. </p> +<<<<<<< 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" target="_blank">GSOC student</a> who will work with Hupa this Summer making it better !. ======= +======= +>>>>>>> constantly changed by manolo <h4>Apr/2012 - Hupa evolution accepted</h4> <p> <<<<<<< HEAD @@ -110,10 +127,14 @@ </subsection> <subsection name="2010"> <<<<<<< HEAD +<<<<<<< HEAD <h4>Jun/2010 - Hupa 0.0.1</h4> ======= <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=1522111&r1=1522110&r2=1522111&view=diff ============================================================================== --- james/hupa/trunk/widgets/pom.xml (original) +++ james/hupa/trunk/widgets/pom.xml Thu Sep 12 02:05:02 2013 @@ -1,4 +1,7 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -39,6 +42,7 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-incubator</artifactId> </dependency> +<<<<<<< HEAD ======= <?xml version="1.0" encoding="ISO-8859-1"?> <!-- @@ -84,11 +88,16 @@ <artifactId>gwt-incubator</artifactId> </dependency> >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo <dependency> <groupId>org.cobogw.gwt</groupId> <artifactId>cobogw</artifactId> </dependency> <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo </dependencies> <build> <resources> @@ -107,6 +116,7 @@ </resource> </resources> </build> +<<<<<<< HEAD ======= </dependencies> <build> @@ -127,4 +137,6 @@ </resources> </build> >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo </project> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org