[teiid-commits] teiid SVN: r1181 - in trunk: build/kit-runtime/examples and 14 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Thu Jul 23 17:56:54 EDT 2009 

Author: shawkins
Date: 2009-07-23 17:56:54 -0400 (Thu, 23 Jul 2009)
New Revision: 1181

Added:
   trunk/build/kit-runtime/examples/portfolio/PortfolioModel/Portfolio.vdb
   trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt
   trunk/build/kit-runtime/examples/simpleclient/
   trunk/build/kit-runtime/examples/simpleclient/JDBCClient.class
   trunk/build/kit-runtime/examples/simpleclient/JDBCClient.java
   trunk/build/kit-runtime/examples/simpleclient/readme.txt
   trunk/build/kit-runtime/examples/simpleclient/run.bat
   trunk/build/kit-runtime/examples/simpleclient/run.sh
   trunk/build/kit-runtime/examples/vdbless-portfolio/
   trunk/build/kit-runtime/examples/vdbless-portfolio/README.txt
   trunk/build/kit-runtime/examples/vdbless-portfolio/vdbless.def
   trunk/documentation/custom.dtd
Removed:
   trunk/build/kit-runtime/examples/portfolio/PortfolioModel/Portfolio.vdb
   trunk/build/kit-runtime/examples/portfolio/java/
   trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt
   trunk/build/kit-runtime/examples/portfolio/run.bat
   trunk/build/kit-runtime/examples/portfolio/run.sh
Modified:
   trunk/build/kit-runtime/deploy.properties
   trunk/build/kit-runtime/examples/portfolio/README.txt
   trunk/documentation/admin-guide/src/main/docbook/en-US/adminshell_guide.xml
   trunk/documentation/connector-developer-guide/src/main/docbook/en-US/connector_developer_guide.xml
   trunk/documentation/jdbc-connector-guide/src/main/docbook/en-US/jdbc-connector.xml
   trunk/documentation/quick-start-example/pom.xml
   trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml
   trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml
   trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml
   trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml
   trunk/documentation/quick-start-example/src/main/docbook/en-US/content/learn.xml
   trunk/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml
   trunk/documentation/quick-start-example/src/main/docbook/en-US/quick_start_example.xml
   trunk/documentation/reference/src/main/docbook/en-US/Reference.xml
   trunk/documentation/salesforce-connector-guide/src/main/docbook/en-US/salesforce_connector_guide.xml
   trunk/documentation/server-extensions-guide/src/main/docbook/en-US/server_extensions_guide.xml
Log:
TEIID-661 TEIID-684 fixing the doc versions, updating the examples/quickstart to mostly remove embedded terminology, and adding a vdbless example

Modified: trunk/build/kit-runtime/deploy.properties
===================================================================
--- trunk/build/kit-runtime/deploy.properties	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/build/kit-runtime/deploy.properties	2009-07-23 21:56:54 UTC (rev 1181)
@@ -32,45 +32,45 @@
 # 
 
 #Process pool maximum thread count. (default 64)
-#ProcessPoolMaxThreads=64
+ProcessPoolMaxThreads=64
 
 #Query processor time slice, in milliseconds. (default 2000)
-#ProcessorTimeslice=2000
+ProcessorTimeslice=2000
 
 #Maximum allowed fetch size, set via JDBC. User requested value ignored above this value. (default 20000)
-#MaxFetchSize=20000
+MaxFetchSize=20000
 
 #The maximum number of query plans that are cached. Note: this is a memory based cache. (default 250) 
-#MaxPlanCacheSize=250
+MaxPlanCacheSize=250
 
 #
 # BufferManager Settings
 #
 
 #The max size of a batch sent between connector and query service. Should be even multiple of processorBatchSize. (default 2000)
-#dqp.buffer.connectorBatchSize=2000
+dqp.buffer.connectorBatchSize=2000
 
 #The max size of a batch sent internally within the query processor. Should be <= the connectorBatchSize. (default 2000)
-#dqp.buffer.processorBatchSize=2000
+dqp.buffer.processorBatchSize=2000
 
-#Defines whether to use disk buffering or not. (default 64)
-#dqp.buffer.useDisk=true
+#Defines whether to use disk buffering or not. (default true)
+dqp.buffer.useDisk=true
 
 #The numeric memory size in MB, to be used before disk buffering kicks in (default 64)
-#dqp.buffer.memory=64
+dqp.buffer.memory=64
 
 #
 # Cache Settings
 #
 
 #Maximum number of cached lookup tables. Note: this is a memory based cache. (default 20)
-#MaxCodeTables=50
+MaxCodeTables=20
 
 #Maximum number of records in a single lookup table (default 10000)
-#MaxCodeTableRecords=10000
+MaxCodeTableRecords=10000
 
 #Denotes whether or not result set caching is enabled. (default false)
-#ResultSetCacheEnabled=false
+ResultSetCacheEnabled=false
 
 #The maximum size in MB the result set cache will be allowed to grow to before objects are removed. 0 indicates no limit. (default 50)
 #ResultSetCacheSize=50
@@ -113,30 +113,40 @@
 entitlements.adminRolesFile=./deploy/admin-roles.properties
 
 #
-# Server Settings (Socket transport)
+# Socket transport
 #
 
+# Setting to enable the use of a per connection 128 bit AES key 
+# to encrypt sensitive client server traffic (default true) 
+client.encryption.enabled=true
+
 server.portNumber=31000
 server.bindAddress=localhost
-#server.maxSocketThreads=15
-#server.inputBufferSize=0       
-#server.outputBufferSize=0      
+server.maxSocketThreads=15
+server.inputBufferSize=0       
+server.outputBufferSize=0      
 
-
 # SSL Settings
-#ssl.enabled=true
+ssl.enabled=false
 #ssl.protocol=SSLv3
 #ssl.authenticationMode=1-way
 #ssl.keymanagementalgorithm=
-#ssl.keystore.filename=teiid.keystore
+#ssl.keystore.filename=ssl.keystore
 #ssl.keystore.Password=changeme
 #ssl.keystoretype=JKS
 #ssl.truststore.filename=teiid.truststore
 #ssl.truststore.Password=changeme
-#client.encryption.enabled=true
 
+#
+# Transaction Settings
+#
 
-# transaction time out in seconds
-#xa.enabled=true
-#xa.max_timeout=120
-#xa.enable_recovery=true
\ No newline at end of file
+# Setting to enable the use of transactions for XA, local, 
+# and request scope transactions (default true) 
+xa.enabled=true
+# default transaction time out in seconds (default 120)
+xa.max_timeout=120
+# Setting to enable recovery scans (default true)
+xa.enable_recovery=true
+# JBoss transactions status port (default 0 - selects an available port)
+xa.txnstatus_port=0
\ No newline at end of file

Deleted: trunk/build/kit-runtime/examples/portfolio/PortfolioModel/Portfolio.vdb
===================================================================
(Binary files differ)

