[teiid-commits] teiid SVN: r3792 - in trunk/build/kits/jboss-as7/docs/teiid/datasources: derby and 11 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Thu Jan 12 13:43:25 EST 2012


Author: rareddy
Date: 2012-01-12 13:43:23 -0500 (Thu, 12 Jan 2012)
New Revision: 3792

Added:
   trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/create-db2-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/create-derby-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/file/create-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/create-ingres-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/create-intersys-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/create-mysql-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/create-oracle-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/create-postgresql-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/create-salesforce-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/create-jtds-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/create-native-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/create-teiid-ds.cli
   trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/create-ws-ds.cli
Modified:
   trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/intersystems-cache.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/salesforce.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver-xa.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver.xml
   trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/readme.txt
   trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/ws.xml
Log:
TEIID-1720: adding the CLI scripts to add data sources

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/create-db2-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/create-db2-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/create-db2-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,14 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=db2DS:add(jndi-name=java:/db2DS,  driver-name=db2jcc4.jar, driver-class=com.ibm.db2.jcc.DB2Driver, connection-url=jdbc:db2://{host}:{port}/{database_name},user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=db2DS:add(jndi-name=java:/db2DS,  driver-name=db2jcc4.jar, xa-datasource-class=com.ibm.db2.jcc.DB2XADataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=db2DS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=db2DS/xa-datasource-properties=PortNumber:add(value=50000)
+#/subsystem=datasources/xa-data-source=db2DS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=db2DS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,11 +3,11 @@
     <datasources>
         <xa-datasource jndi-name="java:/db2DS" pool-name="db2DS" enabled="true" use-java-context="true" use-ccm="true">
         
-            <xa-datasource-property name="PortNumber">3306</xa-datasource-property>
+            <xa-datasource-property name="PortNumber">50000</xa-datasource-property>
             <xa-datasource-property name="DatabaseName">{db-name}</xa-datasource-property>
             <xa-datasource-property name="ServerName">{host}</xa-datasource-property>        
             
-            <driver>db2</driver>
+            <driver>db2jcc4.jar</driver>
             
             <!-- 
             <new-connection-sql>select 1/new-connection-sql>
@@ -39,7 +39,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="db2" module="com.ibm.db2">
+            <driver name="db2jcc4.jar" module="com.ibm.db2">
                 <driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
                 <xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/db2.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -2,8 +2,8 @@
 <subsystem xmlns="urn:jboss:domain:datasources:1.0">
     <datasources>
         <datasource jndi-name="java:/db2DS" pool-name="db2DS">
-            <connection-url>jdbc:db2://{host}:{port}/{database_name}</connection-url>
-            <driver>db2</driver>
+            <connection-url>jdbc:db2://{host}:50000/{database_name}</connection-url>
+            <driver>db2jcc4.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                               
         <drivers>
-            <driver name="db2" module="com.ibm.db2">
+            <driver name="db2jcc4.jar" module="com.ibm.db2">
                 <driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
                 <xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/db2/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -6,11 +6,7 @@
 	Option 1: use the JBoss CLI tool, and deploy the "db2jcc4.jar" or later jar by issuing the command
 		deploy db2jcc4.jar
 		
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file		
-	 
-	Option 2:
+	Option 2:(recommended)
 		1) Stop the server if it is running.
 
 		2) Overlay the "modules" directory on the "<jboss-as>/modules" directory 
@@ -25,7 +21,7 @@
 	or "db2-xa.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your db2 server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
+	Option 2: Take a look at create-db2-ds.cli script, and *modify* and execute using JBoss CLI tool as below 
 	
-	./Jboss-admin.sh --file create-ds.cli
+	./Jboss-admin.sh --file create-db2-ds.cli
 	
