Author: shawkins
Date: 2010-07-13 10:17:17 -0400 (Tue, 13 Jul 2010)
New Revision: 2335
Modified:
trunk/build/kits/jboss-container/teiid-releasenotes.html
trunk/common-core/src/main/resources/org/teiid/core/i18n.properties
trunk/connectors/translator-ws/pom.xml
trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java
Log:
TEIID-1154 removing jdom
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-13 01:29:08 UTC (rev
2334)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-13 14:17:17 UTC (rev
2335)
@@ -2,15 +2,15 @@
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html;
charset=utf-8">
- <TITLE>Teiid 7.0 Final Release Notes</TITLE>
+ <TITLE>Teiid ${project.version} Release Notes</TITLE>
<META NAME="CHANGEDBY" CONTENT="Steve Hawkins">
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
<P><A
HREF="http://www.teiid.org/"><IMG
SRC="https://www.jboss.org/dms/teiid/images/teiid_banner.png"
NAME="graphics1" ALT="Teiid" ALIGN=BOTTOM WIDTH=800></A>
-<H1>Teiid 7.1 Release Notes</H1>
-<P>Teiid 7.1 adds ODBC, clustering, and caching features.
+<H1>Teiid ${project.version} Release Notes</H1>
+<P>Teiid ${project.version} adds ODBC, clustering, and caching features.
<H2>Overview</H2>
<UL>
Modified: trunk/common-core/src/main/resources/org/teiid/core/i18n.properties
===================================================================
--- trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-07-13
01:29:08 UTC (rev 2334)
+++ trunk/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-07-13
14:17:17 UTC (rev 2335)
@@ -173,59 +173,6 @@
SqlResourceBundle.unable_to_find_bundle=Unable to find SQL bundle with name {0} and
language {1}
MetaMatrixRuntimeException.Caused_by=Caused by:
InterceptorStackImpl.Interceptor_array_cannot_be_empty_1=Interceptor array cannot be
empty.
-JdomHelper.The_SAX_driver_class_name_may_not_be_null_1=The SAX driver class name may not
be null
-JdomHelper.The_SAX_driver_class_name_may_not_be_zero-length_2=The SAX driver class name
may not be zero-length
-JdomHelper.The_file_name_may_not_be_null_3=The file name may not be null
-JdomHelper.The_file_name_may_not_be_zero-length_4=The file name may not be zero-length
-JdomHelper.The_SAX_driver_class_name_may_not_be_null_5=The SAX driver class name may not
be null
-JdomHelper.The_SAX_driver_class_name_may_not_be_zero-length_6=The SAX driver class name
may not be zero-length
-JdomHelper.The_InputStream_may_not_be_null_7=The InputStream may not be null
-JdomHelper.The_SAX_driver_class_name_may_not_be_null_8=The SAX driver class name may not
be null
-JdomHelper.The_SAX_driver_class_name_may_not_be_zero-length_9=The SAX driver class name
may not be zero-length
-JdomHelper.The_InputStream_may_not_be_null_10=The InputStream may not be null
-JdomHelper.The_root_tag_name_may_not_be_null_11=The root tag name may not be null
-JdomHelper.The_root_tag_name_may_not_be_zero-length_12=The root tag name may not be
zero-length
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_13=The JDOM Element reference may
not be null
-JdomHelper.The_Namespace_reference_may_not_be_null_14=The Namespace reference may not be
null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_15=The JDOM Element reference may
not be null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_16=The JDOM Element reference may
not be null
-JdomHelper.The_name_may_not_be_null_17=The name may not be null
-JdomHelper.The_name_may_not_be_zero-length_18=The name may not be zero-length
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_19=The JDOM Element reference may
not be null
-JdomHelper.The_Namespace_may_not_be_null_20=The Namespace may not be null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_21=The JDOM Element reference may
not be null
-JdomHelper.The_name_may_not_be_null_22=The name may not be null
-JdomHelper.The_name_may_not_be_zero-length_23=The name may not be zero-length
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_24=The JDOM Element reference may
not be null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_25=The JDOM Element reference may
not be null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_26=The JDOM Element reference may
not be null
-JdomHelper.The_name_may_not_be_null_27=The name may not be null
-JdomHelper.The_name_may_not_be_zero-length_28=The name may not be zero-length
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_29=The JDOM Element reference may
not be null
-JdomHelper.The_name_may_not_be_null_30=The name may not be null
-JdomHelper.The_name_may_not_be_zero-length_31=The name may not be zero-length
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_32=The JDOM Element reference may
not be null
-JdomHelper.The_name_may_not_be_null_33=The name may not be null
-JdomHelper.The_name_may_not_be_zero-length_34=The name may not be zero-length
-JdomHelper.The_Namespace_reference_may_not_be_null_35=The Namespace reference may not be
null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_36=The JDOM Element reference may
not be null
-JdomHelper.The_XMLVisitor_reference_may_not_be_null_37=The XMLVisitor reference may not
be null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_38=The JDOM Element reference may
not be null
-JdomHelper.The_XMLVisitor_reference_may_not_be_null_39=The XMLVisitor reference may not
be null
-JdomHelper.The_JDOM_Element_reference_may_not_be_null_40=The JDOM Element reference may
not be null
-JdomHelper.The_XMLVisitor_reference_may_not_be_null_41=The XMLVisitor reference may not
be null
-JdomHelper.The_Document_reference_may_not_be_null_42=The Document reference may not be
null
-JdomHelper.The_filename_may_not_be_null_43=The filename may not be null
-JdomHelper.The_filename_may_not_be_zero-length_44=The filename may not be zero-length
-JdomHelper.The_Document_reference_may_not_be_null_45=The Document reference may not be
null
-JdomHelper.The_OutputStream_reference_may_not_be_null_46=The OutputStream reference may
not be null
-JdomHelper.The_Document_reference_may_not_be_null_47=The Document reference may not be
null
-JdomHelper.The_Writer_reference_may_not_be_null_48=The Writer reference may not be null
-JdomHelper.The_Document_reference_may_not_be_null_49=The Document reference may not be
null
-JdomHelper.The_stream_reference_may_not_be_null_50=The stream reference may not be null
-JdomHelper.JDOM_Document_tree_51=JDOM Document tree
-JdomHelper.___52=\ \
-JdomHelper.___53=\ \
ServiceInvocation.Method_not_found_{0}.{1}=Method not found {0}.{1}
Command.Could_not_find_method=Could not find method ''{0}.{1}''.
Command.Argument_count_mis-match,_expected_{0}_but_received_{1}=Argument count mis-match,
expected {0} but received {1}.
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2010-07-13 01:29:08 UTC (rev 2334)
+++ trunk/connectors/translator-ws/pom.xml 2010-07-13 14:17:17 UTC (rev 2335)
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <name>Web ervice Translator</name>
+ <name>Web service Translator</name>
<description>This translator provides access to Web
Services.</description>
<dependencies>
<dependency>
@@ -27,11 +27,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
Modified:
trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java
===================================================================
---
trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java 2010-07-13
01:29:08 UTC (rev 2334)
+++
trunk/engine/src/main/java/org/teiid/query/processor/xml/XMLProcessorEnvironment.java 2010-07-13
14:17:17 UTC (rev 2335)
@@ -45,9 +45,6 @@
/** XML result documents should be in String form */
public static final String STRING_RESULT = "String"; //$NON-NLS-1$
- /** XML result documents should be in JDOM document form */
- public static final String JDOM_DOCUMENT_RESULT = "JDOM Document";
//$NON-NLS-1$
-
/* Stack <ProgramState> */
private LinkedList<ProgramState> programStack = new
LinkedList<ProgramState>();