From scm-return-6791-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Mon Jun 06 20:33:04 2005 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 26540 invoked from network); 6 Jun 2005 20:33:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Jun 2005 20:33:04 -0000 Received: (qmail 29537 invoked by uid 500); 6 Jun 2005 20:33:02 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 29512 invoked by uid 500); 6 Jun 2005 20:33:01 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 29488 invoked by uid 99); 6 Jun 2005 20:33:01 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 06 Jun 2005 13:33:00 -0700 Received: (qmail 26487 invoked by uid 65534); 6 Jun 2005 20:32:42 -0000 Message-ID: <20050606203242.26476.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r180468 - in /geronimo/trunk: modules/assembly/src/plan/ specs/activation/src/java/javax/activation/ specs/activation/src/test/javax/activation/ specs/javamail/src/java/javax/mail/internet/ specs/javamail/src/test/javax/mail/internet/ Date: Mon, 06 Jun 2005 20:32:41 -0000 To: scm@geronimo.apache.org From: jboynes@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jboynes Date: Mon Jun 6 13:32:39 2005 New Revision: 180468 URL: http://svn.apache.org/viewcvs?rev=3D180468&view=3Drev Log: fix race condition setting up DataSource pump Added: geronimo/trunk/specs/activation/src/test/javax/activation/DataHandlerTe= st.java Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml geronimo/trunk/specs/activation/src/java/javax/activation/DataHandler.j= ava geronimo/trunk/specs/javamail/src/java/javax/mail/internet/MimeMultipar= t=2Ejava geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMessageT= est.java geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMultipar= tTest.java Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan= /j2ee-client-plan.xml?rev=3D180468&r1=3D180467&r2=3D180468&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original) +++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Mon Jun = 6 13:32:39 2005 @@ -43,6 +43,9 @@ geronimo/jars/geronimo-security-${geronimo_version}.jar + geronimo/jars/geronimo-activation-${geronimo_version}.jar + + openejb/jars/openejb-core-${openejb_version}.jar =20 Modified: geronimo/trunk/specs/activation/src/java/javax/activation/DataHan= dler.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/activation/src/java= /javax/activation/DataHandler.java?rev=3D180468&r1=3D180467&r2=3D180468&vie= w=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/specs/activation/src/java/javax/activation/DataHandler.j= ava (original) +++ geronimo/trunk/specs/activation/src/java/javax/activation/DataHandler.j= ava Mon Jun 6 13:32:39 2005 @@ -73,7 +73,7 @@ ObjectDataSource ods =3D (ObjectDataSource) ds; DataContentHandler dch =3D getDataContentHandler(); if (dch =3D=3D null) { - throw new UnsupportedDataTypeException(); + throw new UnsupportedDataTypeException(ods.mimeType); } dch.writeTo(ods.data, ods.mimeType, os); } else { @@ -185,11 +185,10 @@ throw new UnsupportedDataTypeException(mimeType); } final PipedInputStream is =3D new PipedInputStream(); - Thread thread =3D new Thread() { + final PipedOutputStream os =3D new PipedOutputStream(is); + Thread thread =3D new Thread("DataHandler Pipe Pump") { public void run() { try { - PipedOutputStream os =3D new PipedOutputStream(is); - is.connect(os); try { dch.writeTo(data, mimeType, os); } finally { Added: geronimo/trunk/specs/activation/src/test/javax/activation/DataHandle= rTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/activation/src/test= /javax/activation/DataHandlerTest.java?rev=3D180468&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/specs/activation/src/test/javax/activation/DataHandlerTe= st.java (added) +++ geronimo/trunk/specs/activation/src/test/javax/activation/DataHandlerTe= st.java Mon Jun 6 13:32:39 2005 @@ -0,0 +1,75 @@ +/** + * + * Copyright 2005 The Apache Software Foundation + * + * Licensed 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 implie= d=2E + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// +// This source code implements specifications defined by the Java +// Community Process. In order to remain compliant with the specification +// DO NOT add / change / or delete method signatures! +// +package javax.activation; + +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.UnsupportedFlavorException; + +import junit.framework.TestCase; + +/** + * @version $Rev$ $Date$ + */ +public class DataHandlerTest extends TestCase { + private CommandMap defaultMap; + + public void testObjectInputStream() throws IOException { + DataHandler handler =3D new DataHandler("Hello World", "text/plain= "); + InputStream is =3D handler.getInputStream(); + byte[] bytes =3D new byte[128]; + assertEquals(11, is.read(bytes)); + assertEquals("Hello World", new String(bytes, 0, 11)); + } + + protected void setUp() throws Exception { + defaultMap =3D CommandMap.getDefaultCommandMap(); + MailcapCommandMap myMap =3D new MailcapCommandMap(); + myMap.addMailcap("text/plain;; x-java-content-handler=3D" + Dum= myTextHandler.class.getName()); + CommandMap.setDefaultCommandMap(myMap); + } + + protected void tearDown() throws Exception { + CommandMap.setDefaultCommandMap(defaultMap); + } + + public static class DummyTextHandler implements DataContentHandler { + public DataFlavor[] getTransferDataFlavors() { + throw new UnsupportedOperationException(); + } + + public Object getTransferData(DataFlavor df, DataSource ds) throws= UnsupportedFlavorException, IOException { + throw new UnsupportedOperationException(); + } + + public Object getContent(DataSource ds) throws IOException { + throw new UnsupportedOperationException(); + } + + public void writeTo(Object obj, String mimeType, OutputStream os) = throws IOException { + os.write(((String)obj).getBytes()); + } + } +} Modified: geronimo/trunk/specs/javamail/src/java/javax/mail/internet/MimeMu= ltipart.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/javamail/src/java/j= avax/mail/internet/MimeMultipart.java?rev=3D180468&r1=3D180467&r2=3D180468&= view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/specs/javamail/src/java/javax/mail/internet/MimeMultipar= t=2Ejava (original) +++ geronimo/trunk/specs/javamail/src/java/javax/mail/internet/MimeMultipar= t=2Ejava Mon Jun 6 13:32:39 2005 @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintStream; import javax.activation.DataSource; import javax.mail.BodyPart; import javax.mail.MessagingException; @@ -129,6 +128,7 @@ } out.write(dash); out.write(bytes); + out.write(dash); out.write(crlf); out.flush(); } Modified: geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMe= ssageTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/javamail/src/test/j= avax/mail/internet/MimeMessageTest.java?rev=3D180468&r1=3D180467&r2=3D18046= 8&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMessageT= est.java (original) +++ geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMessageT= est.java Mon Jun 6 13:32:39 2005 @@ -34,22 +34,25 @@ private Session session; =20 public void testWriteTo() throws MessagingException, IOException { -/* MimeMessage msg =3D new MimeMessage(session); msg.setSender(new InternetAddress("foo")); MimeMultipart mp =3D new MimeMultipart(); MimeBodyPart part1 =3D new MimeBodyPart(); + part1.setHeader("foo", "bar"); part1.setContent("Hello World", "text/plain"); mp.addBodyPart(part1); + MimeBodyPart part2 =3D new MimeBodyPart(); + part2.setContent("Hello Again", "text/plain"); + mp.addBodyPart(part2); msg.setContent(mp); msg.writeTo(System.out); -*/ } =20 protected void setUp() throws Exception { defaultMap =3D CommandMap.getDefaultCommandMap(); MailcapCommandMap myMap =3D new MailcapCommandMap(); myMap.addMailcap("text/plain;; x-java-content-handler=3D" + Mim= eMultipartTest.DummyTextHandler.class.getName()); + myMap.addMailcap("multipart/*;; x-java-content-handler=3D" + Mi= meMultipartTest.DummyMultipartHandler.class.getName()); CommandMap.setDefaultCommandMap(myMap); session =3D Session.getDefaultInstance(new Properties()); } Modified: geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMu= ltipartTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/javamail/src/test/j= avax/mail/internet/MimeMultipartTest.java?rev=3D180468&r1=3D180467&r2=3D180= 468&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMultipar= tTest.java (original) +++ geronimo/trunk/specs/javamail/src/test/javax/mail/internet/MimeMultipar= tTest.java Mon Jun 6 13:32:39 2005 @@ -28,7 +28,6 @@ import java.awt.datatransfer.UnsupportedFlavorException; import javax.mail.MessagingException; import javax.activation.CommandMap; -import javax.activation.DataHandler; import javax.activation.MailcapCommandMap; import javax.activation.DataContentHandler; import javax.activation.DataSource; @@ -44,6 +43,7 @@ public void testWriteTo() throws MessagingException, IOException { MimeMultipart mp =3D new MimeMultipart(); MimeBodyPart part1 =3D new MimeBodyPart(); + part1.setHeader("foo", "bar"); part1.setContent("Hello World", "text/plain"); mp.addBodyPart(part1); MimeBodyPart part2 =3D new MimeBodyPart(); @@ -56,6 +56,7 @@ defaultMap =3D CommandMap.getDefaultCommandMap(); MailcapCommandMap myMap =3D new MailcapCommandMap(); myMap.addMailcap("text/plain;; x-java-content-handler=3D" + Dum= myTextHandler.class.getName()); + myMap.addMailcap("multipart/*;; x-java-content-handler=3D" + Du= mmyMultipartHandler.class.getName()); CommandMap.setDefaultCommandMap(myMap); } =20 @@ -83,19 +84,24 @@ =20 public static class DummyMultipartHandler implements DataContentHandle= r { public DataFlavor[] getTransferDataFlavors() { - return new DataFlavor[0]; //To change body of implemented met= hods use File | Settings | File Templates. + throw new UnsupportedOperationException(); } =20 public Object getTransferData(DataFlavor df, DataSource ds) throws= UnsupportedFlavorException, IOException { - return null; //To change body of implemented methods use File= | Settings | File Templates. + throw new UnsupportedOperationException(); } =20 public Object getContent(DataSource ds) throws IOException { - return null; //To change body of implemented methods use File= | Settings | File Templates. + throw new UnsupportedOperationException(); } =20 public void writeTo(Object obj, String mimeType, OutputStream os) = throws IOException { - os.write(((String)obj).getBytes()); + MimeMultipart mp =3D (MimeMultipart) obj; + try { + mp.writeTo(os); + } catch (MessagingException e) { + throw (IOException) new IOException(e.getMessage()).initCa= use(e); + } } } }