\ No newline at end of file

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/create-derby-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/create-derby-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/create-derby-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,14 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=derbyDS:add(jndi-name=java:/derbyDS,  driver-name=derbyclient.jar, driver-class=org.apache.derby.jdbc.ClientDriver, connection-url=jdbc:derby://{host}:1527/{db-name},user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=derbyDS:add(jndi-name=java:/derbyDS,  driver-name=derbyclient.jar, xa-datasource-class=org.apache.derby.jdbc.ClientXADataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=derbyDS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=derbyDS/xa-datasource-properties=PortNumber:add(value=1527)
+#/subsystem=datasources/xa-data-source=derbyDS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=derbyDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -7,7 +7,7 @@
             <xa-datasource-property name="DatabaseName">{db-name}</xa-datasource-property>
             <xa-datasource-property name="ServerName">{host}</xa-datasource-property>        
             
-            <driver>derby</driver>
+            <driver>derbyclient.jar</driver>
             
             <!-- 
             <new-connection-sql>select 1/new-connection-sql>
@@ -39,7 +39,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="derby" module="org.apache.derby">
+            <driver name="derbyclient.jar" module="org.apache.derby">
                 <driver-class>org.apache.derby.jdbc.ClientDriver</driver-class>
                 <xa-datasource-class>org.apache.derby.jdbc.ClientXADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/derby.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/derbyDS" pool-name="derbyDS">
             <connection-url>jdbc:derby://{host}:1527/{db-name}</connection-url>
-            <driver>derby</driver>
+            <driver>derbyclient.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                               
         <drivers>
-            <driver name="derby" module="org.apache.derby">
+            <driver name="derbyclient.jar" module="org.apache.derby">
                 <driver-class>org.apache.derby.jdbc.ClientDriver</driver-class>
                 <xa-datasource-class>org.apache.derby.jdbc.ClientXADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/derby/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -6,11 +6,7 @@
 	Option 1: use the JBoss CLI tool, and deploy the "derbyclient.jar" or later jar by issuing the command
 		deploy derbyclient.jar
 		
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file		
-	 
-	Option 2:
+	Option 2: (recommended)
 		1) Stop the server if it is running.
 
 		2) Overlay the "modules" directory on the "<jboss-as>/modules" directory 
@@ -25,7 +21,7 @@
 	or "derby-xa.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your derby server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
+	Option 2: Take a look at create-derby-ds.cli script, and modify and execute using JBoss CLI tool as below 
 	
-	./Jboss-admin.sh --file create-ds.cli
+	./Jboss-admin.sh --file create-derby-ds.cli
 	