Added: trunk/build/kit-runtime/examples/portfolio/PortfolioModel/Portfolio.vdb
===================================================================
--- trunk/build/kit-runtime/examples/portfolio/PortfolioModel/Portfolio.vdb	                        (rev 0)
+++ trunk/build/kit-runtime/examples/portfolio/PortfolioModel/Portfolio.vdb	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,199 @@
+PK
+a¢GTš©`cãä}ö66Èxµ÷Œç¿µËÅîÈHC…±V_wÃ3`K–$Ê	¥ˆôŽ§½"<w
+"óŠZ¾{/ÆzYuˆß¢x
+qü_üsï85Å÷ëæG‰óå²/’ù¢4á*;„î²n¾­«ðå-¡UN´vŽHê0:œDi˜´,±\å¯±ºܪ(·(i4Ç$N¤ ‰ñ:Zk8·B§W´lÊ›xú囹‡
+ë·Ä^*Ï붛2ÅͤëÅtâ_qÜä!x½JDrËIàˆP[ms¬Hû&–g¥oÛ›ÈQÇ~ z<Äí4+¨ºOƒýmÄ;“_éÑõGíêä©c‚9 b¿ÐÄŠz'e’ÑS!ù:øæt½Èo¥O÷ÍïÜkö\臺ò߬PrLQ¶ß¤P+×{
+Ÿr\[.͆BõP5u‡OÚiqZ
+Žñ{ò
+‰xÇÁeÉ&:ñ¦M°û°^Á°hCߧÁ>¹7oѧ¸Ö‡œÆÆdXš–2bÅÿŒ°’#’ÖÿZ˜N˜ê
+VÀª€^
+ÁæI9)rG×Ò5««¼˜/›¡û÷«¼Æ%óߝ?ùåfÇjK9NÄU”;“G~­ùøag²úMíㇿ
+
+I´AvöŒ?tÛRÕ­[U÷¹oõöÕ_îV‘ò‰¦Y˜Ä/NfSíD¡±—øa¼|qòÃÕ[Õ>Q²œÄ>‰’˜¾8‰““¿üù‹¯þMUåU²¾OÃåM®<óž+º¦i*ü3W.hN.Hž†wå<ö¦Šò2ŠV2SRšÑôõ§Šª¡»ì,ónèŠ(ÀHœ­VÔÏ_œÜäùúìôôöövºj+Fmê%«SláôÇUtÉj¾‰sš®Ó0£¯INòû5ÍN
+RwYƒÎ­1MÒ%ÖŸþxñŽ×?Qr’.iþž¬h¶&ÝÕ4û3ñi”^†«u´mR
+c$žüù~X·X‘+øZa:ûá‡ó×/NV«Í&ôÏLè„ˆÄ™«3ªkª£Ï\•ÂnsÃ^8'EÅtçኵ†ä^œdÀR¼ìøúmxGý'‰2z¢Äб'ï/®>ü×›÷w%‡$Žè
+¿_±rÊ:Mü‡*a,0$Ø2ÈŠè]è‘hK>§œÇƒy¨ˆƒÆxrIVŒq‹¤=ýêT˜Ö­œœv
+ŠÌ1p͹Â&^œÀ‡Œæ‰(7·7aN/Ù °9{qâ%QDÖ ¥)[ƒlÐ4.‹þìý©^ŠqUk½@ÝivCÑLcPtgÆèPŒ“tE¢ðê_òªcc²Ý`
+œ‚ø°9*$w[¯”Í©p	¡¹&bî'P\D$HpN@ʱšGÒ4$K
+\琇gÿ~÷úùD‰ÂôÞàƒ—Ï±ULN\üÖy®x7$%ÈS&‡è£tÙò(ÖoñÜ€°Œ?ÎÔÀ`ÎÚ2Z–ÑbÁŸ£ÁÔ0õ¹çÚšêÛ¦YÀTÓªK-_÷×v
+2LÛZllrÝ^·–øÎk—}a° #•Q[™mȨQIç„S¼!ŸPe
+ÖNIáïŒO‘ ¬kÏð-›$Btéb„'ýÇœQš±>Þ&Šä«$-¢Û²ÁÙm|Y—êfÿàˆ¬°¾ô4"NC‰TÓÖ&됯¬w˜o0¨:ñMß±5OS©¥VßötK%ša{õó…5œ:‰H¼Ü€]£”
+Õ•JLÀêHªlèC¹0Ab’)>Ywï•ëïß¾RfËúXS<r™E‘ÚRlè"á_b$‰
+
+˘’cín…
+ó°à¤
+ãw|~CiõñI©fãÅÁ¾a‰ÀF×
+óÙs	
+¥R¹Ö‘Ï[ßïòw_µÝK\ðé0|b¬Øvue܈kM’ȵ''Ì"Šd
+ðV\pšCÛà¶W–þXaÛvg†¹¨…¦ƒG
+}a
+åemPBvêŒäÉ*ô
+¸ÑhQË-§r…›ñùö¹ØW˯|hV‰m]P~l…8f¶‹û¿<“ô%üdãF}öÃŽ‘'àMuç	Z
+“)G^§¦-³¡%bÝT–‡(GQipNkÚòí(‘i˶vœ
+í(*SA[j‹9«á,´êQªÀÄÎïSt´ùè4ôånýØ©|š:p‡~”ŒK—¾ìòÈ×cÕ¡0w(HÈ…¹CA
+dºf1àGא‚n(K?¶Š4\ÛÑg6S‘‹¾*ÿêó¢Kx„[ž±‘FLŒJ7-Io‡b¥YØ
+܆2á'åi&~èIŒR!º
+.§Õ½.3ÇqÀn«º…~M54Ґ°Ñ™ZM4õ>]ÃwXغIn•‰ïᗍ$“ã.Hdû†žKhJQYöс¤›ßã#šÅöéY$[õ-máP—ÎÍï®ô
+Nñ Ú=÷²ø]Á—ß½3µço.¯^^|ËEzªœç˜£á‰F˜À
+ÒØ<šç©”'Ó ®¡wŽÔݪŸþãÅ»w ÌÒ#øéÛ¦ÚOfâüà B«Ûà*ÎQÕ”%â‰ê
+T-umË°ƒÀ×gÃíi.³Çã§0‹†êVŒÊREú\žÉ,…2Yx§úP5Î
+ǃUã«‹èzxI’ú€™œí^€LîªÒmzT¹§$(+š›	f
+Ÿ4Å»5”g@ç9X‚¸¤ÉeÝ“øzníøK‚¡WÄ6òð4ìŠíNe=ª5jB’%{Ö1ܲò“¿L¬‘¶¡ ‡Ï;Þ¢c;²›dùXk“—0°Ü÷sâRŠ©Ô¦nOÇ›(£ˆªC"_䣆U0y×ß¿}%ÐÑ
+ÇúÈÜBª’Š¾0ô¡ó‚„•¥h”ºsŸ½°l{Æè@û®õõ88c­´–ð„ùÇc@üŠdM~Ÿ'´;½o`t3å׸|î›Ñ›€bÇ€~MÒü·êYDÌ
+í
+ЈÎ-‰â»âpé«S¦æ%šKñõ]û}sôâ$‘¶p<ˆ¾G|O†Ú¾7:DÞ¸zyuþáýè()Ú÷ŽqUn„wŒ+Ú51ebÐñ´š ä2h¢ˆ£M†Ør ³í›ÆÅn5Œ¦ÐÐe^—3­¨K2“8•óCpAspØØrÁ*ñiô¥’v? ¬6™äæyÚzŽßEǍ!ÛJ˜C—I–£Ã(Ô¦1Ìm±´ÀxäÅi×ê+ß9·*ìbggÚ£ÀøÛ©.Ë?6¼}ÇqlöØ°ë–K³ÆÌQmJˆãêúÂò¼î†Þ;pÆÆwÕÒA›Î±¸
+ž[Â<!^³]·mê³o†+šL¼œæCG9²1*ÒçšžãàcÔõ¬Ñ¥¯±ll¬7¶K¿få*áÛŠd_1l48$*o!hjæ¼€4F))-Ê‹	…<¥„]OPvl“•7ŒòU^ñ]fêUJâ)õ
+Ödé½mâá’r鶦6sËXÄ¢™ó¡½±Q7üfÿüÅÿPKØÁà
+¸a5Ox9\gòÌÌm›¬?ýÀçzÌÅD—¤,“Lpr e—È›­Öðr0^~ìÆÁl‘Hø÷¿þ\ÌÒÆå‡UNÉÙd1KÇ<TD±ç|íu·½÷›Á^|9ŒJ£¯zÉsw0îüÚ¹¨×Âè^«žŽoÒÛózš,ò•¨eTK¨~ñb2ÉX:¯†×ƒË^/¨×$PèxeW<¯‡|2‡‰sÍyËE4‰Òð°×»î|iuFãë^÷„uG.ô'ý0_!nA	cÂE¡ã¹b¶BÜör\ßs=È3B‚D±Ò÷z3Ë·¸"Ž$È.,;æ8ˆ[ÔE¶Î¦ar+,Ⱥ³åV»Mtx8Šât½8EœFMØÂ"fɃòp¡,N­MÒ¤ˆOŽ’€=¦Ç³¨Ï˜‚…J=‰ˆ!–Å‘ƒ¹”Taߣ.KJàn8”/|æû($Œ b+ùÓ…À\[ê8bçP¹ã›c¹µŒ¸7Ç—A½¹íX†ß
+=²Ò`°ZÊTi„ŸÒhªáÏéݱS†[½a°á¥ýÈðV½|ʲQá,Xn]ãa¿sqý˧rš·¬xÞ|y1I£»I$s^.Á¨ÓêþÒÍBVȦýƒ
+Pë’o¶{­·îõ<î2á`Š‘Ë(ìÁ>è_fù¢J(L	qÖTn<+¡ÎH슞QsûŠ¸'p$VÙÞšžbª)²l€I8ñ§R¢0ô•Ë°G}ÌW´Le>G~ʐ(ïЉi7›ö§’©
+T§¥ò=ÇCBÀ¡Çöhh{ä©V¥–Ç´ï3„‰‰‚Le>cÙÏ·< _Y¯Øâ\†ÜH¨¾Zcú¸=&š‡ÌulÍ 2\áÀõàX:Èã>÷4Ôò;„¯"#=º¶/[Õ!Ú؈I®mÂ.Εq²1&Ò¾å`—Ù¶vŠqÁ-×eH6†HpCœ,Âzô9Rp}GˆŒ£Ël×
+:×íJÕµ3äؐ;ijÑé$
+Ì‚ñiÛu$p=˜º&r?s&»Á£-²Š¹ýÕ˜;°µ?eΨmkÒÿ5ÓG»:¶RÜo
+¨÷&òõe$º…‰p]³>n±Zö.%CnaNµcv2¨’
+Çì_Ç~A8û÷"S8FB¢Ž]U×v%Þ4F•¿±ý”öæ1ØÖ,Nyë¤ìImE|jtÙâQ÷Óâ!ö½
+‹ÁÅÞZ\µdy{FÚêÒ\Üqù¿Ñ…g™8
+Ç£ÒwyþxU™Ÿfê­:;=ò:AŠ@©9P‘íßP¬'ÂAP\Û¹mg9U榙,«v“±g°IÊ”L(!ˆ@ #°¥Á6NêA–»i¦·¶Ü´EYÄÜO,A5·–ÀñµÄz…¶Ë…K¹t\UÚòÓu¿#ìÙ~hƒ
+
+¹5{ëíô7ø±TC%Mßæ„«le[Ì¢HxÀ<÷µ‚BÆU(ĺ¯*ål§ózM%Ñ×Õ_M·ºÖÖ‰x¨
+túm–ü±Ñšð9ȪYrsÂóa'*v’¹uÒšD:NÛù@PdÉ伞»›9m4&3É'·³yzj¹¶×H³Ë|åCÁE”¿]è4â›²¾1lB‚ª,qEö’•‚ÌòÜYaèøžMDˆ³{2‰æ©^ö'æÝ8³iÕ@[çFËÉBiµ6âéíü}£95Ê,gåûüm³÷ÁÕ`8¸êoæmÙöNƝ~mÜüÐë<wîQ“>w;ÿ­ž–î—Ùø(áÞ¿;ko~¾÷PK³{
+
+ù2µ¿ ”bã–4ãDvÑo[óεÙ5ÅšdÝ0fK!ËbŸÚº(=ÖÔr”oÎ}ž>ÌÑ+aP£|¨ýŽåÊk†Ãµmü]ÐÒZ¼ÌîúÕ"(§Ë‚4ÍÖ®ºày~k‚Æ:pØ»&¦§1Òs6¼„T)µÏ>ñm„}ô±±ZGÝõhçãé(îKˆ~ÂŒhdµ*eFÊm;pÒ°µ˜:Tw¼¤åæ
+Ž¶YÏDAہpÕë±y·ZF ·.³êíõìÜýÀIè$¶ömG§{6¢XLr²ßð4Êo•Ó‘È+Æ\µ†Á¨56èóbþ2½yT¿âôWEîɦØyábÛCU­aèxV„#+µ=4¹¡ºçÝ|Ôcg¼J’ö_ÒO…z›xÖ9¥™ôñ²]û£æ…vŸROñäîÿÐaQ)£Ž¡ÓωRjàIŠ½ø}vß®c>•Djß4ôy;N²S?V‡FNýyþõ^žýPK—èK•
+X"ø6ž½ÞóM:æÒ³€=Z<o·ßÆóÅr0é0·ž‹¶{S°&ض3¾}ï`/û-5¹[ˆ0Äʯ7®øedçeNƒÜ%2t™;€ÐÝ:Ÿè8qaÂú¢KÄw˜}æEcU2G¤’¿ƒùöËc<AŸ…Îâ¤HËf²õT¢¡iîá\ü¸Õ›1b¸²7>Ž„=ù(È÷¾#J\ªjòšÍ®z˜ý×
+ð~â`‚2°üUÅ«gq¦ΰ þS3|Ý«^ÊÑ»ÄÏ]%lè:°ÉÊ)ó%J’`ÆÖzx'Ì'R
+áêEq±ð'¸Ç‰f!?ä
+ðîqŠëQùžX§\+Ý	ìà¹Â‘AI!:h0ˆáÖÜ5ö’՝ÌáÌü†¹vš©	ÀŒj>ݺ¾Û’JâÚsþSbSSnVž3YAÑB&™¢zåÍí³¸ðgµÖ‚LtFªH$™Ö‚Äï©­(Ù
+ì%Z7™4-SDbÄl0‹ý
+DzôȈ_:f•}á9³ä°¯q*×GZ'CãXÑ”¤ž4kš€#s¬Évv¡	¬Ö
+Ú~"”‚ƒšI`Őz8ê("K«D†‰r¶(Bi§A–UŒ’¨:_&LUdYTT³‰ØÚ¨Â*’Êñ°!?Ù‹*ÒñÉËB.ŠÕÑq×û=£
+«É¢Æ‡Ë	áÃ9ênTO*¯â V€¬Í™EU”Ó]ï¢ÊžwÊ~”öS»%•|V³ÝB,bE5ÞÚÔ;Îë}_vµ_Ì©ÂRZ?D‚rŒ°ÙØÎ=ÙUûöU•C½2þ^-ªºÌ]7èTD^ª¤ÓÝ›mà·Ì¬OÚ<àÕ&äŽg%8EZ“š>^c%òúCŸèÓ®y`!©µFÊf<zŸuA
+&Ζ«ëRlÌÓ5Æ‹Ä0ìP4æX “|ŠN¤1¥<¤8ÑÕ…“÷Ì»J3ÿn#û"$|¸œÏõéâîÛ`²Ô™ÏóÙM&‚"äX(’öþ›=֥͎;kL“©1ÿù¢ÏõœW“79±^¦_°³ÚÖ„×é(—Ocùý‚iÖZ[A~Ü£Öärù‰¶ÐŸÆþsùÐT%.ª‡ÜÄÅnŒs°`tßĵõMY4‡³åt‘þ½R_”5.ÅìFŸw?çÆb:¸Ñ«^N¥w_f“Ñxú—Ñ5¾æºq°óþv>-‡‹®ñãæÓlRñb8»¹LÜÅrwv(·ž
+1i6’çïê$ž¡ºç!'Pä¦mȲúeÓõWbß0¦ÄÊ¤’ç‰IÖMX¿‚òüuQ@Ö$Q³ !å¾ÜqºHŸ­ñ›‹<å"VV6ðñá㙆ÚQԝd1œå“‰FgNíÃ40Qš†e¬ ØPNI`¤{$ŽVå¡–8,Îy¹©,”àHmèH­Òö¶8Ètð¬ÚPJp$&}Œvûª–0’ã­†‚O
+#\}Í ÎQâ©€qÝ‹³ììwS`«ÜYT7(J
+GRȆh|ˆê°KS¦x>8Ùâã\ÌDôÖÁɈ¼ƒõ½^’WðFÍò۝4ËkwúK¿Uuœb·:G ˜ó6©çu¯º†ý:nºó¯â2¡;ä;éÀòîWn§ˆ4œëƒ…Î$w8²‹ê£å\ÿ×Û'ðá“þ×xýßHNs1]w…Ã|ÌǃOÝèþ"[Äô™Ïƒ‰¡ˆ?§e7cYâ»P‡n…1cƒ™ÎÌt9™\Öv|O¸É‡ì…úÌõù¶Õá¤ÒsT!”ÿ‡¤›èÞl,Mt,Í¢ßÛ®j*!Þ2“‹or-Xb ï
+S¹kq±ªÌÀn›¢¥”
+r1_¦ö85ôù‚O³6Åûbqšò‡¢’]l,œíÀ炉ªŸSà÷}Ù Þ3Žûøî"+v~³ñc7½éÐõ€‡‡áó‹˜D}:ÚûKæð€(N>ŸÏæÌc'n•÷ǾØĶ‹"ão!öý¬õ¹Ëî‰ÇäOö˜L„˜¡õ”!°’y?ö׾ô&‡Xª1q•ñdÁWµïW[F¦ß‡mJN«¢(]P(yQT¨Tª®6×çµé®"ROö,	Õ<
+³ëMJ•øªâ|^¿¯:PÉK÷•o—óᗁ¡ßˆÍ5Ç¼ÈâgÈš‹þ«Yð	c‡zÔ½q‡­èŽX,XÀ6\*úí,$ø–;‡ü~ûò6«	œ]©».ô{œ6¼X}›S9VãÛ„ô›
+ÍRMÁŠ3¦ƒ†Üf›xæmì)ÛÄSç¯n“X|wè¢UÔ6ÿ’ïê±…0W¸<t˜|râo7ѧMË
+i`•ŸÝׂîj»v*?ç¢8ÝH†:Œe?a4ÁÎ}ðÚé6ú–C;ùp“í0à3°ÞÃû•©AràÁ`Ú+;x&3™Üé߇úíân2þªw˜­cÿ½Å_ñóN‘LÀbþ’$39ª& KQ¼À)’Èr¾q
+WN2ëM—½%©B>Ã	5MDQ|$De:Ì*¡JSÕ¼p±·×–â`"Ñ6½iñ)Kun(»›j¼˜5¾šQQ¤È£Ü3Ÿ$îHã?v’h
+ø©oÚ¹g“+ÌK¯«1U‘=Ñ8ºÀsœvÈÝgÞZ;ª’wÊç—Ð2ùº”¸ß
+iÜp¦h|%ÝmÜ~%+0©Ýyzò¥jUØ,ÆÓ[Ï…m½ŠxJW/-~^±h´óèwþ«ÏgiÝ
+
+sl$
+G^½ÿþº5÷¹‹Á³v2.—]H-M«%õ­fÿç{Û"·LHî:o×zíîaŽášÜ¹z»v1y×ÚYûùàÅþ§ÁáÁöß3j2áÿ  kx?w…bâ“?ÏÁ…sã¸wÎ~§ /ØŸÏ-nP­G‚QÅÌǃ¦è!•Œœ¸&³˜Øï‚Î’û|A_<ðB2OI7Çà㩘ûDº9Ÿp›ÅPú'Ÿ~$‘x#gæ&ž	w΄z §Ôfo×ðß5ò‰Züp”œ¹w×H§|È/£A4Ķ=›{»›Û›¯ÍnËdë;­^¯»Õšnõz-cטîl̦l‹UN¬0š·W
+=8ìãšß²büÛ·æ´r‚¾¡`p4P	/FO«˜jûú¤,IÁ¾a¸ž£d5ö\ò)·¸zˆ1÷¦p’*Gx–âc×:tj13=£–̐÷Èuf(Wr/›ŒûÒýA|ÄIÔ‘ž¯S2á~'AžG‘ê„Š¦TÑïŽX1êõ‘+Ø OœÝ­’^_¾€©Ç-5rj“‡9[éI¯âȵç®Ã¥ñJ‹DGxQæÔ¸fdÀÄ>Ëԝ+n’§ 5æ¾òvm}
+Àç–û€(…ÌZ3PDȝ¸‡9|¨ mìÁSs¾]ûupx”üäЗŠúÐÇTª£kê\¡ÌÑ]3~å	-¸ÆŠ
+åÍS@°Gˆv·»Ûên·º½Iww¯×ÝÛÜmono@Ó^Äx$ÄÊ&Ô
+Î\׊6yÀåÜ¢Y‚@$‚_ƒ|0i>WZñ»ˆ‚
+õ@'pgĈÏa0Ü\rÇÕ5€pvº¢û7£pÜR$DÛ߁CÏ(ˆ´‘<gz\àVû€#	j@f$Ïâõû‡;^á„I¸S þÜR+CÍž|x‚`á‰!!<y)¬È”?‘æ½{ôPÌ!/¹CBH¢\bè'
+çŒÉ%±KÒõÃz@Ê™€‚ô1€NÉá3ÂRÒ[Ê-$~Ž”Ûx¸Ò”DŒ¯˜xVJï
+¦—úÁ9¡÷çîÌÐ/ ð`ÈÇ	
+#IW8nú†L)¿YaÐÂñàÀ‰tDΟ¿› ñh [3ºxÑ=\¯%®²Æ1膊íÇš«ÕY;•Ø¤Ž‰m4<1f’^ì!¯—ä4üÓƒ‹S(„­ƒøÃÐ×sDçÔOrÜ)™øc
+$V؉¬™‚{…üÙä³ÓYGIõaô³:^ž$’'‚:’jÊŒ¤kéYÙ-Ëê	8’
+xØY'BѬ£H¹+µ¸N„=ëæbºÌLNԁXRZÿêò2¿p9Ør}ÿíŸþç‘ûýpÒܐáÇ‹ÑãFü{X‰ÕSf‘i>_KVÒµŸí-<»ýÁƒ€G¡Œ$VÃGÇž½‹j˜zÃ	@	†Q©4ŠúkòÕcÚù'*t<8»™èqˆ|Ó$RÅ|—zا0ŽÜÆW¦¡¤õ*¸@ý«E‰[á-È%¢zÙullw‹®Û±ë\=Ù£Ÿðˆó¿²Ë(©Ó³$ÔZRu:Gª–xøƒc\vÅ
+Ùc¬»„븞$DyàûNƒ`þ-£¦Œ²b§ q™Ú»6Ú¤/qòØÍE–¤6Ǹòuaœ>ÿ+ÏÅôSKc~g,q̨€Ki.—kQ
+½!8*ó"Ào"TšÍc#5zH½²Ò©Ö1’
+2I’øŒ$ItøÀ¢h=F»Þgèç=ru†œP/‡eRAA¬Ã½›>ÀÍ[J¦WúŸ¿tWäoýü†`Ûrá!̦r
+`0¹CzÃnqÏñ´0¾¦‹&
+d¥Ik¿e—Ô1/=L2ûÈ´XÉ¾Tê‚뺛Ë`Ÿ²¾ æ*‘GkX.&*E¡CpçÓݐ‰FÑίžðîÕ{z˝²—kaçŠÒµéýâtm„©UÅÄ'FÌô£Oe74T“:ûÚ›*ÌŒ§ß.ÿ¼^Fg8«TøÕ ôÇ0Åwé.~OÃâ*é;R“«|"¸=Vø
+Û€?—+	`H
+KdeÐI,‹ŒR…BQ寸oç•¥5
+”ȼt;œŒ¡ð¼íìyÈJ&"êÊI	
+¢,§f¬^¿Z÷µÜxç²glS…Èy
+E”Ê°Gæ8 at HXîŠç’i'D‘õ‰Qì|ºÍA4§ûÍÙùiÿª×ÜGœ©¨õÎÃvxgÝzôQH&9¼MðbñspNEh™S§¿ß_k¼†œt T]†Å¸fç
+Þ>¦0cž>ùnam7¶Îê³Ûö—/?mÿ‡9ÞžXƒ‹ÖÿUp/‡åí~o6™ŽGåfý³ÍÊVÙqÆ>È7,+DHk¡,§—¸Q°ˆ,&%Íf†¿1ä±D®xγߎÎ\ö.°${ƒí"’XInYOxËq¸y]¦ý0
+ûg7ÃT>ÌâWD)ï
+¾¤€·—€¿¹,T&“µÂs/fñ”!ÍâÞ
+Wõ±Zæ:
+¶ÌñÜ8`g”¡Rû¯«žÀ\«O:ŸŸžì]ö—%òÁ3¥,ɁÁáÄ¢ Á
+:±T8—L²I¢z¨n5ø0‰x»zŠ:Z(w¨|—ˆ¤6˜¤IæJÄH¥ùë%ª'0—ŒÈŒ¸Póô`Ãcú—둺Õà}]è‹$“m7¹ÚÖé’	¿\˜³j45­Úù¿\§9V·6ªÉ™Ll)W2™GÚnr»FÛºi-ëÕ)m´x¨ë%”¶4{¨o—(‘,%âŒ0$(8ntÁM£%—buk£3åšÉÛëUXÚX¥Âs–½¤^3­<^.Ó©[
+*•A©–è×Y´T«]#mÛ•jJ}üÐyþjð}é‡^ê
+í)K!<Íœp9”Pžî\€ÆsÁŒ’\èR¾WÃün§ws;åëùïƒo—ñÁïÔJÁ¸uÊDxš½Y&½WÍv¸d¨†>ôäϣݳƒÁÅÞîÅ.Â~ð÷Ï%kåL¡üq9zhEL0¹!Ñî˜ã Ë‘¿~“o÷ü­ß9½Æ\‹SI]€²˜¹CØuÞYf“íj½%¨mf^!‹½,n­?kwÖùw‡ÔA³eÔ	.
+´Ü‡¢„Þ‰ÑúJò’¸èá.ÐZN£Ë…­yª)RÙ…»u)Ú5Öu¥ß´Þ<Åg¿ÐUñ1Ÿ¤ˆ’ð ÀiVâ™V„çéåKiáY±:Y¤ÅÝ»œF«ëtÃ4fËÍÓølÂÊÅÓÎÚ¤ˆÕ&"´ýNP£NÔ-K‚­J¢Õ;ó“`µ³àµ³PÐJ’pYX¸&)'Ö‡L|²Ðƒ¢ÎTëÕiÌ"-úôRíZï†iðÚY<û]¨*
+ÍŒÍÎYB¥ƒÛ¾
+@ @ @ @ ÿ–ªøñèìõdŒÎf¯í·oF7³³æÄ]ŒÑÍ|v¦uÛƒŽa6‚	œú­‚@ @ @ @ ÊÕºj<_-UMëËlDƒøùªÕ\-ÇãÅbä=¦í¡Ç{2]÷l†©3-ԏ\ÅudnèpH@Ø’ëN7óY®%ŠL(bWveÇæßa¿N3økµÄßLðÓ$TgÂG-þÝÌÑ+4]-[†¥?×ûÉ59Îö<Î¥ëŽ"{u±LÝ‘¶®ˆŠ+ñû¡1°°Zžõ&Óùpr=št&º>Küs<JÀÞ­þ¦•Õ²òɺúsSµt­Ý5õ>‡užçwÄ—¶D‘Éþø˜˜vƒ§ÛðÍGc4›Ûã?VK«ÕÑMKíô’늞"Ó
+FhÓòŠuÅ¡åº'Ò’‚Äi¯´‡Â/ÖÕÇÝžnlããöÀ[¢È¤<|Â}À{H"ð+Ó4²ìvÍÜÀ…îA‹IhEtÂo6JÙ<\³ùttójµÔ^¨$Q¡èr<Æäò<ëcâ}Lø‚2KK®'pÈ‘
+a
+œ‰ø|º®>²Tk`f	1»Š¬Pá <NÜé8E.‘Pzh]öô,)vGR¡
+Ê*2J¡;£×Õ¦60­nGï7Ôžue:OS›
+íIˆué¢+®)ŠLRüÜ!ïIn!~tcc~B8¹“ß¹Ú?´w$/¿ÓZÖe–œ°+¹Ðå?JKäcZb89
+­Ð#ÂIzÖê›–¡vô,¬¢kX+e‰JÆåacO‰-åaǵÕ|tEµ1DÅÃòÀq§G<#ܾï½è[Ðä]¡EV¨àùP\ŒãRÂÉipE>V_oÔ_!©¢õWB*¯
+ÂÁ÷¤×ï6Z¿¢åFÂ/mŠ"“òøq§ä—öŽì¿ü 7õ«æÆ~,º
+B5‹³è	5Á¹iŒJOËÊ;:lÇÊM	ljÕW
+SÕ¬V×ÈIí¢¥^B2kŽÚ|ašÿ^·\XÝ–¡õõŽnXk8ȧó‹w»ÚèƝ"ÿŸÖ˜­•	²'µ£¢¡u;=Õ¸¼Ú8Ã1´-"®pc*ß•žR)Û¼#”EÜIË¢MIgïËTàFøŠnŒ/ˆÕt|FuïælÞÅùÁ¼ì<í¶³ˆŠ–=1¢Ø
+*&	*6œœ¨ÔŽ¼Šp}°®^œ·ô‹ÆÓÁ%®–µ—
+C¿À4½9èëx	´1‰–>Å(CÙá†~Èyîð]<ÏGèmÃYüeÎ'Þö¦y‹)ê£ÙâzÞ˜-\4›ï=^*%Q¿!æa‡‹òM•o‹Dg2¹FöMúbžËK"¶ƒÁâ²d°‡ÛØ•ˆíGëj7>ƒÄýôÜ%P eWýÍÇ‘ow8}9m1›OÆh½–1K¼S…³¿ƒáHÊ> Xd¬•¦„fîꊴ®þNîÿ¼jƒ~ïèWçj{ÚnEÿÞýÅËñöŒµM»‡[ú(}[Þz“…sÒ×b†Œì0¼hö¡i›q(Š´o×U~»YϏåBÑ^øR6E·[³þ8YºÝ©Çà¦
+—sX/¸‰íHÞ^Ä|c{ ºåXR¤P©•X¢T©*3b¶îfðCα%ù€Ø"&Ë­"·3ŽZ[÷20µG½~K#ȐÄàßA°šÉï,ír‘EöJ[ŤS­b‘#ÕO¹-ÁF6¢Ãt,V¼e‰mš-/1ïh¾91s›ñAbó!ВLjüeZ\|mä,!8K';3‰ëꏵÿR·šª¥†iÕØLVše=!ìµ+·óëØÓ7hÞ´çv£7¹h;C]ÅÁ'¯ WÃÉ»gèÍæR34åHN‚âsê7™sêÐVdÉ	ü’o…->ÛAu  ;vÈRC*(Q @ @ ô•ÿ÷ÿ)üxŒ‹ÿO
+­-ÅkÒlí¢I I±_%/¦±Ôƒ èÉ¢ülvÉÎÂÌæ:Ä:_
+/ïZ£ñä²%Ž(ײ¬
+âXNG²~âøž{s]7´[4÷jF
+hëV;Ëæ}Ö´>5Ñ7×s\ü±íêe»Ên®áÅdšçEÏGÌýÕ7ó_;¹¹Þùû²÷	NÎ0A“™ÿu%¿à¨×É?€Ôuý$òmØQl9Ä
+­Ú±…C;J$NjÓ>Ô
+u˜T…ë†?‚O O[<îïMÎöÅ»¯<«Ð×kçè_.{‹É<'gäü«r¯êäÜc×…	`ÜÃð.î•a[î•aƒûP¼Û1÷ªvÎ}—†ü4ƒÞ!XÐß›ÌÁùçÁ³*9ò
+Ó$ mg&:š
+-íîJ6{´ÄÆÙ¦Y©ò`‘Ùf„Æ@'Þ&Ï—•qê¡ëGnd³@÷•^š´I·¥‹í)˜Ÿõ_ÒŸÊ7íû’yY«Œi¬ÓĵÍAú!²-?ñéÈI± Í)VJÇÍ Á®°GÛ«Í×{ãøåCÄñ½ W"x–Á	Ê¿rþ•rævàQLó†OÄ`™zž£0Å	Ršan®…QûÇYXʨ~Íßé<cˆª%ñi>™Êaöñ«x­F‘=pÛ	bÓ¢Ì5»6±W3cÄ?Mû#ù^‡Ñ]«™ÿͲ÷ïõ¾ŽGÃÑðàD£ZVôT· óÉ9»¶ÚÅØH"ß-8ÛVŒ(l`{1
+	Ž‚(¼¹–fN‹Ö2ªOø;–M借/{‰šã—Ç`FZtLRš‚=FÐw<m×ÅÇãwZÑ{¶ìýe¸ÿîà•N²‚ºådz(IÒ(.ºXIPéD oÈ£
+œ€.uè'…aD€ :§¬Ìtº,KwBTºW2•%*¨¾^ÚÓËzr$aˆü=ÕT?Õ[’뉑Ž,{«9b´Å·M†˜Ícä)ñ­>D^´†Ü·
+áÛU†”Í?ß
+;€(×öÞb¯¤(Œtº*ÊvÂQ8W¬~_‘œ(7{†gÓ=§
+}ºPñ
+ª…%ÕÄs+&
+N	8çï><Ôšs6Âvl—ƒVƒ­jõ»V¾Ãx­Õ¢$\/SÇîuWnÙ.ŠŠ`°îÝ\[t¶ëp-븓e}xúט\u¶ÿVó-ú$IÊ#3ró­f§ÓçZñN¦N5ÿ*®õ"Û£Ín*¯/¹zÙ0ðÑ(VßØÆkÈ«wÿ°ì霠N³•›lJŽòÜÌ{l³-ÆÊÍ6fѪgMx,¿¹ÆEQó8{È#3éR<Ù~qׯ¸Œºž2¥™NGõèL6µvî¨[šÏ}¬b0!q1g¸ª0,MZÅIi"éf›.&ï‹À²F‚WsrF—ŸÈPÍ<›¿É“–F«ÕT$ì&n1ùŒ±§D{Ëz‹²å­¶Ë¨½ÊæÇ­ñëÇð|{qãšØ”r1…â'˜ë±¯q°Mä×4_YŸÚq+ô·Üsôb–L°[¢_“×9Ø.ô·š/ïâsj<ù™`1Zh	àW}‹éN}¯øû2t<卦ÛæO~8¼ÝäZvÿØ>QINºUX#qq¤“òôjmš¹e½E~«í~¤{¾Ìf…º§Õâ(B”²°%YnÓª§Ü¦Ãå]RäuÖ_tŸ÷¶+ßE3+À4DžŠýíòïg¬Ýß^lK.X43€Q;-{ïuÎÿónÎþóú¹¿c:<ÅìT0Rf®}æŸWçý+[…Åc~ç	>i^þ~©¹„½=¢é®Ž<ß
+¤ðpìû|¬·ÝÈ‚„®6E=@›WÚ<ù‡š·S,ÿ¹˜/&gs‚÷ôî9‰â'šãQÓ½˜¶¦iäÅV
+
+Õ0¸è.‚nÔ‹/f=õüÃŃ÷Í’†Év•närËÃ}j’æK¦ñþiÈ!;¹ozþÈÑlQ´´JlàZ†é|ñe yŸîv8Š=×ë#Ù¿¶?»VM at wí¡æ\O÷ëÚ³õm”³t&×qÃL½xþöÏJï~3óìçIõ±ç‰âÜÍ©ï¹v¥65§­9d5ýjÆÒÕ@xâ(áCõ}ß‘.kŠZ</²tŒš)G/첦äOáç<)Ó|¶Â¡öÕ‰¿¾®bN¥¬ûÈYžI»_ž)Ãd.’»8±“yt§”kMâè^~XÆy¦o7i²ŒÖe ˜ó­­æÙkÿE
+
+
+
+
\ No newline at end of file

Modified: trunk/build/kit-runtime/examples/portfolio/README.txt
===================================================================
--- trunk/build/kit-runtime/examples/portfolio/README.txt	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/build/kit-runtime/examples/portfolio/README.txt	2009-07-23 21:56:54 UTC (rev 1181)
@@ -2,10 +2,13 @@
 
 Create the example dataset in Derby by running <derby home>/bin/ij customer-schema.sql
 
-Put the <derby home>/lib/derbyclient.jar to the <teiid embedded home>/extensions directory.
+Put the <derby home>/lib/derbyclient.jar to the <teiid home>/extensions directory.
 
-Run the demo with run.bat or run.sh.
+Copy the PortfolioModel/Portolio.vdb file to the <teiid home>/deploy directory.
 
-This will execute the query contained in the run script against a vdb that integrates the
-Derby datasource with file based data contained in the marketdata-price.txt file. 
+Use the simple client example run script i.e. 
 
+$run.sh portfolio "select * from CustomerAccount"
+
+That will execute the query against the CustomerAccount view in the Portfolio VDB running in Teiid embedded mode. 
+

Deleted: trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt
===================================================================
--- trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt	2009-07-23 21:56:54 UTC (rev 1181)
@@ -1,4 +0,0 @@
-MarketData.Price.location = marketdata-price.txt
-MarketData.Price.delimiter = ,
-MarketData.Price.headerLine = 1
-MarketData.Price.skipHeaderLines = 1

Added: trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt
===================================================================
--- trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt	                        (rev 0)
+++ trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,6 @@
+MarketData.Price.location = marketdata-price.txt
+MarketData.Price.delimiter = ,
+MarketData.Price.headerLine = 1
+MarketData.Price.skipHeaderLines = 1
+MarketData.Price.columns=SYMBOL,PRICE
+MarketData.Price.types=string,bigdecimal


Property changes on: trunk/build/kit-runtime/examples/portfolio/marketdata-def.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: trunk/build/kit-runtime/examples/portfolio/run.bat
===================================================================
--- trunk/build/kit-runtime/examples/portfolio/run.bat	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/build/kit-runtime/examples/portfolio/run.bat	2009-07-23 21:56:54 UTC (rev 1181)
@@ -1,8 +0,0 @@
-rem First one sets the path for client jars and VDB
-set CLIENT_PATH=java/*;PortfolioModel/
-
-rem Second one for the JARs in Teiid embedded
-set TEIID_PATH=../../client/teiid-${pom.version}-client.jar;../..;../../deploy;../../lib/patches/*;../../lib/*;../../extensions/*
-
-java -cp %CLIENT_PATH%;%TEIID_PATH% JDBCClient "select * from CustomerAccount"
-

Deleted: trunk/build/kit-runtime/examples/portfolio/run.sh
===================================================================
--- trunk/build/kit-runtime/examples/portfolio/run.sh	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/build/kit-runtime/examples/portfolio/run.sh	2009-07-23 21:56:54 UTC (rev 1181)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# First one sets the path for client jars and VDB
-CLIENT_PATH=java/*:PortfolioModel/
-
-#Second one for the JARs in Teiid embedded
-TEIID_PATH=../../client/teiid-${pom.version}-client.jar:../..:../../deploy:../../lib/patches/*:../../lib/*:../../extensions/*
-
-java -cp ${CLIENT_PATH}:${TEIID_PATH} JDBCClient "select * from CustomerAccount"

Added: trunk/build/kit-runtime/examples/simpleclient/JDBCClient.class
===================================================================
(Binary files differ)


Property changes on: trunk/build/kit-runtime/examples/simpleclient/JDBCClient.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Copied: trunk/build/kit-runtime/examples/simpleclient/JDBCClient.java (from rev 1172, trunk/build/kit-runtime/examples/portfolio/java/JDBCClient.java)
===================================================================
--- trunk/build/kit-runtime/examples/simpleclient/JDBCClient.java	                        (rev 0)
+++ trunk/build/kit-runtime/examples/simpleclient/JDBCClient.java	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.teiid.jdbc.TeiidDataSource;
+
+public class JDBCClient {
+	public static void main(String[] args) throws Exception {
+		if (args.length < 2) {
+			System.out.println("usage: JDBCClient <vdb> <sql-command>");
+			System.exit(-1);
+		}
+
+		System.out.println("Executing using the TeiidDriver");
+		execute(getDriverConnection(args[0]), args[1]);
+
+		System.out.println("");
+		System.out.println("Executing using the TeiidDataSource");
+		// this is showing how to make a Data Source connection. 
+		execute(getDataSourceConnection(args[0]), args[1]);
+	}
+	
+	static Connection getDriverConnection(String vdb) throws Exception {
+		String url = "jdbc:metamatrix:"+vdb+"@../../deploy.properties";
+		Class.forName("org.teiid.jdbc.TeiidDriver");
+		
+		return DriverManager.getConnection(url,"admin", "teiid");		
+	}
+	
+	static Connection getDataSourceConnection(String vdb) throws Exception {
+		TeiidDataSource ds = new TeiidDataSource();
+		ds.setDatabaseName(vdb);
+		ds.setUser("admin");
+		ds.setPassword("teiid");
+		ds.setEmbeddedBootstrapFile("../.../deploy.properties");
+		/* Alternatively server mode would be		
+		 * ds.setServerName("localhost");
+		 * ds.setPortNumber(31000);
+		 */
+		return ds.getConnection();
+	}
+	
+	public static void execute(Connection connection, String sql) throws Exception {
+		try {
+			Statement statement = connection.createStatement();
+			
+			ResultSet results = statement.executeQuery(sql);
+			
+			ResultSetMetaData metadata = results.getMetaData();
+			int columns = metadata.getColumnCount();
+			
+			while(results.next()) {
+				for (int i = 0; i < columns; i++) {
+					System.out.print(results.getString(i+1));
+					System.out.print(",");
+				}
+				System.out.println("");
+			}
+			results.close();
+			statement.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} finally {
+			if (connection != null) {
+				connection.close();
+			}
+		}		
+	}
+}


Property changes on: trunk/build/kit-runtime/examples/simpleclient/JDBCClient.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: trunk/build/kit-runtime/examples/simpleclient/readme.txt (from rev 1172, trunk/build/kit-runtime/examples/portfolio/java/readme.txt)
===================================================================
--- trunk/build/kit-runtime/examples/simpleclient/readme.txt	                        (rev 0)
+++ trunk/build/kit-runtime/examples/simpleclient/readme.txt	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,11 @@
+JDBCClient.java shows making connections to Teiid in embedded mode through both a Driver
+and a DataSource.
+
+The program expects two arguments <vdb name> and <sql query>.  There are helper run scripts 
+that can be run as follows:
+
+$run.sh admin "select * from groups"
+
+Note that the query is in quotes so that it is understood as a single argument.
+
+See the other examples for deployable .vdb and .def files to create vdbs.
\ No newline at end of file


Property changes on: trunk/build/kit-runtime/examples/simpleclient/readme.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: trunk/build/kit-runtime/examples/simpleclient/run.bat (from rev 1172, trunk/build/kit-runtime/examples/portfolio/run.bat)
===================================================================
--- trunk/build/kit-runtime/examples/simpleclient/run.bat	                        (rev 0)
+++ trunk/build/kit-runtime/examples/simpleclient/run.bat	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,8 @@
+rem First one sets the path for the client
+set CLIENT_PATH=.
+
+rem Second one adds the Teiid client
+set TEIID_PATH=../client/teiid-${pom.version}-client.jar
+
+java -cp %CLIENT_PATH%;%TEIID_PATH% JDBCClient %*
+

Copied: trunk/build/kit-runtime/examples/simpleclient/run.sh (from rev 1172, trunk/build/kit-runtime/examples/portfolio/run.sh)
===================================================================
--- trunk/build/kit-runtime/examples/simpleclient/run.sh	                        (rev 0)
+++ trunk/build/kit-runtime/examples/simpleclient/run.sh	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# First one sets the path for the client
+CLIENT_PATH=.
+
+#Second one for the Teiid client jar
+TEIID_PATH=../../client/teiid-${pom.version}-client.jar
+
+java -cp ${CLIENT_PATH}:${TEIID_PATH} JDBCClient "$@"


Property changes on: trunk/build/kit-runtime/examples/simpleclient/run.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/build/kit-runtime/examples/vdbless-portfolio/README.txt
===================================================================
--- trunk/build/kit-runtime/examples/vdbless-portfolio/README.txt	                        (rev 0)
+++ trunk/build/kit-runtime/examples/vdbless-portfolio/README.txt	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,11 @@
+Follow the same derby setup instructions as the portfolio example.
+
+Copy the vdbless.def file to the <teiid home>/deploy directory. 
+
+Use the simple client example run script i.e. 
+
+$run.sh vdblessportfolio "select * from product, price where product.symbol=price.symbol"
+
+That will execute the query against both Derby and the text file using the 
+vdbless connector supplied metadata running in Teiid embedded mode. 
+


Property changes on: trunk/build/kit-runtime/examples/vdbless-portfolio/README.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/build/kit-runtime/examples/vdbless-portfolio/vdbless.def
===================================================================
--- trunk/build/kit-runtime/examples/vdbless-portfolio/vdbless.def	                        (rev 0)
+++ trunk/build/kit-runtime/examples/vdbless-portfolio/vdbless.def	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VDB>
+    <VDBInfo>
+<!--
+  Name and version will determine the deploy location, which is of the form
+  <Teiid Home>/deploy/<vdb name>/<vdb version>
+-->
+        <Property Name="Name" Value="VDBLessPortfolio" />
+        <Property Name="Version" Value="1" />        
+<!-- 
+  Setting to use connector supplied metadata. Can be "true" or "cached".  
+  "true" will obtain metadata once for every launch of Teiid. 
+  "cached" will save a file containing the metadata into 
+  the deploy/<vdb name>/<vdb version/META-INF directory
+-->
+        <Property Name="UseConnectorMetadata" Value="cached" />
+    </VDBInfo>
+    
+<!-- 
+  Each model represents a access to one or more connector bindings.
+  The name of the model will be used as a top level schema name
+  for all of the metadata imported from the connector.
+
+  NOTE: Multiple model, with different import settings, can be bound to 
+  the same connector binding and will be treated as the same source at
+  runtime. 
+-->        
+    <Model>
+        <Property Name="Name" Value="MarketData" />
+        <ConnectorBindings>
+            <Connector Name="Text Connector" />
+        </ConnectorBindings>
+    </Model>
+    <Model>
+        <Property Name="Name" Value="Accounts" />
+        
+        <ConnectorBindings>
+            <Connector Name="Derby Connector" />
+        </ConnectorBindings>
+        
+<!-- 
+  JDBC Import settings 
+  
+  importer.useFullSchemaName directs the importer to drop the source 
+  schema from the Teiid object name, so that the Teiid fully qualified name
+  will be in the form of <model name>.<table name>
+-->
+        <Property Name="importer.useFullSchemaName" Value="false"/>
+    </Model>
+    
+<!-- 
+  Connector bindings follow the ComponentTypes defined in <Teiid home>/deploy/configuration.xml
+  Defining connector bindings in the .def file makes them local to this VDB.  
+  Connector bindings can also be defined in the configuration.xml file after the ComponentDefinitions
+  and will be available for use by all vdbs.
+-->    
+    <ConnectorBindings>
+        <Connector Name="Text Connector" ComponentType="Text File Connector">
+            <Properties>
+                <Property Name="Immutable">true</Property>
+                <Property Name="DescriptorFile">${teiid.home}/examples/portfolio/marketdata-def.txt</Property>
+            </Properties>
+        </Connector>
+        <Connector Name="Derby Connector" ComponentType="Apache Derby Embedded Connector">
+            <Properties>
+                <Property Name="URL">jdbc:derby://localhost:1527/teiid/accounts</Property>
+                <Property Name="ConnectorClassPath">extensionjar:derbyclient.jar</Property>
+            </Properties>
+        </Connector>
+    </ConnectorBindings>
+</VDB>
\ No newline at end of file

Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/adminshell_guide.xml
===================================================================
--- trunk/documentation/admin-guide/src/main/docbook/en-US/adminshell_guide.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/admin-guide/src/main/docbook/en-US/adminshell_guide.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -24,9 +24,8 @@
 
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "6.0.0 GA">
-        <!ENTITY copyrightYear "2008">
-        <!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY % CustomDTD SYSTEM "../../../../../custom.dtd">
+%CustomDTD;
 ]>
 
 <book>

Modified: trunk/documentation/connector-developer-guide/src/main/docbook/en-US/connector_developer_guide.xml
===================================================================
--- trunk/documentation/connector-developer-guide/src/main/docbook/en-US/connector_developer_guide.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/connector-developer-guide/src/main/docbook/en-US/connector_developer_guide.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -24,9 +24,8 @@
 
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "6.0.0 GA">
-        <!ENTITY copyrightYear "2008">
-        <!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY % CustomDTD SYSTEM "../../../../../custom.dtd">
+%CustomDTD;
 ]>
 
 <book>

