Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 85048 invoked from network); 4 Apr 2008 21:04:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Apr 2008 21:04:05 -0000 Received: (qmail 67634 invoked by uid 500); 4 Apr 2008 21:04:05 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 67622 invoked by uid 500); 4 Apr 2008 21:04:05 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 67613 invoked by uid 99); 4 Apr 2008 21:04:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 14:04:05 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 21:03:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EFFE01A9832; Fri, 4 Apr 2008 14:03:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r644921 - in /openejb/branches/openejb-3.0: ./ container/openejb-core/src/main/java/org/apache/openejb/core/transaction/ server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/ server/openejb-client/src/main/java/org/apa... Date: Fri, 04 Apr 2008 21:03:39 -0000 To: commits@openejb.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080404210340.EFFE01A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Fri Apr 4 14:03:37 2008 New Revision: 644921 URL: http://svn.apache.org/viewvc?rev=644921&view=rev Log: Merging r644249 - http://svn.apache.org/viewvc?rev=644249&view=rev svn merge -r 644248:644249 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r644249 | jlaskowski | 2008-04-03 02:59:12 -0700 (Thu, 03 Apr 2008) | 1 line Incorrect characters that broke mvn site removed ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java openejb/branches/openejb-3.0/pom.xml openejb/branches/openejb-3.0/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java openejb/branches/openejb-3.0/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java?rev=644921&r1=644920&r2=644921&view=diff ============================================================================== --- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java (original) +++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java Fri Apr 4 14:03:37 2008 @@ -28,13 +28,14 @@ * is set to Never without a transaction context defined by the EJB spec. * * The client is required to call without a transaction context. - * - * ¥ If the client calls with a transaction context, the Container throws the - * java.rmi.RemoteException exception if the client is a remote client, or - * the javax.ejb.EJBException if the client is a local client. - * ¥ If the client calls without a transaction context, the Container performs - * the same steps as described in the NotSupported case. - * + * + * If the client calls with a transaction context, the Container throws:
    + *
  • java.rmi.RemoteException exception if the client is a remote client
    • + *
  • javax.ejb.EJBException if the client is a local client
    • + *
+ * + * If the client calls without a transaction context, the Container performs + * the same steps as described in the NotSupported case. */ public class TxNever extends TransactionPolicy { Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java?rev=644921&r1=644920&r2=644921&view=diff ============================================================================== --- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java (original) +++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java Fri Apr 4 14:03:37 2008 @@ -27,7 +27,7 @@ * The Container must invoke an enterprise Bean method whose transaction * attribute is set to RequiresNew with a new transaction context. * - * If the client invokes the enterprise BeanÕs method while the client is not + * If the client invokes the enterprise Bean's method while the client is not * associated with a transaction context, the container automatically starts a * new transaction before delegating a method call to the enterprise Bean * business method. The Container automatically enlists all the resource Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java?rev=644921&r1=644920&r2=644921&view=diff ============================================================================== --- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java (original) +++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java Fri Apr 4 14:03:37 2008 @@ -25,11 +25,11 @@ * The Container invokes an enterprise Bean method whose transaction attribute * is set to Supports as follows. * - * ¥ If the client calls with a transaction context, the Container performs - * the same steps as described in the Required case. - * - * ¥ If the client calls without a transaction context, the Container performs - * the same steps as described in the NotSupported case. + * If the client calls with a transaction context, the Container performs + * the same steps as described in the Required case. + * + * If the client calls without a transaction context, the Container performs + * the same steps as described in the NotSupported case. * * The Supports transaction attribute must be used with caution. This is * because of the different transactional semantics provided by the two Modified: openejb/branches/openejb-3.0/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/pom.xml?rev=644921&r1=644920&r2=644921&view=diff ============================================================================== --- openejb/branches/openejb-3.0/pom.xml (original) +++ openejb/branches/openejb-3.0/pom.xml Fri Apr 4 14:03:37 2008 @@ -1,24 +1,24 @@ - - - - - + + + + + 4.0.0 @@ -322,14 +322,14 @@ rat - - deps - itests - container - server - examples - assembly - + + deps + itests + container + server + examples + assembly + @@ -354,7 +354,7 @@ **/derby.log - **/hsqldb.log + **/hsqldb.log **/*.iml Modified: openejb/branches/openejb-3.0/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java?rev=644921&r1=644920&r2=644921&view=diff ============================================================================== --- openejb/branches/openejb-3.0/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java (original) +++ openejb/branches/openejb-3.0/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java Fri Apr 4 14:03:37 2008 @@ -177,7 +177,7 @@ } else { // Anonymous type, so we need to declare it - // Rule 2.b: Anonymous element absolute name ÒT>NÓ + // Rule 2.b: Anonymous element absolute name "T>N" String anonymoustName = enclosingType.qname.getLocalPart() + ">" + elementQName.getLocalPart(); QName anonymousQName = new QName(elementNamespace, anonymoustName); Modified: openejb/branches/openejb-3.0/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java?rev=644921&r1=644920&r2=644921&view=diff ============================================================================== --- openejb/branches/openejb-3.0/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java (original) +++ openejb/branches/openejb-3.0/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java Fri Apr 4 14:03:37 2008 @@ -91,7 +91,7 @@ try { List interfaces = new ArrayList(); // Interface class must be listed first, before EJBObjectProxy, - // otherwise the proxy code will selectï the openejb system class + // otherwise the proxy code will select the openejb system class // loader for proxy creation instead of the application class loader if (ejb.remoteClass != null) { interfaces.add(ejb.remoteClass);