\ No newline at end of file

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/file/create-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/file/create-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/file/create-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,5 @@
+/subsystem=resource-adapters/resource-adapter=fileDS:add(archive=teiid-connector-file.rar, transaction-support=NoTransaction)
+/subsystem=resource-adapters/resource-adapter=fileDS/connection-definitions=fileDS:add(jndi-name=java:/fileDS, class-name=org.teiid.resource.adapter.file.FileManagedConnectionFactory, enabled=true, use-java-context=true)
+/subsystem=resource-adapters/resource-adapter=fileDS/connection-definitions=fileDS/config-properties=Parentdirectory:add(value=/home/rareddy/testing/)
+/subsystem=resource-adapters/resource-adapter=fileDS/connection-definitions=fileDS/config-properties=AllowParentPaths:add(value=true)
+/subsystem=resource-adapters/resource-adapter=fileDS/connection-definitions=fileDS:enable
\ No newline at end of file

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/create-ingres-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/create-ingres-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/create-ingres-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,14 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=ingresDS:add(jndi-name=java:/ingresDS,  driver-name=iijdbc.jar, driver-class=com.ingres.jdbc.IngresDriver, connection-url=jdbc:ingres://{host}:{port:21071}/{database_name}, user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=ingresDS:add(jndi-name=java:/ingresDS,  driver-name=iijdbc.jar, xa-datasource-class=com.ingres.jdbc.IngresXADataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=ingresDS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=ingresDS/xa-datasource-properties=PortNumber:add(value=21071)
+#/subsystem=datasources/xa-data-source=ingresDS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=ingresDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -9,7 +9,7 @@
             <xa-datasource-property name="timeZone">GMT</xa-datasource-property>
                     
             
-            <driver>ingres</driver>
+            <driver>iijdbc.jar</driver>
             
             <!-- 
             <new-connection-sql>select 1/new-connection-sql>
@@ -41,7 +41,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="ingres" module="com.ingres">
+            <driver name="iijdbc.jar" module="com.ingres">
                 <driver-class>com.ingres.jdbc.IngresDriver</driver-class>
                 <xa-datasource-class>com.ingres.jdbc.IngresXADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/ingres.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/ingresDS" pool-name="ingresDS">
             <connection-url>jdbc:ingres://{host}:{port:21071}/{database_name}</connection-url>
-            <driver>ingres</driver>
+            <driver>iijdbc.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                               
         <drivers>
-            <driver name="ingres" module="com.ingres">
+            <driver name="iijdbc.jar" module="com.ingres">
                 <driver-class>com.ingres.jdbc.IngresDriver</driver-class>
                 <xa-datasource-class>com.ingres.jdbc.IngresXADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/ingres/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,14 +3,11 @@
 
 Step 1: Deploying the JDBC Driver
  
-	Option 1: use the JBoss CLI tool, and deploy the "iijdbc.jar " or later jar by issuing the command
+	Option 1: use the JBoss CLI tool, and deploy the "iijdbc.jar" or later jar by issuing the command
 		deploy iijdbc.jar 
-
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file		
+		
 	 
-	Option 2:
+	Option 2: (Recommended)
 		1) Stop the server if it is running.
 
 		2) Overlay the "modules" directory on the "<jboss-as>/modules" directory 
@@ -25,7 +22,7 @@
 	or "ingres-xa.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your ingres server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
+	Option 2: Take a look at create-ingres-ds.cli script, and modify and execute using JBoss CLI tool as below 
 	
-	./Jboss-admin.sh --file create-ds.cli
+	./Jboss-admin.sh --file create-ingres-ds.cli
 	
\ No newline at end of file

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/create-intersys-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/create-intersys-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/create-intersys-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,6 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=cacheDS:add(jndi-name=java:/cacheDS,  driver-name=CacheDB.jar, driver-class=com.intersys.jdbc.CacheDriver, connection-url=jdbc:Cache://{host}:1972/{database}, user-name={user}, password={password})
+
+# No XA Data source Available
+
+# If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/intersystems-cache.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/intersystems-cache.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/intersystems-cache/intersystems-cache.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/cacheDS" pool-name="cacheDS">
             <connection-url>jdbc:Cache://{host}:1972/{database}</connection-url>
-            <driver>mysql</driver>
+            <driver>CacheDB.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                               
         <drivers>
-            <driver name="intersys" module="com.intersys">
+            <driver name="CacheDB.jar" module="com.intersys">
                 <driver-class>com.intersys.jdbc.CacheDriver</driver-class>
             </driver>    
         </drivers>

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/create-mysql-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/create-mysql-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/create-mysql-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,14 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=mysqlDS:add(jndi-name=java:/mysqlDS,  driver-name=mysql-connector-java-5.1.5.jar, driver-class=com.mysql.jdbc.Driver, connection-url=jdbc:mysql://{host}:3306/{database}, user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=mysqlDS:add(jndi-name=java:/mysqlDS,  driver-name=mysql-connector-java-5.1.5.jar, xa-datasource-class=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=mysqlDS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=mysqlDS/xa-datasource-properties=PortNumber:add(value=3306)
+#/subsystem=datasources/xa-data-source=mysqlDS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=mysqlDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -7,7 +7,7 @@
             <xa-datasource-property name="DatabaseName">{db-name}</xa-datasource-property>
             <xa-datasource-property name="ServerName">{host}</xa-datasource-property>        
             
-            <driver>mysql</driver>
+            <driver>mysql-connector-java-5.1.5.jar</driver>
             
             <!-- 
             <new-connection-sql>select 1/new-connection-sql>
@@ -39,7 +39,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="mysql" module="com.mysql">
+            <driver name="mysql-connector-java-5.1.5.jar" module="com.mysql">
                 <driver-class>com.mysql.jdbc.Driver</driver-class>
                 <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/mysql.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/mysql-ds" pool-name="mysqlDS">
             <connection-url>jdbc:mysql://{host}:3306/{database}</connection-url>
-            <driver>mysql</driver>
+            <driver>mysql-connector-java-5.1.5.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                               
         <drivers>
-            <driver name="mysql" module="com.mysql">
+            <driver name="mysql-connector-java-5.1.5.jar" module="com.mysql">
                 <driver-class>com.mysql.jdbc.Driver</driver-class>
                 <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/mysql/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -6,11 +6,7 @@
 	Option 1: use the JBoss CLI tool, and deploy the "mysql-connector-java-5.1.5.jar" or later jar by issuing the command
 		deploy mysql-connector-java-5.1.5.jar
 		
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file		
-	 
-	Option 2:
+	Option 2:(recommended)
 		1) Stop the server if it is running.
 
 		2) Overlay the "modules" directory on the "<jboss-as>/modules" directory 
