Author: gnodet
Date: Wed May 15 15:05:49 2013
New Revision: 1482886
URL: http://svn.apache.org/r1482886
Log:
[ARIES-1069] Provide a single interface for better integration of the
TransactionManager with other low-level components
Added:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/HOWLLog.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/HOWLLog.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/NLS.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/NLS.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/XidFactoryImpl.java
aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/internal/
aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/internal/txManager.properties
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/txManager.properties
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/LogTest.java
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java
- copied, changed from r1480555,
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/XidFactoryImplTest.java
Removed:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/HOWLLog.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/NLS.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/XidFactoryImpl.java
aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/txManager.properties
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/LogTest.java
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/XidFactoryImplTest.java
Modified:
aries/trunk/transaction/transaction-manager/pom.xml
Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1482886&r1=1482885&r2=1482886&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Wed May 15 15:05:49 2013
@@ -40,8 +40,9 @@
</scm>
<properties>
<aries.osgi.export>
-
org.apache.geronimo.transaction.manager;version="2.3.0";provide:=true,
- org.apache.geronimo.transaction*;version="2.2.1",
+
org.apache.geronimo.transaction.manager;version="3.0";provide:=true,
+ org.apache.geronimo.transaction*;version="3.0",
+ org.apache.aries.transaction;version="1.0",
javax.transaction*;version="1.1.0"
</aries.osgi.export>
<aries.osgi.import>
@@ -55,12 +56,13 @@
</aries.osgi.import>
<aries.osgi.private.pkg>
org.objectweb.howl.log*,
- org.apache.aries.transaction
+ org.apache.aries.transaction.internal
</aries.osgi.private.pkg>
<aries.osgi.activator>
- org.apache.aries.transaction.Activator
+ org.apache.aries.transaction.internal.Activator
</aries.osgi.activator>
<aries.osgi.export.service>
+ org.apache.aries.transaction.AriesTransactionManager,
javax.transaction.TransactionManager,
javax.transaction.TransactionSynchronizationRegistry,
javax.transaction.UserTransaction,
@@ -246,7 +248,10 @@
</execution>
</executions>
</plugin>
-
+ <!--
+ - Disable plugin because it barfs that the
org.apache.geronimo.transaction
+ - package version should be 2.2.1 because there has been no
change
+ -
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
@@ -264,6 +269,7 @@
</execution>
</executions>
</plugin>
+ -->
</plugins>
</build>
Added:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java?rev=1482886&view=auto
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java
(added)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java
Wed May 15 15:05:49 2013
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.aries.transaction;
+
+import org.apache.geronimo.transaction.manager.MonitorableTransactionManager;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
+import org.apache.geronimo.transaction.manager.XAWork;
+import org.apache.geronimo.transaction.manager.XidImporter;
+
+import javax.resource.spi.XATerminator;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
+import javax.transaction.UserTransaction;
+
+public interface AriesTransactionManager extends
+ TransactionManager, UserTransaction,
+ TransactionSynchronizationRegistry, XidImporter,
+ MonitorableTransactionManager, RecoverableTransactionManager,
+ XATerminator, XAWork {
+}
Copied:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java?p2=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java&p1=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java
Wed May 15 15:05:49 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.apache.aries.transaction.internal.NLS;
+import org.apache.aries.transaction.internal.TransactionManagerService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Copied:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java?p2=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java&p1=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java
Wed May 15 15:05:49 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import java.util.Map;
import java.util.Iterator;
@@ -40,29 +40,29 @@ import org.springframework.transaction.j
/**
*/
-public class GeronimoPlatformTransactionManager extends
GeronimoTransactionManager implements PlatformTransactionManager {
+public class AriesPlatformTransactionManager extends
AriesTransactionManagerImpl implements PlatformTransactionManager {
private final PlatformTransactionManager platformTransactionManager;
private final Map<Transaction, SuspendedResourcesHolder>
suspendedResources = new ConcurrentHashMap<Transaction,
SuspendedResourcesHolder>();
- public GeronimoPlatformTransactionManager() throws XAException {
+ public AriesPlatformTransactionManager() throws XAException {
platformTransactionManager = new JtaTransactionManager(this, this);
registerTransactionAssociationListener();
}
- public GeronimoPlatformTransactionManager(int
defaultTransactionTimeoutSeconds) throws XAException {
+ public AriesPlatformTransactionManager(int
defaultTransactionTimeoutSeconds) throws XAException {
super(defaultTransactionTimeoutSeconds);
platformTransactionManager = new JtaTransactionManager(this, this);
registerTransactionAssociationListener();
}
- public GeronimoPlatformTransactionManager(int
defaultTransactionTimeoutSeconds, TransactionLog transactionLog) throws
XAException {
+ public AriesPlatformTransactionManager(int
defaultTransactionTimeoutSeconds, TransactionLog transactionLog) throws
XAException {
super(defaultTransactionTimeoutSeconds, transactionLog);
platformTransactionManager = new JtaTransactionManager(this, this);
registerTransactionAssociationListener();
}
- public GeronimoPlatformTransactionManager(int
defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog
transactionLog) throws XAException {
+ public AriesPlatformTransactionManager(int
defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog
transactionLog) throws XAException {
super(defaultTransactionTimeoutSeconds, xidFactory, transactionLog);
platformTransactionManager = new JtaTransactionManager(this, this);
registerTransactionAssociationListener();
Added:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java?rev=1482886&view=auto
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java
(added)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java
Wed May 15 15:05:49 2013
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.aries.transaction.internal;
+
+import org.apache.aries.transaction.AriesTransactionManager;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.geronimo.transaction.manager.TransactionLog;
+import org.apache.geronimo.transaction.manager.XidFactory;
+
+import javax.transaction.xa.XAException;
+
+public class AriesTransactionManagerImpl extends GeronimoTransactionManager
implements AriesTransactionManager {
+
+ public AriesTransactionManagerImpl() throws XAException {
+ }
+
+ public AriesTransactionManagerImpl(int defaultTransactionTimeoutSeconds)
throws XAException {
+ super(defaultTransactionTimeoutSeconds);
+ }
+
+ public AriesTransactionManagerImpl(int defaultTransactionTimeoutSeconds,
TransactionLog transactionLog) throws XAException {
+ super(defaultTransactionTimeoutSeconds, transactionLog);
+ }
+
+ public AriesTransactionManagerImpl(int defaultTransactionTimeoutSeconds,
XidFactory xidFactory, TransactionLog transactionLog) throws XAException {
+ super(defaultTransactionTimeoutSeconds, xidFactory, transactionLog);
+ }
+
+}
Copied:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/HOWLLog.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/HOWLLog.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/HOWLLog.java?p2=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/HOWLLog.java&p1=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/HOWLLog.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/HOWLLog.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/HOWLLog.java
Wed May 15 15:05:49 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import java.io.File;
import java.io.IOException;
Copied:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/NLS.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/NLS.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/NLS.java?p2=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/NLS.java&p1=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/NLS.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/NLS.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/NLS.java
Wed May 15 15:05:49 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import org.apache.aries.util.nls.MessageUtil;
Copied:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java?p2=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java&p1=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
Wed May 15 15:05:49 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import java.io.File;
import java.util.ArrayList;
@@ -26,6 +26,7 @@ import javax.transaction.TransactionSync
import javax.transaction.UserTransaction;
import javax.transaction.xa.XAException;
+import org.apache.aries.transaction.AriesTransactionManager;
import org.apache.aries.util.AriesFrameworkUtil;
import org.apache.geronimo.transaction.log.UnrecoverableLog;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
@@ -67,7 +68,7 @@ public class TransactionManagerService {
private final Dictionary properties;
private final BundleContext bundleContext;
private boolean useSpring;
- private GeronimoTransactionManager transactionManager;
+ private AriesTransactionManagerImpl transactionManager;
private TransactionLog transactionLog;
private ServiceRegistration serviceRegistration;
@@ -143,7 +144,7 @@ public class TransactionManagerService {
transactionManager = new
SpringTransactionManagerCreator().create(transactionTimeout, xidFactory,
transactionLog);
useSpring = true;
} catch (NoClassDefFoundError e) {
- transactionManager = new
GeronimoTransactionManager(transactionTimeout, xidFactory, transactionLog);
+ transactionManager = new
AriesTransactionManagerImpl(transactionTimeout, xidFactory, transactionLog);
}
} catch (XAException e) {
throw new
RuntimeException(NLS.MESSAGES.getMessage("tx.recovery.error"), e);
@@ -152,6 +153,7 @@ public class TransactionManagerService {
public void start() throws Exception {
List<String> clazzes = new ArrayList<String>();
+ clazzes.add(AriesTransactionManager.class.getName());
clazzes.add(TransactionManager.class.getName());
clazzes.add(TransactionSynchronizationRegistry.class.getName());
clazzes.add(UserTransaction.class.getName());
@@ -208,8 +210,8 @@ public class TransactionManagerService {
*/
public static class SpringTransactionManagerCreator {
- public GeronimoTransactionManager create(int
defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog
transactionLog) throws XAException {
- return new
GeronimoPlatformTransactionManager(defaultTransactionTimeoutSeconds,
xidFactory, transactionLog);
+ public AriesTransactionManagerImpl create(int
defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog
transactionLog) throws XAException {
+ return new
AriesPlatformTransactionManager(defaultTransactionTimeoutSeconds, xidFactory,
transactionLog);
}
}
Copied:
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/XidFactoryImpl.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java?p2=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java&p1=aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/XidFactoryImpl.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/XidFactoryImpl.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java
Wed May 15 15:05:49 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import javax.transaction.xa.Xid;
import org.apache.geronimo.transaction.manager.XidFactory;
Copied:
aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/internal/txManager.properties
(from r1480555,
aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/txManager.properties)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/internal/txManager.properties?p2=aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/internal/txManager.properties&p1=aries/trunk/transaction/transaction-manager/src/main/resources/org/apache/aries/transaction/txManager.properties&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
(empty)
Copied:
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/LogTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java?p2=aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java&p1=aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/LogTest.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/LogTest.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogTest.java
Wed May 15 15:05:49 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import java.io.File;
import javax.transaction.SystemException;
@@ -25,6 +25,8 @@ import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.apache.aries.transaction.internal.HOWLLog;
+import org.apache.aries.transaction.internal.XidFactoryImpl;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
import org.apache.geronimo.transaction.manager.NamedXAResource;
import org.apache.geronimo.transaction.manager.NamedXAResourceFactory;
Copied:
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java
(from r1480555,
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/XidFactoryImplTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java?p2=aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java&p1=aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/XidFactoryImplTest.java&r1=1480555&r2=1482886&rev=1482886&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/XidFactoryImplTest.java
(original)
+++
aries/trunk/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java
Wed May 15 15:05:49 2013
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.aries.transaction;
+package org.apache.aries.transaction.internal;
import java.util.concurrent.TimeUnit;
import javax.transaction.xa.Xid;
+import org.apache.aries.transaction.internal.XidFactoryImpl;
import org.apache.geronimo.transaction.manager.XidFactory;
import org.junit.Test;
