Merge pull request #535 from mdrillin/TEIIDDES-2644

Fixes incorrect cheatSheet target

documentation/guides/Teiid_Designer_User_Guide/en-US/managing-vdbs.xml

@@ -350,5 +350,97 @@
 			</mediaobject>
 		</figure>
 	</section>
+	<section id="vdb-dynamic-import-export">
+		<title>Working with Dynamic VDBs</title>
+		<para>This section desribes the Designer features which allow generating a VDB archive with XMI models from existing dynamic
+		VDBs (*-vdb.xml) files and generating dynamic VDBs from existing VDB archives.</para>
+		<section id="generate-vdb-archive-from-dynamic-vdb">
+			<title>Generate VDB Archive</title>
+			<para>To generate a VDB archive and models from a dynamic vdb (*-vdb.xml) file in your workspace:</para>
+			<itemizedlist>
+				<listitem>
+					<para><emphasis role="bold">Step 1 </emphasis> - Import (or drag and drop) a dynamic vdb file into a model project or folder
+					</para>
+				</listitem>
+				<listitem>
+					<para><emphasis role="bold">Step 2 </emphasis> - Select the dynamic vdb file in the <emphasis role="bold">Model Explorer</emphasis>, then
+						right-click and select the <emphasis role="bold">Modeling &gt; Generate Archive VDB and Models </emphasis> action.
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/screencaps/generate-archive-vdb-action.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</listitem>
+				<listitem>
+					<para><emphasis role="bold">Step 3 </emphasis> - The first page of thw wizard will show the <emphasis role="bold">Dynamic VDB Contents</emphasis>
+						 Verify the contents and click <emphasis role="bold">Next &gt;</emphasis>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/screencaps/generate-vdb-archive-page-1.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</listitem>
+				<listitem>
+					<para><emphasis role="bold">Step 4 </emphasis> - On the second page, specify details and options for yor VDB archive 
+						including actual VDB name, VDB archive file name and target location (project or folder). 
+						 Click <emphasis role="bold">Generate</emphasis> to create the VDB archive and associated models in your target location.
+						 Then click <emphasis role="bold">Finish</emphasis>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/screencaps/generate-vdb-archive-page-2.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</listitem>
+			</itemizedlist>
+			<para>The generated VDB and XMI models will now be visible in the <emphasis role="bold">Model Explorer</emphasis> view.</para>
+			<mediaobject>
+				<imageobject>
+					<imagedata fileref="images/screencaps/generated-vdb-and-models-from-xml.png"/>
+				</imageobject>
+			</mediaobject>
+		</section>
+		<section id="generate-dynamic-vdb-from-vdb-archive">
+			<title>Generate Dynamic VDB</title>
+			<para>To generate a dynamic VDB from a VDB archive (*.vdb) in your workspace:</para>
+			<itemizedlist>
+				<listitem>
+					<para><emphasis role="bold">Step 1 </emphasis> - Select a VDB archive file in the <emphasis role="bold">Model Explorer</emphasis>, then
+						right-click and select the <emphasis role="bold">Modeling &gt; Generate Dynamic VDB </emphasis> action.
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/screencaps/generate-dynamic-vdb-action.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</listitem>
+				<listitem>
+					<para><emphasis role="bold">Step 2 </emphasis> - The first page of thw wizard will show the selected VDB archive file information.
+						You can also set the VDB name adn version as well as specify the target location and actual file name (*-vdb.xml).
+						 Click <emphasis role="bold">Next &gt;</emphasis>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/screencaps/generate-dynamic-vdb-page-1.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</listitem>
+				<listitem>
+					<para><emphasis role="bold">Step 3 </emphasis> - On the second page, click the <emphasis role="bold">Generate</emphasis> button. The 
+						XML contents will be displayed in the viewer which represents the same basic metadata from the origional VDB.
+						 Click <emphasis role="bold">Generate</emphasis> to create the VDB archive and associated models in your target location.
+						 Then click <emphasis role="bold">Finish</emphasis> to save the XML string to the file specified in Step 2.
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/screencaps/generate-dynamic-vdb-page-2.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</listitem>
+			</itemizedlist>
+		</section>
+	</section>
 
 </chapter>

documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml

@@ -20,15 +20,9 @@
 <book>
   <bookinfo>
     <title>Teiid Designer User Guide</title>
-<<<<<<< HEAD
-    <releaseinfo>9.2.0
+    <releaseinfo>9.2.1
     </releaseinfo>
-    <productnumber>9.2.0
-=======
-    <releaseinfo>9.0.3
-    </releaseinfo>
-    <productnumber>9.0.3
->>>>>>> 9.0.x
+    <productnumber>9.2.1
     </productnumber>
     <issuenum>1</issuenum>
     <mediaobject>

documentation/guides/Teiid_Designer_User_Guide/en-US/testmodels.xml

@@ -503,6 +503,13 @@
 				create a Teiid Connection Profile specific for that VDB, open the 
 				Database Development perspective and create a connection to your VDB. 
 				Continue with Step's 2 and 3 above.</para>
+			 <note>
+			     <para>You can deploy a dynamic VDB to the server, but the 
+			     	VDB may end up being INACTIVE if any referenced data source (JNDI name) is not already be deployed. 
+			     	Dynamic VDBs do not contain enough connection or data source information to automatically
+			     	find and/or deploy a data source.
+			     </para>
+            </note>
             <note>
 			     <para>If you do not have a Teiid instance defined or your default 
 					Teiid instance is disconnected, the following dialog will be displayed 

documentation/guides/Teiid_Designer_User_Guide/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>${docname}-${translation}</artifactId>
-	<version>9.2.0-SNAPSHOT</version>
+	<version>9.2.1-SNAPSHOT</version>
 	<packaging>jdocbook</packaging>
 	<name>${bookname}-(${translation})</name>
 

features/org.teiid.datatools.connectivity.feature/feature.xml

@@ -15,7 +15,7 @@
 <feature
       id="org.teiid.datatools.connectivity.feature"
       label="Teiid DataTools Connectivity"
-      version="9.2.0.qualifier"
+      version="9.2.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.teiid.org/">

features/org.teiid.datatools.connectivity.feature/pom.xml

@@ -9,6 +9,6 @@
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.datatools.connectivity.feature</artifactId>
-	<version>9.2.0-SNAPSHOT</version>
+	<version>9.2.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>

features/org.teiid.designer.feature/feature.xml

@@ -9,7 +9,7 @@
 <feature
       id="org.teiid.designer.feature"
       label="Teiid Designer"
-      version="9.2.0.qualifier"
+      version="9.2.1.qualifier"
       provider-name="%providerName"
       plugin="org.teiid.designer"
       image="designer32.png">
@@ -38,7 +38,7 @@
          ws="gtk"/>
 
    <includes
-         id="org.teiid.designer.crypto.dummy.feature"
+         id="org.teiid.designer.library.feature"
          version="0.0.0"
          optional="true"/>
 

features/org.teiid.designer.feature/pom.xml

@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.feature</artifactId> 
-	<version>9.2.0-SNAPSHOT</version>
+	<version>9.2.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>

features/org.teiid.designer.crypto.dummy.feature/.project → features/org.teiid.designer.library.feature/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.teiid.designer.crypto.dummy.feature</name>
+	<name>org.teiid.designer.library.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>

features/org.teiid.designer.crypto.dummy.feature/feature.properties → features/org.teiid.designer.library.feature/feature.properties

@@ -14,10 +14,10 @@
 
 
 # Feature Information Page properties
-description = The Teiid DataTools Connectivity Feature provides connectivity to Teiid to browse metadata and execute SQL in a DataTools context.
+description = Provides miscellaneous plugins and fragments correcting deficiences with libraries depended on by Teiid Designer.
 
 # "featureName" property - name of the feature
-featureName=Teiid DataTools Connectivity Feature
+featureName=Teiid Designer Library Feature
 
 # "providerName" property - name of the company that provides the feature
 providerName=JBoss by Red Hat