@@ -27,7 +23,7 @@
 	
 	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
 	
-	./Jboss-admin.sh --file create-ds.cli
+	./Jboss-admin.sh --file create-mysql-ds.cli
 	
 **************************************************************************************************************	
 NOTE: MySQL JDBC driver does not include the Driver file name as the service loader mechanism as of 

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/create-oracle-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/create-oracle-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/create-oracle-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,12 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=OracleDS:add(jndi-name=java:/OracleDS,  driver-name=ojdbc6.jar, driver-class=oracle.jdbc.OracleDriver, connection-url=jdbc:oracle:thin:{host}:1521:{db-name},user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=OracleDS:add(jndi-name=java:/OracleDS,  driver-name=ojdbc6.jar, xa-datasource-class=oracle.jdbc.xa.client.OracleXADataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=OracleDS/xa-datasource-properties=URL:add(value=jdbc:oracle:thin:{host}:1521:{database_name})
+#/subsystem=datasources/xa-data-source=OracleDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,12 +3,9 @@
     <datasources>
         <xa-datasource jndi-name="java:/OracleDS" pool-name="OracleDS" enabled="true" use-java-context="true" use-ccm="true">
         
-            <xa-datasource-property name="PortNumber">1557</xa-datasource-property>
-            <xa-datasource-property name="DatabaseName">{db-name}</xa-datasource-property>
-            <xa-datasource-property name="ServerName">{host}</xa-datasource-property>        
+            <xa-datasource-property name="URL">jdbc:oracle:thin:{host}:1521:orcl</xa-datasource-property>
+            <driver>ojdbc6.jar</driver>
             
-            <driver>oracle</driver>
-            
             <!-- 
             <new-connection-sql>select * from dual</new-connection-sql>
             <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
@@ -39,7 +36,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="oracle" module="com.oracle">
+            <driver name="ojdbc6.jar" module="com.oracle">
                 <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
             </driver>    
         </drivers>

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/oracle.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/OracleDS" pool-name="OracleDS" enabled="true" jta="true" use-java-context="true" use-ccm="true">
             <connection-url>jdbc:oracle:thin:{host}:1521:orcl</connection-url>
-            <driver>oracle</driver>
+            <driver>ojdbc6.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                
         <drivers>
-            <driver name="oracle" module="com.oracle">
+            <driver name="ojdbc6.jar" module="com.oracle">
                 <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
             </driver>    
         </drivers>

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/oracle/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -6,11 +6,7 @@
 	Option 1: use the JBoss CLI tool, and deploy the "ojdbc6.jar" or later jar by issuing the command
 		deploy ojdbc6.jar
 
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file		
-	 
-	Option 2:
+	Option 2:(recommended)
 
 		1) Stop the server if it is running.
 
@@ -26,6 +22,6 @@
 	or "oracle-xa.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your oracle server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
+	Option 2: Take a look at create-oracle-ds.cli script, and modify and execute using JBoss CLI tool as below 
 	
-	./Jboss-admin.sh --file create-ds.cli
\ No newline at end of file
+	./Jboss-admin.sh --file create-oracle-ds.cli
\ No newline at end of file

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/create-postgresql-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/create-postgresql-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/create-postgresql-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,14 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=postgresDS:add(jndi-name=java:/postgresDS,  driver-name=postgresql-8.3-603.jdbc3.jar, driver-class=org.postgresql.Driver, connection-url=jdbc:postgresql://{host}:5432/{database}, user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=postgresDS:add(jndi-name=java:/postgresDS,  driver-name=postgresql-8.3-603.jdbc3.jar, xa-datasource-class=org.postgresql.xa.PGXADataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=postgresDS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=postgresDS/xa-datasource-properties=PortNumber:add(value=5432)
+#/subsystem=datasources/xa-data-source=postgresDS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=postgresDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -7,7 +7,7 @@
             <xa-datasource-property name="DatabaseName">{db-name}</xa-datasource-property>
             <xa-datasource-property name="ServerName">{host}</xa-datasource-property>        
             
-            <driver>postgresql</driver>
+            <driver>postgresql-8.3-603.jdbc3.jar</driver>
             
             <!-- 
             <new-connection-sql>select 1</new-connection-sql>
@@ -39,7 +39,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="postgresql" module="org.postgresql">
+            <driver name="postgresql-8.3-603.jdbc3.jar" module="org.postgresql">
                 <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
             </driver>
         </drivers>

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/postgresql.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/postgres-ds" pool-name="PostgreDS">
             <connection-url>jdbc:postgresql://{host}:5432/{database}</connection-url>
-            <driver>postgresql</driver>
+            <driver>postgresql-8.3-603.jdbc3.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>
         <drivers>
-            <driver name="postgresql" module="org.postgresql">
+            <driver name="postgresql-8.3-603.jdbc3.jar" module="org.postgresql">
                 <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
             </driver>
         </drivers>

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/postgresql/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -6,11 +6,7 @@
 	Option 1: use the JBoss CLI tool, and deploy the "postgresql-8.3-603.jdbc3.jar" or later jar by issuing the command
 		deploy postgresql-8.3-603.jdbc3.jar
 	 
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file
-			 
-	Option 2:
+	Option 2: (recommended)
 
 		1) Stop the server if it is running.
 
@@ -26,6 +22,6 @@
 	or "postgresql-xa.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your postgresql server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool.
+	Option 2: Take a look at create-postgresql-ds.cli script, and modify and execute using JBoss CLI tool.
 
- 
\ No newline at end of file
+ 	./Jboss-admin.sh --file create-postgresql-ds.cli
\ No newline at end of file

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/create-salesforce-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/create-salesforce-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/create-salesforce-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,6 @@
+/subsystem=resource-adapters/resource-adapter=sfDS:add(archive=teiid-connector-salesforce.rar, transaction-support=NoTransaction)
+/subsystem=resource-adapters/resource-adapter=sfDS/connection-definitions=sfDS:add(jndi-name=java:/sfDS, class-name=org.teiid.resource.adapter.salesforce.SalesForceManagedConnectionFactory, enabled=true, use-java-context=true)
+/subsystem=resource-adapters/resource-adapter=sfDS/connection-definitions=sfDS/config-properties=URL:add(value=https://www.salesforce.com/services/Soap/u/22.0)
+/subsystem=resource-adapters/resource-adapter=sfDS/connection-definitions=sfDS/config-properties=username:add(value={user})
+/subsystem=resource-adapters/resource-adapter=sfDS/connection-definitions=sfDS/config-properties=password:add(value={password})
+/subsystem=resource-adapters/resource-adapter=sfDS/connection-definitions=sfDS:enable
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -1,3 +1,10 @@
+Option 1:
+
 In Teiid, for Salesforce datasource a JCA connector is provided and deployed at the install time. To create
 salesforce datasource connection edit the "standalone-teiid.xml" file or "doamin-teiid.xml" file and add 
-the contents of the salesforce.xml under "resource-adapters" subsystem section.
\ No newline at end of file
+the contents of the salesforce.xml under "resource-adapters" subsystem section.
+
+Option 2:
+
+Take a look at create-salesforce-ds.cli script, and modify and execute using JBoss CLI tool as below  
+./Jboss-admin.sh --file create-salesforce-ds.cli
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/salesforce.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/salesforce.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/salesforce/salesforce.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -12,7 +12,7 @@
                         pool-name="teiid-sf-ds">
                         
                     <!-- URL; the below is test; replace with actual URL you need to connect to -->
-                    <config-property name="URL">https://test.salesforce.com/services/Soap/u/10.0</config-property>
+                    <config-property name="URL">https://www.salesforce.com/services/Soap/u/22.0</config-property>
                     
                     <config-property name="username">user</config-property>
                     <config-property name="password">pass</config-property>

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/create-jtds-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/create-jtds-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/create-jtds-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,14 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=sqlserverDS:add(jndi-name=java:/sqlserverDS,  driver-name=jtds-1.2.5.jar, driver-class=net.sourceforge.jtds.jdbc.Driver, connection-url=jdbc:jtds:sqlserver://{host}:1433/{database}, user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=sqlserverDS:add(jndi-name=java:/sqlserverDS,  driver-name=jtds-1.2.5.jar, xa-datasource-class=net.sourceforge.jtds.jdbcx.JtdsDataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=sqlserverDS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=sqlserverDS/xa-datasource-properties=PortNumber:add(value=1433)
+#/subsystem=datasources/xa-data-source=sqlserverDS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=sqlserverDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -6,11 +6,7 @@
 	Option 1: use the JBoss CLI tool, and deploy the "jtds-1.2.5.jar" or later jar by issuing the command
 		deploy jtds-1.2.5.jar
 
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file		
-	 
-	Option 2:
+	Option 2:(recommended)
 		1) Stop the server if it is running.
 
 		2) Overlay the "modules" directory on the "<jboss-as>/modules" directory 
@@ -25,6 +21,6 @@
 	or "sqlserver-xa.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your sqlserver server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
+	Option 2: Take a look at create-jtds-ds.cli script, and modify and execute using JBoss CLI tool as below 
 	
-	./Jboss-admin.sh --file create-ds.cli	
\ No newline at end of file
+	./Jboss-admin.sh --file create-jtds-ds.cli	
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -7,7 +7,7 @@
             <xa-datasource-property name="DatabaseName">{db-name}</xa-datasource-property>
             <xa-datasource-property name="ServerName">{host}</xa-datasource-property>        
             
-            <driver>jtds</driver>
+            <driver>jtds-1.2.5.jar</driver>
             
             <!-- 
             <new-connection-sql>select 1/new-connection-sql>
@@ -39,7 +39,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="jtds" module="net.sourceforge.jtds">
+            <driver name="jtds-1.2.5.jar" module="net.sourceforge.jtds">
                 <driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>
                 <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/jtds/sqlserver.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/sqlserverDS" pool-name="sqlserverDS">
             <connection-url>jdbc:jtds:sqlserver://{host}:1433/{database}</connection-url>            
-            <driver>jtds</driver>
+            <driver>jtds-1.2.5.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                               
         <drivers>
-            <driver name="jtds" module="net.sourceforge.jtds">
+            <driver name="jtds-1.2.5.jar" module="net.sourceforge.jtds">
                 <driver-class>net.sourceforge.jtds.jdbc.Driver</driver-class>
                 <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class>
             </driver>    

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/create-native-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/create-native-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/create-native-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,14 @@
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=sqlserverDS:add(jndi-name=java:/sqlserverDS,  driver-name=sqljdbc4.jar, driver-class=com.microsoft.jdbc.sqlserver.SQLServerDriver, connection-url=jdbc:microsoft:sqlserver://{host}:1433, user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=sqlserverDS:add(jndi-name=java:/sqlserverDS,  driver-name=sqljdbc4.jar, xa-datasource-class=com.microsoft.sqlserver.jdbc.SQLServerXADataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=sqlserverDS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=sqlserverDS/xa-datasource-properties=PortNumber:add(value=1433)
+#/subsystem=datasources/xa-data-source=sqlserverDS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=sqlserverDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -6,11 +6,7 @@
 	Option 1: use the JBoss CLI tool, and deploy the "sqljdbc4.jar" or later jar by issuing the command
 		deploy sqljdbc4.jar
 		
-		Note: when you use CLI based deployment, the <driver> element in the <datasources> xml fragment, must
-		be the name of the jar file deployed, and no need for adding <drivers> element in standalone-teiid.xml 
-		or domain-teiid.xml file		
-	 
-	Option 2:
+	Option 2: (recommended)
 		1) Stop the server if it is running.
 
 		2) Overlay the "modules" directory on the "<jboss-as>/modules" directory 
