[teiid-commits] teiid SVN: r2560 - in branches/7.1.x: jboss-integration/src/main/java/org/teiid/jboss/deployers and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-09-13 12:58:31 -0400 (Mon, 13 Sep 2010)
New Revision: 2560

Modified:
   branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml
   branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
Log:
TEIID-1256 update to purge on add and to update the docs.

Modified: branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml
===================================================================
--- branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml	2010-09-13 16:55:45 UTC (rev 2559)
+++ branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/vdb-deployment.xml	2010-09-13 16:58:31 UTC (rev 2560)
@@ -13,6 +13,10 @@
      <title>Deploying a VDB</title>
         <para>Once you have a "VDB" built it can be deployed in Teiid runtime in different ways.</para>
         
+        <warning><para>If <link linkend="vdb-versioning">VDB versioning</link> is not used to give distinct version numbers, overwriting a VDB of the same name
+        will terminate all connections to the old VDB.  It is recommended that VDB versioning be used for production systems.
+        </para></warning>
+        
         <section>
             <title>Direct File Deployment</title>
             <para>Copy the VDB file into the "&lt;jboss-install&gt;/server/&lt;profile&gt;/deploy" directory. 
@@ -47,7 +51,7 @@
             deploy a VDB use this method. This method is preferable for OEM users, who are trying to extend the
             Teiid's capabilities through their applications.</para>
         </section>
-                 
+        
    </section>
 
    <section>

Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java	2010-09-13 16:55:45 UTC (rev 2559)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java	2010-09-13 16:58:31 UTC (rev 2560)
@@ -145,7 +145,11 @@
 				}
     		}
     	}
-    	
+    	/*
+    	 * having only a single clientserviceregistry means that the admin and jdbc ports are functionally equivalent.
+    	 * this is an undocuemented feature.  Designer integration relies on this to use the same port
+    	 * for admin and preview logic.
+    	 */
     	this.csr.registerClientService(ILogon.class, logon, LogConstants.CTX_SECURITY);
     	this.csr.registerClientService(DQP.class, proxyService(DQP.class, this.dqpCore, LogConstants.CTX_DQP), LogConstants.CTX_DQP);
     	this.csr.registerClientService(Admin.class, proxyService(Admin.class, admin, LogConstants.CTX_ADMIN_API), LogConstants.CTX_ADMIN_API);
@@ -188,12 +192,12 @@
 		this.vdbRepository.addListener(new VDBLifeCycleListener() {
 
 			@Override
-			public void added(String name, int version) {
+			public void removed(String name, int version) {
 				
 			}
 			
 			@Override
-			public void removed(String name, int version) {
+			public void added(String name, int version) {
 				// terminate all the previous sessions
 				try {
 					Collection<SessionMetadata> sessions = sessionService.getActiveSessions();