Added: trunk/documentation/custom.dtd
===================================================================
--- trunk/documentation/custom.dtd	                        (rev 0)
+++ trunk/documentation/custom.dtd	2009-07-23 21:56:54 UTC (rev 1181)
@@ -0,0 +1,3 @@
+<!ENTITY versionNumber "6.2.0">
+<!ENTITY copyrightYear "2009">
+<!ENTITY copyrightHolder "Red Hat, Inc.">


Property changes on: trunk/documentation/custom.dtd
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/documentation/jdbc-connector-guide/src/main/docbook/en-US/jdbc-connector.xml
===================================================================
--- trunk/documentation/jdbc-connector-guide/src/main/docbook/en-US/jdbc-connector.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/jdbc-connector-guide/src/main/docbook/en-US/jdbc-connector.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -24,9 +24,8 @@
 
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "6.0.0 GA">
-        <!ENTITY copyrightYear "2008">
-        <!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY % CustomDTD SYSTEM "../../../../../custom.dtd">
+%CustomDTD;
 ]>
 
 <book>

Modified: trunk/documentation/quick-start-example/pom.xml
===================================================================
--- trunk/documentation/quick-start-example/pom.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/pom.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>quick-start-guide</artifactId>
   <packaging>jdocbook</packaging>
-  <name>Quick Start Embedded Guide</name>
+  <name>Quick Start Guide</name>
   <description>The Teiid Quick Start guide</description>
   <build>
     <plugins>

Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/connect-vdb.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -2,26 +2,29 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <chapter id="OpenConnection">
   <title>Connecting to a VDB through JDBC</title>