@@ -25,6 +21,6 @@
 	or "sqlserver-xa.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your sqlserver server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
+	Option 2: Take a look at create-native-ds.cli script, and modify and execute using JBoss CLI tool as below 
 	
-	./Jboss-admin.sh --file create-ds.cli	
\ No newline at end of file
+	./Jboss-admin.sh --file create-native-ds.cli	
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver-xa.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver-xa.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver-xa.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -7,7 +7,7 @@
             <xa-datasource-property name="DatabaseName">{db-name}</xa-datasource-property>
             <xa-datasource-property name="ServerName">{host}</xa-datasource-property>        
             
-            <driver>sqlserver</driver>
+            <driver>sqljdbc4.jar</driver>
             
             <!-- 
             <new-connection-sql>select 1/new-connection-sql>
@@ -39,7 +39,7 @@
              -->
         </xa-datasource>                
         <drivers>
-            <driver name="sqlserver" module="com.microsoft.sqlserver">
+            <driver name="sqljdbc4.jar" module="com.microsoft.sqlserver">
                 <driver-class>com.microsoft.jdbc.sqlserver.SQLServerDriver</driver-class>
                 <xa-datasource-class>com.microsoft.sqlserver.jdbc.SQLServerXADataSource</xa-datasource-class>
             </driver>    

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/sqlserver/native/sqlserver.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -3,7 +3,7 @@
     <datasources>
         <datasource jndi-name="java:/sqlserverDS" pool-name="sqlserverDS">
             <connection-url>jdbc:microsoft:sqlserver://{host}:1433</connection-url>
