geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r824812 - in /geronimo/javamail/trunk/geronimo-javamail_1.4: ./ geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/ geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/ geronimo-j...
Date Tue, 13 Oct 2009 15:39:49 GMT
Author: dwoods
Date: Tue Oct 13 15:39:48 2009
New Revision: 824812

URL: http://svn.apache.org/viewvc?rev=824812&view=rev
Log:
upgrade to genesis-2.0 and remove Java 5 language depends, as the spec jar supports 1.4 users

Modified:
    geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java
    geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java
    geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java
    geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java?rev=824812&r1=824811&r2=824812&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java
Tue Oct 13 15:39:48 2009
@@ -463,27 +463,27 @@
         // the individual names 
         String protocols = props.getProperty(MAIL_SSL_PROTOCOLS); 
         if (protocols != null) {
-            ArrayList<String> list = new ArrayList<String>(); 
+            ArrayList list = new ArrayList(); 
             StringTokenizer t = new StringTokenizer(protocols); 
             
             while (t.hasMoreTokens()) {
                 list.add(t.nextToken()); 
             }
             
-            ((SSLSocket)socket).setEnabledProtocols(list.toArray(new String[list.size()]));

+            ((SSLSocket)socket).setEnabledProtocols((String[])list.toArray(new String[list.size()]));

         }
         
         // and do the same for any cipher suites 
         String suites = props.getProperty(MAIL_SSL_CIPHERSUITES); 
         if (suites != null) {
-            ArrayList<String> list = new ArrayList<String>(); 
+            ArrayList list = new ArrayList(); 
             StringTokenizer t = new StringTokenizer(suites); 
             
             while (t.hasMoreTokens()) {
                 list.add(t.nextToken()); 
             }
             
-            ((SSLSocket)socket).setEnabledCipherSuites(list.toArray(new String[list.size()]));

+            ((SSLSocket)socket).setEnabledCipherSuites((String[])list.toArray(new String[list.size()]));

         }
     }
 

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java?rev=824812&r1=824811&r2=824812&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java
Tue Oct 13 15:39:48 2009
@@ -41,7 +41,7 @@
     private GreenMail greenMail;
     private Message[] messages;
     
-    @Override
+    //@Override
     protected void setUp() throws Exception {
         // Setup GreenMail
         greenMail = new GreenMail(ServerSetupTest.SMTP_IMAP);
@@ -69,7 +69,7 @@
         assertEquals(2, messages.length);
     }
     
-    @Override
+    //@Override
     protected void tearDown() throws Exception {
         greenMail.stop();
     }

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java?rev=824812&r1=824811&r2=824812&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java
Tue Oct 13 15:39:48 2009
@@ -41,7 +41,7 @@
     private GreenMail greenMail;
     private Message[] messages;
     
-    @Override
+    //@Override
     protected void setUp() throws Exception {
         // Setup GreenMail
         greenMail = new GreenMail(ServerSetupTest.SMTP_POP3);       
@@ -69,7 +69,7 @@
         assertEquals(2, messages.length);
     }
     
-    @Override
+    //@Override
     protected void tearDown() throws Exception {
         greenMail.stop();
     }

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml?rev=824812&r1=824811&r2=824812&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/pom.xml Tue Oct 13 15:39:48 2009
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.5</version>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java1.4-flava</artifactId>
+        <version>2.0</version>
     </parent>
 
     <groupId>org.apache.geronimo.javamail</groupId>
@@ -56,8 +56,8 @@
     
     <distributionManagement>
         <site>
-            <id>geronimo-website</id>
-            <url>${staging.siteURL}/${siteId}/${version}</url>
+            <id>apache-website</id>
+            <url>${site.deploy.url}/maven/${siteId}/${version}</url>
         </site>
     </distributionManagement>
 



Mime
View raw message