-  <para>At this point you have deployed Teiid Embedded and your VDB. Now it's time to connect the sample application
+  <para>At this point you have deployed Teiid and your VDB. Now it's time to connect the sample application
    to this VDB, issue SQL queries, and view the returned, integrated data. Note that
     this process is no different than connecting to any other JDBC source.</para>
   <sect1>
     <title>Stand-alone Java Application Deployment</title>
     <para>
       For a Java application to connect to a JDBC source, it needs a URL, user-id, and password. To
-      connect to your VDB all you need is URL and any additional optional properties that you would like to set
-      such as log file, number of threads etc. Currently the Teiid Embedded is not associated with any user
-      authentication system, so user-id and password are not required. The JDBC connection is supported through
-      <emphasis>"com.metamatrix.jdbc.EmbeddedDriver"</emphasis>
-      driver requires the URL syntax of
+      connect to your VDB all you need is a URL and any additional optional properties that you would like to set.
+       Teiid defaults to allowing the admin user with password teiid.  Additional user accounts can be added through
+       Teiid extensible MembershipDomain mechanism.  A JDBC connection can be obtained through the Teiid driver
+      <emphasis>"org.teiid.jdbc.TeiidDriver"</emphasis>
+      with the URL syntax of
     </para>
     <para>
-      <emphasis>jdbc:metamatrix:&lt;VDB-Name&gt;</emphasis>
+      <emphasis>jdbc:teiid:&lt;VDB-Name&gt;@((mm|mms)://&lt;host name&gt;:&lt;port&gt;)|(&lt;path to deploy.properties&gt;)</emphasis>
     </para>
-    <para/>
-    <para>to connect to the VDB. You can add any additional optional properties at the end after the semi-colon(;) using name=value
-      format. If multiple properties are defined, they should be separated additional semi-colons. For example</para>
-    <para />
+	<para>When the path to deploy.properties is specified Teiid operates in
+		embedded mode and runs in the same VM as the application.
+    </para>
+	<para>
+		You can add optional properties at the end of the URL using a semi-colon(;) name=value
+		format. For example</para>
+	<para />
     <para>
       <emphasis>jdbc:metamatrix:&lt;VDB-Name&gt;;dqp.logFile=/home/query.log</emphasis>
     </para>
@@ -32,14 +35,14 @@
     </para>
     <programlisting><![CDATA[
       public void execute() throws SQLException {
-          String url = "jdbc:metamatrix:Accounts";
+          String url = "jdbc:metamatrix:Portfolio at mm://localhost:31000";
           String sql = "select firstname, lastname from customer";
           
-          Class.forName("com.metamatrix.jdbc.EmbeddedDriver");
+          Class.forName("org.teiid.jdbc.TeiidDriver");
           
           Connection connection;
           try{
-              connection = DriverManager.getConnection(url);
+              connection = DriverManager.getConnection(url, "admin", "teiid");
               Statement statement = connection.createStatement();
               ResultSet results = statement.executeQuery(sql);
               while(results.next()) {
@@ -61,42 +64,43 @@
           }
       }      
     ]]></programlisting>
-    <para>You can also use <emphasis>com.metamatrix.jdbc.EmbeddedDataSource</emphasis>
+    <para>You can also use <emphasis>org.teiid.jdbc.TeiidDataSource</emphasis>
       to make connection in your Java application. For example, you can use following code fragment to make a 
       connection to the VDB and issuing the query exactly same as in the above example</para>
       <programlisting><![CDATA[
-        EmbeddedDataSource ds = new EmbeddedDataSource(); 
-        ds.setDatabaseName("Accounts");
+        TeiidDataSource ds = new TeiidDataSource(); 
+        ds.setDatabaseName("Portfolio");
+        ds.setEmbeddedBootstrapFile("<teiid home>/deploy.properties");
+        ds.setUser("admin");
+        ds.setPassword("teiid");
         
         Connection connection = ds.getConnection();
         ...
       ]]></programlisting>
-      <para>EmbeddedData source also provides an option to set optional parameters using the "set" methods on the 
+      <para>TeiidDataSource source also provides an option to set optional parameters using the "set" methods on the 
        data source look. For all the allowable properties at the 
        <ulink url="https://www.jboss.org/community/docs/DOC-13158">data source properties</ulink>.</para>       
   </sect1>
   <sect1>
-  <title>Testing Your Teiid Embedded Deployment</title>
-  <para>The Teiid Embedded installation includes a simple Java class which demonstrates JDBC access of the deployed VDB.
+  <title>Testing Your Teiid Deployment</title>
+  <para>The Teiid installation includes a simple Java class which demonstrates JDBC access of the deployed VDB.
   To execute this demonstration, follow these steps:</para> 
   <orderedlist numeration="arabic">
     <listitem><para>Ensure Derby is running</para></listitem>
-    <listitem><para>Change to the /examples/portfolio directory within your Teiid Embedded installation</para></listitem>
+    <listitem><para>Change to the /examples/portfolio directory within your Teiid installation</para></listitem>
     <listitem><para>Execute the run script (either for Linux or Windows)</para></listitem>
   </orderedlist>
     <para>The sample query, "select * from CustomerAccount", queries the view model and, from that, queries the two underlying
     data sources: one relational, one file-based. All the sample Java class does is connect to the VDB, issue the query, 
-    and print the results. Teiid Embedded does the "heavy lifting". 
+    and print the results. Teiid does the "heavy lifting" of integrating the results. 
     (For the complete code used in this example, look in the "examples/portfolio" directory.)</para>
     <para>
-    You are encouraged to experiment with queries that go beyond the simple "select * from CustomerAccount". Additionally,
-    there is a sample Yahoo connector that returns stock market data. It can be used in place of the text file so the 
-    market data is more timely. Go to the Teiid Connector Sandbox projects for more information. 
+    You are encouraged to experiment with queries that go beyond the simple "select * from CustomerAccount". 
    </para>
      
-  <para>If your application is Web based, you can also deploy Teiid Embedded in an application server 
+  <para>If your application is Web based, you can also deploy Teiid in an application server 
   and treat it as any other JDBC source by creating a connection pool with the 
-  <emphasis>com.metamatrix.jdbc.EmbeddedDataSource</emphasis> and assigning it a JNDI name. 
+  <emphasis>org.teiid.jdbc.TeiidDataSource</emphasis> and assigning it a JNDI name. 
   Refer to <ulink url="https://www.jboss.org/community/docs/DOC-13183">deployment to application server</ulink> for more information.</para>
   </sect1>   
 </chapter>
\ No newline at end of file

Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/deployment.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -6,13 +6,13 @@
   Note there are two steps involved in this deployment:</para>
   <orderedlist>
     <listitem>
-      <para>Deploying Teiid Embedded</para>
+      <para>Deploying Teiid</para>
     </listitem>
     <listitem>
-      <para>Deploying VDB</para>
+      <para>Deploying a VDB</para>
     </listitem>
   </orderedlist>
-  <para> Teiid Embedded is typically used in one of two manners:</para>
+  <para> Teiid is typically used in one of two manners:</para>
   <itemizedlist>
     <listitem>
       <para>
@@ -26,17 +26,17 @@
     </listitem>
   </itemizedlist>
   <para />
-  <para>This example deploys Teiid Embedded as a stand-alone Java application. The sample deployment is shown below.
+  <para>This example deploys Teiid within a stand-alone Java application. The sample deployment is shown below.
   You can find more details about deploying to application servers on the Teiid web-site</para>
   <para />
   <sect1 id="stand-alone-deployment">
     <title>Stand-alone Application Deployment</title>
     <orderedlist>
       <listitem>
-        <para>Add the "${embedded root}/teiid-${version}-client.jar" to your application classpath</para>
+        <para>Add the "${teiid.home}/client/teiid-${version}-client.jar" to your application classpath</para>
       </listitem>
       <listitem>
-        <para>Place your VDB in a the "${embedded root}/deploy" or another location referenced by the deploy.properties file. 
+        <para>Place your VDB in a the "${teiid.home}/deploy". 
         </para>
       </listitem>
       <listitem>

Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/download.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -4,7 +4,7 @@
   <title>Download</title>
   <para>
     You need to download the binaries for
-    <ulink url="http://teiid.org/Download.html">Teiid Embedded</ulink>
+    <ulink url="http://teiid.org/Download.html">Teiid</ulink>
     . Note that there are three different artifacts are available for download.
   </para>
   <orderedlist>
@@ -12,34 +12,34 @@
       <para>Teiid Source - contains all the source code for all modules</para>
     </listitem>
     <listitem>
-      <para>Teiid Binary - contains all the binary code for all modules</para>
+      <para>Teiid Adminshell - contains the admin client binary code</para>
     </listitem>
     <listitem>
-      <para>Teiid Embedded Kit - contains only required modules and their required 3rd party
+      <para>Teiid Kit - contains only required modules and their required 3rd party
         dependencies</para>
     </listitem>
   </orderedlist>
   <para>
     For this Quick Start, download the
-    <emphasis>Teiid Embedded Kit</emphasis>
+    <emphasis>Teiid Kit</emphasis>
     and extract this tar/zip file to a directory you can access.
   </para>
-  <para>In the expanded directory, you will find "teiid-${version}-client.jar", which is the main client binary jar
-    file for Teiid Embedded, and the "lib" and "extension" directories containing binaries either directly or indirectly
-    required to execute Teiid Embedded. Later sections describe installing these artifacts.</para>
+  <para>In the expanded directory, you will find "client/teiid-${version}-client.jar", which is the main client binary jar
+    file for Teiid, and the "lib" and "extension" directories containing binaries either directly or indirectly
+    required to execute Teiid. Later sections describe installing these artifacts.</para>
   <note>
-    <para>Teiid Embedded requires <ulink url="http://java.sun.com/javase/downloads">Java 6</ulink> to run.
+    <para>Teiid requires <ulink url="http://java.sun.com/javase/downloads">Java 6</ulink> to run.
     </para>
   	<para>
       Access to physical data sources such as Oracle, MS-SQL Server, DB2, and Sybase through Teiid relies upon
-      the user supplying their own JDBC drivers in the deployment. Teiid Embedded
+      the user supplying their own JDBC drivers in the deployment. Teiid
       has been tested extensively with
       <ulink url="http://www.datadirect.com">DataDirect</ulink>
        If you have access to these JDBC drivers, we recommend their use.
     </para>
     <!-- 
     <para>Free open source software JDBC drivers for MySQL, Postgres,and Derby are included in the "lib" folder as the LGPL
-      license permits them to be included with the Teiid Embedded kit.</para>
+      license permits them to be included with the Teiid kit.</para>
     -->
   </note>
 </chapter>
\ No newline at end of file

Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/example-explained.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -5,10 +5,10 @@
   <sect1>
     <title>Portfolio Application Explained</title>
     <para>
-      To demonstrate how Teiid Designer and Teiid Embedded work together, follow these steps to build a simple
+      To demonstrate how Teiid Designer and Teiid work together, follow these steps to build a simple
       portfolio valuation virtual database. The investor's portfolio information is stored in a Derby database and
       "current" stock prices are stored in a delimited text file. When completed, a single query will cause
-      Teiid Embedded to access the relational and non-relational sources, calculate the portfolio values, and
+      Teiid to access the relational and non-relational sources, calculate the portfolio values, and
       return the results. Here are some of key points to consider as you build this example:
       <itemizedlist>
         <listitem>
@@ -19,7 +19,7 @@
         </listitem>
         <listitem>
           <para>Imagine how much more complete this would be if you replaced the text file with a connection
-            to a financial Web site. (Hint: You can with Teiid Embedded and a custom connector.)</para>
+            to a financial Web site. (Hint: You can with Teiid and a custom connector.)</para>
         </listitem>
       </itemizedlist>
     </para>
@@ -45,7 +45,7 @@
       </listitem>
       <listitem>
         <para>
-          <link linkend="step-4">Step-4: Deploy the VDB in Teiid Embedded</link>
+          <link linkend="step-4">Step-4: Deploy the VDB in Teiid</link>
         </para>
       </listitem>
       <listitem>

Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/learn.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/learn.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/learn.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -15,8 +15,8 @@
       returns the top level results to the application.</para>
   </sect1>
   <sect1>
-    <title>What is Teiid Embedded?</title>
-    <para> Teiid Embedded is a container for deploying your VDB. Before you can access your data in a federated
+    <title>What is Teiid?</title>
+    <para> Teiid is runtime for executing queries against a VDB. Before you can access your data in a federated
       manner, use the Teiid Designer to build a VDB. This picture shows the relationship between the tools
       involved.</para>
     <figure id="lifecycle">

Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/preface.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -2,12 +2,12 @@
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <preface>
   <title>Preface</title>
-  <para> Teiid Embedded offers the power of a federated relational query engine for use with any Java
+  <para> Teiid offers the power of a federated relational query engine for use with any Java
     application - without the need for a separate server process. Accessing your federated data is as easy as
     making a JDBC connection to any relational data source. This guide will take you through</para>
   <itemizedlist>
     <listitem>
-      <para>Deployment of Teiid Embedded in your environment</para>
+      <para>Deployment of Teiid in your environment</para>
     </listitem>
     <listitem>
       <para>Building and deploying a Virtual Database(VDB)</para>
@@ -22,8 +22,8 @@
     Platform.</para>
   <sect1>
     <title>What is This Guide About?</title>
-    <para>This guide takes you through an introduction to the concepts important to Teiid Embedded, 
-    downloading the software,  and building and deploying a demonstration virtual database in 60 minutes.
+    <para>This guide takes you through an introduction to the concepts important to Teiid, 
+    downloading the software, and building and deploying a demonstration virtual database in 60 minutes.
     There is a lot to cover, so let's begin!</para>
   </sect1>
   <note>

Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/quick_start_example.xml
===================================================================
--- trunk/documentation/quick-start-example/src/main/docbook/en-US/quick_start_example.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/quick-start-example/src/main/docbook/en-US/quick_start_example.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -24,14 +24,14 @@
 
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "6.0.0">
-        <!ENTITY copyrightYear "2008">
-        <!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY % CustomDTD SYSTEM "../../../../../custom.dtd">
+%CustomDTD;
 ]>
+
 <book>
   <bookinfo>
     <title>Teiid - Scalable Information Integration</title>
-    <subtitle>Teiid Embedded Quick Start Example</subtitle>
+    <subtitle>Teiid Quick Start Example</subtitle>
     <releaseinfo>&versionNumber;
     </releaseinfo>
     <productnumber>&versionNumber;

Modified: trunk/documentation/reference/src/main/docbook/en-US/Reference.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/Reference.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/reference/src/main/docbook/en-US/Reference.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -24,10 +24,10 @@
 
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "6.0.0">
-        <!ENTITY copyrightYear "2008">
-        <!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY % CustomDTD SYSTEM "../../../../../custom.dtd">
+%CustomDTD;
 ]>
