[geode] branch davebarnes97-feature/GEODE-5308 deleted (was 40327e7)

2018-06-12 Thread dbarnes
This is an automated email from the ASF dual-hosted git repository.

dbarnes pushed a change to branch davebarnes97-feature/GEODE-5308
in repository https://gitbox.apache.org/repos/asf/geode.git.


 was 40327e7  GEODE-5308: User Guide - simplify terminology: "cache 
transactions" can be "transactions".

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
dbar...@apache.org.


[geode] 01/01: GEODE-5308: User Guide - simplify terminology: "cache transactions" can be "transactions".

2018-06-12 Thread dbarnes
This is an automated email from the ASF dual-hosted git repository.

dbarnes pushed a commit to branch davebarnes97-feature/GEODE-5308
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 40327e7bd5dd4d108eda871125a6a81cd07a6854
Merge: 0f75926 09f0ba9
Author: Dave Barnes 
AuthorDate: Tue Jun 12 17:17:41 2018 -0700

GEODE-5308: User Guide - simplify terminology: "cache transactions" can be 
"transactions".

 .../source/subnavs/geode-subnav.erb| 14 ++---
 .../transactions/JTA_transactions.html.md.erb  | 10 -
 .../cache_transaction_performance.html.md.erb  |  4 ++--
 .../transactions/cache_transactions.html.md.erb| 24 +++---
 .../cache_transactions_by_region_type.html.md.erb  |  2 +-
 .../transactions/chapter_overview.html.md.erb  |  8 
 .../client_server_transactions.html.md.erb |  2 +-
 .../data_location_cache_transactions.html.md.erb   |  2 +-
 .../how_cache_transactions_work.html.md.erb|  2 +-
 .../monitor_troubleshoot_transactions.html.md.erb  |  4 ++--
 .../run_a_cache_transaction.html.md.erb|  8 
 ..._cache_transaction_with_external_db.html.md.erb | 10 -
 .../working_with_transactions.html.md.erb  | 10 -
 13 files changed, 50 insertions(+), 50 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
dbar...@apache.org.


[geode] branch develop updated (0f75926 -> 40327e7)

2018-06-12 Thread dbarnes
This is an automated email from the ASF dual-hosted git repository.

dbarnes pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.


from 0f75926  GEODE-5313: User Guide - consolidate transaction coding 
examples
 add 09f0ba9  GEODE-5308: User Guide - simplify terminology: "cache 
transactions" can be "transactions".
 add 40327e7  GEODE-5308: User Guide - simplify terminology: "cache 
transactions" can be "transactions".

No new revisions were added by this update.

Summary of changes:
 .../source/subnavs/geode-subnav.erb| 14 ++---
 .../transactions/JTA_transactions.html.md.erb  | 10 -
 .../cache_transaction_performance.html.md.erb  |  4 ++--
 .../transactions/cache_transactions.html.md.erb| 24 +++---
 .../cache_transactions_by_region_type.html.md.erb  |  2 +-
 .../transactions/chapter_overview.html.md.erb  |  8 
 .../client_server_transactions.html.md.erb |  2 +-
 .../data_location_cache_transactions.html.md.erb   |  2 +-
 .../how_cache_transactions_work.html.md.erb|  2 +-
 .../monitor_troubleshoot_transactions.html.md.erb  |  4 ++--
 .../run_a_cache_transaction.html.md.erb|  8 
 ..._cache_transaction_with_external_db.html.md.erb | 10 -
 .../working_with_transactions.html.md.erb  | 10 -
 13 files changed, 50 insertions(+), 50 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
dbar...@apache.org.


[geode] branch davebarnes97-feature/GEODE-5308 created (now 40327e7)

2018-06-12 Thread dbarnes
This is an automated email from the ASF dual-hosted git repository.

dbarnes pushed a change to branch davebarnes97-feature/GEODE-5308
in repository https://gitbox.apache.org/repos/asf/geode.git.


  at 40327e7  GEODE-5308: User Guide - simplify terminology: "cache 
transactions" can be "transactions".

This branch includes the following new commits:

 new 40327e7  GEODE-5308: User Guide - simplify terminology: "cache 
transactions" can be "transactions".

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
dbar...@apache.org.


[geode] branch develop updated: GEODE-5313: User Guide - consolidate transaction coding examples

