Author: gnodet
Date: Wed Oct 7 14:27:15 2009
New Revision: 822755
URL: http://svn.apache.org/viewvc?rev=822755&view=rev
Log:
ARIES-21: refactor package names for transaction component
Added:
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/
- copied from r822750,
incubator/aries/trunk/transaction/src/main/java/org/apache/servicemix/
Removed:
incubator/aries/trunk/transaction/src/main/java/org/apache/servicemix/
Modified:
incubator/aries/trunk/transaction/pom.xml
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/Activator.java
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
Modified: incubator/aries/trunk/transaction/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/pom.xml?rev=822755&r1=822754&r2=822755&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (original)
+++ incubator/aries/trunk/transaction/pom.xml Wed Oct 7 14:27:15 2009
@@ -87,10 +87,10 @@
</Export-Package>
<Private-Package>
org.objectweb.howl.log*,
- org.apache.servicemix.transaction
+ org.apache.aries.transaction
</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-
<Bundle-Activator>org.apache.servicemix.transaction.Activator</Bundle-Activator>
+
<Bundle-Activator>org.apache.aries.transaction.Activator</Bundle-Activator>
<Export-Service>javax.transaction.TransactionManager,javax.transaction.TransactionSynchronizationRegistry,javax.transaction.UserTransaction,org.apache.geronimo.transaction.manager.RecoverableTransactionManager</Export-Service>
<Include-Resource>
{maven-resources},
Modified:
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/Activator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/Activator.java?rev=822755&r1=822750&r2=822755&view=diff
==============================================================================
---
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/Activator.java
(original)
+++
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/Activator.java
Wed Oct 7 14:27:15 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.transaction;
+package org.apache.aries.transaction;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -34,7 +34,7 @@
*/
public class Activator implements BundleActivator, ManagedServiceFactory {
- private static final Logger log =
LoggerFactory.getLogger("org.apache.felix.transaction");
+ private static final Logger log =
LoggerFactory.getLogger("org.apache.aries.transaction");
private BundleContext bundleContext;
private Map managers = new HashMap<String, TransactionManagerService>();
@@ -73,7 +73,7 @@
}
public String getName() {
- return "org.apache.felix.transaction";
+ return "org.apache.aries.transaction";
}
public void updated(String pid, Dictionary properties) throws
ConfigurationException {
Modified:
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java?rev=822755&r1=822750&r2=822755&view=diff
==============================================================================
---
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java
(original)
+++
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/GeronimoPlatformTransactionManager.java
Wed Oct 7 14:27:15 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.transaction;
+package org.apache.aries.transaction;
import java.util.Map;
import java.util.Iterator;
Modified:
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TransactionManagerService.java?rev=822755&r1=822750&r2=822755&view=diff
==============================================================================
---
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
(original)
+++
incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TransactionManagerService.java
Wed Oct 7 14:27:15 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.transaction;
+package org.apache.aries.transaction;
import java.util.Dictionary;
import java.util.List;
@@ -44,21 +44,21 @@
*/
public class TransactionManagerService {
- public static final String TRANSACTION_TIMEOUT =
"felix.transaction.timeout";
- public static final String RECOVERABLE = "felix.transaction.recoverable";
- public static final String HOWL_BUFFER_CLASS_NAME =
"felix.transaction.howl.bufferClassName";
- public static final String HOWL_BUFFER_SIZE =
"felix.transaction.howl.bufferSize";
- public static final String HOWL_CHECKSUM_ENABLED =
"felix.transaction.howl.checksumEnabled";
- public static final String HOWL_ADLER32_CHECKSUM =
"felix.transaction.howl.adler32Checksum";
- public static final String HOWL_FLUSH_SLEEP_TIME =
"felix.transaction.howl.flushSleepTime";
- public static final String HOWL_LOG_FILE_EXT =
"felix.transaction.howl.logFileExt";
- public static final String HOWL_LOG_FILE_NAME =
"felix.transaction.howl.logFileName";
- public static final String HOWL_MAX_BLOCKS_PER_FILE =
"felix.transaction.howl.maxBlocksPerFile";
- public static final String HOWL_MAX_LOG_FILES =
"felix.transaction.howl.maxLogFiles";
- public static final String HOWL_MAX_BUFFERS =
"felix.transaction.howl.maxBuffers";
- public static final String HOWL_MIN_BUFFERS =
"felix.transaction.howl.minBuffers";
- public static final String HOWL_THREADS_WAITING_FORCE_THRESHOLD =
"felix.transaction.howl.threadsWaitingForceThreshold";
- public static final String HOWL_LOG_FILE_DIR =
"felix.transaction.howl.logFileDir";
+ public static final String TRANSACTION_TIMEOUT =
"aries.transaction.timeout";
+ public static final String RECOVERABLE = "aries.transaction.recoverable";
+ public static final String HOWL_BUFFER_CLASS_NAME =
"aries.transaction.howl.bufferClassName";
+ public static final String HOWL_BUFFER_SIZE =
"aries.transaction.howl.bufferSize";
+ public static final String HOWL_CHECKSUM_ENABLED =
"aries.transaction.howl.checksumEnabled";
+ public static final String HOWL_ADLER32_CHECKSUM =
"aries.transaction.howl.adler32Checksum";
+ public static final String HOWL_FLUSH_SLEEP_TIME =
"aries.transaction.howl.flushSleepTime";
+ public static final String HOWL_LOG_FILE_EXT =
"aries.transaction.howl.logFileExt";
+ public static final String HOWL_LOG_FILE_NAME =
"aries.transaction.howl.logFileName";
+ public static final String HOWL_MAX_BLOCKS_PER_FILE =
"aries.transaction.howl.maxBlocksPerFile";
+ public static final String HOWL_MAX_LOG_FILES =
"aries.transaction.howl.maxLogFiles";
+ public static final String HOWL_MAX_BUFFERS =
"aries.transaction.howl.maxBuffers";
+ public static final String HOWL_MIN_BUFFERS =
"aries.transaction.howl.minBuffers";
+ public static final String HOWL_THREADS_WAITING_FORCE_THRESHOLD =
"aries.transaction.howl.threadsWaitingForceThreshold";
+ public static final String HOWL_LOG_FILE_DIR =
"aries.transaction.howl.logFileDir";
public static final int DEFAULT_TRANSACTION_TIMEOUT = 600; // 600 seconds
-> 10 minutes
public static final boolean DEFAULT_RECOVERABLE = false; // not
recoverable by default