+
 <book>
   <bookinfo>
     <title>Teiid - Scalable Information Integration</title>

Modified: trunk/documentation/salesforce-connector-guide/src/main/docbook/en-US/salesforce_connector_guide.xml
===================================================================
--- trunk/documentation/salesforce-connector-guide/src/main/docbook/en-US/salesforce_connector_guide.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/salesforce-connector-guide/src/main/docbook/en-US/salesforce_connector_guide.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -24,10 +24,10 @@
 
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "6.1.0">
-        <!ENTITY copyrightYear "2009">
-        <!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY % CustomDTD SYSTEM "../../../../../custom.dtd">
+%CustomDTD;
 ]>
+
 <book>
   <bookinfo>
     <title>Teiid - Salesforce Connector Guide</title>

Modified: trunk/documentation/server-extensions-guide/src/main/docbook/en-US/server_extensions_guide.xml
===================================================================
--- trunk/documentation/server-extensions-guide/src/main/docbook/en-US/server_extensions_guide.xml	2009-07-23 21:06:42 UTC (rev 1180)
+++ trunk/documentation/server-extensions-guide/src/main/docbook/en-US/server_extensions_guide.xml	2009-07-23 21:56:54 UTC (rev 1181)
@@ -24,9 +24,8 @@
 
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "6.0.0 GA">
-        <!ENTITY copyrightYear "2008">
-        <!ENTITY copyrightHolder "Red Hat, Inc.">
+<!ENTITY % CustomDTD SYSTEM "../../../../../custom.dtd">
+%CustomDTD;
 ]>
 
 <book>

More information about the teiid-commits mailing list