features/org.teiid.designer.crypto.dummy.feature/feature.xml → features/org.teiid.designer.library.feature/feature.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.teiid.designer.crypto.dummy.feature"
-      label="Dummy Crypto Feature"
-      version="9.2.0.qualifier"
+      id="org.teiid.designer.library.feature"
+      label="Teiid Designer Library Feature"
+      version="9.2.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.teiid.org/">
@@ -22,10 +22,11 @@
    </requires>
 
    <plugin
-         id="org.teiid.designer.bc.dummy"
+         id="org.apache.directory.studio.slf4j-eclipselog"
          download-size="0"
          install-size="0"
          version="0.0.0"
+         fragment="true"
          unpack="false"/>
 
 </feature>

features/org.teiid.designer.crypto.dummy.feature/pom.xml → features/org.teiid.designer.library.feature/pom.xml

@@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	  <version>0.0.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools</groupId>
-	<artifactId>org.teiid.designer.crypto.dummy.feature</artifactId> 
-	<version>9.2.0-SNAPSHOT</version>
+	<artifactId>org.teiid.designer.library.feature</artifactId> 
+	<version>9.2.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>

features/org.teiid.designer.runtime.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.teiid.designer.runtime.feature"
       label="Teiid Designer Runtime"
-      version="9.2.0.qualifier"
+      version="9.2.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">

features/org.teiid.designer.runtime.feature/pom.xml

@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.runtime.feature</artifactId> 
-	<version>9.2.0-SNAPSHOT</version>
+	<version>9.2.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>

features/org.teiid.designer.teiid.client.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.teiid.designer.teiid.client.feature"
       label="Teiid Runtime Clients"
-      version="9.2.0.qualifier"
+      version="9.2.1.qualifier"
       provider-name="%providerName">
 
    <description url="www.jboss.org/projects/teiiddesigner">

features/org.teiid.designer.teiid.client.feature/pom.xml

@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.teiid.client.feature</artifactId> 
-	<version>9.2.0-SNAPSHOT</version>
+	<version>9.2.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>

features/org.teiid.designer.test.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.teiid.designer.test.feature"
       label="Teiid Designer Test"
-      version="9.2.0.qualifier"
+      version="9.2.1.qualifier"
       provider-name="%providerName"
       plugin="org.teiid.designer"
       image="feature.gif">

features/org.teiid.designer.test.feature/pom.xml

@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.test.feature</artifactId> 
-	<version>9.2.0-SNAPSHOT</version>
+	<version>9.2.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>

features/pom.xml

@@ -14,7 +14,7 @@
 	<packaging>pom</packaging>
 
 	<modules>
-    <module>org.teiid.designer.crypto.dummy.feature</module>
+    <module>org.teiid.designer.library.feature</module>
 		<module>org.teiid.designer.teiid.client.feature</module>
 		<module>org.teiid.designer.feature</module>
 		<module>org.teiid.designer.test.feature</module>
@@ -41,8 +41,8 @@
 					<excludes>
 						<plugin id="org.teiid.designer.json.lib"/>
 						<plugin id="org.teiid.designer.modelgenerator.salesforce.lib"/>
-						<plugin id="org.teiid.designer.webservice.lib"/>
 						<plugin id="org.jboss.tools.locus.mockito"/>
+						<plugin id="org.apache.directory.studio.slf4j-eclipselog"/>
 						<feature id="org.jboss.tools.foundation.security.linux.feature"/>
 					</excludes>
 				</configuration>
@@ -67,6 +67,7 @@
 						<plugin id="org.teiid.designer.modelgenerator.salesforce.lib"/>
 						<plugin id="org.teiid.designer.webservice.lib"/>
 						<plugin id="org.jboss.tools.locus.mockito"/>
+						<plugin id="org.apache.directory.studio.slf4j-eclipselog"/>
 						<feature id="org.jboss.tools.foundation.security.linux.feature"/>
 					</excludes>
 				</configuration>