Author: timothyjward
Date: Wed Apr 27 10:26:10 2016
New Revision: 1741201
URL: http://svn.apache.org/viewvc?rev=1741201&view=rev
Log:
Add links to tx-control quick start and advanced topics
Added:
aries/site/trunk/content/modules/tx-control/advancedResourceProviders.mdtext
(with props)
aries/site/trunk/content/modules/tx-control/advancedScopes.mdtext (with
props)
Modified:
aries/site/trunk/content/modules/transactioncontrol.mdtext
aries/site/trunk/content/modules/tx-control/index.mdtext
aries/site/trunk/content/modules/tx-control/quickstart.mdtext
Modified: aries/site/trunk/content/modules/transactioncontrol.mdtext
URL:
http://svn.apache.org/viewvc/aries/site/trunk/content/modules/transactioncontrol.mdtext?rev=1741201&r1=1741200&r2=1741201&view=diff
==============================================================================
--- aries/site/trunk/content/modules/transactioncontrol.mdtext (original)
+++ aries/site/trunk/content/modules/transactioncontrol.mdtext Wed Apr 27
10:26:10 2016
@@ -9,7 +9,13 @@ The Transaction Control Service (RFC-221
Given that the RFC is non-final the OSGi API declared in this project is
subject to change at any time up to its official release. Also the behaviour of
this implementation may not always be up-to-date with the latest wording in the
RFC. The project maintainers will, however try to keep pace with the RFC, and
to ensure that the implementations are compliant with any OSGi specifications
that result from the RFC.
-# Modules
+#Getting started
+
+If you're new to the Transaction Control service then we recommend that you
read the [quickstart documentation first][1].
+
+More detailed documentation is available in the [Aries Transaction Control
Project][2]
+
+## Modules
The following modules are available for use in OSGi
@@ -19,7 +25,7 @@ The following modules are available for
4. tx-control-provider-jdbc-xa :- A JDBC resource provider that can integrate
with local or XA transactions. The JDBCConnectionProviderFactory service may be
used directly, or a service may be configured using the
_org.apache.aries.tx.control.jdbc.xa_ pid
-## Which modules should I use?
+### Which modules should I use?
If you wish to use entirely lightweight, resource-local transactions then it
is best to pair the tx-control-service-local and tx-control-provider-jdbc-local
or tx-control-provider-jpa-local bundles. This will give transactional
behaviour, but the result is _not guaranteed to be ACID if more than one
resource is used_.
@@ -27,4 +33,8 @@ If two-phase commit is needed across mul
**DO NOT** use both tx-control-service-xa and tx-control-service-local at the
same time. This will be confusing, and will lead to problems if different parts
of the runtime bind to different service implementations.
-There is also no reason to use the tx-control-provider-jdbc-local in addition
to the tx-control-provider-jdbc-xa service. Using both together is not
typically harmful, however the tx-control-provider-jdbc-xa bundle supports all
of the same features as the tx-control-provider-jdbc-local bundle.
\ No newline at end of file
+There is also no reason to use the tx-control-provider-jdbc-local in addition
to the tx-control-provider-jdbc-xa service. Using both together is not
typically harmful, however the tx-control-provider-jdbc-xa bundle supports all
of the same features as the tx-control-provider-jdbc-local bundle.
+
+
+ [1]: tx-control/quickstart.html
+ [2]: tx-control/index.html
\ No newline at end of file
Added:
aries/site/trunk/content/modules/tx-control/advancedResourceProviders.mdtext
URL:
http://svn.apache.org/viewvc/aries/site/trunk/content/modules/tx-control/advancedResourceProviders.mdtext?rev=1741201&view=auto
==============================================================================
---
aries/site/trunk/content/modules/tx-control/advancedResourceProviders.mdtext
(added)
+++
aries/site/trunk/content/modules/tx-control/advancedResourceProviders.mdtext
Wed Apr 27 10:26:10 2016
@@ -0,0 +1,19 @@
+Title:
+Notice: 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.
+
+#TODO
\ No newline at end of file
Propchange:
aries/site/trunk/content/modules/tx-control/advancedResourceProviders.mdtext
------------------------------------------------------------------------------
svn:eol-style = native
Added: aries/site/trunk/content/modules/tx-control/advancedScopes.mdtext
URL:
http://svn.apache.org/viewvc/aries/site/trunk/content/modules/tx-control/advancedScopes.mdtext?rev=1741201&view=auto
==============================================================================
--- aries/site/trunk/content/modules/tx-control/advancedScopes.mdtext (added)
+++ aries/site/trunk/content/modules/tx-control/advancedScopes.mdtext Wed Apr
27 10:26:10 2016
@@ -0,0 +1,19 @@
+Title:
+Notice: 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.
+
+#TODO
\ No newline at end of file
Propchange: aries/site/trunk/content/modules/tx-control/advancedScopes.mdtext
------------------------------------------------------------------------------
svn:eol-style = native
Modified: aries/site/trunk/content/modules/tx-control/index.mdtext
URL:
http://svn.apache.org/viewvc/aries/site/trunk/content/modules/tx-control/index.mdtext?rev=1741201&r1=1741200&r2=1741201&view=diff
==============================================================================
--- aries/site/trunk/content/modules/tx-control/index.mdtext (original)
+++ aries/site/trunk/content/modules/tx-control/index.mdtext Wed Apr 27
10:26:10 2016
@@ -36,5 +36,12 @@ first.
* TODO With Local Transactions
* TODO With XA Transactions
+###Advanced topics
- [1]: quickstart.html
\ No newline at end of file
+* [Custom Resource Providers][2]
+* [Advanced Scope control][3]
+
+
+ [1]: quickstart.html
+ [2]: advancedResourceProviders.html
+ [3]: advancedScopes.html
\ No newline at end of file
Modified: aries/site/trunk/content/modules/tx-control/quickstart.mdtext
URL:
http://svn.apache.org/viewvc/aries/site/trunk/content/modules/tx-control/quickstart.mdtext?rev=1741201&r1=1741200&r2=1741201&view=diff
==============================================================================
--- aries/site/trunk/content/modules/tx-control/quickstart.mdtext (original)
+++ aries/site/trunk/content/modules/tx-control/quickstart.mdtext Wed Apr 27
10:26:10 2016
@@ -124,4 +124,4 @@ The transactionality and lifecycle of th
}
[1]: advancedScopes.html
- [2]: advancedResourceProviders
\ No newline at end of file
+ [2]: advancedResourceProviders.html
\ No newline at end of file
