diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-archive-vdb-action.png b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-archive-vdb-action.png
new file mode 100644
index 0000000000..84a1a65524
Binary files /dev/null and b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-archive-vdb-action.png differ
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-action.png b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-action.png
new file mode 100644
index 0000000000..bfc7b76e13
Binary files /dev/null and b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-action.png differ
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-page-1.png b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-page-1.png
new file mode 100644
index 0000000000..7059e1b3ca
Binary files /dev/null and b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-page-1.png differ
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-page-2.png b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-page-2.png
new file mode 100644
index 0000000000..80353e6e5b
Binary files /dev/null and b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-dynamic-vdb-page-2.png differ
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-vdb-archive-page-1.png b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-vdb-archive-page-1.png
new file mode 100644
index 0000000000..f826bf5ede
Binary files /dev/null and b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-vdb-archive-page-1.png differ
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-vdb-archive-page-2.png b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-vdb-archive-page-2.png
new file mode 100644
index 0000000000..467923eac1
Binary files /dev/null and b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generate-vdb-archive-page-2.png differ
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generated-vdb-and-models-from-xml.png b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generated-vdb-and-models-from-xml.png
new file mode 100644
index 0000000000..9594267030
Binary files /dev/null and b/documentation/guides/Teiid_Designer_User_Guide/en-US/images/screencaps/generated-vdb-and-models-from-xml.png differ
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/managing-vdbs.xml b/documentation/guides/Teiid_Designer_User_Guide/en-US/managing-vdbs.xml
index a1c39c2425..1e47c4fdd4 100644
--- a/documentation/guides/Teiid_Designer_User_Guide/en-US/managing-vdbs.xml
+++ b/documentation/guides/Teiid_Designer_User_Guide/en-US/managing-vdbs.xml
@@ -350,5 +350,97 @@
+
+ Working with Dynamic VDBs
+ 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.
+
+ Generate VDB Archive
+ To generate a VDB archive and models from a dynamic vdb (*-vdb.xml) file in your workspace:
+
+
+ Step 1 - Import (or drag and drop) a dynamic vdb file into a model project or folder
+
+
+
+ Step 2 - Select the dynamic vdb file in the Model Explorer, then
+ right-click and select the Modeling > Generate Archive VDB and Models action.
+
+
+
+
+
+
+
+
+ Step 3 - The first page of thw wizard will show the Dynamic VDB Contents
+ Verify the contents and click Next >
+
+
+
+
+
+
+
+
+ Step 4 - 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 Generate to create the VDB archive and associated models in your target location.
+ Then click Finish
+
+
+
+
+
+
+
+
+ The generated VDB and XMI models will now be visible in the Model Explorer view.
+
+
+
+
+
+
+
+ Generate Dynamic VDB
+ To generate a dynamic VDB from a VDB archive (*.vdb) in your workspace:
+
+
+ Step 1 - Select a VDB archive file in the Model Explorer, then
+ right-click and select the Modeling > Generate Dynamic VDB action.
+
+
+
+
+
+
+
+
+ Step 2 - 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 Next >
+
+
+
+
+
+
+
+
+ Step 3 - On the second page, click the Generate button. The
+ XML contents will be displayed in the viewer which represents the same basic metadata from the origional VDB.
+ Click Generate to create the VDB archive and associated models in your target location.
+ Then click Finish to save the XML string to the file specified in Step 2.
+
+
+
+
+
+
+
+
+
+
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml b/documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml
index f8400ca732..cb4d77497a 100644
--- a/documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml
+++ b/documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml
@@ -20,15 +20,9 @@
Teiid Designer User Guide
-<<<<<<< HEAD
- 9.2.0
+ 9.2.1
- 9.2.0
-=======
- 9.0.3
-
- 9.0.3
->>>>>>> 9.0.x
+ 9.2.1
1
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/testmodels.xml b/documentation/guides/Teiid_Designer_User_Guide/en-US/testmodels.xml
index dd9eb954aa..24147be065 100644
--- a/documentation/guides/Teiid_Designer_User_Guide/en-US/testmodels.xml
+++ b/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.
+
+ 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.
+
+ If you do not have a Teiid instance defined or your default
Teiid instance is disconnected, the following dialog will be displayed
diff --git a/documentation/guides/Teiid_Designer_User_Guide/pom.xml b/documentation/guides/Teiid_Designer_User_Guide/pom.xml
index 6a47896374..15b536c49f 100644
--- a/documentation/guides/Teiid_Designer_User_Guide/pom.xml
+++ b/documentation/guides/Teiid_Designer_User_Guide/pom.xml
@@ -5,7 +5,7 @@
4.0.0org.jboss.tools${docname}-${translation}
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTjdocbook${bookname}-(${translation})
diff --git a/features/org.teiid.datatools.connectivity.feature/feature.xml b/features/org.teiid.datatools.connectivity.feature/feature.xml
index 60aa0b2109..69df928289 100644
--- a/features/org.teiid.datatools.connectivity.feature/feature.xml
+++ b/features/org.teiid.datatools.connectivity.feature/feature.xml
@@ -15,7 +15,7 @@
diff --git a/features/org.teiid.datatools.connectivity.feature/pom.xml b/features/org.teiid.datatools.connectivity.feature/pom.xml
index 38ed723d61..f41852994f 100644
--- a/features/org.teiid.datatools.connectivity.feature/pom.xml
+++ b/features/org.teiid.datatools.connectivity.feature/pom.xml
@@ -9,6 +9,6 @@
org.jboss.toolsorg.teiid.datatools.connectivity.feature
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-feature
diff --git a/features/org.teiid.designer.feature/feature.xml b/features/org.teiid.designer.feature/feature.xml
index bdccd35bf5..24c4aeb99b 100644
--- a/features/org.teiid.designer.feature/feature.xml
+++ b/features/org.teiid.designer.feature/feature.xml
@@ -9,7 +9,7 @@
@@ -38,7 +38,7 @@
ws="gtk"/>
diff --git a/features/org.teiid.designer.feature/pom.xml b/features/org.teiid.designer.feature/pom.xml
index c9c3146010..881ae8196c 100644
--- a/features/org.teiid.designer.feature/pom.xml
+++ b/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
org.jboss.toolsorg.teiid.designer.feature
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-feature
diff --git a/features/org.teiid.designer.crypto.dummy.feature/.project b/features/org.teiid.designer.library.feature/.project
similarity index 86%
rename from features/org.teiid.designer.crypto.dummy.feature/.project
rename to features/org.teiid.designer.library.feature/.project
index e01748fd06..103014d68d 100644
--- a/features/org.teiid.designer.crypto.dummy.feature/.project
+++ b/features/org.teiid.designer.library.feature/.project
@@ -1,6 +1,6 @@
- org.teiid.designer.crypto.dummy.feature
+ org.teiid.designer.library.feature
diff --git a/features/org.teiid.designer.crypto.dummy.feature/AUTHORS.txt b/features/org.teiid.designer.library.feature/AUTHORS.txt
similarity index 100%
rename from features/org.teiid.designer.crypto.dummy.feature/AUTHORS.txt
rename to features/org.teiid.designer.library.feature/AUTHORS.txt
diff --git a/features/org.teiid.designer.crypto.dummy.feature/LEGAL.txt b/features/org.teiid.designer.library.feature/LEGAL.txt
similarity index 100%
rename from features/org.teiid.designer.crypto.dummy.feature/LEGAL.txt
rename to features/org.teiid.designer.library.feature/LEGAL.txt
diff --git a/features/org.teiid.designer.crypto.dummy.feature/build.properties b/features/org.teiid.designer.library.feature/build.properties
similarity index 100%
rename from features/org.teiid.designer.crypto.dummy.feature/build.properties
rename to features/org.teiid.designer.library.feature/build.properties
diff --git a/features/org.teiid.designer.crypto.dummy.feature/feature.properties b/features/org.teiid.designer.library.feature/feature.properties
similarity index 90%
rename from features/org.teiid.designer.crypto.dummy.feature/feature.properties
rename to features/org.teiid.designer.library.feature/feature.properties
index 08fbefdeb6..3d154babde 100644
--- a/features/org.teiid.designer.crypto.dummy.feature/feature.properties
+++ b/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
diff --git a/features/org.teiid.designer.crypto.dummy.feature/feature.xml b/features/org.teiid.designer.library.feature/feature.xml
similarity index 70%
rename from features/org.teiid.designer.crypto.dummy.feature/feature.xml
rename to features/org.teiid.designer.library.feature/feature.xml
index 325dd8fe42..1095a8abb3 100644
--- a/features/org.teiid.designer.crypto.dummy.feature/feature.xml
+++ b/features/org.teiid.designer.library.feature/feature.xml
@@ -1,8 +1,8 @@
@@ -22,10 +22,11 @@
diff --git a/features/org.teiid.designer.crypto.dummy.feature/license.html b/features/org.teiid.designer.library.feature/license.html
similarity index 100%
rename from features/org.teiid.designer.crypto.dummy.feature/license.html
rename to features/org.teiid.designer.library.feature/license.html
diff --git a/features/org.teiid.designer.crypto.dummy.feature/pom.xml b/features/org.teiid.designer.library.feature/pom.xml
similarity index 82%
rename from features/org.teiid.designer.crypto.dummy.feature/pom.xml
rename to features/org.teiid.designer.library.feature/pom.xml
index 7389f11fe8..39cafb78cf 100644
--- a/features/org.teiid.designer.crypto.dummy.feature/pom.xml
+++ b/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
0.0.4-SNAPSHOTorg.jboss.tools
- org.teiid.designer.crypto.dummy.feature
- 9.2.0-SNAPSHOT
+ org.teiid.designer.library.feature
+ 9.2.1-SNAPSHOTeclipse-feature
diff --git a/features/org.teiid.designer.runtime.feature/feature.xml b/features/org.teiid.designer.runtime.feature/feature.xml
index 748daefc00..125139f76f 100644
--- a/features/org.teiid.designer.runtime.feature/feature.xml
+++ b/features/org.teiid.designer.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/features/org.teiid.designer.runtime.feature/pom.xml b/features/org.teiid.designer.runtime.feature/pom.xml
index e81162042b..609c617538 100644
--- a/features/org.teiid.designer.runtime.feature/pom.xml
+++ b/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
org.jboss.toolsorg.teiid.designer.runtime.feature
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-feature
diff --git a/features/org.teiid.designer.teiid.client.feature/feature.xml b/features/org.teiid.designer.teiid.client.feature/feature.xml
index 56ca514f43..52ffa905e3 100644
--- a/features/org.teiid.designer.teiid.client.feature/feature.xml
+++ b/features/org.teiid.designer.teiid.client.feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/features/org.teiid.designer.teiid.client.feature/pom.xml b/features/org.teiid.designer.teiid.client.feature/pom.xml
index 356e9cdf2a..83f9ec9f0b 100644
--- a/features/org.teiid.designer.teiid.client.feature/pom.xml
+++ b/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
org.jboss.toolsorg.teiid.designer.teiid.client.feature
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-feature
diff --git a/features/org.teiid.designer.test.feature/feature.xml b/features/org.teiid.designer.test.feature/feature.xml
index b10232d08b..8c009679b6 100644
--- a/features/org.teiid.designer.test.feature/feature.xml
+++ b/features/org.teiid.designer.test.feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/features/org.teiid.designer.test.feature/pom.xml b/features/org.teiid.designer.test.feature/pom.xml
index 1cd464ac30..f3e2477996 100644
--- a/features/org.teiid.designer.test.feature/pom.xml
+++ b/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
org.jboss.toolsorg.teiid.designer.test.feature
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-feature
diff --git a/features/pom.xml b/features/pom.xml
index 7c4847b602..23f031b51c 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,7 +14,7 @@
pom
- org.teiid.designer.crypto.dummy.feature
+ org.teiid.designer.library.featureorg.teiid.designer.teiid.client.featureorg.teiid.designer.featureorg.teiid.designer.test.feature
@@ -41,8 +41,8 @@
-
+
@@ -67,6 +67,7 @@
+
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/.classpath b/plugins/crypto/org.teiid.designer.bc.dummy/.classpath
deleted file mode 100644
index 098194ca4b..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/.project b/plugins/crypto/org.teiid.designer.bc.dummy/.project
deleted file mode 100644
index 2c8e871144..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- org.teiid.designer.bc.dummy
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/COPYRIGHT.txt b/plugins/crypto/org.teiid.designer.bc.dummy/COPYRIGHT.txt
deleted file mode 100644
index 47fe775315..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/COPYRIGHT.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Portions Copyright (C) 2008-2015 Red Hat, Inc.
-Portions Copyright (C) 2000-2007 MetaMatrix, Inc.
-Portions Copyright (c) 2000, 2003, 2008 IBM Corporation and others.
-Portions Copyright (c) 1997-2000 Sun Microsystems, Inc.
\ No newline at end of file
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/LICENSE-lgpl-2.1.txt b/plugins/crypto/org.teiid.designer.bc.dummy/LICENSE-lgpl-2.1.txt
deleted file mode 100644
index 5ab7695ab8..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/LICENSE-lgpl-2.1.txt
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- 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
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- , 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/META-INF/MANIFEST.MF b/plugins/crypto/org.teiid.designer.bc.dummy/META-INF/MANIFEST.MF
deleted file mode 100644
index dba0230d64..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.teiid.designer.bc.dummy;singleton:=true
-Bundle-Version: 9.2.0.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.apache.commons.codec
-Export-Package: org.bouncycastle.asn1,
- org.bouncycastle.x509.extension
-
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/build.properties b/plugins/crypto/org.teiid.designer.bc.dummy/build.properties
deleted file mode 100644
index 7f4769c3d7..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- COPYRIGHT.txt,\
- LICENSE-lgpl-2.1.txt,\
- plugin.properties
-src.includes = COPYRIGHT.txt,\
- LICENSE-lgpl-2.1.txt
\ No newline at end of file
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/pom.xml b/plugins/crypto/org.teiid.designer.bc.dummy/pom.xml
deleted file mode 100644
index 1cc7694a86..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
- 4.0.0
-
- org.jboss.tools.teiid.plugins
- crypto
- 0.0.4-SNAPSHOT
-
- org.jboss.tools
- org.teiid.designer.bc.dummy
- 9.2.0-SNAPSHOT
- eclipse-plugin
-
-
-
- org.eclipse.tycho
- tycho-compiler-plugin
- ${tychoVersion}
-
-
- 1.7
-
-
-
-
-
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/src/org/bouncycastle/asn1/ASN1Object.java b/plugins/crypto/org.teiid.designer.bc.dummy/src/org/bouncycastle/asn1/ASN1Object.java
deleted file mode 100644
index 2e73a9582c..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/src/org/bouncycastle/asn1/ASN1Object.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
-*
-* See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
-*
-* See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
-*/
-package org.bouncycastle.asn1;
-
-import org.apache.commons.codec.binary.Hex;
-
-/**
- *
- */
-public class ASN1Object {
-
- private byte[] content;
-
- /**
- * @param content
- */
- public ASN1Object(byte[] content) {
- this.content = content;
- }
-
- @Override
- public String toString() {
- if (content == null)
- return new String();
-
- return new String(Hex.encodeHex(content));
- }
-}
diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/src/org/bouncycastle/x509/extension/X509ExtensionUtil.java b/plugins/crypto/org.teiid.designer.bc.dummy/src/org/bouncycastle/x509/extension/X509ExtensionUtil.java
deleted file mode 100644
index 76e6801df7..0000000000
--- a/plugins/crypto/org.teiid.designer.bc.dummy/src/org/bouncycastle/x509/extension/X509ExtensionUtil.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
-*
-* See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
-*
-* See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
-*/
-package org.bouncycastle.x509.extension;
-
-import org.bouncycastle.asn1.ASN1Object;
-
-/**
- *
- */
-public class X509ExtensionUtil {
-
- public static ASN1Object fromExtensionValue(byte[] content) {
- return new ASN1Object(content);
- }
-}
diff --git a/plugins/crypto/pom.xml b/plugins/crypto/pom.xml
deleted file mode 100644
index 0230709571..0000000000
--- a/plugins/crypto/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
- 4.0.0
-
- org.jboss.tools.teiid
- plugins
- 0.0.4-SNAPSHOT
-
- org.jboss.tools.teiid.plugins
- crypto
- teiid.plugins.crypto
- 0.0.4-SNAPSHOT
- pom
-
- org.teiid.designer.bc.dummy
-
-
diff --git a/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF b/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF
index 69c049fee8..5a68149fab 100644
--- a/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.core.designer;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.core.designer.CoreModelerPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.core.designer/pom.xml b/plugins/org.teiid.core.designer/pom.xml
index 60baf3e378..69a04ec3c4 100644
--- a/plugins/org.teiid.core.designer/pom.xml
+++ b/plugins/org.teiid.core.designer/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.core.designer
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/StringUtilities.java b/plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/StringUtilities.java
index 1d955b135b..654878d6aa 100644
--- a/plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/StringUtilities.java
+++ b/plugins/org.teiid.core.designer/src/org/teiid/core/designer/util/StringUtilities.java
@@ -474,6 +474,62 @@ public static void main(String[] args) {
System.out.println(" START NAME = " + startName + " UNIQUE NAME = " + newName);
}
+ /**
+ * Compares two strings lexicographically.
+ * The comparison is based on the Unicode value of each character in
+ * the strings.
+ * @param str1
+ * @param str2
+ *
+ * @return the value 0 if the str1 is equal to str2;
+ * a value less than 0 if str1
+ * is lexicographically less than str2;
+ * and a value greater than 0 if str1 is
+ * lexicographically greater than str2.
+ */
+ public static int compare(char[] str1, char[] str2) {
+ int len1 = str1.length;
+ int len2 = str2.length;
+ int n = Math.min(len1, len2);
+ int i = 0;
+ while (n-- != 0) {
+ char c1 = str1[i];
+ char c2 = str2[i++];
+ if (c1 != c2) {
+ return c1 - c2;
+ }
+ }
+ return len1 - len2;
+ }
+
+ /**
+ * Returns the length of the common prefix between s1 and s2.
+ * @param s1
+ * @param s2
+ * @return length of the prefix
+ */
+ public static int prefixLength(char[] s1, char[] s2) {
+ int len = 0;
+ int max = Math.min(s1.length, s2.length);
+ for (int i = 0; i < max && s1[i] == s2[i]; ++i)
+ ++len;
+ return len;
+ }
+
+ /**
+ * Returns the length of the common prefix between s1 and s2.
+ * @param s1
+ * @param s2
+ * @return length of the prefix
+ */
+ public static int prefixLength(String s1, String s2) {
+ int len = 0;
+ int max = Math.min(s1.length(), s2.length());
+ for (int i = 0; i < max && s1.charAt(i) == s2.charAt(i); ++i)
+ ++len;
+ return len;
+ }
+
private StringUtilities() {
}
}
diff --git a/plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF
index b36804ddc0..da82f04c30 100644
--- a/plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.datatools.connectivity.model;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.datatools.connectivity.model/pom.xml b/plugins/org.teiid.datatools.connectivity.model/pom.xml
index f285e941b7..ee87026dff 100644
--- a/plugins/org.teiid.datatools.connectivity.model/pom.xml
+++ b/plugins/org.teiid.datatools.connectivity.model/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.datatools.connectivity.model
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF
index 6709ea561e..7c58ec2a22 100644
--- a/plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginProvider
Bundle-SymbolicName: org.teiid.datatools.connectivity.ui.flatfile;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Fragment-Host: org.eclipse.datatools.connectivity.oda.flatfile.ui;bundle-version="[3.1.7,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml b/plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml
index f352baf59d..860b98d05d 100644
--- a/plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml
+++ b/plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.datatools.connectivity.ui.flatfile
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF
index 710c5b320b..44b3922a4c 100644
--- a/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.teiid.datatools.connectivity.ui;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.datatools.connectivity.ui.Activator
Bundle-Vendor: %pluginProvider
Require-Bundle: org.eclipse.ui;bundle-version="[3.106.1,4.0.0)",
diff --git a/plugins/org.teiid.datatools.connectivity.ui/pom.xml b/plugins/org.teiid.datatools.connectivity.ui/pom.xml
index 52d5a51282..cf17fa29ac 100644
--- a/plugins/org.teiid.datatools.connectivity.ui/pom.xml
+++ b/plugins/org.teiid.datatools.connectivity.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.datatools.connectivity.ui
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF
index edc007f523..c807cc7edb 100644
--- a/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.teiid.datatools.connectivity;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.datatools.connectivity.Activator
Bundle-Vendor: %pluginProvider
Require-Bundle: org.eclipse.ui;bundle-version="[3.106.1,4.0.0)",
diff --git a/plugins/org.teiid.datatools.connectivity/pom.xml b/plugins/org.teiid.datatools.connectivity/pom.xml
index 371c74b826..405bf03008 100644
--- a/plugins/org.teiid.datatools.connectivity/pom.xml
+++ b/plugins/org.teiid.datatools.connectivity/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.datatools.connectivity
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/security/impl/EquinoxSecureStorageProvider.java b/plugins/org.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/security/impl/EquinoxSecureStorageProvider.java
index 52e0a7e8be..90f05b61f8 100644
--- a/plugins/org.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/security/impl/EquinoxSecureStorageProvider.java
+++ b/plugins/org.teiid.datatools.connectivity/src/org/teiid/datatools/connectivity/security/impl/EquinoxSecureStorageProvider.java
@@ -11,6 +11,8 @@
import java.net.URLEncoder;
import java.util.Arrays;
import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
import org.eclipse.equinox.security.storage.EncodingUtils;
import org.eclipse.equinox.security.storage.ISecurePreferences;
import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
@@ -103,4 +105,12 @@ private ISecurePreferences getNode(String nodeKey) throws Exception {
return root.node(encoded);
}
+
+ @Override
+ public void removeFromSecureStorage(String nodeKey) throws Exception {
+ Assert.isNotNull(nodeKey);
+ ISecurePreferences node = getNode(nodeKey);
+ node.removeNode();
+ }
+
}
diff --git a/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF
index e45e74489c..c399f7dce1 100644
--- a/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.advisor.ui;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.advisor.ui.AdvisorUiPlugin
Bundle-Vendor: %pluginProvider
Require-Bundle: org.eclipse.ui;bundle-version="[3.106.1,4.0.0)",
diff --git a/plugins/org.teiid.designer.advisor.ui/cheatsheets/subsheets/join-two-sources.xml b/plugins/org.teiid.designer.advisor.ui/cheatsheets/subsheets/join-two-sources.xml
index 3eb2701e56..6261fb38b7 100644
--- a/plugins/org.teiid.designer.advisor.ui/cheatsheets/subsheets/join-two-sources.xml
+++ b/plugins/org.teiid.designer.advisor.ui/cheatsheets/subsheets/join-two-sources.xml
@@ -38,7 +38,7 @@
+ param1="org.teiid.designer.defineViewTable"/>
diff --git a/plugins/org.teiid.designer.advisor.ui/pom.xml b/plugins/org.teiid.designer.advisor.ui/pom.xml
index efcd15e5a3..8b9eb6a94f 100644
--- a/plugins/org.teiid.designer.advisor.ui/pom.xml
+++ b/plugins/org.teiid.designer.advisor.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.advisor.ui
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/AdvisorUiConstants.java b/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/AdvisorUiConstants.java
index 02c7f3504a..c1b12a37a9 100644
--- a/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/AdvisorUiConstants.java
+++ b/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/AdvisorUiConstants.java
@@ -154,7 +154,6 @@ interface COMMAND_IDS {
String NEW_MODEL_MED = "org.teiid.designer.newModelMEDCommand"; //$NON-NLS-1$
String NEW_OBJECT_BASE_TABLE = "org.teiid.designer.newObjectBaseTable"; //$NON-NLS-1$
- String NEW_OBJECT_VIEW_TABLE = "org.teiid.designer.newObjectViewTable"; //$NON-NLS-1$
String DEFINE_VIEW_TABLE = "org.teiid.designer.defineViewTable"; //$NON-NLS-1$
String DEFINE_VIEW_PROCEDURE = "org.teiid.designer.defineViewProcedure"; //$NON-NLS-1$
String NEW_OBJECT_REST_PROCEDURE = "org.teiid.designer.newObjectRestProcedure"; //$NON-NLS-1$
diff --git a/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java b/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java
index 19ead98d8d..c00aab8f0e 100644
--- a/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java
+++ b/plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java
@@ -306,11 +306,6 @@ static void loadHandlers() {
COMMAND_LABELS.DEFINE_TEIID_MODEL_PROJECT,
COMMAND_LABELS_SHORT.DEFINE_TEIID_MODEL_PROJECT,
COMMAND_DESC.DEFINE_TEIID_MODEL_PROJECT);
- addActionHandler(
- COMMAND_IDS.NEW_OBJECT_VIEW_TABLE,
- COMMAND_LABELS.NEW_OBJECT_VIEW_TABLE,
- COMMAND_LABELS_SHORT.NEW_OBJECT_VIEW_TABLE,
- COMMAND_DESC.NEW_OBJECT_VIEW_TABLE);
addActionHandler(
COMMAND_IDS.DEFINE_VIEW_TABLE,
COMMAND_LABELS.DEFINE_VIEW_TABLE,
@@ -836,10 +831,6 @@ public static String getImageId(String id) {
return Images.REFRESH_TEIID_SERVER;
}
- if( id.equalsIgnoreCase(COMMAND_IDS.NEW_OBJECT_VIEW_TABLE)) {
- return Images.NEW_VIRTUAL_TABLE_ICON;
- }
-
if( id.equalsIgnoreCase(COMMAND_IDS.DEFINE_VIEW_TABLE)) {
return Images.NEW_VIRTUAL_TABLE_ICON;
}
diff --git a/plugins/org.teiid.designer.compare.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.compare.ui/META-INF/MANIFEST.MF
index dd3a0fd428..d6c34a86e2 100644
--- a/plugins/org.teiid.designer.compare.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.compare.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.compare.ui;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.compare.ui.UiPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.compare.ui/pom.xml b/plugins/org.teiid.designer.compare.ui/pom.xml
index 0f53876652..ae66c6b099 100644
--- a/plugins/org.teiid.designer.compare.ui/pom.xml
+++ b/plugins/org.teiid.designer.compare.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.compare.ui
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.compare/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.compare/META-INF/MANIFEST.MF
index e361b45178..1a529baea9 100644
--- a/plugins/org.teiid.designer.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.compare;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.compare.ModelerComparePlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.compare/pom.xml b/plugins/org.teiid.designer.compare/pom.xml
index 9e2ec7b7fb..31584f3398 100644
--- a/plugins/org.teiid.designer.compare/pom.xml
+++ b/plugins/org.teiid.designer.compare/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.compare
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF
index 35ec62ccff..a0973b9949 100644
--- a/plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.core.xslt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.core.xslt;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.core.xslt.CoreXsltPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.core.xslt/pom.xml b/plugins/org.teiid.designer.core.xslt/pom.xml
index dbe01e55b4..a79cdbf753 100644
--- a/plugins/org.teiid.designer.core.xslt/pom.xml
+++ b/plugins/org.teiid.designer.core.xslt/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.core.xslt
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.core/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.core/META-INF/MANIFEST.MF
index 55da58d6bd..a28a7489d3 100644
--- a/plugins/org.teiid.designer.core/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.core;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.core.ModelerCore
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.core/pom.xml b/plugins/org.teiid.designer.core/pom.xml
index 4b655db095..f8c016adcb 100644
--- a/plugins/org.teiid.designer.core/pom.xml
+++ b/plugins/org.teiid.designer.core/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.core
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.core/src/org/teiid/designer/core/builder/ModelBuildUtil.java b/plugins/org.teiid.designer.core/src/org/teiid/designer/core/builder/ModelBuildUtil.java
index c7a3e8ce61..63dce498e9 100644
--- a/plugins/org.teiid.designer.core/src/org/teiid/designer/core/builder/ModelBuildUtil.java
+++ b/plugins/org.teiid.designer.core/src/org/teiid/designer/core/builder/ModelBuildUtil.java
@@ -17,8 +17,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -36,9 +34,11 @@
import org.teiid.core.designer.plugin.PluginUtilities;
import org.teiid.core.designer.util.CoreArgCheck;
import org.teiid.core.designer.util.Stopwatch;
+import org.teiid.core.designer.util.StringConstants;
import org.teiid.designer.core.ModelerCore;
import org.teiid.designer.core.container.Container;
import org.teiid.designer.core.container.DuplicateResourceException;
+import org.teiid.designer.core.index.BlockIndexException;
import org.teiid.designer.core.index.ModelIndexer;
import org.teiid.designer.core.index.ModelSearchIndexer;
import org.teiid.designer.core.index.ResourceIndexer;
@@ -304,15 +304,55 @@ public static void indexResource( IProgressMonitor monitor,
final String sTask = ModelerCore.Util.getString("ModelBuildUtil.Creating_{0}_for_{1}_1", indexer.getIndexType(), iResource.getFullPath()); //$NON-NLS-1$
//System.out.println("[ModelBuildUtil.indexResource TaskName is: " + sTask ); //$NON-NLS-1$
monitor.setTaskName(sTask);
+
+ Throwable throwable = null;
try {
final Stopwatch totalWatch = new Stopwatch();
totalWatch.start();
indexer.indexResource(iResource, false, true);
totalWatch.stop();
+ } catch (final ModelerCoreException e) {
+ throwable = e.getCause() != null ? e.getCause() : e;
} catch (final Throwable e) {
- ModelerCore.Util.log(IStatus.ERROR,
- e,
- ModelerCore.Util.getString("ModelBuilder.Error_indexing_model_resource_3", iResource.getFullPath())); //$NON-NLS-1$
+ throwable = e;
+ }
+
+ if (throwable == null)
+ return;
+
+ //
+ // Something went wrong so create a problem marker on the resource
+ //
+
+ StringBuffer buf = new StringBuffer(ModelerCore.Util.getString("ModelBuilder.Error_indexing_model_resource_3", iResource.getName())); //$NON-NLS-1$
+ buf.append(StringConstants.SPACE).append(StringConstants.COLON).append(StringConstants.NEW_LINE);
+ buf.append(throwable.getLocalizedMessage());
+
+ try {
+ IMarker[] markers = iResource.findMarkers(IMarker.PROBLEM, false, IResource.DEPTH_ONE);
+ if (markers != null) {
+ for (IMarker marker : markers) {
+ if (buf.toString().equals(marker.getAttribute(IMarker.MESSAGE)))
+ return; // A duplicate so already recorded
+ }
+ }
+
+ IMarker marker = iResource.createMarker(IMarker.PROBLEM);
+ marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
+ marker.setAttribute(IMarker.MESSAGE, buf.toString());
+
+ String location = iResource.getLocation().toOSString();
+ if (throwable instanceof BlockIndexException) {
+ BlockIndexException ex = (BlockIndexException) throwable;
+ location = ex.getWord();
+ }
+
+ marker.setAttribute(IMarker.LOCATION, location);
+
+ ModelerCore.Util.log(IStatus.ERROR, throwable, buf.toString());
+
+ } catch (CoreException ex) {
+ ModelerCore.Util.log(IStatus.ERROR, ex, "Failed to create a problem marker on the resource"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.teiid.designer.core/src/org/teiid/designer/core/extension/EmfModelObjectExtensionAssistant.java b/plugins/org.teiid.designer.core/src/org/teiid/designer/core/extension/EmfModelObjectExtensionAssistant.java
index 09086616dd..5f393faf07 100644
--- a/plugins/org.teiid.designer.core/src/org/teiid/designer/core/extension/EmfModelObjectExtensionAssistant.java
+++ b/plugins/org.teiid.designer.core/src/org/teiid/designer/core/extension/EmfModelObjectExtensionAssistant.java
@@ -598,4 +598,10 @@ public boolean supportsMyNamespace( Object modelObject ) throws Exception {
return ModelExtensionUtils.isSupportedNamespace(modelResource, getNamespacePrefix());
}
+ @Override
+ public boolean supportsProperty(Object modelObject, String propId)
+ throws Exception {
+ return getPropertyDefinition(modelObject, propId) != null;
+ }
+
}
diff --git a/plugins/org.teiid.designer.datatools.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.datatools.ui/META-INF/MANIFEST.MF
index 13ed3fe567..cfa54461b0 100644
--- a/plugins/org.teiid.designer.datatools.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.datatools.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.datatools.ui;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.datatools.ui.DatatoolsUiPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.datatools.ui/pom.xml b/plugins/org.teiid.designer.datatools.ui/pom.xml
index 87217a29e9..ee5085bc13 100644
--- a/plugins/org.teiid.designer.datatools.ui/pom.xml
+++ b/plugins/org.teiid.designer.datatools.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.datatools.ui
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.datatools/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.datatools/META-INF/MANIFEST.MF
index 652c971e98..e9a1e8ca95 100644
--- a/plugins/org.teiid.designer.datatools/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.datatools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.datatools;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.datatools.DatatoolsPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.datatools/pom.xml b/plugins/org.teiid.designer.datatools/pom.xml
index bb98b80a2f..9f1638728b 100644
--- a/plugins/org.teiid.designer.datatools/pom.xml
+++ b/plugins/org.teiid.designer.datatools/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.datatools
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.ddl.importer.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.ddl.importer.ui/META-INF/MANIFEST.MF
index ea9bc66897..de509c425c 100644
--- a/plugins/org.teiid.designer.ddl.importer.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.ddl.importer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.teiid.designer.ddl.importer.ui;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.ddl.importer.ui.DdlImporterUiPlugin
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.teiid.designer.ddl.importer;bundle-version="[9.0.2,10.0.0)",
diff --git a/plugins/org.teiid.designer.ddl.importer.ui/pom.xml b/plugins/org.teiid.designer.ddl.importer.ui/pom.xml
index 4dcdc9b6c4..051bdc9d62 100644
--- a/plugins/org.teiid.designer.ddl.importer.ui/pom.xml
+++ b/plugins/org.teiid.designer.ddl.importer.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.ddl.importer.ui
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImportDifferencesPage.java b/plugins/org.teiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImportDifferencesPage.java
index 0904578cfd..8fdd29d7af 100644
--- a/plugins/org.teiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImportDifferencesPage.java
+++ b/plugins/org.teiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImportDifferencesPage.java
@@ -378,7 +378,7 @@ class CheckboxTreeLabelProvider extends LabelProvider {
private final Image PROCEDURE_IMG = UiPlugin.getDefault().getImage(UiConstants.Images.PROCEDURE_ICON);
private final Image INDEX_IMG = UiPlugin.getDefault().getImage(UiConstants.Images.INDEX_ICON);
private final Image VIEW_TABLE_IMG = UiPlugin.getDefault().getImage(UiConstants.Images.VIRTUAL_TABLE_ICON);
-
+ private final Image VIRTUAL_PROCEDURE_IMG = UiPlugin.getDefault().getImage(UiConstants.Images.VIRTUAL_PROCEDURE_ICON);
@Override
public Image getImage( final Object node ) {
@@ -397,6 +397,9 @@ public Image getImage( final Object node ) {
}
return VIEW_IMG;
} else if(type==RelationalConstants.TYPES.PROCEDURE) {
+ if( importer.modelType() == ModelType.VIRTUAL_LITERAL) {
+ return VIRTUAL_PROCEDURE_IMG;
+ }
return PROCEDURE_IMG;
} else if(type==RelationalConstants.TYPES.INDEX) {
return INDEX_IMG;
diff --git a/plugins/org.teiid.designer.ddl.importer/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.ddl.importer/META-INF/MANIFEST.MF
index 2d748658d3..5dd7a7c562 100644
--- a/plugins/org.teiid.designer.ddl.importer/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.ddl.importer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.teiid.designer.ddl.importer;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.ddl.importer.DdlImporterPlugin
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.teiid.designer.compare;bundle-version="[9.0.2,10.0.0)",
diff --git a/plugins/org.teiid.designer.ddl.importer/pom.xml b/plugins/org.teiid.designer.ddl.importer/pom.xml
index c7d8f6201d..58a243562b 100644
--- a/plugins/org.teiid.designer.ddl.importer/pom.xml
+++ b/plugins/org.teiid.designer.ddl.importer/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.ddl.importer
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/DdlImporter.java b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/DdlImporter.java
index 3e9b2e4173..d6663f9ccf 100644
--- a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/DdlImporter.java
+++ b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/DdlImporter.java
@@ -13,6 +13,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Properties;
+
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -22,6 +23,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
@@ -51,6 +53,7 @@
import org.teiid.designer.metamodels.relational.Procedure;
import org.teiid.designer.metamodels.relational.RelationalPackage;
import org.teiid.designer.metamodels.relational.View;
+import org.teiid.designer.metamodels.relational.extension.RestModelExtensionAssistant;
import org.teiid.designer.relational.compare.DifferenceGenerator;
import org.teiid.designer.relational.compare.DifferenceReport;
import org.teiid.designer.relational.model.RelationalModel;
@@ -209,6 +212,7 @@ public void importDdl(String ddl, IProgressMonitor monitor, int totalWork, Prope
importManager.setRelationalModel(model);
RelationalModel targetRelationalModel = importManager.getObjectFactory().createRelationalModel(model);
+ targetRelationalModel.setModelType(importManager.getModelType().getValue());
importManager.setProgressMonitor(monitor);
@@ -354,6 +358,13 @@ public void save(IProgressMonitor monitor, int totalWork ) throws Exception {
modelAnnotation.setPrimaryMetamodelUri(RelationalPackage.eNS_URI);
modelAnnotation.setModelType(importManager.getModelType());
}
+
+ if( importManager.getModelType() == ModelType.VIRTUAL_LITERAL) {
+ RestModelExtensionAssistant.getRestAssistant().applyMedIfNecessary(model.getCorrespondingResource());
+ }
+ model.save(new NullProgressMonitor(), true);
+
+ // Let's save the model, then apply extension properties for relational and rest?
// Update the model, based on difference report
importStatus = EmfModelGenerator.INSTANCE.execute(diffReport, model, monitor, totalWork);
diff --git a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/TeiidDDLConstants.java b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/TeiidDDLConstants.java
index f23ab5d6f9..04ec098feb 100644
--- a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/TeiidDDLConstants.java
+++ b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/TeiidDDLConstants.java
@@ -68,5 +68,7 @@ public interface TeiidDDLConstants {
public String DDL_IMPORT_FILTER_CONSTRAINTS = "ddlImport_filterConstraints"; //$NON-NLS-1$
public String DDL_IMPORT_TABLE_UPDATABLE_OVERRIDE = "ddlImport_table_updatable_override"; //$NON-NLS-1$
+ public static final String RETURNS = "RETURNS"; //$NON-NLS-1$
+
}
diff --git a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/EmfModelGenerator.java b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/EmfModelGenerator.java
index ea1f229209..d049507a5d 100644
--- a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/EmfModelGenerator.java
+++ b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/EmfModelGenerator.java
@@ -188,13 +188,15 @@ public IStatus execute(DifferenceReport diffReport, ModelResource targetModelRes
createPrimaryKey(pk, table, targetModelResource);
}
}
- if(!fkList.isEmpty()) {
- for( DeferredPair item : fkList ) {
- RelationalForeignKey fk = (RelationalForeignKey)item.getRelationalReference();
+
+ if(!ucList.isEmpty()) {
+ for( DeferredPair item : ucList ) {
+ RelationalUniqueConstraint uc = (RelationalUniqueConstraint)item.getRelationalReference();
BaseTable table = (BaseTable)item.getEObject();
- createForeignKey(fk, table, targetModelResource);
+ createUniqueConstraint(uc, table, targetModelResource);
}
}
+
if(!apList.isEmpty()) {
for( DeferredPair item : apList ) {
RelationalAccessPattern ap = (RelationalAccessPattern)item.getRelationalReference();
@@ -202,18 +204,21 @@ public IStatus execute(DifferenceReport diffReport, ModelResource targetModelRes
createAccessPattern(ap, table, targetModelResource);
}
}
- if(!ucList.isEmpty()) {
- for( DeferredPair item : ucList ) {
- RelationalUniqueConstraint uc = (RelationalUniqueConstraint)item.getRelationalReference();
- BaseTable table = (BaseTable)item.getEObject();
- createUniqueConstraint(uc, table, targetModelResource);
- }
- }
+
if(!indexList.isEmpty()) {
for( RelationalIndex index : indexList ) {
createIndex(index, targetModelResource);
}
}
+
+ if(!fkList.isEmpty()) {
+ for( DeferredPair item : fkList ) {
+ RelationalForeignKey fk = (RelationalForeignKey)item.getRelationalReference();
+ BaseTable table = (BaseTable)item.getEObject();
+ createForeignKey(fk, table, targetModelResource);
+ }
+ }
+
progressMonitor.worked(workUnit);
// 5) Process all 'deferred' operations - Extension properties and descriptions...
@@ -293,7 +298,10 @@ public EObject createObject( RelationalReference relationalRef, ModelResource mo
} break;
case TYPES.TABLE: {
if( relationalRef instanceof RelationalViewTable ) {
- newEObject = VIEW_MODEL_FACTORY.buildObject(relationalRef, modelResource, new NullProgressMonitor());
+// newEObject = VIEW_MODEL_FACTORY.buildObject(relationalRef, modelResource, new NullProgressMonitor());
+ newEObject = createBaseTable(relationalRef, modelResource);
+ modelResource.getEmfResource().getContents().add(newEObject);
+ VIEW_MODEL_FACTORY.addTransformation((BaseTable)newEObject, (RelationalViewTable)relationalRef);
} else {
newEObject = createBaseTable(relationalRef, modelResource);
modelResource.getEmfResource().getContents().add(newEObject);
@@ -304,12 +312,12 @@ public EObject createObject( RelationalReference relationalRef, ModelResource mo
modelResource.getEmfResource().getContents().add(newEObject);
} break;
case TYPES.PROCEDURE: {
- if (relationalRef instanceof RelationalViewProcedure) {
- newEObject = VIEW_MODEL_FACTORY.buildObject(relationalRef, modelResource, new NullProgressMonitor());
- } else {
- newEObject = createProcedure(relationalRef, modelResource);
- modelResource.getEmfResource().getContents().add(newEObject);
- }
+ if( relationalRef instanceof RelationalViewProcedure ) {
+ newEObject = VIEW_MODEL_FACTORY.buildObject(relationalRef, modelResource, new NullProgressMonitor());
+ } else {
+ newEObject = createProcedure(relationalRef, modelResource);
+ modelResource.getEmfResource().getContents().add(newEObject);
+ }
} break;
case TYPES.INDEX: {
@@ -806,7 +814,7 @@ public EObject createForeignKey( RelationalReference ref, BaseTable baseTable, M
if( fkTable != null && ukRefName != null ) {
if( fkTable.getPrimaryKey() != null && fkTable.getPrimaryKey().getName().equalsIgnoreCase(ukRefName)) {
foreignKey.setUniqueKey(fkTable.getPrimaryKey());
- } else if( fkTable.getUniqueConstraints().isEmpty() ) {
+ } else if( ! fkTable.getUniqueConstraints().isEmpty() ) {
for( Object key : fkTable.getUniqueConstraints()) {
String keyName = this.getModelEditor().getName((UniqueKey)key);
if( keyName.equalsIgnoreCase(ukRefName) ) {
@@ -1211,7 +1219,9 @@ private void setPropertyValue(ModelObjectExtensionAssistant assistant, EObject e
}
try {
- assistant.setPropertyValue(eObject, namespacedId, propValue);
+ if( assistant.supportsProperty(eObject, propId) ) {
+ assistant.setPropertyValue(eObject, namespacedId, propValue);
+ }
} catch (Exception ex) {
RelationalPlugin.Util.log(IStatus.ERROR,ex,
NLS.bind(Messages.emfModelGenerator_errorSettingPropertyValue, namespacedId));
diff --git a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/StandardImporter.java b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/StandardImporter.java
index 0ace2dffb6..11af1f845d 100644
--- a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/StandardImporter.java
+++ b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/StandardImporter.java
@@ -558,6 +558,37 @@ protected RelationalProcedure createProcedure( AstNode procedureNode, Relational
return procedure;
}
+
+ /**
+ * Create a RelationalProcedure
+ * @param procedureNode the AstNode for the procedure
+ * @param model the RelationalModel
+ * @return the RelationalProcedure
+ *
+ * @throws Exception
+ */
+ protected RelationalProcedure createViewProcedure( AstNode procedureNode, RelationalModel model) throws Exception {
+ RelationalProcedure procedure = getFactory().createViewProcedure();
+ Info info = createInfo(procedureNode, model);
+ if (info.getSchema() == null)
+ model.addChild(procedure);
+ else {
+ info.getSchema().getProcedures().add(procedure);
+ procedure.setParent(info.getSchema());
+ }
+
+ initialize(procedure, procedureNode, info.getName());
+ // TODO: determine how to handle Procedure StatementOption
+ // TODO: determine how to handle Procedure Statement
+
+ if (procedureNode.getProperty(StandardDdlLexicon.DATATYPE_NAME) != null) {
+ RelationalProcedureResultSet result = getFactory().createProcedureResultSet();
+ procedure.setResultSet(result);
+ initialize(result, procedureNode);
+ }
+
+ return procedure;
+ }
/**
* Perform the import
diff --git a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/TeiidDdlImporter.java b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/TeiidDdlImporter.java
index ffc4df8f4b..71212888bf 100644
--- a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/TeiidDdlImporter.java
+++ b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/node/TeiidDdlImporter.java
@@ -38,6 +38,8 @@
import org.teiid.designer.extension.ExtensionPlugin;
import org.teiid.designer.extension.definition.ModelExtensionDefinition;
import org.teiid.designer.extension.registry.ModelExtensionRegistry;
+import org.teiid.designer.metamodels.core.ModelType;
+import org.teiid.designer.metamodels.relational.DirectionKind;
import org.teiid.designer.relational.model.RelationalAccessPattern;
import org.teiid.designer.relational.model.RelationalColumn;
import org.teiid.designer.relational.model.RelationalForeignKey;
@@ -71,13 +73,17 @@ public class TeiidDdlImporter extends StandardImporter {
private static final String NS_TEIID_JPA = "teiid_jpa"; //$NON-NLS-1$
private static final String NS_DESIGNER_ODATA = "odata"; //$NON-NLS-1$
private static final String NS_DESIGNER_WEBSERVICE= "ws"; //$NON-NLS-1$
- private static final String NS_DESIGNER_MONGO = "mongo"; //$NON-NLS-1$
+ private static final String NS_DESIGNER_MONGO = "mongodb"; //$NON-NLS-1$
private static final String NS_DESIGNER_SALESFORCE = "salesforce"; //$NON-NLS-1$
private static final String NS_DESIGNER_RELATIONAL = "relational"; //$NON-NLS-1$
private static final String NS_DESIGNER_ACCUMULO = "accumulo"; //$NON-NLS-1$
private static final String NS_DESIGNER_EXCEL = "excel"; //$NON-NLS-1$
private static final String NS_DESIGNER_JPA = "jpa2"; //$NON-NLS-1$
+ private static final String REST_COLON_PREFIX= "REST:"; //$NON-NLS-1$
+ private static final String REST_URI = "URI"; //$NON-NLS-1$
+ private static final String REST_METHOD = "METHOD"; //$NON-NLS-1$
+ private static final String REST_CHARSET = "CHARSET"; //$NON-NLS-1$
// Added to address TEIID-3629
private static final String SF_PROPNAME_CALCULATED_BAD = "calculated"; //$NON-NLS-1$
private static final String SF_PROPNAME_CALCULATED_GOOD = "Calculated"; //$NON-NLS-1$
@@ -194,124 +200,252 @@ protected String getTeiidDataTypeName(String datatype) throws Exception {
private void createConstraint(AstNode constraintNode, RelationalTable table, RelationalModel model, Collection allRefs) throws CoreException {
String type = constraintNode.getProperty(TeiidDdlLexicon.Constraint.TYPE).toString();
- boolean primaryKeyConstraint = false;
- boolean uniqueConstraint = false;
- boolean accessPatternConstraint = false;
- boolean foreignKeyConstraint = false;
- boolean indexConstraint = false;
+
RelationalReference key = null;
if (DdlConstants.PRIMARY_KEY.equals(type)) {
- key = getFactory().createPrimaryKey();
- initialize(key, constraintNode);
- table.setPrimaryKey((RelationalPrimaryKey)key);
- primaryKeyConstraint = true;
+ createPrimaryKey(constraintNode, table, allRefs);
+ key = table.getPrimaryKey();
} else if (DdlConstants.INDEX.equals(type)) {
// TODO need to process teiidddl:expression property
- key = getFactory().createIndex();
- initialize(key, constraintNode);
- model.addChild(key);
- indexConstraint = true;
+ key = createIndex(constraintNode, table, allRefs);
} else if (DdlConstants.UNIQUE.equals(type)) {
- key = getFactory().createUniqueConstraint();
- initialize(key, constraintNode);
- table.getUniqueConstraints().add((RelationalUniqueConstraint)key);
- uniqueConstraint = true;
+ key = createUniqueConstraint(constraintNode, table, allRefs);
} else if (TeiidDdlConstants.TeiidNonReservedWord.ACCESSPATTERN.toDdl().equals(type)) {
- key = getFactory().createAccessPattern();
- initialize(key, constraintNode);
- table.getAccessPatterns().add((RelationalAccessPattern)key);
- accessPatternConstraint = true;
+ key = createAccessPattern(constraintNode, table, allRefs);
} else if (DdlConstants.FOREIGN_KEY.equals(type)) {
- key = getFactory().createForeignKey();
- initializeFK(table.getForeignKeys(), (RelationalForeignKey)key, constraintNode);
- table.getForeignKeys().add((RelationalForeignKey)key);
- foreignKeyConstraint = true;
+ key = createForeignKey(constraintNode, table, allRefs);
} else {
assert false : "Unexpected constraint type of '" + type + "'"; //$NON-NLS-1$ //$NON-NLS-2$
}
+
+ // Find all the Option properties
+ List optionNodes = new ArrayList();
+ List children = constraintNode.getChildren();
+ for(AstNode child: children) {
+ if(is(child, StandardDdlLexicon.TYPE_STATEMENT_OPTION)) {
+ optionNodes.add(child);
+ }
+ }
+
+ // process the Column Options
+ if( ! optionNodes.isEmpty() ) {
+ processOptions(optionNodes,key);
+ }
+ }
+
+ private boolean columnsMatch(List columns_1, Collection columns_2) {
+ if( columns_1 == null && columns_2 == null ) return true;
+
+ if( columns_1 == null || columns_2 == null ) return false;
+
+ // Neither can be NULL
+ if( columns_1.size() != columns_2.size() ) return false;
+
+ // Size is the same
+ for( AstNode colOuter_1 : columns_1) {
+ boolean foundIt = false;
+ String columnName = colOuter_1.getName();
+ for( RelationalColumn colInner_2 : columns_2) {
+ if( columnName.equals(colInner_2.getName()) ) {
+ foundIt = true;
+ }
+ }
+
+ if( !foundIt ) return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ protected void createPrimaryKey(AstNode node, RelationalTable table, Collection allRefs) throws CoreException {
+ RelationalPrimaryKey key = getFactory().createPrimaryKey();
+ table.setPrimaryKey(key);
+ initialize(key, node);
+
// process referenced columns multi-valued property
- Object temp = constraintNode.getProperty(TeiidDdlLexicon.Constraint.REFERENCES);
- List references = (List)temp;
+ List references = (List)node.getProperty(TeiidDdlLexicon.Constraint.REFERENCES);
+
+ for (AstNode ref : references) {
+ try {
+ RelationalColumn column = find(RelationalColumn.class, ref, table, allRefs);
+ key.getColumns().add(column);
+ } catch (EntityNotFoundException error) {
+ addProgressMessage(error.getMessage());
+ }
+ }
+ }
+
+ private RelationalReference createUniqueConstraint(AstNode constraintNode, RelationalTable table, Collection allRefs) throws CoreException {
+ RelationalUniqueConstraint constraint = getFactory().createUniqueConstraint();
+ initialize(constraint, constraintNode);
+ table.addUniqueConstraint(constraint);
+
+ // process referenced columns multi-valued property
+ List references = (List)constraintNode.getProperty(TeiidDdlLexicon.Constraint.REFERENCES);
for (AstNode ref : references) {
try {
RelationalColumn col = find(RelationalColumn.class, ref, table, allRefs);
if(col!=null) {
- if (primaryKeyConstraint) {
- ((RelationalPrimaryKey)key).getColumns().add(col);
- } else if (uniqueConstraint) {
- ((RelationalUniqueConstraint)key).getColumns().add(col);
- } else if (accessPatternConstraint) {
- ((RelationalAccessPattern)key).getColumns().add(col);
- } else if (foreignKeyConstraint) {
- ((RelationalForeignKey)key).getColumns().add(col);
- } else if (indexConstraint) {
- ((RelationalIndex)key).getColumns().add(col);
- }else {
- assert false : "Unexpected constraint type of '" + type + "'"; //$NON-NLS-1$ //$NON-NLS-2$
- }
+ constraint.getColumns().add(col);
}
} catch (EntityNotFoundException error) {
addProgressMessage(error.getMessage());
}
}
+
+ return constraint;
+ }
+
+ private RelationalReference createAccessPattern(AstNode constraintNode, RelationalTable table, Collection allRefs) throws CoreException {
+ RelationalAccessPattern constraint = getFactory().createAccessPattern();
+ initialize(constraint, constraintNode);
+ table.addAccessPattern(constraint);
+
+ // process referenced columns multi-valued property
+ List references = (List)constraintNode.getProperty(TeiidDdlLexicon.Constraint.REFERENCES);
- // special processing for foreign key
- if (foreignKeyConstraint) {
- RelationalForeignKey foreignKey = (RelationalForeignKey)key;
+ for (AstNode ref : references) {
+ try {
+ RelationalColumn col = find(RelationalColumn.class, ref, table, allRefs);
+ if(col!=null) {
+ constraint.getColumns().add(col);
+ }
+ } catch (EntityNotFoundException error) {
+ addProgressMessage(error.getMessage());
+ }
+ }
+
+ return constraint;
+ }
+
+ private RelationalReference createIndex(AstNode constraintNode, RelationalTable table, Collection allRefs) throws CoreException {
+ RelationalIndex constraint = getFactory().createIndex();
+ initialize(constraint, constraintNode);
+ table.addIndex(constraint);
+
+ // process referenced columns multi-valued property
+ List references = (List)constraintNode.getProperty(TeiidDdlLexicon.Constraint.REFERENCES);
- AstNode tableRefNode = (AstNode)constraintNode.getProperty(TeiidDdlLexicon.Constraint.TABLE_REFERENCE);
- if(tableRefNode==null) {
- addProgressMessage(DdlImporterI18n.FK_TABLE_REF_NOT_FOUND_MSG+" '"+foreignKey.getName()+"'"); //$NON-NLS-1$ //$NON-NLS-2$
- return;
+ for (AstNode ref : references) {
+ try {
+ RelationalColumn col = find(RelationalColumn.class, ref, table, allRefs);
+ if(col!=null) {
+ constraint.getColumns().add(col);
+ }
+ } catch (EntityNotFoundException error) {
+ addProgressMessage(error.getMessage());
}
+ }
+ return constraint;
+ }
+
+ private RelationalReference createForeignKey(AstNode constraintNode, RelationalTable table, Collection allRefs) throws CoreException {
+ RelationalForeignKey foreignKey = getFactory().createForeignKey();
+ initializeFK(table.getForeignKeys(), foreignKey, constraintNode);
+ table.addForeignKey(foreignKey);
+
+ // process referenced columns multi-valued property
+ List references = (List)constraintNode.getProperty(TeiidDdlLexicon.Constraint.REFERENCES);
+
+ for (AstNode ref : references) {
try {
- RelationalTable tableRef = find(RelationalTable.class, tableRefNode, null, allRefs);
- RelationalPrimaryKey tableRefPrimaryKey = tableRef.getPrimaryKey();
- Collection primaryKeyColumns = tableRef.getColumns();
- // check to see if foreign table columns are referenced
- Object tempRefColumns = constraintNode.getProperty(TeiidDdlLexicon.Constraint.TABLE_REFERENCE_REFERENCES);
-
- List foreignTableColumnNodes = (tempRefColumns==null) ? Collections.emptyList() : (List)tempRefColumns;
- int numPKColumns = primaryKeyColumns.size();
- int numFKColumns = foreignTableColumnNodes.size();
-
- //TODO: Can we just set PK object on the FK, instead of the Names???
- if( foreignTableColumnNodes.isEmpty() ) {
- if(tableRefPrimaryKey!=null) {
- foreignKey.setUniqueKeyName(tableRefPrimaryKey.getName());
- foreignKey.setUniqueKeyTableName(tableRef.getName());
- }
- } else if( numPKColumns == numFKColumns ) {
- //TODO: not sure what this is doing
- for(AstNode fTableColumn : foreignTableColumnNodes) {
- find(RelationalColumn.class, fTableColumn, tableRef, allRefs);
- }
- foreignKey.setUniqueKeyName(tableRefPrimaryKey.getName());
- foreignKey.setUniqueKeyTableName(tableRef.getName());
- } else {
- foreignKey.setUniqueKeyName(tableRefPrimaryKey.getName());
- foreignKey.setUniqueKeyTableName(tableRef.getName());
+ RelationalColumn col = find(RelationalColumn.class, ref, table, allRefs);
+ if(col!=null) {
+ foreignKey.getColumns().add(col);
}
} catch (EntityNotFoundException error) {
addProgressMessage(error.getMessage());
}
}
- // Find all the Option properties
- List optionNodes = new ArrayList();
- List children = constraintNode.getChildren();
- for(AstNode child: children) {
- if(is(child, StandardDdlLexicon.TYPE_STATEMENT_OPTION)) {
- optionNodes.add(child);
+ AstNode tableRefNode = (AstNode)constraintNode.getProperty(TeiidDdlLexicon.Constraint.TABLE_REFERENCE);
+ if(tableRefNode==null) {
+ addProgressMessage(DdlImporterI18n.FK_TABLE_REF_NOT_FOUND_MSG + " '"+ foreignKey.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+ return foreignKey;
+ }
+
+ try {
+ RelationalTable tableRef = find(RelationalTable.class, tableRefNode, null, allRefs);
+
+ // Note that a REFERENCE table can have either a PK reference or a Unique Constraint reference.
+ // So get the RelationalReference object for each
+
+ RelationalPrimaryKey tableRefPrimaryKey = tableRef.getPrimaryKey();
+ RelationalUniqueConstraint tableRefUC = null;
+ if( ! tableRef.getUniqueConstraints().isEmpty() ) {
+ tableRefUC = tableRef.getUniqueConstraints().iterator().next();
+ }
+
+ // check to see if foreign table columns are referenced
+ Object tempRefColumns = constraintNode.getProperty(TeiidDdlLexicon.Constraint.TABLE_REFERENCE_REFERENCES);
+
+ // Create list of AstNode's
+ List foreignTableColumnNodes = (tempRefColumns==null) ? Collections.emptyList() : (List)tempRefColumns;
+
+ // Get number of columns that are referenced
+ int numFKTableReferenceColumns = foreignTableColumnNodes.size();
+ if( numFKTableReferenceColumns == 0 ) {
+ if(tableRefPrimaryKey!=null) {
+ foreignKey.setUniqueKeyName(tableRefPrimaryKey.getName());
+ foreignKey.setUniqueKeyTableName(tableRef.getName());
+ } else if( tableRefUC != null ) {
+ foreignKey.setUniqueKeyName(tableRefUC.getName());
+ foreignKey.setUniqueKeyTableName(tableRef.getName());
+ }
+ // That's all we can do, there are no references
+ return foreignKey;
}
+
+
+ int numPKColumns = 0;
+ if( tableRefPrimaryKey != null ) {
+ numPKColumns = tableRefPrimaryKey.getColumns().size();
+ }
+ int numUCColumns = 0;
+ if( tableRefUC != null ) {
+ numUCColumns = tableRefUC.getColumns().size();
+ }
+ boolean constraintWasPK = false;
+
+ // there are referenced columns in FK.
+ // Check if #PK columns matches
+ if( numFKTableReferenceColumns == numPKColumns ) {
+ // Check PK to see if the columns are found and match
+ // Assumes UC and PK can't reference the same keys
+
+ // Need to compare the foreignTableColumnNodes (AstNode's) against the PK column names
+
+ boolean columnsMatch = columnsMatch(foreignTableColumnNodes, tableRefPrimaryKey.getColumns());
+ if( columnsMatch ) {
+ foreignKey.setUniqueKeyName(tableRefPrimaryKey.getName());
+ foreignKey.setUniqueKeyTableName(tableRef.getName());
+ constraintWasPK = true;
+ }
+ }
+ if( ! constraintWasPK ) {
+ if( numUCColumns == numFKTableReferenceColumns ) {
+ // Check UC to see if the columns are found and match
+ // Assumes UC and PK can't reference the same keys
+ boolean columnsMatch = columnsMatch(foreignTableColumnNodes, tableRefUC.getColumns());
+ if( columnsMatch ) {
+ foreignKey.setUniqueKeyName(tableRefUC.getName());
+ foreignKey.setUniqueKeyTableName(tableRef.getName());
+ }
+ } else {
+ foreignKey.setUniqueKeyName(tableRefPrimaryKey.getName());
+ foreignKey.setUniqueKeyTableName(tableRef.getName());
+ }
+ }
+ } catch (EntityNotFoundException error) {
+ addProgressMessage(error.getMessage());
}
- // process the Column Options
- processOptions(optionNodes,key);
+ return foreignKey;
}
@Override
@@ -352,24 +486,24 @@ protected RelationalColumn createColumn(AstNode node, RelationalTable table) thr
@Override
protected void setDataType(AstNode node, RelationalColumn column) throws Exception {
String datatype = node.getProperty(StandardDdlLexicon.DATATYPE_NAME).toString();
-// column.setNativeType(datatype);
String teiidType = getTeiidDataTypeName(datatype);
- column.setDatatype(teiidType);
+ if( teiidType.toUpperCase().equals(TYPES_UPPER.INTEGER)) {
+ column.setDatatype(TYPES_UPPER.INT.toLowerCase());
+ } else {
+ column.setDatatype(teiidType);
+ }
- // Datatype length
+ // Data type length
Object prop = node.getProperty(StandardDdlLexicon.DATATYPE_LENGTH);
if (prop != null) {
column.setLength(Integer.parseInt(prop.toString()));
} else {
// Length is not provided for type 'string', use the default length specified in preferences...
- //String dtName = ModelerCore.getWorkspaceDatatypeManager().getName(type);
- if(teiidType != null) {
- if( teiidType.equalsIgnoreCase(STRING_TYPENAME)) {
- column.setLength(ModelerCore.getTransformationPreferences().getDefaultStringLength());
- } else if( teiidType.equalsIgnoreCase(CHAR_TYPENAME) ) {
- column.setLength(1);
- }
+ if( teiidType.equalsIgnoreCase(STRING_TYPENAME)) {
+ column.setLength(ModelerCore.getTransformationPreferences().getDefaultStringLength());
+ } else if( teiidType.equalsIgnoreCase(CHAR_TYPENAME) ) {
+ column.setLength(1);
}
}
@@ -434,6 +568,12 @@ protected RelationalProcedure createProcedure(AstNode procedureNode, RelationalM
return procedure;
}
+ /**
+ * @param procedureNode
+ * @param model
+ * @return procedure
+ * @throws Exception
+ */
protected RelationalProcedure createVirtualProcedure(AstNode procedureNode, RelationalModel model) throws Exception {
RelationalViewProcedure procedure = getFactory().createViewProcedure();
Info info = createInfo(procedureNode, model);
@@ -470,10 +610,10 @@ protected RelationalProcedure createVirtualProcedure(AstNode procedureNode, Rela
}
}
} else if(is(child, TeiidDdlLexicon.CreateProcedure.RESULT_DATA_TYPE)) {
- RelationalProcedureResultSet result = getFactory().createProcedureResultSet();
- procedure.setResultSet(result);
- initialize(result, procedureNode);
- createColumn(child,result);
+ // Add a parameter with RETURN direction
+ RelationalParameter param = createProcedureParameter(child, procedure);
+ param.setDirection(DirectionKind.RETURN_LITERAL.toString());
+ param.setName(TeiidDDLConstants.RETURNS);
} else if(is(child, StandardDdlLexicon.TYPE_STATEMENT_OPTION)) {
procOptionNodes.add(child);
}
@@ -637,7 +777,7 @@ protected Map createObject(AstNode node, Relational
// Statement Options
} else if (is(child, StandardDdlLexicon.TYPE_STATEMENT_OPTION)) {
optionNodes.add(child);
- // Contraints
+ // Constraints
} else if (is(child, TeiidDdlLexicon.Constraint.TABLE_ELEMENT)
|| is(child, TeiidDdlLexicon.Constraint.FOREIGN_KEY_CONSTRAINT)
|| is(child, TeiidDdlLexicon.Constraint.INDEX_CONSTRAINT)) {
@@ -657,7 +797,7 @@ protected Map createObject(AstNode node, Relational
|| is(node, TeiidDdlLexicon.CreateProcedure.FUNCTION_STATEMENT)) {
String modelType = (String)node.getProperty(TeiidDdlLexicon.SchemaElement.TYPE);
if( modelType != null ) {
- if( modelType.equalsIgnoreCase("VIRTUAL")) {
+ if( modelType.equalsIgnoreCase(ModelType.VIRTUAL_LITERAL.toString())) {
createVirtualProcedure(node, model);
} else {
createProcedure(node, model);
@@ -1089,7 +1229,23 @@ private void processTeiidExtensionOptions(List optionNodes, RelationalR
}
String optionValueStr = (String)optionValue;
if(!CoreStringUtil.isEmpty(optionValueStr)) {
- relationalEntity.addExtensionProperty(optionName, optionValueStr);
+ if( relationalEntity instanceof RelationalViewProcedure ) {
+ RelationalViewProcedure proc = (RelationalViewProcedure)relationalEntity;
+ // If REST property for Virtual Procedures.. process separately
+ if( optionName.startsWith(REST_COLON_PREFIX) ) {
+ if( optionName.toUpperCase().endsWith(REST_URI)) {
+ proc.setRestUri(optionValueStr);
+ } else if( optionName.toUpperCase().endsWith(REST_METHOD)) {
+ proc.setRestMethod(optionValueStr);
+ } else if( optionName.toUpperCase().endsWith(REST_CHARSET)) {
+ proc.setRestCharSet(optionValueStr);
+ } else {
+ relationalEntity.addExtensionProperty(optionName, optionValueStr);
+ }
+ }
+ } else {
+ relationalEntity.addExtensionProperty(optionName, optionValueStr);
+ }
}
}
nodeIter.remove();
@@ -1106,9 +1262,10 @@ private void removeRedundantConstraints(RelationalModel model) {
if( pk != null ) {
Collection constraints = ((RelationalTable) child).getUniqueConstraints();
for( RelationalUniqueConstraint uc : constraints ) {
- boolean same = true;
+ boolean same = false;
if( pk.getColumns().size() == uc.getColumns().size() ) {
// need to check all columns
+ same = true;
for(RelationalColumn col : pk.getColumns()) {
if( !uc.getColumns().contains(col) ) {
same = false;
diff --git a/plugins/org.teiid.designer.ddl.spi/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.ddl.spi/META-INF/MANIFEST.MF
index 698136ed7a..60593946f6 100644
--- a/plugins/org.teiid.designer.ddl.spi/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.ddl.spi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.ddl.spi;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.ddl.spi/pom.xml b/plugins/org.teiid.designer.ddl.spi/pom.xml
index 5faf6733f7..1ea2c15b8a 100644
--- a/plugins/org.teiid.designer.ddl.spi/pom.xml
+++ b/plugins/org.teiid.designer.ddl.spi/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.ddl.spi
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.ddl/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.ddl/META-INF/MANIFEST.MF
index 6801e32e6b..d84375cf74 100644
--- a/plugins/org.teiid.designer.ddl/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.ddl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.ddl;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.ddl.DdlPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.ddl/pom.xml b/plugins/org.teiid.designer.ddl/pom.xml
index 9d99e7a45a..27082a497a 100644
--- a/plugins/org.teiid.designer.ddl/pom.xml
+++ b/plugins/org.teiid.designer.ddl/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.ddl
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.diagram.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.diagram.ui/META-INF/MANIFEST.MF
index 2995700b78..97264baa61 100644
--- a/plugins/org.teiid.designer.diagram.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.diagram.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.diagram.ui;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.diagram.ui.DiagramUiPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.diagram.ui/pom.xml b/plugins/org.teiid.designer.diagram.ui/pom.xml
index f61f981882..323cddd004 100644
--- a/plugins/org.teiid.designer.diagram.ui/pom.xml
+++ b/plugins/org.teiid.designer.diagram.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.diagram.ui
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF
index f238bd7371..cbb6c8dc69 100644
--- a/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.teiid.designer.dqp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.dqp.ui;singleton:=true
-Bundle-Version: 9.2.0.qualifier
+Bundle-Version: 9.2.1.qualifier
Bundle-Activator: org.teiid.designer.runtime.ui.DqpUiPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.teiid.designer.dqp.ui/icons/full/ctool16/show-vdb-errors.png b/plugins/org.teiid.designer.dqp.ui/icons/full/ctool16/show-vdb-errors.png
new file mode 100644
index 0000000000..5cbe699b90
Binary files /dev/null and b/plugins/org.teiid.designer.dqp.ui/icons/full/ctool16/show-vdb-errors.png differ
diff --git a/plugins/org.teiid.designer.dqp.ui/pom.xml b/plugins/org.teiid.designer.dqp.ui/pom.xml
index 957acdc043..fcce4319ef 100644
--- a/plugins/org.teiid.designer.dqp.ui/pom.xml
+++ b/plugins/org.teiid.designer.dqp.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.jboss.toolsorg.teiid.designer.dqp.ui
- 9.2.0-SNAPSHOT
+ 9.2.1-SNAPSHOTeclipse-plugin
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiConstants.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiConstants.java
index e12f772af5..68e3d19e8b 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiConstants.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiConstants.java
@@ -130,6 +130,7 @@ interface Images {
public static final String DYNAMIC_VDB = PC.OBJ16 + "dynamic-vdb.png"; //$NON-NLS-1$
public static final String DDL_VDB = PC.OBJ16 + "ddl-vdb.png"; //$NON-NLS-1$
public static final String STANDARD_VDB = PC.OBJ16 + "standard-vdb.png"; //$NON-NLS-1$
+ public static final String SHOW_VDB_ERRORS = PC.CTOOL16 + "show-vdb-errors.png"; //$NON-NLS-1$
}
/**
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceWizard.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceWizard.java
index 5f51e13285..6742167f11 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceWizard.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/CreateDataSourceWizard.java
@@ -20,7 +20,6 @@
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -92,7 +91,6 @@ private static String getString( final String id,
// private TeiidDataSource teiidDataSource;
String dataSourceName;
- private WizardPage wizardPage;
Combo modelsCombo;
Button useModelCheckBox;
Combo connectionProfilesCombo;
@@ -408,7 +406,7 @@ public void widgetSelected( final SelectionEvent event ) {
}
if (profileWorker.getProfiles().isEmpty() && !hasModelResources) {
- wizardPage.setErrorMessage(getString("noConnectionDataError.message")); //$NON-NLS-1$
+ setErrorMessage(getString("noConnectionDataError.message")); //$NON-NLS-1$
} else {
setConnectionProperties();
}
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbDataSourceInfo.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbDataSourceInfo.java
index 4d9b199da5..32366c6d26 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbDataSourceInfo.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbDataSourceInfo.java
@@ -141,7 +141,7 @@ public void setPassThroughAuthentication(boolean passThroughAuthentication) {
public String getUrl() {
StringBuilder sb = new StringBuilder();
sb.append(TEIID_JDBC_URL_PREFIX).append(this.vdbName);
- String host = this.teiidServer.getTeiidJdbcInfo().getHostProvider().getHost();
+ String host = this.teiidServer.getTeiidJdbcInfo().getHost();
String port = this.teiidServer.getTeiidJdbcInfo().getPort();
String protocol = this.teiidServer.getTeiidJdbcInfo().isSecure() ? SECURE_PROTOCOL : PROTOCOL;
sb.append(protocol).append(COLON).append(DELIMITER).append(host).append(COLON).append(port);
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/i18n.properties b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/i18n.properties
index e8afe42c71..d6cfd0aeb9 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/i18n.properties
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/i18n.properties
@@ -107,6 +107,10 @@ TeiidServerActionProvider.enablePreviewMenuItem=Enable Preview
TeiidServerActionProvidererrorClearingPreviewVdbs = Error deleting preview VDBs on server : {0}
TeiidServerActionProvider.errorClearingPreviewDataSources = Error deleting preview data sources on server : {0}
TeiidServerActionProvider.clearPreviewArtifacts = Clear Preview Artifacts
+TeiidServerActionProvider.problemShowingDeployedVdbErrors=Problems showing errors for deployed VDB {0}
+TeiidServerActionProvider.showVdbErrorsAction=Show VDB Errors
+TeiidServerActionProvider.deployedVdbHasErrorsTitle=VDB Errors
+TeiidServerActionProvider.deployedVdbHasErrorsMessage=The deployed VDB "{0}" has the following errors
########## ParameterInputDialog ##########
ClearPreviewArtifactsOptionsDialog.title=Clear Preview Artifact Options
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditor.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditor.java
index 01065207ec..34be8fd967 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditor.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/server/editor/TeiidServerEditor.java
@@ -21,8 +21,6 @@
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
@@ -54,6 +52,7 @@
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
import org.eclipse.wst.server.ui.internal.editor.ServerEditorPartInput;
import org.eclipse.wst.server.ui.internal.editor.ServerResourceCommandManager;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.teiid.core.designer.util.CoreStringUtil;
import org.teiid.core.designer.util.StringUtilities;
import org.teiid.designer.core.loading.ComponentLoadingManager;
@@ -161,11 +160,18 @@ public void run() {
switch (event.getEventType()) {
case REFRESH:
case UPDATE:
- refreshDisplayValues();
+ // Put the refesh on Swt thread
+ Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ refreshDisplayValues(teiidServer.getTeiidAdminInfo().getPassword(),
+ teiidServer.getTeiidJdbcInfo().getPassword());
+ }
+ };
+ UiUtil.runInSwtThread(runnable, true);
break;
case REMOVE:
disposeContents();
- manageLoad(new Properties());
break;
case DEFAULT:
case ADD:
@@ -231,7 +237,7 @@ public void serverChanged(IServer server) {
if (! parentServer.equals(server))
return;
- refreshDisplayValues();
+ refreshDisplayValues(teiidServer.getTeiidAdminInfo().getPassword(), teiidServer.getTeiidJdbcInfo().getPassword());
}
};
@@ -292,17 +298,25 @@ public void run() {
getServerManager().addListener(excutionConfigListener);
+ String adminPWD = null;
+ String jdbcPWD = null;
+
try {
TeiidServerAdapterFactory adapterFactory = new TeiidServerAdapterFactory();
- if (parentServer.getServerState() == IServer.STATE_STARTED)
+ if (parentServer.getServerState() == IServer.STATE_STARTED) {
// If server is started we can be more adventurous in what to display since we can ask
// the server whether teiid has been installed.
teiidServer = adapterFactory.adaptServer(parentServer, ServerOptions.ADD_TO_REGISTRY);
- else {
+ adminPWD = teiidServer.getTeiidAdminInfo().getPassword();
+ jdbcPWD = teiidServer.getTeiidJdbcInfo().getPassword();
+ } else {
// Cannot ask a lot except whether the server is a JBoss Server
teiidServer = adapterFactory.adaptServer(parentServer,
ServerOptions.NO_CHECK_CONNECTION,
ServerOptions.ADD_TO_REGISTRY);
+ // password may still be a passToken only
+ adminPWD = teiidServer.getTeiidAdminInfo().getPassword();
+ jdbcPWD = teiidServer.getTeiidJdbcInfo().getPassword();
}
} catch (Exception ex) {
ErrorHandler.toExceptionDialog(ex);
@@ -320,6 +334,18 @@ public void run() {
}
form.reflow(true);
+ if( teiidServer != null ) {
+ final String aPWD = adminPWD;
+ final String jPWD = jdbcPWD;
+ // Put the refesh on Swt thread
+ Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ refreshDisplayValues(aPWD, jPWD);
+ }
+ };
+ UiUtil.runInSwtThread(runnable, true);
+ }
}
};
@@ -590,10 +616,12 @@ private void execute(ServerCommand command) {
commandManager.execute(command);
}
- private void refreshDisplayValues() {
+ private void refreshDisplayValues(final String adminPWD, final String jdbcPWD) {
if (teiidServer == null || form.isDisposed())
return;
+ if( hostNameLabel.isDisposed() ) return;
+
hostNameLabel.setText(teiidServer.getHost());
String versionValue = teiidServer.getServerVersion().toString();
if(! versionValueCombo.getText().equals(versionValue)){
@@ -605,14 +633,14 @@ private void refreshDisplayValues() {
ITeiidAdminInfo teiidAdminInfo = teiidServer.getTeiidAdminInfo();
ITeiidJdbcInfo teiidJdbcInfo = teiidServer.getTeiidJdbcInfo();
-
+
if( isSevenServer() ) {
if (adminUserNameText != null) {
setIfDifferent(adminUserNameText, teiidAdminInfo.getUsername() != null ? teiidAdminInfo.getUsername() : EMPTY_STRING);
}
if (adminPasswdText != null) {
- setIfDifferent(adminPasswdText, teiidAdminInfo.getPassword() != null ? teiidAdminInfo.getPassword() : EMPTY_STRING);
+ setIfDifferent(adminPasswdText, adminPWD != null ? adminPWD : EMPTY_STRING);
}
String portValue = teiidAdminInfo.getPort() != null ? teiidAdminInfo.getPort() : EMPTY_STRING;
@@ -628,7 +656,7 @@ private void refreshDisplayValues() {
}
setIfDifferent(jdbcUserNameText, teiidJdbcInfo.getUsername() != null ? teiidJdbcInfo.getUsername() : EMPTY_STRING);
- setIfDifferent(jdbcPasswdText, teiidJdbcInfo.getPassword() != null ? teiidJdbcInfo.getPassword() : EMPTY_STRING);
+ setIfDifferent(jdbcPasswdText, jdbcPWD != null ? jdbcPWD : EMPTY_STRING);
if( isSevenServer() ) {
String portValue = teiidJdbcInfo.getPort() != null ? teiidJdbcInfo.getPort() : EMPTY_STRING;
@@ -729,19 +757,30 @@ public void doSave(IProgressMonitor monitor) {
}
// =========================================================================
- ITeiidServer newTeiidServer = teiidServerFactory.createTeiidServer(
- newTeiidServerVersion,
- getServerManager(),
- teiidServer.getParent(),
- teiidServer.getTeiidAdminInfo().getPort(),
- adminUserNameText != null ? adminUserNameText.getText() : teiidServer.getTeiidAdminInfo().getUsername(),
- adminPasswdText != null ? adminPasswdText.getText() : teiidServer.getTeiidAdminInfo().getPassword(),
- finalJdbcPort, // <<<<<<<<< DETERMINED ABOVE
- jdbcUserNameText.getText(),
- jdbcPasswdText.getText(),
- serverOptions.toArray(new ServerOptions[0]));
-
- teiidServer.update(newTeiidServer);
+ String adminUname = null;
+ String adminPwd = null;
+ if( isSevenServer() ) {
+ adminUname = adminUserNameText != null ? adminUserNameText.getText() : teiidServer.getTeiidAdminInfo().getUsername();
+ adminPwd = adminPasswdText != null ? adminPasswdText.getText() : teiidServer.getTeiidAdminInfo().getPassword();
+ } else {
+ JBossServer jb = (JBossServer) teiidServer.getParent().loadAdapter(JBossServer.class, null);
+ adminUname = jb.getUsername();
+ adminPwd = jb.getPassword();
+ }
+
+ teiidServer.getTeiidAdminInfo().setAll(
+ teiidServer.getTeiidAdminInfo().getHost(),
+ teiidServer.getTeiidAdminInfo().getPort(),
+ adminUname,
+ adminPwd,
+ teiidServer.getTeiidAdminInfo().isSecure());
+
+ teiidServer.getTeiidJdbcInfo().setAll(
+ teiidServer.getTeiidAdminInfo().getHost(),
+ finalJdbcPort,
+ jdbcUserNameText.getText(),
+ jdbcPasswdText.getText(),
+ teiidServer.getTeiidAdminInfo().isSecure());
dirty = false;
firePropertyChange(IEditorPart.PROP_DIRTY);
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidServerActionProvider.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidServerActionProvider.java
index 77568e48e2..126094bf41 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidServerActionProvider.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidServerActionProvider.java
@@ -55,6 +55,7 @@
import org.teiid.designer.runtime.ui.views.content.DataSourcesFolder;
import org.teiid.designer.ui.common.eventsupport.SelectionUtilities;
import org.teiid.designer.ui.common.util.UiUtil;
+import org.teiid.designer.ui.common.widget.ListMessageDialog;
/**
* @since 8.0
@@ -112,6 +113,8 @@ public class TeiidServerActionProvider extends CommonActionProvider {
private IAction clearPreviewArtifactsAction;
private Action createVdbDataSourceAction;
+
+ private Action showVdbErrorsAction;
private final TeiidServerPreviewOptionContributor previewOptionContributor;
@@ -277,7 +280,7 @@ public void run() {
this.executeVdbAction.setEnabled(true);
// the shell used for dialogs that the actions display
- Shell shell = this.actionSite.getViewSite().getShell();
+ final Shell shell = this.actionSite.getViewSite().getShell();
// the reconnect action tries to ping a selected server
this.refreshAction = new RefreshServerAction();
viewer.addSelectionChangedListener(this.refreshAction);
@@ -396,6 +399,34 @@ public void run() {
this.createVdbDataSourceAction.setToolTipText(getString("createDataSourceAction.tooltip")); //$NON-NLS-1$
this.createVdbDataSourceAction.setEnabled(true);
+
+ this.showVdbErrorsAction = new Action(getString("showVdbErrorsAction")) { //$NON-NLS-1$
+ @Override
+ public void run() {
+ List