svn commit: r992270 - in /felix/trunk/ipojo: annotations/src/main/java/org/apache/felix/ipojo/transaction/ handler/transaction/src/main/java/org/apache/felix/ipojo/transaction/ tests/handler/transaction/ tests/handler/transaction/src/test/java/org/apac...

[cl...@apache.org]

Author: clement
Date: Fri Sep  3 11:52:15 2010
New Revision: 992270

URL: http://svn.apache.org/viewvc?rev=992270&view=rev
Log:
Fix FELIX-2568 Rename Transactionnal to Transactional

Added:
    felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java
      - copied, changed from r992266, felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactionnal.java
Removed:
    felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactionnal.java
Modified:
    felix/trunk/ipojo/handler/transaction/src/main/java/org/apache/felix/ipojo/transaction/TransactionHandler.java
    felix/trunk/ipojo/tests/handler/transaction/pom.xml
    felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/component/ComponentUsingAnnotations.java

Copied: felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java (from r992266, felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactionnal.java)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java?p2=felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java&p1=felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactionnal.java&r1=992266&r2=992270&rev=992270&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactionnal.java (original)
+++ felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java Fri Sep  3 11:52:15 2010
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 @Target(ElementType.METHOD)
-public @interface Transactionnal {
+public @interface Transactional {
 
     /**
      * Sets the transaction timeout.

Modified: felix/trunk/ipojo/handler/transaction/src/main/java/org/apache/felix/ipojo/transaction/TransactionHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/transaction/src/main/java/org/apache/felix/ipojo/transaction/TransactionHandler.java?rev=992270&r1=992269&r2=992270&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/transaction/src/main/java/org/apache/felix/ipojo/transaction/TransactionHandler.java (original)
+++ felix/trunk/ipojo/handler/transaction/src/main/java/org/apache/felix/ipojo/transaction/TransactionHandler.java Fri Sep  3 11:52:15 2010
@@ -32,7 +32,7 @@ public class TransactionHandler extends 
 
     private static final String ONROLLBACK_ATTRIBUTE= "onrollback";
 
-    private static final String TRANSACTIONNAL_ELEMENT = "transactionnal";
+    private static final String TRANSACTIONAL_ELEMENT = "transactional";
 
     private static final String METHOD_ATTRIBUTE = "method";
 
@@ -90,9 +90,9 @@ public class TransactionHandler extends 
         }
 
 
-        Element[] sub = elements[0].getElements(TRANSACTIONNAL_ELEMENT);
+        Element[] sub = elements[0].getElements(TRANSACTIONAL_ELEMENT);
         if (sub == null  || sub.length == 0) {
-            throw new ConfigurationException("The handler " + NAMESPACE + ":" + NAME + " must have " + TRANSACTIONNAL_ELEMENT + " subelement");
+            throw new ConfigurationException("The handler " + NAMESPACE + ":" + NAME + " must have " + TRANSACTIONAL_ELEMENT + " subelement");
         }
 
         for (int i = 0; i < sub.length; i++) {

Modified: felix/trunk/ipojo/tests/handler/transaction/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/transaction/pom.xml?rev=992270&r1=992269&r2=992270&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/transaction/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/transaction/pom.xml Fri Sep  3 11:52:15 2010
@@ -41,6 +41,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+      <version>1.7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>

Modified: felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/component/ComponentUsingAnnotations.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/component/ComponentUsingAnnotations.java?rev=992270&r1=992269&r2=992270&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/component/ComponentUsingAnnotations.java (original)
+++ felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/component/ComponentUsingAnnotations.java Fri Sep  3 11:52:15 2010
@@ -11,21 +11,21 @@ public class ComponentUsingAnnotations {
     Transaction transaction;
 
 
-    @org.apache.felix.ipojo.transaction.Transactionnal
+    @org.apache.felix.ipojo.transaction.Transactional
     public void doSomethingBad() throws NullPointerException {
     }
 
-    @org.apache.felix.ipojo.transaction.Transactionnal(propagation="required")
+    @org.apache.felix.ipojo.transaction.Transactional(propagation="required")
     public void doSomethingBad2() throws UnsupportedOperationException {
 
     }
 
-    @org.apache.felix.ipojo.transaction.Transactionnal(propagation="supported", norollbackfor= {"java.lang.Exception"})
+    @org.apache.felix.ipojo.transaction.Transactional(propagation="supported", norollbackfor= {"java.lang.Exception"})
     public void doSomethingGood() {
 
     }
 
-    @org.apache.felix.ipojo.transaction.Transactionnal(timeout=1000, exceptiononrollback=true)
+    @org.apache.felix.ipojo.transaction.Transactional(timeout=1000, exceptiononrollback=true)
     public void doSomethingLong() {
 
     }