You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/11/05 13:25:16 UTC
svn commit: r1031533 - in
/incubator/aries/sandbox/jbohn/interceptor-proto/transaction:
transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/
transaction-blueprint/
transaction-blueprint/src/main/java/org/apache/aries/transaction/ tra...
Author: jbohn
Date: Fri Nov 5 12:25:15 2010
New Revision: 1031533
URL: http://svn.apache.org/viewvc?rev=1031533&view=rev
Log:
ARIES-420 create api package for shared transaction blueprint classes
Added:
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxData.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxData.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxDataUtil.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxDataUtil.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/Constants.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/MatchedTxData.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/MatchedTxData.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionAttribute.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionAttribute.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionToken.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionToken.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelper.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelperImpl.java
- copied, changed from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java
Removed:
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxData.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxDataUtil.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/MatchedTxData.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionAttribute.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionToken.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/
Modified:
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/InterceptorTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/TranStrategyTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/src/main/java/org/apache/aries/transaction/interceptor/TxInterceptorImpl.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java
incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/resources/OSGI-INF/blueprint/transaction.xml
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java Fri Nov 5 12:25:15 2010
@@ -38,6 +38,7 @@ import org.apache.aries.blueprint.contai
import org.apache.aries.blueprint.namespace.ComponentDefinitionRegistryImpl;
import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl;
import org.apache.aries.mocks.BundleMock;
+import org.apache.aries.transaction.api.TxComponentMetaDataHelperImpl;
import org.apache.aries.transaction.parsing.TxElementHandler;
import org.apache.aries.transaction.interceptor.TxInterceptorImpl;
import org.apache.aries.unittest.mocks.Skeleton;
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/InterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/InterceptorTest.java?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/InterceptorTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/InterceptorTest.java Fri Nov 5 12:25:15 2010
@@ -23,6 +23,8 @@ import java.io.IOException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
+import org.apache.aries.transaction.api.TransactionAttribute;
+import org.apache.aries.transaction.api.TransactionToken;
import org.apache.aries.transaction.interceptor.TxInterceptorImpl;
import org.apache.aries.unittest.mocks.MethodCall;
import org.apache.aries.unittest.mocks.Skeleton;
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java Fri Nov 5 12:25:15 2010
@@ -46,7 +46,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.BeanProperty;
-import org.apache.aries.transaction.TxComponentMetaDataHelperImpl;
+import org.apache.aries.transaction.api.TxComponentMetaDataHelperImpl;
import org.apache.aries.transaction.interceptor.TxInterceptorImpl;
import org.apache.aries.transaction.parsing.TxElementHandler;
import org.apache.aries.unittest.mocks.Skeleton;
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/TranStrategyTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/TranStrategyTest.java?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/TranStrategyTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint-tests/src/test/java/org/apache/aries/transaction/TranStrategyTest.java Fri Nov 5 12:25:15 2010
@@ -35,7 +35,8 @@ import javax.transaction.TransactionMana
import org.junit.Before;
import org.junit.Test;
-import org.apache.aries.transaction.TransactionAttribute;
+import org.apache.aries.transaction.api.TransactionAttribute;
+import org.apache.aries.transaction.api.TransactionToken;
import org.apache.aries.unittest.mocks.MethodCall;
import org.apache.aries.unittest.mocks.Skeleton;
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/pom.xml?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/pom.xml Fri Nov 5 12:25:15 2010
@@ -31,12 +31,10 @@
<properties>
<aries.osgi.export.pkg>
- org.apache.aries.transaction,
+ org.apache.aries.transaction.api,
org.apache.aries.transaction.exception
</aries.osgi.export.pkg>
<aries.osgi.import>
- org.apache.aries.transaction.interceptor,
- org.apache.aries.transaction.parsing,
org.osgi.framework;version="1.5",
org.osgi.service.cm;version="[1.2.0,2.0.0)",
org.osgi.util.tracker;version="1.4",
@@ -44,8 +42,7 @@
</aries.osgi.import>
<!--
<aries.osgi.private.pkg>
- org.apache.aries.transaction,
- org.apache.aries.transaction.parsing
+ org.apache.aries.transaction
</aries.osgi.private.pkg>
-->
</properties>
@@ -63,16 +60,6 @@
<!--<scope>test</scope>-->
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.interceptor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.parsing</artifactId>
- </dependency>
--->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxData.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxData.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxData.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxData.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxData.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxData.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxData.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import java.util.ArrayList;
import java.util.List;
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxDataUtil.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxDataUtil.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxDataUtil.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxDataUtil.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxDataUtil.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/BundleWideTxDataUtil.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/BundleWideTxDataUtil.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import java.util.ArrayList;
import java.util.List;
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/Constants.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/Constants.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/Constants.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/Constants.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/Constants.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import java.util.regex.Pattern;
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/MatchedTxData.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/MatchedTxData.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/MatchedTxData.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/MatchedTxData.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/MatchedTxData.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/MatchedTxData.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/MatchedTxData.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import java.util.regex.Pattern;
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionAttribute.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionAttribute.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionAttribute.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionAttribute.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionAttribute.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionAttribute.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionAttribute.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionToken.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionToken.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionToken.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionToken.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionToken.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionToken.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TransactionToken.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import javax.transaction.Transaction;
@@ -33,7 +33,7 @@ public class TransactionToken
this(activeTransaction, suspendedTransaction, transactionAttribute, false);
}
- TransactionToken(Transaction activeTransaction, Transaction suspendedTransaction,
+ public TransactionToken(Transaction activeTransaction, Transaction suspendedTransaction,
TransactionAttribute transactionAttribute, boolean isCompletionAllowed)
{
this.activeTransaction = activeTransaction;
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelper.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelper.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelper.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelper.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
Copied: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelperImpl.java (from r1031115, incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java)
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelperImpl.java?p2=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelperImpl.java&p1=incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java&r1=1031115&r2=1031533&rev=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/api/TxComponentMetaDataHelperImpl.java Fri Nov 5 12:25:15 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.api;
import java.util.ArrayList;
import java.util.Enumeration;
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/pom.xml?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/pom.xml Fri Nov 5 12:25:15 2010
@@ -34,7 +34,8 @@
org.apache.aries.transaction.interceptor
</aries.osgi.export.pkg>
<aries.osgi.import>
- org.apache.aries.transaction,
+ org.apache.aries.transaction.api,
+ org.apache.aries.transaction.exception,
org.osgi.framework;version="1.5",
org.osgi.service.cm;version="[1.2.0,2.0.0)",
org.osgi.util.tracker;version="1.4",
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/src/main/java/org/apache/aries/transaction/interceptor/TxInterceptorImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/src/main/java/org/apache/aries/transaction/interceptor/TxInterceptorImpl.java?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/src/main/java/org/apache/aries/transaction/interceptor/TxInterceptorImpl.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-interceptor/src/main/java/org/apache/aries/transaction/interceptor/TxInterceptorImpl.java Fri Nov 5 12:25:15 2010
@@ -24,11 +24,11 @@ import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.apache.aries.blueprint.Interceptor;
-import org.apache.aries.transaction.Constants;
+import org.apache.aries.transaction.api.Constants;
+import org.apache.aries.transaction.api.TransactionToken;
+import org.apache.aries.transaction.api.TransactionAttribute;
+import org.apache.aries.transaction.api.TxComponentMetaDataHelper;
import org.apache.aries.transaction.exception.TransactionRollbackException;
-import org.apache.aries.transaction.TxComponentMetaDataHelper;
-import org.apache.aries.transaction.TransactionToken;
-import org.apache.aries.transaction.TransactionAttribute;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/pom.xml?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/pom.xml Fri Nov 5 12:25:15 2010
@@ -35,19 +35,13 @@
</aries.osgi.export.pkg>
<aries.osgi.import>
org.apache.aries.blueprint.utils,
- org.apache.aries.transaction,
+ org.apache.aries.transaction.api,
org.apache.aries.transaction.exception,
org.osgi.framework;version="1.5",
org.osgi.service.cm;version="[1.2.0,2.0.0)",
org.osgi.util.tracker;version="1.4",
*
</aries.osgi.import>
-<!--
- <aries.osgi.private.pkg>
- org.apache.aries.transaction,
- org.apache.aries.transaction.parsing
- </aries.osgi.private.pkg>
--->
</properties>
<dependencies>
@@ -76,11 +70,13 @@
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
</dependency>
+-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java Fri Nov 5 12:25:15 2010
@@ -28,8 +28,8 @@ import org.apache.aries.blueprint.Interc
import org.apache.aries.blueprint.NamespaceHandler;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.utils.InterceptorManager;
-import org.apache.aries.transaction.Constants;
-import org.apache.aries.transaction.TxComponentMetaDataHelper;
+import org.apache.aries.transaction.api.Constants;
+import org.apache.aries.transaction.api.TxComponentMetaDataHelper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/resources/OSGI-INF/blueprint/transaction.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/resources/OSGI-INF/blueprint/transaction.xml?rev=1031533&r1=1031532&r2=1031533&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/resources/OSGI-INF/blueprint/transaction.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-parsing/src/main/resources/OSGI-INF/blueprint/transaction.xml Fri Nov 5 12:25:15 2010
@@ -37,7 +37,7 @@
</bean>
</service>
- <bean id="txEnhancer" class="org.apache.aries.transaction.TxComponentMetaDataHelperImpl"/>
+ <bean id="txEnhancer" class="org.apache.aries.transaction.api.TxComponentMetaDataHelperImpl"/>
<reference id="tm" interface="javax.transaction.TransactionManager"/>