2018-06-12 Thread dbarnes
This is an automated email from the ASF dual-hosted git repository.

dbarnes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
 new 0f75926  GEODE-5313: User Guide - consolidate transaction coding 
examples
0f75926 is described below

commit 0f759269a61ddb81bd3fcf7a3f9529127a26944a
Author: Dave Barnes 
AuthorDate: Mon Jun 11 16:09:08 2018 -0700

GEODE-5313: User Guide - consolidate transaction coding examples
---
 .../source/subnavs/geode-subnav.erb|  16 +-
 .../transactions/jca_adapter_example.html.md.erb   |  51 --
 .../transaction_coding_examples.html.md.erb| 172 -
 .../transaction_suspend_resume_example.html.md.erb |  38 -
 .../transactional_function_example.html.md.erb |  72 -
 .../transactions/transactions_overview.html.md.erb |  67 
 6 files changed, 169 insertions(+), 247 deletions(-)

diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb 
b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index b9d042e..ad09b17 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -1493,22 +1493,8 @@ limitations under the License.
 
 Monitoring
 and Troubleshooting Transactions
 
-
+
 Transaction
 Coding Examples
-
-
-Basic
 Transaction Example
-
-
-Basic
 Suspend and Resume Transaction Example
-
-
-Transaction
 Embedded within a Function Example
-
-
-JCA
 Resource Adapter Example
-
-
 
 
 
diff --git a/geode-docs/developing/transactions/jca_adapter_example.html.md.erb 
b/geode-docs/developing/transactions/jca_adapter_example.html.md.erb
deleted file mode 100644
index 1c7b420..000
--- a/geode-docs/developing/transactions/jca_adapter_example.html.md.erb
+++ /dev/null
@@ -1,51 +0,0 @@

-title:  JCA Resource Adapter Example

-
-
-
-This example shows how to use the JCA Resource Adapter in 
<%=vars.product_name%> .
-
-``` pre
-Hashtable env = new Hashtable();
-env.put(Context.INITIAL_CONTEXT_FACTORY, 
“weblogic.jndi.WLInitialContextFactory”);
-env.put(Context.PROVIDER_URL, “t3://localhost:7001”);
-Context ctx = new InitialContext(env);
-UserTransaction utx = (UserTransaction) 
ctx.lookup(“javax.transaction.UserTransaction”);
-utx.begin();
-  // the XA Resource
-javax.sql.DataSource ds = (DataSource) ctx.lookup(“derby”);
-javax.sql.Connection derbyConn = ds.getConnection();
-Statement stmt = conn.createStatement();
-stmt.executeUpdate(“insert into test values(2,4) “);
- // do ConnectionFactory lookup
-GFConnectionFactory cf = (GFConnectionFactory) ctx.lookup(“gfe/jca”);
-
- // Obtaining the connection begins the LocalTransaction.
- // If this is absent, operations will not be part of any transaction.
-GFConnection conn = cf.getConnection();
-
-testRegion.put(“foo”, “bar-”);
-utx.commit();
-
- // the connection can also be closed within the transaction
-derbyConn.close();
-conn.close();
-```
-
-
diff --git 
a/geode-docs/developing/transactions/transaction_coding_examples.html.md.erb 
b/geode-docs/developing/transactions/transaction_coding_examples.html.md.erb
index c2dd517..2d1854f 100644
--- a/geode-docs/developing/transactions/transaction_coding_examples.html.md.erb
+++ b/geode-docs/developing/transactions/transaction_coding_examples.html.md.erb
@@ -21,20 +21,184 @@ limitations under the License.
 
 This section provides several code examples for writing and executing 
transactions.
 
--   **[Basic Transaction Example](transactions_overview.html)**
+-   **[Basic Transaction Example](#basic_transaction_example)**
 
 This example operates on two replicated regions. It begins a transaction, 
updates one entry in each region, and commits the result.
 
--   **[Basic Suspend and Resume Transaction 
Example](transaction_suspend_resume_example.html)**
+-   **[Basic Suspend and Resume Transaction Example](#suspend_resume_example)**
 
 This example suspends and resumes a transaction.
 
--   **[Transaction Embedded within a Function 
Example](transactional_function_example.html)**
+-   **[Transaction Embedded within a Function