-            <driver>sqlserver</driver>
+            <driver>sqljdbc4.jar</driver>
             <pool>
                 <prefill>false</prefill>
                 <use-strict-min>false</use-strict-min>
@@ -15,7 +15,7 @@
             </security>
         </datasource>                               
         <drivers>
-            <driver name="sqlserver" module="com.microsoft.sqlserver">
+            <driver name="sqljdbc4.jar" module="com.microsoft.sqlserver">
                 <driver-class>com.microsoft.jdbc.sqlserver.SQLServerDriver</driver-class>
                 <xa-datasource-class>com.microsoft.sqlserver.jdbc.SQLServerXADataSource</xa-datasource-class>
             </driver>    

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/create-teiid-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/create-teiid-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/create-teiid-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,16 @@
+/subsystem=datasources/jdbc-driver=teiid:add(driver-name=teiid, driver-module-name=org.jboss.teiid.client, driver-xa-datasource-class-name=org.teiid.jdbc.TeiidDataSource, driver-class-name=org.teiid.jdbc.TeiidDriver)
+
+# note that driver-name could be driver's module name if you went module approach.
+/subsystem=datasources/data-source=teiidDS:add(jndi-name=java:/teiidDS,  driver-name=teiid, driver-class=org.teiid.jdbc.TeiidDriver, connection-url=jdbc:teiid:{vdb}@mm://{host}:31000, user-name={user}, password={password})
+
+# XA Data source
+#batch
+#/subsystem=datasources/xa-data-source=teiidDS:add(jndi-name=java:/teiidDS,  driver-name=teiid, xa-datasource-class=org.teiid.jdbc.TeiidDataSource, user-name={user}, password={password})
+#/subsystem=datasources/xa-data-source=teiidDS/xa-datasource-properties=DatabaseName:add(value={database_name})
+#/subsystem=datasources/xa-data-source=teiidDS/xa-datasource-properties=PortNumber:add(value=31000)
+#/subsystem=datasources/xa-data-source=teiidDS/xa-datasource-properties=ServerName:add(value={host})
+#/subsystem=datasources/xa-data-source=teiidDS:enable
+#run-batch
+
+
+## If you are working in a clustered environment, prepend "/profile=ha" to all the above commands that start with "/subsystem=.." 
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/readme.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/readme.txt	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/teiid/readme.txt	2012-01-12 18:43:23 UTC (rev 3792)
@@ -2,11 +2,15 @@
 
 Creating the datasource 
 
-	Option 1: Edit the standalone-teiid.xml or domain-teiid.xml file and add contents of the "teiid.xml" 
+  Option 1: 
+	
+	Edit the standalone-teiid.xml or domain-teiid.xml file and add contents of the "teiid.xml" 
 	or "teiid-xa.xml" or "teiid-local.xml" file under the "datasources" subsystem. You may have to edit contents according 
 	to where your Teiid server is located and credentials you need to use to access it.
 	
-	Option 2: Take a look at create-ds.cli script, and modify and execute using JBoss CLI tool as below 
+  Option 2: 
 	
-	./Jboss-admin.sh --file create-ds.cli
+	Take a look at create-teiid-ds.cli script, and modify and execute using JBoss CLI tool as below 
 	
+	./Jboss-admin.sh --file create-teiid-ds.cli
+	

Added: trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/create-ws-ds.cli
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/create-ws-ds.cli	                        (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/create-ws-ds.cli	2012-01-12 18:43:23 UTC (rev 3792)
@@ -0,0 +1,4 @@
+/subsystem=resource-adapters/resource-adapter=wsDS:add(archive=teiid-connector-ws.rar, transaction-support=NoTransaction)
+/subsystem=resource-adapters/resource-adapter=wsDS/connection-definitions=wsDS:add(jndi-name=java:/wsDS, class-name=org.teiid.resource.adapter.ws.WSManagedConnectionFactory, enabled=true, use-java-context=true)
+/subsystem=resource-adapters/resource-adapter=wsDS/connection-definitions=wsDS/config-properties=EndPoint:add(value={end_point})
+/subsystem=resource-adapters/resource-adapter=wsDS/connection-definitions=wsDS:enable
\ No newline at end of file

Modified: trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/ws.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/ws.xml	2012-01-12 16:13:09 UTC (rev 3791)
+++ trunk/build/kits/jboss-as7/docs/teiid/datasources/web-service/ws.xml	2012-01-12 18:43:23 UTC (rev 3792)
@@ -12,7 +12,7 @@
                         pool-name="teiid-ws-ds">
                         
                       <!-- End point for the web service -->
-                      <config-property name="EndPoint">endpoint url</config-property>
+                      <config-property name="EndPoint">{endpoint_url}</config-property>
                         
                         <!-- 
                             Uncomment these properties to supply specific CXF configuration for this service. This file



More information about the teiid-commits mailing list